public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.dune: rename into dune_1

This commit is contained in:
Vincent Laporte 2021-02-26 17:35:41 +01:00 committed by Vincent Laporte
parent 5dc759afec
commit 60785fe4db
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/ocaml/dune.nix
View File

@ -1,8 +1,8 @@
{ lib, stdenv, ocaml, findlib, dune, dune_2 }: { lib, stdenv, ocaml, findlib, dune_1, dune_2 }:
{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: { pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args:
let Dune = if args.useDune2 or false then dune_2 else dune; in let Dune = if args.useDune2 or false then dune_2 else dune_1; in
if args ? minimumOCamlVersion && if args ? minimumOCamlVersion &&
! lib.versionAtLeast ocaml.version args.minimumOCamlVersion ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion

0
pkgs/development/tools/ocaml/dune/default.nix → pkgs/development/tools/ocaml/dune/1.nix
View File

2
pkgs/top-level/aliases.nix
View File

@ -293,7 +293,7 @@ mapAliases ({
i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21
jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21
jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities"; jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities";
jbuilder = dune; # added 2018-09-09 jbuilder = dune_1; # added 2018-09-09
jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";
joseki = apache-jena-fuseki; # added 2016-02-28 joseki = apache-jena-fuseki; # added 2016-02-28
json_glib = json-glib; # added 2018-02-25 json_glib = json-glib; # added 2018-02-25

2
pkgs/top-level/all-packages.nix
View File

@ -2220,7 +2220,7 @@ in
duf = callPackage ../tools/misc/duf { }; duf = callPackage ../tools/misc/duf { };
inherit (ocamlPackages) dune dune_2 dune-release; inherit (ocamlPackages) dune_1 dune_2 dune-release;
duperemove = callPackage ../tools/filesystems/duperemove { }; duperemove = callPackage ../tools/filesystems/duperemove { };

2
pkgs/top-level/ocaml-packages.nix
View File

@ -276,7 +276,7 @@ let
dum = callPackage ../development/ocaml-modules/dum { }; dum = callPackage ../development/ocaml-modules/dum { };
dune = callPackage ../development/tools/ocaml/dune { }; dune_1 = callPackage ../development/tools/ocaml/dune/1.nix { };
dune_2 = dune_2 =
if lib.versionAtLeast ocaml.version "4.08" if lib.versionAtLeast ocaml.version "4.08"