eff: 20140928 -> 5.0 (#39264)

authored by Vincent Laporte and committed by Jörg Thalheim 5f82c322 82063417

+14 -13
+12 -11
pkgs/development/interpreters/eff/default.nix
··· 1 - { stdenv, fetchgit, ocaml, findlib, ocamlbuild, menhir, which }: 2 - 3 - let inherit (stdenv.lib) getVersion versionAtLeast; in 1 + { stdenv, fetchFromGitHub, which, ocamlPackages }: 4 2 5 - assert versionAtLeast (getVersion ocaml) "3.12"; 3 + let version = "5.0"; in 6 4 7 5 stdenv.mkDerivation { 8 6 9 - name = "eff-20140928"; 7 + name = "eff-${version}"; 10 8 11 - src = fetchgit { 12 - url = "https://github.com/matijapretnar/eff.git"; 13 - rev = "90f884a790fddddb51d4d1d3b7c2edf1e8aabb64"; 14 - sha256 = "0cqqrpvfw0nrk5d28mkzfvc8yzqxcss0k46bkmqhqjkqq886n2mm"; 9 + src = fetchFromGitHub { 10 + owner = "matijapretnar"; 11 + repo = "eff"; 12 + rev = "v${version}"; 13 + sha256 = "1fslfj5d7fhj3f7kh558b8mk5wllwyq4rnhfkyd96fpy144sdcka"; 15 14 }; 16 15 17 - buildInputs = [ ocaml findlib ocamlbuild menhir which ]; 16 + buildInputs = [ which ] ++ (with ocamlPackages; [ 17 + ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild 18 + ]); 18 19 19 20 doCheck = true; 20 21 checkTarget = "test"; ··· 29 30 backtracking, multi-threading, and much more... 30 31 ''; 31 32 license = licenses.bsd2; 32 - platforms = ocaml.meta.platforms or []; 33 + inherit (ocamlPackages.ocaml.meta) platforms; 33 34 maintainers = [ maintainers.jirkamarsik ]; 34 35 }; 35 36 }
+2
pkgs/top-level/all-packages.nix
··· 2089 2089 2090 2090 edk2 = callPackage ../development/compilers/edk2 { }; 2091 2091 2092 + eff = callPackage ../development/interpreters/eff { }; 2093 + 2092 2094 eflite = callPackage ../applications/audio/eflite {}; 2093 2095 2094 2096 eid-mw = callPackage ../tools/security/eid-mw { };
-2
pkgs/top-level/ocaml-packages.nix
··· 217 217 218 218 easy-format = callPackage ../development/ocaml-modules/easy-format { }; 219 219 220 - eff = callPackage ../development/interpreters/eff { }; 221 - 222 220 eliom = callPackage ../development/ocaml-modules/eliom { 223 221 lwt = lwt2; 224 222 js_of_ocaml = js_of_ocaml_2;