diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-09-08 04:09:11 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-09-08 04:09:11 +0000 |
| commit | ebd5c936fd6760c61022f6c342003c9dc0d5bac2 (patch) | |
| tree | b621a50c517e8eb7728e1712a7264bcd38f30f9d /pkgs/top-level/ocaml-packages.nix | |
| parent | e93d92d391bd93587b78a0a78ba42abcab64d880 (diff) | |
| download | nixpkgs-ebd5c936fd6760c61022f6c342003c9dc0d5bac2.tar nixpkgs-ebd5c936fd6760c61022f6c342003c9dc0d5bac2.tar.gz nixpkgs-ebd5c936fd6760c61022f6c342003c9dc0d5bac2.tar.bz2 nixpkgs-ebd5c936fd6760c61022f6c342003c9dc0d5bac2.tar.lz nixpkgs-ebd5c936fd6760c61022f6c342003c9dc0d5bac2.tar.xz nixpkgs-ebd5c936fd6760c61022f6c342003c9dc0d5bac2.tar.zst nixpkgs-ebd5c936fd6760c61022f6c342003c9dc0d5bac2.zip | |
ocamlPackages.cmdliner: make version 1.0 the default
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 27c24a8adf9..cccb378068d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -54,7 +54,7 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; - bap = callPackage ../development/ocaml-modules/bap { }; + bap = callPackage ../development/ocaml-modules/bap { cmdliner = cmdliner_0_9; }; bitstring = callPackage ../development/ocaml-modules/bitstring { }; @@ -124,9 +124,9 @@ let cil = callPackage ../development/ocaml-modules/cil { }; - cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; + cmdliner_0_9 = callPackage ../development/ocaml-modules/cmdliner/0.9.nix { }; - cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { }; + cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix { lwt = lwt2; @@ -447,8 +447,8 @@ let ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; - ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { cmdliner = cmdliner_1_0; }; - ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { }; + ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; + ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; }; ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; }; |