diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 962685c2d537..2430536656dc 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -11,7 +11,7 @@ , nixosTests }: let - generic = { version, sha256, cargoHash, cargoPatches ? [], eol ? false, broken ? false }: rustPlatform.buildRustPackage { + generic = { version, hash, cargoHash, cargoPatches ? [], eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; inherit version; @@ -20,7 +20,7 @@ let owner = "Deuxfleurs"; repo = "garage"; rev = "v${version}"; - inherit sha256; + inherit hash; }; postPatch = '' @@ -96,33 +96,32 @@ rec { garage_0_8_7 = generic { version = "0.8.7"; - sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; + hash = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; cargoHash = "sha256-1cGlJP/RRgxt3GGMN1c+7Y5lLHJyvHEnpLsR35R5FfI="; cargoPatches = [ ./update-time-0.8.patch ]; broken = stdenv.isDarwin; }; - garage_0_8 = garage_0_8_7; - garage_0_9_4 = generic { version = "0.9.4"; - sha256 = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; + hash = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; cargoHash = "sha256-1Hrip4R5dr31czOcFMGW4ZvVfVwvdd7LkwukwNpS3o4="; cargoPatches = [ ./update-time.patch ]; broken = stdenv.isDarwin; }; - garage_1_0_0 = generic { - version = "1.0.0"; - sha256 = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8="; - cargoHash = "sha256-zol9P01bwlvl1Wap4EekgVpC45izNCt2uKs7x+EEA/E="; - cargoPatches = [ ./update-time.patch ]; + garage_1_0_1 = generic { + version = "1.0.1"; + hash = "sha256-f6N2asycN04I6U5XQ5LEAqYu/v5jYZiFCxZ8YQ32XyM="; + cargoHash = "sha256-jpc/vaygC5WNSkVA3P01mCRk9Nx/CUumE893tHWoe34="; broken = stdenv.isDarwin; }; + garage_0_8 = garage_0_8_7; + garage_0_9 = garage_0_9_4; - garage_1_x = garage_1_0_0; + garage_1_x = garage_1_0_1; garage = garage_1_x; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6be47423f32..af6915d04f2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7851,7 +7851,7 @@ with pkgs; garage garage_0_8 garage_0_9 garage_0_8_7 garage_0_9_4 - garage_1_0_0 garage_1_x; + garage_1_0_1 garage_1_x; garmintools = callPackage ../development/libraries/garmintools { };