mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-06-07 09:16:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #270 from Whovian9369/main

Browse Source 
Update version of `buildGoModule` used in `flake.nix`
This commit is contained in:
comp500 2023-12-25 00:42:44 +00:00 committed by GitHub
commit 7545d9a777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1689444953, "lastModified": 1703013332,
"narHash": "sha256-0o56bfb2LC38wrinPdCGLDScd77LVcr7CrH1zK7qvDg=", "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8acef304efe70152463a6399f73e636bcc363813", "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@ -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 = { outputs = {
self, self,
@ -32,7 +34,9 @@
packwiz = pkgs.callPackage ./nix { packwiz = pkgs.callPackage ./nix {
version = substring 0 8 self.rev or "dirty"; version = substring 0 8 self.rev or "dirty";
vendorSha256 = readFile ./nix/vendor-sha256; 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 # Build packwiz by default when no package name is specified
default = packwiz; default = packwiz;

11
nix/prefetcher.nix
View File

@ -3,13 +3,12 @@
pkgs ? import <nixpkgs> {}, pkgs ? import <nixpkgs> {},
}: }:
pkgs.callPackage (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; vendorSha256 = sha256;
} }
// { // {