diff options
| author | Kirill Boltaev <aske@fmap.me> | 2016-09-19 20:00:42 +0300 |
|---|---|---|
| committer | Kirill Boltaev <aske@fmap.me> | 2016-09-26 02:36:49 +0300 |
| commit | e61663a23310a7f7cdb5e87a4ca332948da39177 (patch) | |
| tree | a2721ff7b833ace5026d8dcaba1310b29320382a /pkgs/development/tools/ocaml/opam | |
| parent | 8967a3f7981ad0d029a0057a4493701398893ad2 (diff) | |
| download | nixpkgs-e61663a23310a7f7cdb5e87a4ca332948da39177.tar nixpkgs-e61663a23310a7f7cdb5e87a4ca332948da39177.tar.gz nixpkgs-e61663a23310a7f7cdb5e87a4ca332948da39177.tar.bz2 nixpkgs-e61663a23310a7f7cdb5e87a4ca332948da39177.tar.lz nixpkgs-e61663a23310a7f7cdb5e87a4ca332948da39177.tar.xz nixpkgs-e61663a23310a7f7cdb5e87a4ca332948da39177.tar.zst nixpkgs-e61663a23310a7f7cdb5e87a4ca332948da39177.zip | |
treewide: move to ocaml-ng system
Diffstat (limited to 'pkgs/development/tools/ocaml/opam')
| -rw-r--r-- | pkgs/development/tools/ocaml/opam/1.0.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/opam/1.1.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/opam/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/ocaml/opam/1.0.0.nix b/pkgs/development/tools/ocaml/opam/1.0.0.nix index 52c710a86b8..d66b3880de2 100644 --- a/pkgs/development/tools/ocaml/opam/1.0.0.nix +++ b/pkgs/development/tools/ocaml/opam/1.0.0.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: +{ stdenv, lib, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; +assert lib.versionAtLeast ocaml.version "3.12.1"; let srcs = { diff --git a/pkgs/development/tools/ocaml/opam/1.1.nix b/pkgs/development/tools/ocaml/opam/1.1.nix index 2c71f8ba49f..a8a9463bb3d 100644 --- a/pkgs/development/tools/ocaml/opam/1.1.nix +++ b/pkgs/development/tools/ocaml/opam/1.1.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: +{ stdenv, lib, 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"; +assert lib.versionAtLeast ocaml.version "3.12.1"; let srcs = { diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index afa480296f6..28d4724a162 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, +{ stdenv, lib, fetchgit, fetchurl, makeWrapper, ocaml, unzip, ncurses, curl, aspcudSupport ? !stdenv.isDarwin, aspcud }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; +assert lib.versionAtLeast ocaml.version "3.12.1"; let srcs = { |