dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

eff: 20140928 -> 5.0 (#39264)

Browse Source
This commit is contained in:
Vincent Laporte 2018-04-23 09:16:03 +02:00 committed by Jörg Thalheim
parent 8206341757
commit 5f82c322d6
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/interpreters/eff/default.nix
View File

@ -1,20 +1,21 @@
{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, menhir, which }: { stdenv, fetchFromGitHub, which, ocamlPackages }:
let inherit (stdenv.lib) getVersion versionAtLeast; in let version = "5.0"; in
assert versionAtLeast (getVersion ocaml) "3.12";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "eff-20140928"; name = "eff-${version}";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/matijapretnar/eff.git"; owner = "matijapretnar";
rev = "90f884a790fddddb51d4d1d3b7c2edf1e8aabb64"; repo = "eff";
sha256 = "0cqqrpvfw0nrk5d28mkzfvc8yzqxcss0k46bkmqhqjkqq886n2mm"; rev = "v${version}";
sha256 = "1fslfj5d7fhj3f7kh558b8mk5wllwyq4rnhfkyd96fpy144sdcka";
}; };
buildInputs = [ ocaml findlib ocamlbuild menhir which ]; buildInputs = [ which ] ++ (with ocamlPackages; [
ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild
]);
doCheck = true; doCheck = true;
checkTarget = "test"; checkTarget = "test";
@ -29,7 +30,7 @@ stdenv.mkDerivation {
backtracking, multi-threading, and much more... backtracking, multi-threading, and much more...
''; '';
license = licenses.bsd2; license = licenses.bsd2;
platforms = ocaml.meta.platforms or []; inherit (ocamlPackages.ocaml.meta) platforms;
maintainers = [ maintainers.jirkamarsik ]; maintainers = [ maintainers.jirkamarsik ];
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -2089,6 +2089,8 @@ with pkgs;
edk2 = callPackage ../development/compilers/edk2 { }; edk2 = callPackage ../development/compilers/edk2 { };
eff = callPackage ../development/interpreters/eff { };
eflite = callPackage ../applications/audio/eflite {}; eflite = callPackage ../applications/audio/eflite {};
eid-mw = callPackage ../tools/security/eid-mw { }; eid-mw = callPackage ../tools/security/eid-mw { };

2
pkgs/top-level/ocaml-packages.nix
View File

@ -217,8 +217,6 @@ let
easy-format = callPackage ../development/ocaml-modules/easy-format { }; easy-format = callPackage ../development/ocaml-modules/easy-format { };
eff = callPackage ../development/interpreters/eff { };
eliom = callPackage ../development/ocaml-modules/eliom { eliom = callPackage ../development/ocaml-modules/eliom {
lwt = lwt2; lwt = lwt2;
js_of_ocaml = js_of_ocaml_2; js_of_ocaml = js_of_ocaml_2;