shelvacu/colins-nix-files
1
0
Fork 0
forked from colin/nix-files
Code Pull Requests Activity

nit: use pkg.extend in place of pkgs.appendOverlays where applicable

Browse Source
This commit is contained in:
Colin 2024-06-12 19:59:35 +00:00
parent f1705686b8
commit 4fdaacf8ad
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
default.nix
View File

@ -5,9 +5,8 @@
# the root to be `default.nix` # the root to be `default.nix`
{ }: { }:
let let
mkPkgs = args: (import ./pkgs/additional/nixpkgs args).appendOverlays [ mkPkgs = args: (import ./pkgs/additional/nixpkgs args).extend
(import ./overlays/all.nix) (import ./overlays/all.nix);
];
inherit (mkPkgs {}) lib; inherit (mkPkgs {}) lib;
evalHost = { name, system, branch ? "master", variant ? null }: evalHost = { name, system, branch ? "master", variant ? null }:

2
pkgs/additional/mobile-nixos/default.nix
View File

@ -12,7 +12,7 @@ let
hash = "sha256-MiVokKlpcJmfoGuWAMeW1En7gZ5hk0rCQArYm6P9XCc="; hash = "sha256-MiVokKlpcJmfoGuWAMeW1En7gZ5hk0rCQArYm6P9XCc=";
}; };
overlay = import "${src}/overlay/overlay.nix"; overlay = import "${src}/overlay/overlay.nix";
final = pkgs.appendOverlays [ overlay ]; final = pkgs.extend overlay;
in src.overrideAttrs (base: { in src.overrideAttrs (base: {
# passthru only mobile-nixos' own packages -- not the whole nixpkgs-with-mobile-nixos-as-overlay: # passthru only mobile-nixos' own packages -- not the whole nixpkgs-with-mobile-nixos-as-overlay:
passthru = base.passthru // (overlay final pkgs); passthru = base.passthru // (overlay final pkgs);

2
pkgs/additional/nixpkgs-wayland/default.nix
View File

@ -21,7 +21,7 @@ let
}; };
overlay = evaluated.overlay; overlay = evaluated.overlay;
final = pkgs.appendOverlays [ overlay ]; final = pkgs.extend overlay;
in src.overrideAttrs (base: { in src.overrideAttrs (base: {
# attributes required by update scripts # attributes required by update scripts
pname = "nixpkgs-wayland"; pname = "nixpkgs-wayland";

2
pkgs/additional/sops-nix/default.nix
View File

@ -16,7 +16,7 @@ let
nixpkgs-stable = pkgs; #< shameless lie :) nixpkgs-stable = pkgs; #< shameless lie :)
}; };
overlay = evaluated.overlays.default; overlay = evaluated.overlays.default;
final = pkgs.appendOverlays [ overlay ]; final = pkgs.extend overlay;
in src.overrideAttrs (base: { in src.overrideAttrs (base: {
# attributes required by update scripts # attributes required by update scripts
pname = "sops-nix"; pname = "sops-nix";

2
pkgs/default.nix
View File

@ -14,7 +14,7 @@ let
inherit (py-final) callPackage; inherit (py-final) callPackage;
inherit pkgs; inherit pkgs;
}; };
final' = if final != null then final else pkgs.appendOverlays [(_: _: sane-overlay)]; final' = if final != null then final else pkgs.extend (_: _: sane-overlay);
sane-additional = with final'; { sane-additional = with final'; {
sane-data = import ../modules/data { inherit lib sane-lib; }; sane-data = import ../modules/data { inherit lib sane-lib; };
sane-lib = import ../modules/lib final'; sane-lib = import ../modules/lib final';