gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

inputs -> inputs' where relevent

Browse source
This commit is contained in:
Gerg-L 2024-04-22 19:43:50 -04:00
parent 66b902c1f5
commit 1c4daadc16
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/nix.nix
View file

@ -1,4 +1,4 @@
inputs: inputs':
{ {
lib, lib,
config, config,
@ -9,10 +9,10 @@ inputs:
# #
# Flake registry and $NIX_PATH pinning # Flake registry and $NIX_PATH pinning
# #
nix.registry = lib.pipe inputs [ nix.registry = lib.pipe inputs' [
(lib.filterAttrs (_: lib.isType "flake")) (lib.filterAttrs (_: lib.isType "flake"))
(lib.mapAttrs (_: flake: { inherit flake; })) (lib.mapAttrs (_: flake: { inherit flake; }))
(x: x // { nixpkgs.flake = inputs.unstable; }) (x: x // { nixpkgs.flake = inputs'.unstable; })
]; ];
environment.etc = lib.mapAttrs' (name: value: { environment.etc = lib.mapAttrs' (name: value: {
@ -27,7 +27,7 @@ inputs:
# #
# Use nix directly from master # Use nix directly from master
# #
nix.package = inputs.nix.packages.default.overrideAttrs (old: { nix.package = inputs'.nix.packages.default.overrideAttrs (old: {
patches = old.patches or [ ] ++ [ patches = old.patches or [ ] ++ [
(pkgs.fetchpatch { (pkgs.fetchpatch {
url = "https://github.com/NixOS/nix/commit/b6ae3be9c6ec4e9de55479188e76fc330b2304dd.patch"; url = "https://github.com/NixOS/nix/commit/b6ae3be9c6ec4e9de55479188e76fc330b2304dd.patch";