dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #227197 from vbgl/ocaml-facile-nonstd-noocaml5

Browse Source 
ocamlPackages.{facile,nonstd}: disable for OCaml ≥ 5.0
This commit is contained in:
Ulrik Strid 2023-04-20 07:54:48 +02:00 committed by GitHub
commit d82af0d6f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/ocaml-modules/facile/default.nix
View File

@ -1,5 +1,8 @@
{ lib, fetchurl, buildDunePackage, ocaml }:
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
"facile is not available for OCaml ≥ 5.0"
buildDunePackage rec {
pname = "facile";
version = "1.1.4";
@ -11,8 +14,8 @@ buildDunePackage rec {
doCheck = true;
useDune2 = lib.versionAtLeast ocaml.version "4.12";
postPatch = lib.optionalString useDune2 "dune upgrade";
duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1";
postPatch = lib.optionalString (duneVersion != "1") "dune upgrade";
meta = {
homepage = "http://opti.recherche.enac.fr/facile/";

7
pkgs/development/ocaml-modules/nonstd/default.nix
View File

@ -1,5 +1,8 @@
{ lib, fetchzip, buildDunePackage, ocaml }:
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
"nonstd is not available for OCaml ≥ 5.0"
buildDunePackage rec {
pname = "nonstd";
version = "0.0.3";
@ -11,8 +14,8 @@ buildDunePackage rec {
sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46";
};
useDune2 = lib.versionAtLeast ocaml.version "4.12";
postPatch = lib.optionalString useDune2 "dune upgrade";
duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1";
postPatch = lib.optionalString (duneVersion != "1") "dune upgrade";
doCheck = true;
meta = with lib; {