Unverified Commit 849c8689 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

vault: remove postPatch, use finalAttrs (#503938)

parents d65f8a52 a91da62e

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

+7 −13
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 
  glibc,

}:



buildGoModule rec {

buildGoModule (finalAttrs: {

  pname = "vault";

  version = "1.21.4";



  src = fetchFromGitHub {

    owner = "hashicorp";

    repo = "vault";

    rev = "v${version}";

    rev = "v${finalAttrs.version}";

    hash = "sha256-1yBvcGKzLZYFWlZJL1iJgDFkiT4g2f84iZCjWi2CwDg=";

  };
@@ -25,12 +25,6 @@ buildGoModule rec { 


  proxyVendor = true;



  postPatch = ''

    # Remove defunct github.com/hashicorp/go-cmp dependency

    sed -i '/github\.com\/hashicorp\/go-cmp/d' go.mod

    sed -i '/github\.com\/hashicorp\/go-cmp/d' go.sum

  '';



  subPackages = [ "." ];



  nativeBuildInputs = [
@@ -43,8 +37,8 @@ buildGoModule rec { 
  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.GitCommit=${finalAttrs.src.rev}"

    "-X github.com/hashicorp/vault/sdk/version.Version=${finalAttrs.version}"

    "-X github.com/hashicorp/vault/sdk/version.VersionPrerelease="

  ];
@@ -72,9 +66,9 @@ buildGoModule rec { 
  };



  meta = {

    homepage = "https://www.vaultproject.io/";

    homepage = "https://developer.hashicorp.com/vault";

    description = "Tool for managing secrets";

    changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md";

    changelog = "https://github.com/hashicorp/vault/blob/v${finalAttrs.version}/CHANGELOG.md";

    license = lib.licenses.bsl11;

    mainProgram = "vault";

    maintainers = with lib.maintainers; [
@@ -84,4 +78,4 @@ buildGoModule rec { 
      techknowlogick

    ];

  };

}
 
})