nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 02:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22871 from FlorentBecker/default_ocaml_402

Browse Source 
Default ocaml 402
This commit is contained in:
vbgl 2017-02-19 15:54:54 +01:00 committed by GitHub
commit d31577cfd3
6 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/orpie/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy";
};
buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml ]);
buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml camlp4 ]);
meta = {
homepage = http://pessimization.com/software/orpie/;

2
pkgs/applications/version-management/monotone-viz/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "1.0.2";
name = "monotone-viz-${version}";
buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper];
buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper camlp4];
src = fetchurl {
url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz";
sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";

6
pkgs/development/tools/analysis/frama-c/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = with ocamlPackages; [
ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph
lablgtk coq graphviz zarith why3 apron
lablgtk coq graphviz zarith why3 apron camlp4
];
@ -56,13 +56,15 @@ stdenv.mkDerivation rec {
patches = [ ./dynamic.diff ];
postPatch = ''
# strip absolute paths to /usr/bin
for file in ./configure ./share/Makefile.common ./src/*/configure; do
for file in ./configure ./share/Makefile.common ./src/*/configure; do #*/
substituteInPlace $file --replace '/usr/bin/' ""
done
substituteInPlace ./src/plugins/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba'
cd ../why*
substituteInPlace ./Makefile.in --replace '-warn-error A' '-warn-error A-3'
substituteInPlace ./frama-c-plugin/Makefile --replace 'shell frama-c' "shell $out/bin/frama-c"
substituteInPlace ./jc/jc_make.ml --replace ' why-dp ' " $out/bin/why-dp "
substituteInPlace ./jc/jc_make.ml --replace "?= why@\n" "?= $out/bin/why@\n"

4
pkgs/servers/sks/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl }:
{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl, camlp4 }:
stdenv.mkDerivation rec {
name = "sks-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm";
};
buildInputs = [ ocaml zlib db48 perl ];
buildInputs = [ ocaml zlib db48 perl camlp4 ];
makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ];
preConfigure = ''

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

@ -3833,7 +3833,7 @@ with pkgs;
skippy-xd = callPackage ../tools/X11/skippy-xd {};
sks = callPackage ../servers/sks { };
sks = callPackage ../servers/sks { inherit (ocamlPackages) ocaml camlp4; };
skydns = callPackage ../servers/skydns { };
@ -6259,7 +6259,9 @@ with pkgs;
# Does not actually depend on Qt 5
extra-cmake-modules = qt5.ecmNoHooks;
coccinelle = callPackage ../development/tools/misc/coccinelle { };
coccinelle = callPackage ../development/tools/misc/coccinelle {
ocamlPackages = ocamlPackages_4_01_0;
};
cpptest = callPackage ../development/libraries/cpptest { };
@ -14099,7 +14101,7 @@ with pkgs;
bison = bison2;
};
inherit (ocaml-ng.ocamlPackages_4_04) llpp;
llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { };
lmms = callPackage ../applications/audio/lmms { };
@ -14217,7 +14219,9 @@ with pkgs;
mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
mldonkey = callPackage ../applications/networking/p2p/mldonkey {
ocaml = ocamlPackages_4_01_0.ocaml;
};
MMA = callPackage ../applications/audio/MMA { };
@ -15477,7 +15481,9 @@ with pkgs;
spice_gtk = spice_gtk;
};
virt-top = callPackage ../applications/virtualization/virt-top { };
virt-top = callPackage ../applications/virtualization/virt-top {
ocamlPackages = ocamlPackages_4_01_0;
};
virtmanager = callPackage ../applications/virtualization/virt-manager {
vte = gnome3.vte;
@ -17226,7 +17232,8 @@ with pkgs;
lean2 = callPackage ../applications/science/logic/lean2 {};
lean3 = lean;
leo2 = callPackage ../applications/science/logic/leo2 {};
leo2 = callPackage ../applications/science/logic/leo2 {
ocaml = ocamlPackages_4_01_0.ocaml;};
logisim = callPackage ../applications/science/logic/logisim {};
@ -17250,13 +17257,18 @@ with pkgs;
picosat = callPackage ../applications/science/logic/picosat {};
inherit (ocaml-ng.ocamlPackages_4_01_0) prooftree;
prooftree = (with ocamlPackages_4_01_0;
callPackage ../applications/science/logic/prooftree {
camlp5 = camlp5_transitional;
});
prover9 = callPackage ../applications/science/logic/prover9 { };
proverif = callPackage ../applications/science/logic/proverif { };
satallax = callPackage ../applications/science/logic/satallax {};
satallax = callPackage ../applications/science/logic/satallax {
ocaml = ocamlPackages_4_01_0.ocaml;
};
saw-tools = callPackage ../applications/science/logic/saw-tools {};

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

@ -53,13 +53,10 @@ let
bolt = callPackage ../development/ocaml-modules/bolt { };
bitstring_2_0_4 = callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { };
bitstring_git = callPackage ../development/ocaml-modules/bitstring { };
bitstring =
if lib.versionOlder "4.02" ocaml.version
then bitstring_git
else bitstring_2_0_4;
then callPackage ../development/ocaml-modules/bitstring { }
else callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { };
camlidl = callPackage ../development/tools/ocaml/camlidl { };
@ -99,7 +96,10 @@ let
camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
camomile = callPackage ../development/ocaml-modules/camomile { };
camlimages_4_0 = callPackage ../development/ocaml-modules/camlimages/4.0.nix {
camlimages_4_0 =
if lib.versionOlder "4.02" ocaml.version
then null
else callPackage ../development/ocaml-modules/camlimages/4.0.nix {
libpng = pkgs.libpng12;
giflib = pkgs.giflib_4_1;
};
@ -392,7 +392,10 @@ let
sequence = callPackage ../development/ocaml-modules/sequence { };
spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
spacetime_lib = if lib.versionOlder "4.04" ocaml.version then
callPackage ../development/tools/ocaml/ocamlbuild { }
else
null;
sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };
@ -700,7 +703,6 @@ let
google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
llpp = callPackage ../applications/misc/llpp { };
monotoneViz = callPackage ../applications/version-management/monotone-viz {
inherit (pkgs.gnome2) libgnomecanvas glib;
@ -724,9 +726,6 @@ let
camlp5 = camlp5_transitional;
};
prooftree = callPackage ../applications/science/logic/prooftree {
camlp5 = camlp5_transitional;
};
};
in lib.fix' (lib.extends overrides packageSet);
in rec
@ -754,5 +753,5 @@ in rec
ocamlPackages_latest = ocamlPackages_4_04;
ocamlPackages = ocamlPackages_4_01_0;
ocamlPackages = ocamlPackages_4_02;
}