diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-09-05 16:54:37 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-09-18 15:03:10 +0200 |
| commit | af34e3be8c7d11b89779ccb5617c0c5f843dda6b (patch) | |
| tree | 08375d082af43682560472682cfea0c24254f290 /pkgs/development/tools/ocaml | |
| parent | 6260b4f4285cefd8106bb9e21a9d9f8d6fba7fe0 (diff) | |
| download | nixpkgs-af34e3be8c7d11b89779ccb5617c0c5f843dda6b.tar nixpkgs-af34e3be8c7d11b89779ccb5617c0c5f843dda6b.tar.gz nixpkgs-af34e3be8c7d11b89779ccb5617c0c5f843dda6b.tar.bz2 nixpkgs-af34e3be8c7d11b89779ccb5617c0c5f843dda6b.tar.lz nixpkgs-af34e3be8c7d11b89779ccb5617c0c5f843dda6b.tar.xz nixpkgs-af34e3be8c7d11b89779ccb5617c0c5f843dda6b.tar.zst nixpkgs-af34e3be8c7d11b89779ccb5617c0c5f843dda6b.zip | |
ocamlPackages.cmdliner: default to 1.1
ocamlPackages.alcotest: 1.5.0 → 1.6.0 ocamlPackages.crowbar: 0.2 → 0.2.1 ocamlPackages.dune-release: 1.5.1 → 1.6.2 ocamlPackages.functoria: 3.1.1 → 4.2.0 ocamlPackages.mirage: 3.10.7 → 4.2.0 ocamlPackages.irmin-pack: disable checks ocamlPackages.mdx: disable checks ocamlPackages.git-unix: mark as broken
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/crunch/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/dune-release/default.nix | 17 |
2 files changed, 7 insertions, 16 deletions
diff --git a/pkgs/development/tools/ocaml/crunch/default.nix b/pkgs/development/tools/ocaml/crunch/default.nix index 54f6639fbeb..d7b4d64096c 100644 --- a/pkgs/development/tools/ocaml/crunch/default.nix +++ b/pkgs/development/tools/ocaml/crunch/default.nix @@ -1,16 +1,18 @@ -{ lib, buildDunePackage, fetchurl, ocaml, cmdliner_1_1, ptime }: +{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, ptime }: buildDunePackage rec { pname = "crunch"; version = "3.3.1"; + minimalOCamlVersion = "4.08"; + src = fetchurl { url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-${version}.tbz"; sha256 = "sha256-LFug1BELy7dzHLpOr7bESnSHw/iMGtR0AScbaf+o7Wo="; }; - buildInputs = [ cmdliner_1_1 ]; + buildInputs = [ cmdliner ]; propagatedBuildInputs = [ ptime ]; diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 32ff517178c..20aec3d171f 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -10,13 +10,13 @@ let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; in buildDunePackage rec { pname = "dune-release"; - version = "1.5.2"; + version = "1.6.2"; - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1r6bz1zz1al5y762ws3w98d8bnyi5ipffajgczixacmbrxvp3zgx"; + sha256 = "sha256-oJ5SL7qNM5izoEpr+nTjbT+YmmNIoy7QgSNse3wNIA4="; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,17 +25,6 @@ in buildDunePackage rec { checkInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; - useDune2 = true; - - patches = [ - # add missing git config calls to avoid failing due to the lack of a global git config - (fetchpatch { - name = "tests-missing-git-config.patch"; - url = "https://github.com/ocamllabs/dune-release/commit/87e7ffe2a9c574620d4e2fc0d79eed8772eab973.patch"; - sha256 = "0wrzcpzr54dwrdjdc75mijh78xk4bmsmqs1pci06fb2nf03vbd2k"; - }) - ]; - postPatch = '' # remove check for curl in PATH, since curly is patched # to have a fixed path to the binary in nix store |