diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-10-08 08:45:59 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-10-09 11:55:19 +0200 |
| commit | 731b616fdbb7b3b0d753f5ac05926de33d17c177 (patch) | |
| tree | 58709716de0f2d760ce622e0cdb082ab0c8425cd /pkgs/top-level/ocaml-packages.nix | |
| parent | 03c2b449f8bdd9cf67dfa1a49353054df7cabf97 (diff) | |
| download | nixpkgs-731b616fdbb7b3b0d753f5ac05926de33d17c177.tar nixpkgs-731b616fdbb7b3b0d753f5ac05926de33d17c177.tar.gz nixpkgs-731b616fdbb7b3b0d753f5ac05926de33d17c177.tar.bz2 nixpkgs-731b616fdbb7b3b0d753f5ac05926de33d17c177.tar.lz nixpkgs-731b616fdbb7b3b0d753f5ac05926de33d17c177.tar.xz nixpkgs-731b616fdbb7b3b0d753f5ac05926de33d17c177.tar.zst nixpkgs-731b616fdbb7b3b0d753f5ac05926de33d17c177.zip | |
camlp4: fix for OCaml-4.03
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9a3167f4cdd..bda35e9383f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -58,9 +58,7 @@ let camlidl = callPackage ../development/tools/ocaml/camlidl { }; camlp4 = - if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/tools/ocaml/camlp4/4_03.nix { } - else if lib.versionOlder "4.02" ocaml.version + if lib.versionOlder "4.02" ocaml.version then callPackage ../development/tools/ocaml/camlp4 { } else null; @@ -707,7 +705,7 @@ in rec ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { }) (self: super: { }); - ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { }) (self: super: { }); + ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { }) (self: super: { }); ocamlPackages_latest = ocamlPackages_4_03; |