b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #229740 from vbgl/useDune2-cleanup

Browse source 
ocamlPackages: remove last meaningful uses of `useDune2`
This commit is contained in:
Weijia Wang 2023-05-04 01:19:38 +03:00 committed by GitHub
parent 36ef888b63 5d5089297e
commit 6b788bd810
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/ocaml-modules/ocaml-result/default.nix
View file

@ -1,11 +1,9 @@
{ lib, buildDunePackage, fetchurl, ocaml }:
buildDunePackage rec {
buildDunePackage (rec {
pname = "result";
version = "1.5";
useDune2 = lib.versionAtLeast ocaml.version "4.08";
src = fetchurl {
url = "https://github.com/janestreet/result/releases/download/${version}/result-${version}.tbz";
sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw";
@ -21,4 +19,6 @@ buildDunePackage rec {
'';
license = lib.licenses.bsd3;
};
}
} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") {
duneVersion = "1";
})

9
pkgs/development/ocaml-modules/octavius/default.nix
View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml }:
buildDunePackage rec {
buildDunePackage (rec {
pname = "octavius";
version = "1.2.2";
@ -11,8 +11,7 @@ buildDunePackage rec {
sha256 = "sha256-/S6WpIo1c5J9uM3xgtAM/elhnsl0XimnIFsKy3ootbA=";
};
minimumOCamlVersion = "4.03";
useDune2 = lib.versionAtLeast ocaml.version "4.08";
minimalOCamlVersion = "4.03";
doCheck = true;
@ -22,4 +21,6 @@ buildDunePackage rec {
license = licenses.isc;
maintainers = with maintainers; [ vbgl ];
};
}
} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") {
duneVersion = "1";
})

10
pkgs/development/ocaml-modules/ppx_derivers/default.nix
View file

@ -1,12 +1,10 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml }:
buildDunePackage rec {
buildDunePackage (rec {
pname = "ppx_derivers";
version = "1.2.1";
useDune2 = lib.versionAtLeast ocaml.version "4.08";
minimumOCamlVersion = "4.02";
minimalOCamlVersion = "4.02";
src = fetchFromGitHub {
owner = "diml";
@ -21,4 +19,6 @@ buildDunePackage rec {
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}
} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") {
duneVersion = "1";
})

8
pkgs/development/ocaml-modules/re/default.nix
View file

@ -13,14 +13,12 @@ let version_sha = if lib.versionAtLeast ocaml.version "4.08"
};
in
buildDunePackage rec {
buildDunePackage (rec {
pname = "re";
version = version_sha.version;
minimalOCamlVersion = "4.02";
useDune2 = lib.versionAtLeast ocaml.version "4.08";
src = fetchurl {
url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz";
sha256 = version_sha.sha256;
@ -36,4 +34,6 @@ buildDunePackage rec {
license = lib.licenses.lgpl2;
maintainers = with lib.maintainers; [ vbgl ];
};
}
} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") {
duneVersion = "1";
})

9
pkgs/development/ocaml-modules/stdlib-shims/default.nix
View file

@ -1,14 +1,13 @@
{ buildDunePackage, lib, fetchurl, ocaml }:
buildDunePackage rec {
buildDunePackage (rec {
pname = "stdlib-shims";
version = "0.3.0";
src = fetchurl {
url = "https://github.com/ocaml/${pname}/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs";
};
useDune2 = lib.versionAtLeast ocaml.version "4.08";
minimumOCamlVersion = "4.02";
minimalOCamlVersion = "4.02";
doCheck = true;
meta = {
description = "Shims for forward-compatibility between versions of the OCaml standard library";
@ -16,4 +15,6 @@ buildDunePackage rec {
inherit (ocaml.meta) license;
maintainers = [ lib.maintainers.vbgl ];
};
}
} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") {
duneVersion = "1";
})