diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-26 18:04:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-26 18:04:40 +0000 |
| commit | 8f71a7f33524bf3cdb2bd4df0ab0cf7a29a3115e (patch) | |
| tree | a7257856d455a94f50d8e1d43f5f85ec7ef5994b /pkgs/development/ocaml-modules | |
| parent | 071e8ee2f704ef6e4c70c8be83c48ea6984f5688 (diff) | |
| parent | e127f77b045e9f7aa0f7a2d483e3e957256a6bb0 (diff) | |
| download | nixlib-8f71a7f33524bf3cdb2bd4df0ab0cf7a29a3115e.tar nixlib-8f71a7f33524bf3cdb2bd4df0ab0cf7a29a3115e.tar.gz nixlib-8f71a7f33524bf3cdb2bd4df0ab0cf7a29a3115e.tar.bz2 nixlib-8f71a7f33524bf3cdb2bd4df0ab0cf7a29a3115e.tar.lz nixlib-8f71a7f33524bf3cdb2bd4df0ab0cf7a29a3115e.tar.xz nixlib-8f71a7f33524bf3cdb2bd4df0ab0cf7a29a3115e.tar.zst nixlib-8f71a7f33524bf3cdb2bd4df0ab0cf7a29a3115e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix (renamed from pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix) | 6 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ppx_deriving/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ppxlib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/torch/default.nix | 1 |
4 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix index ca88fe32416a..dab537df2219 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix @@ -2,15 +2,15 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "2.1.0"; + version = "2.2.0"; useDune2 = true; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "07x7lm45kny0mi0fjvzw51445brm0dgy099cw0gpyly0wj77hyrq"; + sha256 = "188v3z09bg4gyv80c138fa3a3j2w54w5gc4r1ajw7klr70yqz9mj"; }; meta = { diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 7d415bd894e0..5563e6113462 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -7,7 +7,7 @@ , result , ounit , ocaml-migrate-parsetree -, ocaml-migrate-parsetree-2-1 +, ocaml-migrate-parsetree-2 }: let params = @@ -40,7 +40,7 @@ buildDunePackage rec { buildInputs = [ ppxlib cppo ]; propagatedBuildInputs = [ (if params.useOMP2 - then ocaml-migrate-parsetree-2-1 + then ocaml-migrate-parsetree-2 else ocaml-migrate-parsetree) ppx_derivers result diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index c92992197d22..a19d8cce52fb 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -4,7 +4,7 @@ then if lib.versionAtLeast ocaml.version "4.08" then "0.22.0" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio -, stdlib-shims, ocaml-migrate-parsetree-2-1 +, stdlib-shims, ocaml-migrate-parsetree-2 }: let param = { @@ -57,7 +57,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocaml-compiler-libs (if param.useOMP2 or true - then ocaml-migrate-parsetree-2-1 + then ocaml-migrate-parsetree-2 else ocaml-migrate-parsetree) ppx_derivers stdio diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index 5f59b4ae056e..4126e3304861 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -56,5 +56,6 @@ buildDunePackage rec { description = "Ocaml bindings to Pytorch"; maintainers = [ maintainers.bcdarwin ]; license = licenses.asl20; + broken = true; }; } |