diff options
| author | Artturin <Artturin@artturin.com> | 2023-07-11 21:16:30 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-07-14 00:18:06 +0300 |
| commit | 1c29673fcce3aecd0cb4f30058c266ea5480c8a3 (patch) | |
| tree | 342dbdf9d35bb9fb4290aeb99fecde1762f0b097 /pkgs/applications/networking/cluster/k3s | |
| parent | 9caab144be31e088bfd3468de2f26e5c08b0f4fa (diff) | |
| download | nixlib-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar nixlib-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar.gz nixlib-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar.bz2 nixlib-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar.lz nixlib-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar.xz nixlib-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar.zst nixlib-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.zip | |
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
Diffstat (limited to 'pkgs/applications/networking/cluster/k3s')
| -rwxr-xr-x | pkgs/applications/networking/cluster/k3s/update-script.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 <<EOF EOF set +e -K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s_1_${MINOR_VERSION}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") +K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s_1_${MINOR_VERSION}.goModules.overrideAttrs (_: { vendorSha256 = sha256; })") set -e if [ -n "${K3S_VENDOR_SHA256:-}" ]; then |