summary refs log tree commit diff
path: root/pkgs/applications/virtualization/singularity
diff options
context:
space:
mode:
authorArtturin <Artturin@artturin.com>2023-07-11 21:16:30 +0300
committerArtturin <Artturin@artturin.com>2023-07-14 00:18:06 +0300
commit1c29673fcce3aecd0cb4f30058c266ea5480c8a3 (patch)
tree342dbdf9d35bb9fb4290aeb99fecde1762f0b097 /pkgs/applications/virtualization/singularity
parent9caab144be31e088bfd3468de2f26e5c08b0f4fa (diff)
downloadnixpkgs-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar
nixpkgs-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar.gz
nixpkgs-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar.bz2
nixpkgs-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar.lz
nixpkgs-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar.xz
nixpkgs-1c29673fcce3aecd0cb4f30058c266ea5480c8a3.tar.zst
nixpkgs-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/virtualization/singularity')
-rw-r--r--pkgs/applications/virtualization/singularity/generic.nix2
-rw-r--r--pkgs/applications/virtualization/singularity/packages.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix
index ab9f1d1ce71..543a696d6b8 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 73bed19fb73..a2b47562f8b 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=";