Skip to content

Commit

Permalink
treewide: change cargoSha256 with SRI hash to cargoHash manually
Browse files Browse the repository at this point in the history
  • Loading branch information
Aleksanaa committed Jul 3, 2024
1 parent 292c452 commit bfc3e0f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions pkgs/by-name/ca/cargo-profiler/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let
version = "0.2.0";
rev = "0a8ab772fd5c0f1579e4847c5d05aa443ffa2bc8";
sha256 = "sha256-ZRAbvSMrPtgaWy9RwlykQ3iiPxHCMh/tS5p67/4XqqA=";
cargoSha256 = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI=";
cargoHash = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI=";

inherit (rustPlatform) buildRustPackage;
in buildRustPackage rec {
Expand All @@ -22,7 +22,7 @@ in buildRustPackage rec {
repo = pname;
};

inherit cargoSha256;
inherit cargoHash;

meta = with lib; {
description = "Cargo subcommand for profiling Rust binaries";
Expand Down
10 changes: 5 additions & 5 deletions pkgs/tools/filesystems/garage/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
, nixosTests
}:
let
generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
generic = { version, sha256, cargoHash, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
pname = "garage";
inherit version;

Expand All @@ -29,7 +29,7 @@ let
rm .cargo/config.toml || true
'';

inherit cargoSha256;
inherit cargoHash;

nativeBuildInputs = [ protobuf pkg-config ];

Expand Down Expand Up @@ -97,7 +97,7 @@ rec {
garage_0_8_7 = generic {
version = "0.8.7";
sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc=";
cargoSha256 = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo=";
cargoHash = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo=";
broken = stdenv.isDarwin;
};

Expand All @@ -106,14 +106,14 @@ rec {
garage_0_9_4 = generic {
version = "0.9.4";
sha256 = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk=";
cargoSha256 = "sha256-Cssls9csn6qribF+pAAagBydX9e9WTq4K/ehaLCWOOA=";
cargoHash = "sha256-Cssls9csn6qribF+pAAagBydX9e9WTq4K/ehaLCWOOA=";
broken = stdenv.isDarwin;
};

garage_1_0_0 = generic {
version = "1.0.0";
sha256 = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8=";
cargoSha256 = "sha256-tXO+Vk6bYpayNWi/y4sMtkn2EQ9wiwSAfn79Zbt28q0=";
cargoHash = "sha256-tXO+Vk6bYpayNWi/y4sMtkn2EQ9wiwSAfn79Zbt28q0=";
broken = stdenv.isDarwin;
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/misc/lorri/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let
version = "1.6.0";
gitRev = "1.6.0";
sha256 = "sha256-peelMKv9GOTPdyb1iifzlFikeayTchqaYCgeXyR5EgM=";
cargoSha256 = "sha256-UFAmTYnCqsQxBnCm1zMu+BcWIZMuuxvpF7poLlzC6Kg=";
cargoHash = "sha256-UFAmTYnCqsQxBnCm1zMu+BcWIZMuuxvpF7poLlzC6Kg=";

in (rustPlatform.buildRustPackage rec {
pname = "lorri";
Expand All @@ -32,7 +32,7 @@ in (rustPlatform.buildRustPackage rec {

outputs = [ "out" "man" "doc" ];

inherit cargoSha256;
inherit cargoHash;
doCheck = false;

BUILD_REV_COUNT = src.revCount or 1;
Expand Down

0 comments on commit bfc3e0f

Please sign in to comment.