public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ocaml-utop

Browse Source
This commit is contained in:
Michael Raskin
2017-05-01 14:38:18 +02:00
committed by GitHub
parent 1a7586ce24 69250aa4ee
commit 9ae5487b19
579 changed files with 18588 additions and 12037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/ocaml/cppo/default.nix
+3 -3
View File
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
let
pname = "cppo";
version = "1.3.2";
version = "1.5.0";
webpage = "http://mjambon.com/${pname}.html";
in
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
assert stdenv.lib.versionAtLeast ocaml.version "3.12";
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "mjambon";
repo = pname;
rev = "v${version}";
sha256 = "06j0zr78f04ahxi2459vjn61z25hkvs4dfj76200ydg3g6ifb3k1";
sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8";
};
buildInputs = [ ocaml findlib ocamlbuild ];
pkgs/development/tools/ocaml/utop/default.nix
+6 -4
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, ocaml_react
, lambdaTerm, ocaml_lwt, makeWrapper, camomile, zed, cppo, ppx_tools
{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4, ocaml_react
, lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools
}:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "16z02vp9n97iax4fqpbi7v86r75vbabxvnd1rirh8w2miixs1g4x";
};
buildInputs = [ ocaml findlib ocamlbuild makeWrapper cppo camlp4 ppx_tools ];
buildInputs = [ ocaml findlib ocamlbuild cppo camlp4 ppx_tools ];
propagatedBuildInputs = [ lambdaTerm ocaml_lwt ];
@@ -52,14 +52,16 @@ stdenv.mkDerivation rec {
in ''
for prog in "$out"/bin/*
do
# Note: wrapProgram by default calls 'exec -a $0 ...', but this
# breaks utop on Linux with OCaml 4.04, and is disabled with
# '--argv0 ""' flag. See https://github.com/NixOS/nixpkgs/issues/24496
wrapProgram $prog \
wrapProgram "$prog" \
--argv0 "" \
--prefix CAML_LD_LIBRARY_PATH ":" "${get "CAML_LD_LIBRARY_PATH"}" \
--prefix OCAMLPATH ":" "${get "OCAMLPATH"}" \
--prefix OCAMLPATH ":" $(unset OCAMLPATH; addOCamlPath "$out"; printf %s "$OCAMLPATH")
done
'';