From 71040ea59e2837abcf6b42ca328460a41f4e960e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 16 Oct 2023 20:48:57 +0100 Subject: garage: nixpkgs-fmt --- pkgs/tools/filesystems/garage/default.nix | 51 +++++++++++++++++++------------ 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index cadb64a3215..18e668b0a48 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf -, cacert, Security, garage, nixosTests }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitea +, fetchpatch +, openssl +, pkg-config +, protobuf +, cacert +, Security +, garage +, nixosTests +}: let generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; @@ -65,26 +76,26 @@ let }; }; in - rec { - # Until Garage hits 1.0, 0.7.3 is equivalent to 7.3.0 for now, therefore - # we have to keep all the numbers in the version to handle major/minor/patch level. - # for <1.0. +rec { + # Until Garage hits 1.0, 0.7.3 is equivalent to 7.3.0 for now, therefore + # we have to keep all the numbers in the version to handle major/minor/patch level. + # for <1.0. - garage_0_8_4 = generic { - version = "0.8.4"; - sha256 = "sha256-YgMw41ofM59h7OnHK1H8+Se5mZEdYypPIdkqbyX9qfs="; - cargoSha256 = "sha256-dEtksOVqy5wAPoqCuXJj3c4TB6UbR8PTaB70fbL6iR8="; - }; + garage_0_8_4 = generic { + version = "0.8.4"; + sha256 = "sha256-YgMw41ofM59h7OnHK1H8+Se5mZEdYypPIdkqbyX9qfs="; + cargoSha256 = "sha256-dEtksOVqy5wAPoqCuXJj3c4TB6UbR8PTaB70fbL6iR8="; + }; - garage_0_8 = garage_0_8_4; + garage_0_8 = garage_0_8_4; - garage_0_9_0 = generic { - version = "0.9.0"; - sha256 = "sha256-Bw7ohMAfnbkhl43k8KxYu2OJd5689PqDS0vAcgU09W8="; - cargoSha256 = "sha256-JqCt/8p24suQMRzEyTE2OkbzZCGUDLuGq32kCq3eZ7o="; - }; + garage_0_9_0 = (generic { + version = "0.9.0"; + sha256 = "sha256-Bw7ohMAfnbkhl43k8KxYu2OJd5689PqDS0vAcgU09W8="; + cargoSha256 = "sha256-JqCt/8p24suQMRzEyTE2OkbzZCGUDLuGq32kCq3eZ7o="; + }); - garage_0_9 = garage_0_9_0; + garage_0_9 = garage_0_9_0; - garage = garage_0_8; - } + garage = garage_0_8; +} -- cgit 1.4.1