diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2013-12-25 14:43:23 +0100 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2013-12-25 14:43:23 +0100 |
| commit | e87515e5198a9b225778caea4c7b88fe27c8fabb (patch) | |
| tree | c1cd464c36fbedec2ac3b6aa7b9b152b845e75be /pkgs | |
| parent | 545216ee02d888b8d696dbb6a678a5d068d72eb0 (diff) | |
| download | nixlib-e87515e5198a9b225778caea4c7b88fe27c8fabb.tar nixlib-e87515e5198a9b225778caea4c7b88fe27c8fabb.tar.gz nixlib-e87515e5198a9b225778caea4c7b88fe27c8fabb.tar.bz2 nixlib-e87515e5198a9b225778caea4c7b88fe27c8fabb.tar.lz nixlib-e87515e5198a9b225778caea4c7b88fe27c8fabb.tar.xz nixlib-e87515e5198a9b225778caea4c7b88fe27c8fabb.tar.zst nixlib-e87515e5198a9b225778caea4c7b88fe27c8fabb.zip | |
Opam 1.1: Constrain supported ocaml versions.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/ocaml/opam/1.1.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/tools/ocaml/opam/1.1.nix b/pkgs/development/tools/ocaml/opam/1.1.nix index 9d16c6f1e819..c5093db107d0 100644 --- a/pkgs/development/tools/ocaml/opam/1.1.nix +++ b/pkgs/development/tools/ocaml/opam/1.1.nix @@ -1,5 +1,8 @@ { stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: +# Opam 1.1 only works with ocaml >= 3.12.1 according to ./configure +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; + let srcs = { cudf = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce38f2c48808..6a75135604dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3024,7 +3024,7 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; - opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { ocaml = ocaml_4_01_0; }; + opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; opam = opam_1_1; }; |