diff options
| author | K900 <me@0upti.me> | 2023-05-12 10:30:12 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-05-12 10:30:12 +0300 |
| commit | db3781a5b58711ce0f97883e672e5a7adbf48286 (patch) | |
| tree | 283c0f4652844a32aeb2723583a5d22f48d612b4 | |
| parent | kde/gear: 23.04.0 -> 23.04.1 (diff) | |
| download | nixpkgs-db3781a5b58711ce0f97883e672e5a7adbf48286.tar.gz | |
angelfish: rework how cargo hashes are handled a bitorigin/kde-gear-23.04.1
This should simplify future updates.
| -rw-r--r-- | pkgs/applications/kde/angelfish.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix index 45cfcad67d8e..3d09c9a9e75c 100644 --- a/pkgs/applications/kde/angelfish.nix +++ b/pkgs/applications/kde/angelfish.nix @@ -20,18 +20,10 @@ , srcs # These must be updated in tandem with package updates. -, cargoShaForVersion ? "23.04.0" -, cargoSha256 ? "sha256-96Qe8zdLZdOrU/t6J+JJ6V0PXyFOnJF18qDrk4PZGsA=" -}: - -# Guard against incomplete updates. # Values are provided as callPackage inputs to enable easier overrides through overlays. -if cargoShaForVersion != srcs.angelfish.version -then builtins.throw '' - angelfish package update is incomplete. - Hash for cargo dependencies is declared for version ${cargoShaForVersion}, but we're building ${srcs.angelfish.version}. - Update the cargoSha256 and cargoShaForVersion for angelfish. -'' else +, cargoShaForVersion ? "23.04.1" +, cargoSha256 ? "sha256-whMfpElpFB7D+dHHJrbwINFL4bVpHTlcZX+mdBfiqEE=" +}: mkDerivation rec { pname = "angelfish"; @@ -39,7 +31,8 @@ mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { src = srcs.angelfish.src; name = "${pname}-${srcs.angelfish.version}"; - sha256 = cargoSha256; + # Fail at build time so this gets caught by nixpkgs-review. + sha256 = if cargoShaForVersion == srcs.angelfish.version then cargoSha256 else lib.fakeHash; }; nativeBuildInputs = [ |