diff options
| author | Malcolm Matalka <mmatalka@gmail.com> | 2013-12-17 23:16:38 +0100 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2013-12-25 14:18:28 +0100 |
| commit | 545216ee02d888b8d696dbb6a678a5d068d72eb0 (patch) | |
| tree | 340539747d782dbc5fc8945da4934f1c6b25780a /pkgs/top-level | |
| parent | 7129ba057bf7e3e5e8e19df4538934d63e1fd895 (diff) | |
Opam: Update to 1.1.0
Also keeps 1.0 for backwards compatibility. Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a71e712b55793..ce38f2c48808f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3023,7 +3023,9 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; - opam = callPackage ../development/tools/ocaml/opam { }; + 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 = opam_1_1; }; ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1; |