From 306c5e55e7d05ff41756f28fd3b44c6fa1aee4bd Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 25 Sep 2024 21:54:44 -0400 Subject: [PATCH 1/6] vault: 1.17.5 -> 1.17.6 Diff: https://github.com/hashicorp/vault/compare/v1.17.5...v1.17.6 Changelog: https://github.com/hashicorp/vault/blob/v1.17.6/CHANGELOG.md --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 007edb9c6abe..38b481cf28cf 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.17.5"; + version = "1.17.6"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-OMA4c+Ot5xioRdI4z7zY4Eux8KxxIZ4opnT/xSc5oUk="; + hash = "sha256-sd4gNNJ/DVpl7ReymykNemWz4NNisofMIH6lLNl+iVw="; }; - vendorHash = "sha256-MJPKICuaxyUA8DQsdeToJK7HQk1VINNjv7JGjb1mrCs="; + vendorHash = "sha256-V7aMf03U2DTNg1murp4LBfuOioA+7iG6jX9o05rhM2U="; proxyVendor = true; From 45f4361477374da95de9279c19abfe8941757817 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 25 Sep 2024 22:09:44 -0400 Subject: [PATCH 2/6] vault: move to pkgs/by-name --- .../security/vault/default.nix => by-name/va/vault/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/vault/default.nix => by-name/va/vault/package.nix} (100%) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/by-name/va/vault/package.nix similarity index 100% rename from pkgs/tools/security/vault/default.nix rename to pkgs/by-name/va/vault/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5d6cac78946..8f3827092661 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38461,8 +38461,6 @@ with pkgs; valent = callPackage ../applications/misc/valent { }; - vault = callPackage ../tools/security/vault { }; - vault-medusa = callPackage ../tools/security/vault-medusa { }; vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { }; From 0421579b13c65d53caf75a686641716dd4a35440 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 25 Sep 2024 22:10:03 -0400 Subject: [PATCH 3/6] vault: nixfmt --- pkgs/by-name/va/vault/package.nix | 61 +++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index 38b481cf28cf..f34203cf9669 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -1,7 +1,13 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests -, makeWrapper -, gawk -, glibc +{ + stdenv, + lib, + fetchFromGitHub, + buildGoModule, + installShellFiles, + nixosTests, + makeWrapper, + gawk, + glibc, }: buildGoModule rec { @@ -21,26 +27,44 @@ buildGoModule rec { subPackages = [ "." ]; - nativeBuildInputs = [ installShellFiles makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; tags = [ "vault" ]; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/hashicorp/vault/sdk/version.GitCommit=${src.rev}" "-X github.com/hashicorp/vault/sdk/version.Version=${version}" "-X github.com/hashicorp/vault/sdk/version.VersionPrerelease=" ]; - postInstall = '' - echo "complete -C $out/bin/vault vault" > vault.bash - installShellCompletion vault.bash - '' + lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram $out/bin/vault \ - --prefix PATH ${lib.makeBinPath [ gawk glibc ]} - ''; + postInstall = + '' + echo "complete -C $out/bin/vault vault" > vault.bash + installShellCompletion vault.bash + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram $out/bin/vault \ + --prefix PATH ${ + lib.makeBinPath [ + gawk + glibc + ] + } + ''; - passthru.tests = { inherit (nixosTests) vault vault-postgresql vault-dev vault-agent; }; + passthru.tests = { + inherit (nixosTests) + vault + vault-postgresql + vault-dev + vault-agent + ; + }; meta = with lib; { homepage = "https://www.vaultproject.io/"; @@ -48,6 +72,13 @@ buildGoModule rec { changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; license = licenses.bsl11; mainProgram = "vault"; - maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man techknowlogick ]; + maintainers = with maintainers; [ + rushmorem + lnl7 + offline + pradeepchhetri + Chili-Man + techknowlogick + ]; }; } From 74d6d7b3f4aa4940f3ba51a5a6402a78d5c77c02 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 25 Sep 2024 22:16:06 -0400 Subject: [PATCH 4/6] vault-bin: 1.17.5 -> 1.17.6 --- pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 9cfdc187eaee..c1cfb66628da 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.17.5"; + version = "1.17.6"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-rh0ZVmAbiOmZFCpiiX9ClAYmQKx084VKCjxvD9bbYAk="; - aarch64-linux = "sha256-DtriOEQCuSMMjzfJJpJAf7z+wGJSbzU3V/X+glTLkv8="; - i686-linux = "sha256-EPS3Sx2l0Gv4PWeqrnIEoNYUF4Or075vdhn71vKXQEw="; - x86_64-darwin = "sha256-pi/sD88haBxUx6dSUEUv6ugQO2K/lhg4ne7xbcVzg3M="; - aarch64-darwin = "sha256-6ZESO3m5FCRwTNh3xlWjWw6c9sjiAwV09YA/hQ5Py/o="; + x86_64-linux = "sha256-K9yNZ4M8u8FfisWi6Y6TsBJy6FQytr3htNCsKh2MlyA="; + aarch64-linux = "sha256-KLHkxUGvekHT/bPtoIlmylCubTWH+I7Q0wJM0UG0Hp8="; + i686-linux = "sha256-jBS/nGKP27weFw4u6Q10athYwCqWLzpb7ph39v+QAN8="; + x86_64-darwin = "sha256-5KfWqtJldk66dO5ImYKivDau4JzacUIXBfAzWkkPfoE="; + aarch64-darwin = "sha256-wjmNY1lunJDjpkWDXl0upAeNBqBx8momlY4a3j+hMd0="; }; in fetchzip { From 2460ec66bb6b5156b013aad306eba2b7cbbc780a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 25 Sep 2024 22:22:46 -0400 Subject: [PATCH 5/6] vault-bin: move to pkgs/by-name --- .../vault/vault-bin.nix => by-name/va/vault-bin/package.nix} | 0 .../security/vault => by-name/va/vault-bin}/update-bin.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{tools/security/vault/vault-bin.nix => by-name/va/vault-bin/package.nix} (100%) rename pkgs/{tools/security/vault => by-name/va/vault-bin}/update-bin.sh (100%) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/by-name/va/vault-bin/package.nix similarity index 100% rename from pkgs/tools/security/vault/vault-bin.nix rename to pkgs/by-name/va/vault-bin/package.nix diff --git a/pkgs/tools/security/vault/update-bin.sh b/pkgs/by-name/va/vault-bin/update-bin.sh similarity index 100% rename from pkgs/tools/security/vault/update-bin.sh rename to pkgs/by-name/va/vault-bin/update-bin.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f3827092661..69f46694aea9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38465,8 +38465,6 @@ with pkgs; vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { }; - vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; - vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv; vazir-code-font = callPackage ../data/fonts/vazir-code-font { }; From b99a01b7113cfebb499864d89d0df560bfde9c58 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 25 Sep 2024 22:23:11 -0400 Subject: [PATCH 6/6] vault-bin: nixfmt --- pkgs/by-name/va/vault-bin/package.nix | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix index c1cfb66628da..896597eb5792 100644 --- a/pkgs/by-name/va/vault-bin/package.nix +++ b/pkgs/by-name/va/vault-bin/package.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchzip }: +{ + lib, + stdenv, + fetchzip, +}: stdenv.mkDerivation rec { pname = "vault-bin"; @@ -25,7 +29,7 @@ stdenv.mkDerivation rec { in fetchzip { url = "https://releases.hashicorp.com/vault/${version}/vault_${version}_${suffix}.zip"; - stripRoot=false; + stripRoot = false; inherit hash; }; @@ -57,8 +61,23 @@ stdenv.mkDerivation rec { homepage = "https://www.vaultproject.io"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsl11; - maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick mkaito ]; + maintainers = + with maintainers; + teams.serokell.members + ++ [ + offline + psyanticy + Chili-Man + techknowlogick + mkaito + ]; mainProgram = "vault"; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + "x86_64-darwin" + "aarch64-darwin" + "aarch64-linux" + ]; }; }