From 061d9eb2d936b76e8ff680e194445fcee9ac7778 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 22 Sep 2024 18:07:14 +0300 Subject: [PATCH 1/2] garage: 1.0.0 -> 1.0.1 Changelog: https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v1.0.1 --- pkgs/tools/filesystems/garage/default.nix | 11 +++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 962685c2d537..f4dcc60f9c2c 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -112,17 +112,16 @@ rec { 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"; + sha256 = "sha256-f6N2asycN04I6U5XQ5LEAqYu/v5jYZiFCxZ8YQ32XyM="; + cargoHash = "sha256-jpc/vaygC5WNSkVA3P01mCRk9Nx/CUumE893tHWoe34="; broken = stdenv.isDarwin; }; 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 b175f8c9e5b9..631742974da5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7845,7 +7845,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 { }; From a0b89aac042c3da21b9727d662fac3556890e48f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 22 Sep 2024 18:08:34 +0300 Subject: [PATCH 2/2] garage: move from sha256 to hash --- pkgs/tools/filesystems/garage/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index f4dcc60f9c2c..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,17 +96,15 @@ 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; @@ -114,11 +112,13 @@ rec { garage_1_0_1 = generic { version = "1.0.1"; - sha256 = "sha256-f6N2asycN04I6U5XQ5LEAqYu/v5jYZiFCxZ8YQ32XyM="; + 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_1;