diff --git a/flake.lock b/flake.lock index 63ea6b3..cbc8415 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1689444953, - "narHash": "sha256-0o56bfb2LC38wrinPdCGLDScd77LVcr7CrH1zK7qvDg=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8acef304efe70152463a6399f73e636bcc363813", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 099840c..31f46ec 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,7 @@ { - inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # This maps to https://github.com/NixOS/nixpkgs/tree/nixos-unstable + # The `url` option is the pattern of `github:USER_OR_ORG/REPO/BRANCH` outputs = { self, @@ -32,7 +34,9 @@ packwiz = pkgs.callPackage ./nix { version = substring 0 8 self.rev or "dirty"; vendorSha256 = readFile ./nix/vendor-sha256; - buildGoModule = pkgs.buildGo119Module; + 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 {}, }: 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; } // {