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

prooftree: move out of ocamlPackages

Browse Source
This commit is contained in:
Florent Becker 2017-02-18 18:10:00 +01:00
parent 6893d8a2fd
commit 4c5f083d70
2 changed files with 4 additions and 7 deletions

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

@ -17254,7 +17254,10 @@ with pkgs;
picosat = callPackage ../applications/science/logic/picosat {}; 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 { }; prover9 = callPackage ../applications/science/logic/prover9 { };

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

@ -721,12 +721,6 @@ let
camlp5 = camlp5_transitional; camlp5 = camlp5_transitional;
}; };
prooftree =
if lib.versionOlder "4.01" ocaml.version
then null
else callPackage ../applications/science/logic/prooftree {
camlp5 = camlp5_transitional;
};
}; };
in lib.fix' (lib.extends overrides packageSet); in lib.fix' (lib.extends overrides packageSet);
in rec in rec