lol

Merge pull request #301928 from nevivurn/feat/gomod-workvendor

buildGoModule: vendorHash fixes for proxyVendor and Go 1.22

authored by

Sandro and committed by
GitHub
ec2cb66c dc6d23fe

+41 -39
+1
doc/languages-frameworks/go.section.md
··· 142 142 - [`patchFlags`](#var-stdenv-patchFlags) 143 143 - [`postPatch`](#var-stdenv-postPatch) 144 144 - [`preBuild`](#var-stdenv-preBuild) 145 + - `env`: useful for passing down variables such as `GOWORK`. 145 146 146 147 To control test execution of the build derivation, the following attributes are of interest: 147 148
+1 -1
pkgs/applications/misc/deckmaster/default.nix
··· 17 17 hash = "sha256-1hZ7yAKTvkk20ho+QOqFEtspBvFztAtfmITs2uxhdmQ="; 18 18 }; 19 19 20 - vendorHash = "sha256-d38s5sSvENIou+rlphXIrrOcGOdsvkNaMJlhiXVWN6c="; 20 + vendorHash = "sha256-DFssAic2YtXNH1Jm6zCDv1yPNz3YUXaFLs7j7rNHhlE="; 21 21 22 22 proxyVendor = true; 23 23
+1 -1
pkgs/applications/misc/pop/default.nix
··· 13 13 14 14 vendorHash = "sha256-8YcJXvR0cdL9PlP74Qh6uN2XZoN16sz/yeeZlBsk5N8="; 15 15 16 - GOWORK = "off"; 16 + env.GOWORK = "off"; 17 17 18 18 nativeBuildInputs = [ 19 19 installShellFiles
+1 -1
pkgs/applications/misc/ratt/default.nix
··· 11 11 }; 12 12 13 13 proxyVendor = true; 14 - vendorHash = "sha256-6cpHDwnxdc/9YPj77JVuT5ZDFjKkF6nBX4RgZr/9fFY="; 14 + vendorHash = "sha256-L8mDs9teQJW6P3dhKSLfzbpA7kzhJk61oR2q0ME+u0M="; 15 15 16 16 # tests try to access the internet to scrape websites 17 17 doCheck = false;
+1 -1
pkgs/applications/misc/skate/default.nix
··· 12 12 }; 13 13 14 14 proxyVendor = true; 15 - vendorHash = "sha256-xNM4qmpv+wcoiGrQ585N3VoKW6tio0cdHmUHRl2Pvio="; 15 + vendorHash = "sha256-/qZB/GGEkoqRoNhEmZw9Q2lsUPZRg5/xVxWgdBZTMLk="; 16 16 17 17 ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; 18 18
+1 -1
pkgs/applications/misc/wtf/default.nix
··· 17 17 sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY="; 18 18 }; 19 19 20 - vendorHash = "sha256-9uuLidieBMoKz/FLcBnp9wenyveOIzB0IvRBRasulZk="; 20 + vendorHash = "sha256-mQdKw3DeBEkCOtV2/B5lUIHv5EBp+8QSxpA13nFxESw="; 21 21 proxyVendor = true; 22 22 23 23 doCheck = false;
+1 -1
pkgs/applications/networking/cluster/argocd-autopilot/default.nix
··· 11 11 sha256 = "sha256-txbs1SzAaV1nCl104m0Ht5DwzCmK+sBDn4rZ1newdLc="; 12 12 }; 13 13 14 - vendorHash = "sha256-1nolJLWkArzSKf11fzlvvgiCnvMYSu5MHRNAn1lryms="; 14 + vendorHash = "sha256-QbjiQVclT8paEKYQmMwj5MLq40mAVh5Ji5VJJTOmEZI="; 15 15 16 16 proxyVendor = true; 17 17
+1 -1
pkgs/applications/networking/cluster/talosctl/default.nix
··· 15 15 16 16 ldflags = [ "-s" "-w" ]; 17 17 18 - GOWORK = "off"; 18 + env.GOWORK = "off"; 19 19 20 20 subPackages = [ "cmd/talosctl" ]; 21 21
+4 -4
pkgs/applications/networking/cluster/terraform-providers/providers.json
··· 242 242 "repo": "terraform-provider-cloudfoundry", 243 243 "rev": "v0.52.0", 244 244 "spdx": "MPL-2.0", 245 - "vendorHash": "sha256-g1T6kH8Rv9bpvb6Q3YHCseEi1ayydJIxlplH3k12s8c=" 245 + "vendorHash": "sha256-6MKWpiDq4yI3mfIJyzEsWLa7gi0+DScI5jKcOcM6Qs0=" 246 246 }, 247 247 "cloudinit": { 248 248 "hash": "sha256-etZeCGtYhO0szRGxnj1c3/WOelxScWiHEA9w1Jb7bEE=", ··· 316 316 "repo": "terraform-provider-dhall", 317 317 "rev": "v0.0.7", 318 318 "spdx": "BSD-3-Clause", 319 - "vendorHash": "sha256-e/+czUeOACwRC7xY90pZp2EWDzDpLU6Ud9RPzuNKaOY=" 319 + "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" 320 320 }, 321 321 "digitalocean": { 322 322 "hash": "sha256-wwb62tZZxpr7NXbiqcS40aF9E2msagj2Mqy4kogDsEA=", ··· 434 434 "repo": "terraform-provider-fortios", 435 435 "rev": "1.19.0", 436 436 "spdx": "MPL-2.0", 437 - "vendorHash": "sha256-DwRfbD4AqB+4KLuYtqY5fUdzRrEpTIvL4VAM7nieJJA=" 437 + "vendorHash": "sha256-mE25KfP2+7K7nHpkQOn1pfilm+fz5kGDDW8U+P2zglY=" 438 438 }, 439 439 "gandi": { 440 440 "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", ··· 552 552 "repo": "terraform-provider-htpasswd", 553 553 "rev": "v1.0.4", 554 554 "spdx": "MIT", 555 - "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" 555 + "vendorHash": "sha256-6jaAgyHS5H63YKnm4xcYmjKVhPbWm6KK6qHzxg/78yU=" 556 556 }, 557 557 "http": { 558 558 "hash": "sha256-druSExXZeZMNWFIJQoQ/Xh0gCQQx0AnKbIAJQlRi8Po=",
+1 -1
pkgs/applications/networking/mailreaders/aerc/default.nix
··· 22 22 }; 23 23 24 24 proxyVendor = true; 25 - vendorHash = "sha256-rycAGqZhO48bPTFO2y2J1d16oon24sEEUns4EayWDvg="; 25 + vendorHash = "sha256-AHEhIWa6PP8f+hhIdY+0brLF2HYhvTal7qXfCwG9iyo="; 26 26 27 27 nativeBuildInputs = [ 28 28 scdoc
+1
pkgs/build-support/go/module.nix
··· 84 84 preBuild = args.preBuild or ""; 85 85 postBuild = args.modPostBuild or ""; 86 86 sourceRoot = args.sourceRoot or ""; 87 + env = args.env or { }; 87 88 88 89 impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ 89 90 "GIT_PROXY_COMMAND"
+1 -1
pkgs/by-name/be/bepass/package.nix
··· 23 23 hash = "sha256-ruOhPWNs1WWM3r6X+6ch0HoDCu/a+IkBQiCr0Wh6yS8="; 24 24 }; 25 25 26 - vendorHash = "sha256-SiggDy6vc19yIw15g45yjl8gscE91zUoR6woECbAtR0="; 26 + vendorHash = "sha256-Juie/Hq3i6rvAK19x6ah3SCQJL0uCrmV9gvzHih3crY="; 27 27 28 28 subPackages = [ 29 29 "cmd/cli"
+1 -1
pkgs/by-name/bu/butler/package.nix
··· 31 31 32 32 proxyVendor = true; 33 33 34 - vendorHash = "sha256-CtBwc5mcgLvl2Bvg5gI+ULJMQEEibx1aN3IpmRNUtwE="; 34 + vendorHash = "sha256-GvUUCQ2BPW0HlXZljBWJ2Wyys9OEIM55dEWAa6J19Zg="; 35 35 36 36 doCheck = false; 37 37
+1 -1
pkgs/by-name/mc/mcap-cli/package.nix
··· 20 20 21 21 modRoot = "go/cli/mcap"; 22 22 23 - GOWORK="off"; 23 + env.GOWORK="off"; 24 24 25 25 # copy the local versions of the workspace modules 26 26 postConfigure = ''
+1 -1
pkgs/by-name/zi/zitadel/console.nix
··· 23 23 workDir = "console"; 24 24 bufArgs = "../proto --include-imports --include-wkt"; 25 25 outputPath = "src/app/proto"; 26 - hash = "sha256-h/5K6PvEFyjzS5p7SfuDIk91TkN1iPc+iXor8T/QSeE="; 26 + hash = "sha256-BBXFt4f2SQphr106sQ0eEL4Z2ooAI8fxXhu2rKqhjb4="; 27 27 }; 28 28 in 29 29 mkYarnPackage rec {
+2 -2
pkgs/by-name/zi/zitadel/package.nix
··· 22 22 rev = "v${version}"; 23 23 hash = "sha256-Uv0iEIFkTdBAi0WDBQHf0ATs4L2FOU4NmiE9p1MHSa0="; 24 24 }; 25 - goModulesHash = "sha256-PQch046YjYhAmVlNNdgDLWIqFvEpXRgXAYFMwSZmk4w="; 25 + goModulesHash = "sha256-thd1bhbPVedYd+Yq1IYYUJFr66AWRTzA3DceCXFTEQo="; 26 26 27 27 buildZitadelProtocGen = name: 28 28 buildGoModule { ··· 92 92 protoc-gen-zitadel 93 93 ]; 94 94 outputPath = ".artifacts"; 95 - hash = "sha256-3qDVY2CvtY8lZDr+p5i0vV6zZ5KyTtxBLyV7Os9KuIw="; 95 + hash = "sha256-ntIKudNFBs7kHjK7cfzbOfDCA6J8uvJRUbCTa6afK/I="; 96 96 }; 97 97 in 98 98 buildGoModule rec {
+1 -1
pkgs/development/libraries/boringssl/default.nix
··· 20 20 21 21 nativeBuildInputs = [ cmake ninja perl ]; 22 22 23 - vendorHash = "sha256-McSmG+fMO8/T/bJR6YAJDYw9pxsWJoj1hcSTPv/wMsI="; 23 + vendorHash = "sha256-074bgtoBRS3SOxLrwZbBdK1jFpdCvF6tRtU1CkrhoDY="; 24 24 proxyVendor = true; 25 25 26 26 # hack to get both go and cmake configure phase
+1 -1
pkgs/development/tools/benthos/default.nix
··· 16 16 17 17 proxyVendor = true; 18 18 19 - vendorHash = "sha256-bnQn6gdHhbUJUPWU3CKrw1sq5CL0Tkss4DINPwlsiPU="; 19 + vendorHash = "sha256-Ce2vXPKbyj517N3uJEGc00hCVZhcRrPvXUSuK+jjK3U="; 20 20 21 21 doCheck = false; 22 22
+1 -1
pkgs/development/tools/dapr/cli/default.nix
··· 11 11 sha256 = "sha256-nR9+6glX0oUJZq32XxyV4aVjfjVlNycZvMNaVHy+Q1s="; 12 12 }; 13 13 14 - vendorHash = "sha256-iqoxlqSdHDfLlb1bcHLPAO2/wiwRpqFBIuoVi7lecKs="; 14 + vendorHash = "sha256-kFmoNd40YxUXVXk0F1Bf77KS5AM0jjOTwTjM5pYKkv4="; 15 15 16 16 proxyVendor = true; 17 17
+1 -1
pkgs/development/tools/database/sqlcmd/default.nix
··· 17 17 sha256 = "sha256-LLRNaY6ArUNoKSWSauCh2RKEGO5+G1OnoCAqMaAfOkY="; 18 18 }; 19 19 20 - vendorHash = "sha256-G6Patjrafg9VXXbisBDs/JVvy0SA6moTquKj66z9lzw="; 20 + vendorHash = "sha256-NVmgAlNQvRj/7poIEWjMyKw2qWMd/HwbdSFHpumnRlo="; 21 21 proxyVendor = true; 22 22 23 23 ldflags = [ "-s" "-w" "-X main.version=${version}" ];
+1 -1
pkgs/development/tools/go-migrate/default.nix
··· 12 12 }; 13 13 14 14 proxyVendor = true; # darwin/linux hash mismatch 15 - vendorHash = "sha256-3otiRbswhENs/YvKKr+ZeodLWtK7fhCjEtlMDlkLOlY="; 15 + vendorHash = "sha256-q8wShIcVHZtpnhvZfsxiI5FLq0xneA8IBMDWd/vpz/0="; 16 16 17 17 subPackages = [ "cmd/migrate" ]; 18 18
+1 -1
pkgs/development/tools/kustomize/default.nix
··· 21 21 # avoid finding test and development commands 22 22 modRoot = "kustomize"; 23 23 proxyVendor = true; 24 - vendorHash = "sha256-6+8cwRH37lkQvnHBUlSqyNrZMfDpKbeUNJS4YMflBq0="; 24 + vendorHash = "sha256-inCBDIVdvkEdDJEwX7vdoWANk+f01VxhBGPKxrjR6Ao="; 25 25 26 26 nativeBuildInputs = [ installShellFiles ]; 27 27
+1 -1
pkgs/development/tools/opcr-policy/default.nix
··· 19 19 20 20 subPackages = [ "cmd/policy" ]; 21 21 # disable go workspaces 22 - GOWORK = "off"; 22 + env.GOWORK = "off"; 23 23 24 24 doCheck = false; 25 25
+1 -1
pkgs/development/tools/wails/default.nix
··· 23 23 hash = "sha256-MHwIRanmgpjTKM+ILSQheCd9+XUwVTCVrREqntxpv7Q="; 24 24 } + "/v2"; 25 25 26 - vendorHash = "sha256-0cGmJEi7OfMZS7ObPBLHOVqKfvnlpHBiGRjSdV6wxE4="; 26 + vendorHash = "sha256-6QFnLuRnSzIqkQkK1qg7VBYxwjK8fSQWz5RxpuyutoY="; 27 27 28 28 proxyVendor = true; 29 29
+1 -1
pkgs/servers/alps/default.nix
··· 11 11 hash = "sha256-RSug3YSiqYLGs05Bee4NoaoCyPvUZ7IqlKWI1hmxbiA="; 12 12 }; 13 13 14 - vendorHash = "sha256-XDm6LU9D/rVQHiko7EFpocv+IktGe6tQhJYRrOJxeSs="; 14 + vendorHash = "sha256-QsGfINktk+rBj4b5h+NBVS6XV1SVz+9fDL1vtUqcKEU="; 15 15 16 16 ldflags = [ 17 17 "-s"
+1 -1
pkgs/servers/hydron/default.nix
··· 17 17 hash = "sha256-Q1pZf5FPQw+pHItcZyOGx0N+iHmz9rW0+ANFsketh6E="; 18 18 }; 19 19 20 - vendorHash = "sha256-fyGC6k9/xER5GwVelBhy5C5tiq6NMhwSmYjSpvenrfA="; 20 + vendorHash = "sha256-hKF2RCGnk/5hNS65vGoDdF1OUPSLe4PDegYlKTeqJDM="; 21 21 proxyVendor = true; 22 22 23 23 nativeBuildInputs = [ pkg-config ];
+1 -1
pkgs/servers/icebreaker/default.nix
··· 16 16 }; 17 17 18 18 proxyVendor = true; 19 - vendorHash = "sha256-i648w+BOUX5IfEEZ11gJAjX1ZUdoYRzDPz6GDe7i2S8="; 19 + vendorHash = "sha256-A0jNy8cUKpfAqocgjdYU7LB4EgIr9tiOCyEaXGQl8TM="; 20 20 21 21 nativeBuildInputs = [ 22 22 makeBinaryWrapper
+1 -1
pkgs/servers/monitoring/phlare/default.nix
··· 12 12 }; 13 13 14 14 proxyVendor = true; 15 - vendorHash = "sha256-y8IWS5OQkDYRTt5xOzzbjb1ya6AiFtvAc0YNH99KZBA="; 15 + vendorHash = "sha256-l7+iDT9GAP9BX+xKvnx57iVF8wCM1YyHwq6dD9PbTDI="; 16 16 17 17 ldflags = let 18 18 prefix = "github.com/grafana/phlare/pkg/util/build";
+1 -1
pkgs/servers/pufferpanel/default.nix
··· 58 58 59 59 nativeBuildInputs = [ makeWrapper go-swag ]; 60 60 61 - vendorHash = "sha256-itiWROoIhnMbG9evH6X7kjClC4VdpX983d/SCwr4HbY="; 61 + vendorHash = "sha256-1U7l7YW1fu5M0/pPHTLamLsTQdEltesRODUn21SuP8w="; 62 62 proxyVendor = true; 63 63 64 64 # Generate code for Swagger documentation endpoints (see web/swagger/docs.go).
+1 -1
pkgs/servers/teleport/12/default.nix
··· 2 2 callPackage ../generic.nix ({ 3 3 version = "12.4.32"; 4 4 hash = "sha256-dYriqQwrc3tfLv+/G/W8n+4cLbPUq7lq1/kGH/GIsHs="; 5 - vendorHash = "sha256-1z1Aocxi34/6Kuwj30LWjEq+LrZThG6ZzrMb0Qtok8w="; 5 + vendorHash = "sha256-R7gWdUIrc7VLe+9/En47FI3G9x2V1VGUVTrT/kmA9c4="; 6 6 yarnHash = "sha256-Sr9T2TmrysMQs6A00rHU1IZjslu8jyYkVnYE6AmBmLA="; 7 7 cargoLock = { 8 8 lockFile = ./Cargo.lock;
+1 -1
pkgs/servers/teleport/13/default.nix
··· 2 2 callPackage ../generic.nix ({ 3 3 version = "13.4.14"; 4 4 hash = "sha256-g11D5lekI3pUpKf5CLUuNjejs0gN/bEemHkCj3akha0="; 5 - vendorHash = "sha256-wQywm41qnv/ryZwwyIg+La1Z7qAw2I/fUI3kLgHlq9Q="; 5 + vendorHash = "sha256-kiDhlR/P81u/yNq72JuskES/UzMrTFzJT0H3xldGk8I="; 6 6 yarnHash = "sha256-E9T+7aXVoERdUnVEL4va2fcMnv1jsL9Js/R2LZo4hu4="; 7 7 cargoLock = { 8 8 lockFile = ./Cargo.lock;
+1 -1
pkgs/servers/teleport/14/default.nix
··· 2 2 callPackage ../generic.nix ({ 3 3 version = "14.3.0"; 4 4 hash = "sha256-yTbJeHCmPlelq7BrZQRY3XyNQiovV7NQ1tNh2NfYGbk="; 5 - vendorHash = "sha256-ySe5YkBMt+1tF/8PWctfAkK/e03cqp5P1aJ2ANz7pLo="; 5 + vendorHash = "sha256-lHsgSbY1nqQminU67QgV6FbHXNlv5tCMv2oVq48S33M="; 6 6 yarnHash = "sha256-m934P+KygGiCzr5fDsNTlmZ1T9JxA6P8zTimocQyVi0="; 7 7 cargoLock = { 8 8 lockFile = ./Cargo.lock;
+1 -1
pkgs/tools/networking/dae/default.nix
··· 15 15 fetchSubmodules = true; 16 16 }; 17 17 18 - vendorHash = "sha256-qK+x6ciAebwIWHRjRpNXCAqsfnmEx37evS4+7kwcFIs="; 18 + vendorHash = "sha256-4U6zIxK8K+MGxRboTtsKntDMp8/cQWPqXQ3l03AEtBs="; 19 19 20 20 proxyVendor = true; 21 21
+1 -1
pkgs/tools/networking/juicity/default.nix
··· 13 13 hash = "sha256-SUZ5E2GRLyUI/Z5ekJPNypVJXfJFzIz3qr9kCeXN7Gk="; 14 14 }; 15 15 16 - vendorHash = "sha256-Gj4uM9EL6QjlrCFGq3u1+TkIxzIU2mthFRK00pOAaJg="; 16 + vendorHash = "sha256-13U3B9VKspSlpD1hYPtyCuPAZvAYc/d/UKcjXMURxyo="; 17 17 18 18 proxyVendor = true; 19 19
+1 -1
pkgs/tools/networking/oneshot/default.nix
··· 15 15 16 16 subPackages = [ "cmd" ]; 17 17 18 - GOWORK = "off"; 18 + env.GOWORK = "off"; 19 19 20 20 modRoot = "v2"; 21 21
+1 -1
pkgs/tools/security/age-plugin-tpm/default.nix
··· 18 18 19 19 proxyVendor = true; 20 20 21 - vendorHash = "sha256-BSb+8p5+RJMfcYc2+BuT4YbhCWCbcYOt9upesD11Ytw="; 21 + vendorHash = "sha256-veduD0K3Onkqvyg9E5v854a6/8UIRQZEH098lUepRNU="; 22 22 23 23 nativeCheckInputs = [ 24 24 swtpm
+1 -1
pkgs/tools/security/threatest/default.nix
··· 16 16 }; 17 17 18 18 proxyVendor = true; 19 - vendorHash = "sha256-zwHcGy7wjy2yx7nMi88R+z+Is+YcqGRMK0czeBNlcdA="; 19 + vendorHash = "sha256-EvVazz51sW8z+8XfZB0Xo42KuUT6Q9n2Y/0HvlF1bV4="; 20 20 21 21 nativeBuildInputs = [ 22 22 installShellFiles