From d8f9bcbcd6df047bebb909ad75d4fe0cb9adffb0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 21 Jan 2023 11:35:00 -0500 Subject: [PATCH] treewide: remove empty go vendor hashes --- pkgs/applications/networking/alpnpass/default.nix | 2 +- pkgs/applications/networking/cluster/argo/default.nix | 2 +- pkgs/development/interpreters/ivy/default.nix | 2 +- pkgs/development/libraries/boringssl/default.nix | 2 +- pkgs/development/tools/asmfmt/default.nix | 2 +- pkgs/development/tools/gllvm/default.nix | 2 +- pkgs/development/tools/go-bindata-assetfs/default.nix | 2 +- pkgs/development/tools/go-bindata/default.nix | 2 +- pkgs/development/tools/go-motion/default.nix | 2 +- pkgs/development/tools/goconst/default.nix | 2 +- pkgs/development/tools/gocyclo/default.nix | 2 +- pkgs/development/tools/gotestfmt/default.nix | 2 +- pkgs/development/tools/hostess/default.nix | 2 +- pkgs/development/tools/misc/loccount/default.nix | 2 +- pkgs/development/tools/nasmfmt/default.nix | 2 +- pkgs/development/tools/wp4nix/default.nix | 2 +- pkgs/servers/mail/listmonk/stuffbin.nix | 2 +- pkgs/tools/filesystems/stuffbin/default.nix | 2 +- pkgs/tools/misc/envsubst/default.nix | 2 +- pkgs/tools/misc/frei/default.nix | 2 +- pkgs/tools/misc/tcat/default.nix | 2 +- pkgs/tools/misc/undocker/default.nix | 2 +- pkgs/tools/security/minica/default.nix | 2 +- pkgs/tools/text/cidrgrep/default.nix | 2 +- pkgs/tools/text/codesearch/default.nix | 2 +- pkgs/tools/text/goawk/default.nix | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/alpnpass/default.nix b/pkgs/applications/networking/alpnpass/default.nix index 5cc0ac1cf05c..1d24c8028770 100644 --- a/pkgs/applications/networking/alpnpass/default.nix +++ b/pkgs/applications/networking/alpnpass/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; meta = with lib; { description = "Inspect the plaintext payload inside of proxied TLS connections"; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index ab2d1bd3d3fc..6d13063bd056 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -22,7 +22,7 @@ let hash = "sha256-wchj5KjhTmhc4XVW0sRFCcyx5W9am8TNAIhej3WFWXU="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; excludedPackages = [ "./example" ]; diff --git a/pkgs/development/interpreters/ivy/default.nix b/pkgs/development/interpreters/ivy/default.nix index 81ddfbf23888..434b49527714 100644 --- a/pkgs/development/interpreters/ivy/default.nix +++ b/pkgs/development/interpreters/ivy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-pb/dJfEXz13myT6XadCg0kKd+n9bcHNBc84ES+hDw2Y="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; subPackages = [ "." ]; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index efcb64a7fd5c..61c2a27f3d85 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -20,7 +20,7 @@ buildGoModule { nativeBuildInputs = [ cmake ninja perl ]; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; # hack to get both go and cmake configure phase # (if we use postConfigure then cmake will loop runHook postConfigure) diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index 953a5469ec51..61b5d624c8ff 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; # This package comes with its own version of goimports, gofmt and goreturns # but these binaries are outdated and are offered by other packages. diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index d2d7e523a94f..30094b553d6e 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-CoreqnMRuPuv+Ci1uyF3HJCJFwK2jwB79okynv6AHTA="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; checkInputs = with llvmPackages; [ clang diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix index ea6ba727d738..dff78895fa57 100644 --- a/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-yQgIaTl06nmIu8BfmQzrvEnlPQ2GQ/2nnvTmYXCL1oI="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 11f42d81a3e5..293f5c078ef9 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-dEfD5oV2nXLVg+a7PlB6LqhEBosG7eTptqKKDWcQAss="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; patches = [ # Add go modules support diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix index d06f6e5acd17..d7e686235af4 100644 --- a/pkgs/development/tools/go-motion/default.nix +++ b/pkgs/development/tools/go-motion/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-bD6Mm9/LOzguoK/xMpVEeT7G8j1shCsMv14wFostlW4="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix index 27e43fec9998..002f13c77e3a 100644 --- a/pkgs/development/tools/goconst/default.nix +++ b/pkgs/development/tools/goconst/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-chBWxOy9V4pO3hMaeCoKwnQxIEYiSejUOD3QDBCpaoE="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix index bef3d3e7507b..b8e0bb1c4f56 100644 --- a/pkgs/development/tools/gocyclo/default.nix +++ b/pkgs/development/tools/gocyclo/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-1IwtGUqshpLDyxH5NNkGUads1TKLs48eslNnFylGUPA="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; meta = with lib; { description = "Calculate cyclomatic complexities of functions in Go source code"; diff --git a/pkgs/development/tools/gotestfmt/default.nix b/pkgs/development/tools/gotestfmt/default.nix index 69f90c1f9731..9c7819653169 100644 --- a/pkgs/development/tools/gotestfmt/default.nix +++ b/pkgs/development/tools/gotestfmt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-Rb/nIsHISzvqd+jJU4TNrHbailvgGEq4y0JuM9IdA3w="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; meta = with lib; { description = "Go test output for humans"; diff --git a/pkgs/development/tools/hostess/default.nix b/pkgs/development/tools/hostess/default.nix index 47eab1abd8ef..0d32f835f87f 100644 --- a/pkgs/development/tools/hostess/default.nix +++ b/pkgs/development/tools/hostess/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; meta = with lib; { description = "An idempotent command-line utility for managing your /etc/hosts* file."; diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 5fd519eb06a5..899ee219c4d7 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { hash = "sha256-9tzDNwWM4uzxC+xqM603l8EIqYrGUUvZgSe6r1EyHi8="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; excludedPackages = "tests"; diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/development/tools/nasmfmt/default.nix index bb94e8f8ee81..413d7df67885 100644 --- a/pkgs/development/tools/nasmfmt/default.nix +++ b/pkgs/development/tools/nasmfmt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-1c7ZOdoM0/Us7cnTT3sds2P5pcCedrCfl0GqQBnf9Rk="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; preBuild = '' cp ${./go.mod} go.mod diff --git a/pkgs/development/tools/wp4nix/default.nix b/pkgs/development/tools/wp4nix/default.nix index a97ae7737064..8460cb7d94e2 100644 --- a/pkgs/development/tools/wp4nix/default.nix +++ b/pkgs/development/tools/wp4nix/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "sha256-WJteeFUMr684yZEtUP13MqRjJ1UAeo48AzOPdLEE65w="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/servers/mail/listmonk/stuffbin.nix b/pkgs/servers/mail/listmonk/stuffbin.nix index 92c9785e2731..442307fad65b 100644 --- a/pkgs/servers/mail/listmonk/stuffbin.nix +++ b/pkgs/servers/mail/listmonk/stuffbin.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "stuffbin"; version = "1.1.0"; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; src = fetchFromGitHub { owner = "knadh"; diff --git a/pkgs/tools/filesystems/stuffbin/default.nix b/pkgs/tools/filesystems/stuffbin/default.nix index 92c9785e2731..442307fad65b 100644 --- a/pkgs/tools/filesystems/stuffbin/default.nix +++ b/pkgs/tools/filesystems/stuffbin/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "stuffbin"; version = "1.1.0"; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; src = fetchFromGitHub { owner = "knadh"; diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix index 5ecae8dbcbe9..9f7c80d32853 100644 --- a/pkgs/tools/misc/envsubst/default.nix +++ b/pkgs/tools/misc/envsubst/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0zkgjdlw3d5xh7g45bzxqspxr61ljdli8ng4a1k1gk0dls4sva8n"; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; postInstall = '' install -Dm444 -t $out/share/doc/${pname} LICENSE *.md diff --git a/pkgs/tools/misc/frei/default.nix b/pkgs/tools/misc/frei/default.nix index 62a3c1f0614c..22e627646432 100644 --- a/pkgs/tools/misc/frei/default.nix +++ b/pkgs/tools/misc/frei/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-9CV6B7fRHXl73uI2JRv3RiaFczLHHBOd7/8UoCAwK6w="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; meta = with lib; { description = "Modern replacement for free"; diff --git a/pkgs/tools/misc/tcat/default.nix b/pkgs/tools/misc/tcat/default.nix index 350405ee4b01..3556eb232c1e 100644 --- a/pkgs/tools/misc/tcat/default.nix +++ b/pkgs/tools/misc/tcat/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1szzfz5xsx9l8gjikfncgp86hydzpvsi0y5zvikd621xkp7g7l21"; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; subPackages = "."; meta = with lib; { diff --git a/pkgs/tools/misc/undocker/default.nix b/pkgs/tools/misc/undocker/default.nix index 4608f4b6c198..25f6b385ac5d 100644 --- a/pkgs/tools/misc/undocker/default.nix +++ b/pkgs/tools/misc/undocker/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { hash = "sha256-SmtM25sijcm5NF0ZrSqrRQDXiLMNp8WGAZX9yKvj1rQ="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; meta = with lib; { homepage = "https://git.sr.ht/~motiejus/undocker"; diff --git a/pkgs/tools/security/minica/default.nix b/pkgs/tools/security/minica/default.nix index b984221bec36..902961e049f7 100644 --- a/pkgs/tools/security/minica/default.nix +++ b/pkgs/tools/security/minica/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-3p6rUFFiWXhX9BBbxqWxRoyRceexvNnqcFCyNi5HoaA="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/tools/text/cidrgrep/default.nix index c636eef3c46e..2feadbabfd77 100644 --- a/pkgs/tools/text/cidrgrep/default.nix +++ b/pkgs/tools/text/cidrgrep/default.nix @@ -11,7 +11,7 @@ buildGoModule { hash = "sha256-Bp1cST6/8ppvpgNxjUpwL498C9vTJmoWOKLJgmWqfEs="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; postInstall = '' mv $out/bin/cmd $out/bin/cidrgrep diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index b02d4fcd5fc9..f0a23d8d3020 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-i03w8PZ31j5EutUZaamZsHz+z4qgX4prePbj5DLA78s="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index c65a05c2a73c..ac00358ef0d6 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-I6KmNPFD8kkYDyek8lR1ZS7biPA/LYGwJqMoA2fG7Wg="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; checkInputs = [ gawk ];