diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-12-08 07:20:52 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-12-15 09:01:23 +0100 |
| commit | 840afa4054c26ff6556eb7a9f100f8c340cb1853 (patch) | |
| tree | 0a384059e34d4bc85a6a17c143bd4e91993a64a6 | |
| parent | ocamlPackages.lustre-v6: 6.103.3 -> 6.107.1 (diff) | |
| download | nixpkgs-840afa4054c26ff6556eb7a9f100f8c340cb1853.tar.gz | |
ocamlPackages.sha: 1.15.1 → 1.15.2
(cherry picked from commit 08d53175b4a4ae998fedbff70314906112dd311d)
| -rw-r--r-- | pkgs/development/compilers/haxe/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/plotkicadsch/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/sha/default.nix | 15 |
3 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 7a6c019c16da..6d97e7ada29f 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -11,7 +11,7 @@ let ptmap camlp5 sha - dune_2 + dune_3 luv extlib ] else if lib.versionAtLeast version "4.0" @@ -23,7 +23,7 @@ let ptmap camlp5 sha - dune_2 + dune_3 luv extlib-1-7-7 ] else with ocaml-ng.ocamlPackages_4_05; [ diff --git a/pkgs/development/ocaml-modules/plotkicadsch/default.nix b/pkgs/development/ocaml-modules/plotkicadsch/default.nix index e08fcdfeb2f3..27b3a0ac5ee7 100644 --- a/pkgs/development/ocaml-modules/plotkicadsch/default.nix +++ b/pkgs/development/ocaml-modules/plotkicadsch/default.nix @@ -17,6 +17,7 @@ buildDunePackage rec { pname = "plotkicadsch"; + duneVersion = "3"; inherit (kicadsch) src version; diff --git a/pkgs/development/ocaml-modules/sha/default.nix b/pkgs/development/ocaml-modules/sha/default.nix index 4cbb658b6549..4d400d32844a 100644 --- a/pkgs/development/ocaml-modules/sha/default.nix +++ b/pkgs/development/ocaml-modules/sha/default.nix @@ -1,25 +1,22 @@ -{ lib, fetchurl, buildDunePackage, stdlib-shims, dune-configurator, ounit }: +{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit2 }: buildDunePackage rec { pname = "sha"; - version = "1.15.1"; + version = "1.15.2"; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "sha256-cRtjydvwgXgimi6F3C48j7LrWgfMO6m9UJKjKlxvp0Q="; + url = "https://github.com/djs55/ocaml-${pname}/releases/download/${version}/${pname}-${version}.tbz"; + hash = "sha256-P71Xs5p8QAaOtBrh7MuhQJOL6144BqTLvXlZOyGD/7c="; }; - useDune2 = true; - - buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ stdlib-shims ]; doCheck = true; checkInputs = [ - ounit + ounit2 ]; meta = with lib; { |