From 0254bc67821a9f18575df9bd572c5312fd1399b9 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 27 Nov 2024 16:28:09 +0800 Subject: [PATCH] apptainer, singularity: fix the update instructions in the comment --- .../virtualization/singularity/generic.nix | 5 +++-- .../virtualization/singularity/packages.nix | 10 ++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 12a9039cb016..288fc3119ed7 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -14,8 +14,9 @@ }: let - # Workaround for vendor-related attributes not overridable (#86349) - # should be removed when the issue is resolved + # Backward compatibility layer for the obsolete workaround of + # the "vendor-related attributes not overridable" issue (#86349), + # whose solution is merged and released. _defaultGoVendorArgs = { inherit vendorHash deleteVendor proxyVendor; }; diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 525013bf86e0..71e9a38a2731 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -19,9 +19,8 @@ let hash = "sha256-yBUCUHc9vgyKFqAOHXQjAYQnmN0yXSIvkpR/s3LNAmk="; }; - # Update by running - # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules" - # at the root directory of the Nixpkgs repository + # Override vendorHash with overrideAttrs. + # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash vendorHash = "sha256-W853++SSvkAYYUczbl8vnoBQZnimUdsAEXp4MCkLPBU="; extraDescription = " (previously known as Singularity)"; @@ -57,9 +56,8 @@ let hash = "sha256-Go4um/bIgq2lCZvjJ2GR81XpA/JvjPholi1PzNG9Hz8="; }; - # Update by running - # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" - # at the root directory of the Nixpkgs repository + # Override vendorHash with overrideAttrs. + # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash vendorHash = "sha256-CRZ42NdmJhAkV6bkl5n7rEV4Tu/h65qF5qaQ4W5wQ3w="; # Do not build conmon and squashfuse from the Git submodule sources,