From 1c29673fcce3aecd0cb4f30058c266ea5480c8a3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 11 Jul 2023 21:16:30 +0300 Subject: [PATCH] treewide: go-modules -> goModules In 787af0f79f128cb21b113d2eb37e64d913f18aae I had to change ${go-modules} to $goModules to allow overrideAttrs to work; However, env vars cannot contain -, so i had to change go-modules too. This in turn broke nix-update because it uses the go-modules attr. Instead of making nix-update more complicated, make go-modules naming match cargoDeps. `fd --type f | xargs sd '\bgo-modules\b' 'goModules'` and revert change to pkgs/applications/misc/dstask/default.nix and pkgs/servers/http/dave/default.nix and pkgs/os-specific/darwin/plistwatch/default.nix release note added --- doc/languages-frameworks/go.section.md | 4 ++-- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ .../networking/cluster/k3s/update-script.sh | 2 +- .../networking/cluster/kfctl/default.nix | 2 +- .../networking/cluster/kubemqctl/default.nix | 2 +- .../cluster/terraform-providers/update-provider | 2 +- pkgs/applications/system/mgmt/default.nix | 2 +- .../terminal-emulators/kitty/default.nix | 3 +-- .../version-management/forgejo/default.nix | 2 +- .../version-management/git-hound/default.nix | 2 +- .../sourcehut/fix-gqlgen-trimpath.nix | 2 +- .../virtualization/singularity/generic.nix | 2 +- .../virtualization/singularity/packages.nix | 4 ++-- pkgs/build-support/go/module.nix | 12 ++++++------ pkgs/development/tools/kcli/default.nix | 2 +- pkgs/servers/authelia/update.sh | 2 +- pkgs/servers/dns/ncdns/default.nix | 2 +- pkgs/servers/geospatial/pg_featureserv/default.nix | 2 +- pkgs/servers/gobetween/default.nix | 2 +- pkgs/servers/memos/update.sh | 2 +- pkgs/servers/monitoring/alertmanager-bot/default.nix | 2 +- pkgs/servers/monitoring/grafana/update.sh | 2 +- pkgs/tools/networking/mozillavpn/default.nix | 6 +++--- pkgs/tools/networking/shadowfox/default.nix | 2 +- pkgs/tools/networking/waitron/default.nix | 2 +- pkgs/tools/networking/wuzz/default.nix | 2 +- pkgs/tools/security/deepsea/default.nix | 2 +- pkgs/tools/security/shhgit/default.nix | 2 +- pkgs/tools/security/ssb/default.nix | 2 +- pkgs/tools/text/wrap/default.nix | 2 +- 30 files changed, 40 insertions(+), 39 deletions(-) diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index cf1808414234..7fd38a7d21c5 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -20,7 +20,7 @@ In the following is an example expression using `buildGoModule`, the following a To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)). - `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums. -- `modPostBuild`: Shell commands to run after the build of the go-modules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash` (or `vendorSha256`). Note that if you change this attribute, you need to update `vendorHash` (or `vendorSha256`) attribute. +- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash` (or `vendorSha256`). Note that if you change this attribute, you need to update `vendorHash` (or `vendorSha256`) attribute. ```nix pet = buildGoModule rec { @@ -115,7 +115,7 @@ done ## Attributes used by the builders {#ssec-go-common-attributes} -Many attributes [controlling the build phase](#variables-controlling-the-build-phase) are respected by both `buildGoModule` and `buildGoPackage`. Note that `buildGoModule` reads the following attributes also when building the `vendor/` go-modules fixed output derivation as well: +Many attributes [controlling the build phase](#variables-controlling-the-build-phase) are respected by both `buildGoModule` and `buildGoPackage`. Note that `buildGoModule` reads the following attributes also when building the `vendor/` goModules fixed output derivation as well: - [`sourceRoot`](#var-stdenv-sourceRoot) - [`prePatch`](#var-stdenv-prePatch) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index eb68c9acbf8a..49990435dd1c 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -98,6 +98,8 @@ - DocBook option documentation is no longer supported, all module documentation now uses markdown. +- `buildGoModule` `go-modules` attrs have been renamed to `goModules`. + - `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets. - The module [services.ankisyncd](#opt-services.ankisyncd.package) has been switched to [anki-sync-server-rs](https://github.com/ankicommunity/anki-sync-server-rs) from the old python version, which was difficult to update, had not been updated in a while, and did not support recent versions of anki. diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index 3d10acb83c10..d1dad25b07a4 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -114,7 +114,7 @@ cat >versions.nix < 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/applications/networking/cluster/kubemqctl/default.nix b/pkgs/applications/networking/cluster/kubemqctl/default.nix index 1712a018cbe2..1f7d691f0cc6 100644 --- a/pkgs/applications/networking/cluster/kubemqctl/default.nix +++ b/pkgs/applications/networking/cluster/kubemqctl/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Kubemqctl is a command line interface (CLI) for Kubemq Kubernetes Message Broker."; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ brianmcgee ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 8c6d0b07e862..4d380a141b8f 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -151,7 +151,7 @@ update_attr hash "${hash}" old_vendor_hash="$(read_attr vendorHash)" if [[ ${old_vendor_hash} != null ]]; then echo_provider "calculating vendorHash" - vendorHash=$(generate_hash go-modules) + vendorHash=$(generate_hash goModules) update_attr vendorHash "${vendorHash}" fi diff --git a/pkgs/applications/system/mgmt/default.nix b/pkgs/applications/system/mgmt/default.nix index 0bc65dc95052..8a8396630815 100644 --- a/pkgs/applications/system/mgmt/default.nix +++ b/pkgs/applications/system/mgmt/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { hash = "sha256-jurZvEtiaTjWeDkmCJDIFlTzR5EVglfoDxkFgOilo8s="; }; - # patching must be done in prebuild, so it is shared with go-modules + # patching must be done in prebuild, so it is shared with goModules # see https://github.com/NixOS/nixpkgs/issues/208036 preBuild = '' for file in `find -name Makefile -type f`; do diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 7ff455286fc4..2ec075a6876c 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -43,7 +43,7 @@ buildPythonApplication rec { pname = "kitty-go-modules"; inherit src version; vendorHash = "sha256-jk2EcYVuhV/UQfHAIfpnn8ZIZnwjA/o8YRXmpoC85Vc="; - }).go-modules; + }).goModules; buildInputs = [ harfbuzz @@ -224,7 +224,6 @@ buildPythonApplication rec { ''; passthru = { - go-modules = goModules; # allow for updateScript to handle vendorHash tests.test = nixosTests.terminal-emulators.kitty; updateScript = nix-update-script {}; }; diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index b571d0a48dba..bb4a9e01297c 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -88,7 +88,7 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - # $data is not available in go-modules.drv and preBuild isn't needed + # $data is not available in goModules.drv and preBuild isn't needed overrideModAttrs = (_: { postPatch = null; preBuild = null; diff --git a/pkgs/applications/version-management/git-hound/default.nix b/pkgs/applications/version-management/git-hound/default.nix index 463d550cbcab..d2be44bc1a2f 100644 --- a/pkgs/applications/version-management/git-hound/default.nix +++ b/pkgs/applications/version-management/git-hound/default.nix @@ -26,6 +26,6 @@ buildGoModule rec { homepage = "https://github.com/tillson/git-hound"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix index 629d767a1caf..4327e395d533 100644 --- a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix +++ b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix @@ -3,7 +3,7 @@ }: { overrideModAttrs = (_: { - # No need to workaround -trimpath: it's not used in go-modules, + # No need to workaround -trimpath: it's not used in goModules, # but do download `go generate`'s dependencies nonetheless. preBuild = '' go generate ./loaders diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index ab9f1d1ce710..543a696d6b88 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -93,7 +93,7 @@ in inherit pname version src; # Override vendorHash with the output got from - # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules" + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules" # or with `null` when using vendored source tarball. inherit vendorHash deleteVendor proxyVendor; diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 73bed19fb734..a2b47562f8b3 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -18,7 +18,7 @@ let }; # Update by running - # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules" + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules" # at the root directory of the Nixpkgs repository vendorHash = "sha256-PfFubgR/W1WBXIsRO+Kg7hA6ebeAcRiJlTlAZbnl19A="; @@ -49,7 +49,7 @@ let }; # Update by running - # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).go-modules" + # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" # at the root directory of the Nixpkgs repository vendorHash = "sha256-mBhlH6LSmcJuc6HbU/3Q9ii7vJkW9jcikBWCl8oeMOk="; diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 61abd040a46f..ced7873e6a2b 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -6,7 +6,7 @@ , passthru ? { } , patches ? [ ] - # A function to override the go-modules derivation + # A function to override the goModules derivation , overrideModAttrs ? (_oldAttrs: { }) # path to go.mod and go.sum directory @@ -52,9 +52,9 @@ assert (args' ? vendorHash && args' ? vendorSha256) -> throw "both `vendorHash` let args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "vendorHash" ]; - go-modules = if (vendorHash == null) then "" else + goModules = if (vendorHash == null) then "" else (stdenv.mkDerivation { - name = "${name}-go-modules"; + name = "${name}-goModules"; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ go git cacert ]; @@ -163,10 +163,10 @@ let cd "$modRoot" '' + lib.optionalString (vendorHash != null) '' ${if proxyVendor then '' - export GOPROXY=file://${go-modules} + export GOPROXY=file://${goModules} '' else '' rm -rf vendor - cp -r --reflink=auto ${go-modules} vendor + cp -r --reflink=auto ${goModules} vendor ''} '' + '' @@ -288,7 +288,7 @@ let disallowedReferences = lib.optional (!allowGoReference) go; - passthru = passthru // { inherit go go-modules vendorHash; } // { inherit (args') vendorSha256; }; + passthru = passthru // { inherit go goModules vendorHash; } // { inherit (args') vendorSha256; }; meta = { # Add default meta information diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 605022ffc12d..77c773cea1b9 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { homepage = "https://github.com/cswank/kcli"; license = licenses.mit; maintainers = with maintainers; [ cswank ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/servers/authelia/update.sh b/pkgs/servers/authelia/update.sh index dd2435453c2a..c51272ea9193 100755 --- a/pkgs/servers/authelia/update.sh +++ b/pkgs/servers/authelia/update.sh @@ -80,6 +80,6 @@ clean_up OLD_GO_VENDOR_HASH="$(instantiateClean authelia.vendorHash)" echo "Old go vendor hash $OLD_GO_VENDOR_HASH" replace "$OLD_GO_VENDOR_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix" -NEW_GO_VENDOR_HASH="$(fetchNewSha authelia.go-modules)" +NEW_GO_VENDOR_HASH="$(fetchNewSha authelia.goModules)" echo "New go vendor hash $NEW_GO_VENDOR_HASH" replace "$TMP_HASH" "$NEW_GO_VENDOR_HASH" "$DRV_DIR/sources.nix" diff --git a/pkgs/servers/dns/ncdns/default.nix b/pkgs/servers/dns/ncdns/default.nix index 5af71a9a4136..85c9dddf16dd 100644 --- a/pkgs/servers/dns/ncdns/default.nix +++ b/pkgs/servers/dns/ncdns/default.nix @@ -37,7 +37,7 @@ buildGoModule { vendorSha256 = "sha256-ENtTnDsz5WhRz1kiqnWQ5vyEpZtgi7ZeYvksffgW78k="; - # Override the go-modules fetcher derivation to apply + # Override the goModules fetcher derivation to apply # upstream's patch of the crypto/x509 library. modBuildPhase = '' go mod init github.com/namecoin/x509-compressed diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/servers/geospatial/pg_featureserv/default.nix index 5da5d16e90d9..21ecb71ae281 100644 --- a/pkgs/servers/geospatial/pg_featureserv/default.nix +++ b/pkgs/servers/geospatial/pg_featureserv/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { homepage = "https://github.com/CrunchyData/pg_featureserv"; license = licenses.asl20; maintainers = with maintainers; [ sikmir ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index 224eca352bb9..290d1db26087 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -35,6 +35,6 @@ buildGoModule rec { homepage = "https://gobetween.io"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/servers/memos/update.sh b/pkgs/servers/memos/update.sh index f925f75bcd70..ded76e3db2cb 100755 --- a/pkgs/servers/memos/update.sh +++ b/pkgs/servers/memos/update.sh @@ -13,7 +13,7 @@ fi extractVendorHash() { original="${1?original hash missing}" - result="$(nix-build -A memos.go-modules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + result="$(nix-build -A memos.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" [ -z "$result" ] && { echo "$original"; } || { echo "$result"; } } diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix index de12c0336c77..beb2bf08d4b5 100644 --- a/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -30,6 +30,6 @@ buildGoModule rec { homepage = "https://github.com/metalmatze/alertmanager-bot"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/servers/monitoring/grafana/update.sh b/pkgs/servers/monitoring/grafana/update.sh index 8fce84333885..9a19485e37a4 100755 --- a/pkgs/servers/monitoring/grafana/update.sh +++ b/pkgs/servers/monitoring/grafana/update.sh @@ -16,7 +16,7 @@ replaceHash() { } extractVendorHash() { original="${1?original hash missing}" - result="$(nix-build -A grafana.go-modules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + result="$(nix-build -A grafana.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" [ -z "$result" ] && { echo "$original"; } || { echo "$result"; } } diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 92cb1e553f84..078bd8e316d2 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -46,11 +46,11 @@ let }) ]; - netfilter-go-modules = (buildGoModule { + netfilter-goModules = (buildGoModule { inherit pname version src patches; modRoot = "linux/netfilter"; vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; - }).go-modules; + }).goModules; extensionBridgeDeps = rustPlatform.fetchCargoTarball { inherit src patches; @@ -132,7 +132,7 @@ stdenv.mkDerivation { substituteInPlace extension/CMakeLists.txt \ --replace '/etc' "$out/etc" - ln -s '${netfilter-go-modules}' linux/netfilter/vendor + ln -s '${netfilter-goModules}' linux/netfilter/vendor pushd extension/bridge cargoDepsCopy="$extensionBridgeDepsCopy" cargoSetupPostPatchHook diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 109188d0b1b5..0dce41ff571d 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -27,6 +27,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ infinisil ]; mainProgram = "shadowfox-updater"; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index bc52bb33e370..c316e98317e7 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -34,6 +34,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ guibert ]; platforms = platforms.linux; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index c162ee8036a4..599dd4b29f82 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -18,6 +18,6 @@ buildGoModule rec { description = "Interactive cli tool for HTTP inspection"; license = licenses.agpl3; maintainers = with maintainers; [ pradeepchhetri ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix index bfe004d2d9b1..0befd62e2212 100644 --- a/pkgs/tools/security/deepsea/default.nix +++ b/pkgs/tools/security/deepsea/default.nix @@ -26,6 +26,6 @@ buildGoModule rec { homepage = "https://github.com/dsnezhkov/deepsea"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/tools/security/shhgit/default.nix b/pkgs/tools/security/shhgit/default.nix index fa714622fe97..48b9c144a820 100644 --- a/pkgs/tools/security/shhgit/default.nix +++ b/pkgs/tools/security/shhgit/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/eth0izzle/shhgit"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/tools/security/ssb/default.nix b/pkgs/tools/security/ssb/default.nix index a461fad2fd8c..aed2dd79aeb3 100644 --- a/pkgs/tools/security/ssb/default.nix +++ b/pkgs/tools/security/ssb/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { homepage = "https://github.com/kitabisa/ssb"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/pkgs/tools/text/wrap/default.nix b/pkgs/tools/text/wrap/default.nix index aeafda70a2d6..728cad2c3fee 100644 --- a/pkgs/tools/text/wrap/default.nix +++ b/pkgs/tools/text/wrap/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { homepage = "https://github.com/Wraparound/wrap"; license = licenses.gpl3Only; maintainers = [ maintainers.austinbutler ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; }