Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

ocamlPackages.ocp-index: 1.1.4 -> 1.1.5

+14 -23
+14 -23
pkgs/development/tools/ocaml/ocp-index/default.nix
··· 1 - { stdenv, fetchFromGitHub, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: 1 + { stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: 2 2 3 3 let inherit (stdenv.lib) getVersion versionAtLeast optional; in 4 4 5 5 assert versionAtLeast (getVersion ocaml) "4"; 6 - assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; 6 + assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta"; 7 7 assert versionAtLeast (getVersion ocpIndent) "1.4.2"; 8 8 9 9 let 10 - version = "1.1.4"; 11 - srcs = { 12 - "4.03.0" = { 13 - rev = "${version}-4.03"; 14 - sha256 = "0c6s5radwyvxf9hrq2y9lirk72z686k9yzd0vgzy98yrrp1w56mv"; 15 - }; 16 - "4.02.3" = { 17 - rev = "${version}-4.02"; 18 - sha256 = "057ss3lz754b2pznkb3zda5h65kjgqnvabvfqwqcz4qqxxki2yc8"; 19 - }; 20 - "4.01.0" = { 21 - rev = "${version}"; 22 - sha256 = "106bnc8jhmjnychcl8k3gl9n6b50bc66qc5hqf1wkbkk9kz4vc9d"; 23 - }; 24 - }; 25 - 26 - src = fetchFromGitHub ({ 27 - owner = "OCamlPro"; 28 - repo = "ocp-index"; 29 - } // srcs."${ocaml.version}"); 10 + version = "1.1.5"; 30 11 in 31 12 32 13 stdenv.mkDerivation { 33 14 34 15 name = "ocp-index-${version}"; 35 16 36 - inherit src; 17 + src = fetchFromGitHub { 18 + owner = "OCamlPro"; 19 + repo = "ocp-index"; 20 + rev = version; 21 + sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd"; 22 + }; 23 + 24 + patches = [ (fetchpatch { 25 + url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff; 26 + sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z"; 27 + }) ]; 37 28 38 29 buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ] 39 30 ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;