kylekrein/snowfall-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #141 from msfjarvis/main

Browse source 
fix: replace `pkgs.system` with `pkgs.stdenv.hostPlatform.system`
This commit is contained in:
Jake Hamilton 2024-11-25 06:17:54 -08:00 • committed by GitHub
commit cfeacd0555
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
snowfall-lib/checks/default.nix
View file

@ -51,6 +51,6 @@ in {
aliased-checks = mapAttrs (name: value: checks-without-aliases.${value}) alias; aliased-checks = mapAttrs (name: value: checks-without-aliases.${value}) alias;
checks = checks-without-aliases // aliased-checks // overrides; checks = checks-without-aliases // aliased-checks // overrides;
in in
filterPackages pkgs.system checks; filterPackages pkgs.stdenv.hostPlatform.system checks;
}; };
} }

4
snowfall-lib/home/default.nix
View file

@ -262,7 +262,7 @@ in {
extra-special-args-module = args @ { extra-special-args-module = args @ {
config, config,
pkgs, pkgs,
system ? pkgs.system, system ? pkgs.stdenv.hostPlatform.system,
target ? system, target ? system,
format ? "home", format ? "home",
host ? "", host ? "",
@ -297,7 +297,7 @@ in {
options, options,
pkgs, pkgs,
host ? "", host ? "",
system ? pkgs.system, system ? pkgs.stdenv.hostPlatform.system,
... ...
}: let }: let
host-matches = host-matches =

2
snowfall-lib/module/default.nix
View file

@ -42,7 +42,7 @@ in {
# NOTE: home-manager *requires* modules to specify named arguments or it will not # NOTE: home-manager *requires* modules to specify named arguments or it will not
# pass values in. For this reason we must specify things like `pkgs` as a named attribute. # pass values in. For this reason we must specify things like `pkgs` as a named attribute.
${metadata.name} = args @ {pkgs, ...}: let ${metadata.name} = args @ {pkgs, ...}: let
system = args.system or args.pkgs.system; system = args.system or args.pkgs.stdenv.hostPlatform.system;
target = args.target or system; target = args.target or system;
format = let format = let

2
snowfall-lib/package/default.nix
View file

@ -68,6 +68,6 @@ in {
aliased-packages = mapAttrs (name: value: packages-without-aliases.${value}) alias; aliased-packages = mapAttrs (name: value: packages-without-aliases.${value}) alias;
packages = packages-without-aliases // aliased-packages // overrides; packages = packages-without-aliases // aliased-packages // overrides;
in in
filterPackages pkgs.system packages; filterPackages pkgs.stdenv.hostPlatform.system packages;
}; };
} }

2
snowfall-lib/shell/default.nix
View file

@ -51,6 +51,6 @@ in {
aliased-shells = mapAttrs (name: value: shells-without-aliases.${value}) alias; aliased-shells = mapAttrs (name: value: shells-without-aliases.${value}) alias;
shells = shells-without-aliases // aliased-shells // overrides; shells = shells-without-aliases // aliased-shells // overrides;
in in
filterPackages pkgs.system shells; filterPackages pkgs.stdenv.hostPlatform.system shells;
}; };
} }