vault: 1.17.5 -> 1.17.6, vault-bin: 1.17.5 -> 1.17.6 (#344555)

pkgs/by-name/va/vault-bin/package.nix

@@ -1,8 +1,12 @@
-{ lib, stdenv, fetchzip }:
+{
+  lib,
+  stdenv,
+  fetchzip,
+}:
 
 stdenv.mkDerivation rec {
   pname = "vault-bin";
-  version = "1.17.5";
+  version = "1.17.6";
 
   src =
     let
@@ -16,16 +20,16 @@ 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 {
       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"
+    ];
   };
 }

pkgs/by-name/va/vault/package.nix

@@ -0,0 +1,84 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  installShellFiles,
+  nixosTests,
+  makeWrapper,
+  gawk,
+  glibc,
+}:
+
+buildGoModule rec {
+  pname = "vault";
+  version = "1.17.6";
+
+  src = fetchFromGitHub {
+    owner = "hashicorp";
+    repo = "vault";
+    rev = "v${version}";
+    hash = "sha256-sd4gNNJ/DVpl7ReymykNemWz4NNisofMIH6lLNl+iVw=";
+  };
+
+  vendorHash = "sha256-V7aMf03U2DTNg1murp4LBfuOioA+7iG6jX9o05rhM2U=";
+
+  proxyVendor = true;
+
+  subPackages = [ "." ];
+
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ];
+
+  tags = [ "vault" ];
+
+  ldflags = [
+    "-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
+          ]
+        }
+    '';
+
+  passthru.tests = {
+    inherit (nixosTests)
+      vault
+      vault-postgresql
+      vault-dev
+      vault-agent
+      ;
+  };
+
+  meta = with lib; {
+    homepage = "https://www.vaultproject.io/";
+    description = "Tool for managing secrets";
+    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
+    ];
+  };
+}

pkgs/tools/security/vault/default.nix

@@ -1,53 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests
-, makeWrapper
-, gawk
-, glibc
-}:
-
-buildGoModule rec {
-  pname = "vault";
-  version = "1.17.5";
-
-  src = fetchFromGitHub {
-    owner = "hashicorp";
-    repo = "vault";
-    rev = "v${version}";
-    hash = "sha256-OMA4c+Ot5xioRdI4z7zY4Eux8KxxIZ4opnT/xSc5oUk=";
-  };
-
-  vendorHash = "sha256-MJPKICuaxyUA8DQsdeToJK7HQk1VINNjv7JGjb1mrCs=";
-
-  proxyVendor = true;
-
-  subPackages = [ "." ];
-
-  nativeBuildInputs = [ installShellFiles makeWrapper ];
-
-  tags = [ "vault" ];
-
-  ldflags = [
-    "-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 ]}
-  '';
-
-  passthru.tests = { inherit (nixosTests) vault vault-postgresql vault-dev vault-agent; };
-
-  meta = with lib; {
-    homepage = "https://www.vaultproject.io/";
-    description = "Tool for managing secrets";
-    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 ];
-  };
-}

pkgs/top-level/all-packages.nix

@@ -38250,14 +38250,10 @@ 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 { };
 
-  vault-bin = callPackage ../tools/security/vault/vault-bin.nix { };
-
   vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;
 
   vazir-code-font = callPackage ../data/fonts/vazir-code-font { };