git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.nonstd,facile: run `dune upgrade` for newer ocaml versions

This allows us to build the packages on OCaml >=4.12 Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

commitd6e2e39a6e5998e4ad4cbd9d422835b365dfa763 authorUlrik Strid <ulrik.strid@outlook.com> dateFri 4 Mar 2022, 11:34 (5 years ago) parent661ee6b
2 files changed+7−6
compare with master
unifiedsplit
pkgs/development/ocaml-modules/facile/default.nix+4−3 pkgs/development/ocaml-modules/nonstd/default.nix+3−3
pkgs/development/ocaml-modules/facile/default.nix+4−3
@@ -1,11 +1,9 @@
1−{ lib, fetchurl, buildDunePackage }:
1+{ lib, fetchurl, buildDunePackage, ocaml }:
22
33buildDunePackage rec {
44 pname = "facile";
55 version = "1.1.4";
66
7− useDune2 = false;
8−
97 src = fetchurl {
108 url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz";
119 sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp";
@@ -13,6 +11,9 @@ buildDunePackage rec {
1311
1412 doCheck = true;
1513
14+ useDune2 = lib.versionAtLeast ocaml.version "4.12";
15+ postPatch = lib.optionalString useDune2 "dune upgrade";
16+
1617 meta = {
1718 homepage = "http://opti.recherche.enac.fr/facile/";
1819 license = lib.licenses.lgpl21Plus;
pkgs/development/ocaml-modules/nonstd/default.nix+3−3
@@ -1,11 +1,9 @@
1−{ lib, fetchzip, buildDunePackage }:
1+{ lib, fetchzip, buildDunePackage, ocaml }:
22
33buildDunePackage rec {
44 pname = "nonstd";
55 version = "0.0.3";
66
7− useDune2 = false;
8−
97 minimalOCamlVersion = "4.02";
108
119 src = fetchzip {
@@ -13,6 +11,8 @@ buildDunePackage rec {
1311 sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46";
1412 };
1513
14+ useDune2 = lib.versionAtLeast ocaml.version "4.12";
15+ postPatch = lib.optionalString useDune2 "dune upgrade";
1616 doCheck = true;
1717
1818 meta = with lib; {