From 1c29673fcce3aecd0cb4f30058c266ea5480c8a3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 11 Jul 2023 21:16:30 +0300 Subject: 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 --- pkgs/servers/memos/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/servers/memos') diff --git a/pkgs/servers/memos/update.sh b/pkgs/servers/memos/update.sh index f925f75bcd70e..ded76e3db2cb1 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"; } } -- cgit 1.4.1