From 9faaa27620c96e7e3e4384341b7f1d8c1b0c0abd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 19:31:39 +0000 Subject: [PATCH 1/2] dnglab: 0.5.2 -> 0.6.3 --- pkgs/tools/graphics/dnglab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/tools/graphics/dnglab/default.nix index 6354c4f495fe..ebcced6e2e23 100644 --- a/pkgs/tools/graphics/dnglab/default.nix +++ b/pkgs/tools/graphics/dnglab/default.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "dnglab"; - version = "0.5.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "dnglab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jkOkkcMFK1RLY8Hn/bMMuMZtyGwnwGdm0os8QKhcWqo="; + sha256 = "sha256-EJ0uWc3pp7ixRxDIdTIVVaT2ph3P2IvuK+ecBSB5HYw="; }; - cargoHash = "sha256-qwhOJxFYRJC51dKB1pi/WVJs7H955jM6KmKbxsAScDI="; + cargoHash = "sha256-6qJFNfgWh3i1CpuM/QdLksVAFz4XIV8uT5oz5BZ3U30="; postInstall = '' rm $out/bin/benchmark $out/bin/identify From 0bd382c5c8a9f0bbe65b98733307d364626eb5ff Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:33:11 +0200 Subject: [PATCH 2/2] dnglab: fix hash mismatch --- pkgs/tools/graphics/dnglab/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/tools/graphics/dnglab/default.nix index ebcced6e2e23..3d9ffbeba2ef 100644 --- a/pkgs/tools/graphics/dnglab/default.nix +++ b/pkgs/tools/graphics/dnglab/default.nix @@ -8,9 +8,13 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "dnglab"; - repo = pname; + repo = "dnglab"; rev = "v${version}"; - sha256 = "sha256-EJ0uWc3pp7ixRxDIdTIVVaT2ph3P2IvuK+ecBSB5HYw="; + # darwin/linux hash mismatch + postFetch = '' + rm -rf "$out"/rawler/data/testdata/cameras/Canon/{"EOS REBEL T7i","EOS Rebel T7i"} + ''; + hash = "sha256-k0tKNtVDzE5vVi/953aEQihh+5BsVneqauTr9WRFFrY="; }; cargoHash = "sha256-6qJFNfgWh3i1CpuM/QdLksVAFz4XIV8uT5oz5BZ3U30=";