From 23311218a108a54d9a56d6a6849e3a5670fb001f Mon Sep 17 00:00:00 2001
From: Whovian9369 <Whovian9369@gmail.com>
Date: Fri, 22 Dec 2023 21:23:57 -0500
Subject: [PATCH] Add some notes to `flake.nix` and `nix/prefetcher.nix`
Notes are to describe `pkgs.buildGoModule` mapping in Nixpkgs.
---
flake.nix | 2 ++
nix/prefetcher.nix | 11 +++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/flake.nix b/flake.nix
index 7c4fc7f..0cb1692 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,6 +33,8 @@
version = substring 0 8 self.rev or "dirty";
vendorSha256 = readFile ./nix/vendor-sha256;
buildGoModule = pkgs.buildGoModule;
+ # As of writing, `pkgs.buildGoModule` is aliased to
+ # `pkgs.buildGo121Module` in Nixpkgs.
};
# Build packwiz by default when no package name is specified
default = packwiz;
diff --git a/nix/prefetcher.nix b/nix/prefetcher.nix
index 5362219..18ee3f6 100644
--- a/nix/prefetcher.nix
+++ b/nix/prefetcher.nix
@@ -3,13 +3,12 @@
pkgs ? import <nixpkgs> {},
}:
pkgs.callPackage (import ./.) {
- ## Keeping `buildGoModule` commented out in case it's needed in the future.
- ## As of writing, `buildGo121Module` is currently used as the default for
- ## `buildGoModule` in nixpkgs. `buildGo118Module` seems deprecated and
- ## entirely removed from nixpkgs, so manually setting that is likely to cause
- ## issues in the future.
- # buildGoModule = pkgs.buildGo118Module;
+ buildGoModule = pkgs.buildGoModule;
+ ## As of writing, `pkgs.buildGoModule` is aliased to
+ ## `pkgs.buildGo121Module` in Nixpkgs.
+ ## `buildGoModule` is set as `pkgs.buildGoModule` to try and work around
+ ## `vendorHash` issues in the future.
vendorSha256 = sha256;
}
// {