forked from colin/nix-files
nit: use pkg.extend
in place of pkgs.appendOverlays
where applicable
This commit is contained in:
parent
f1705686b8
commit
4fdaacf8ad
|
@ -5,9 +5,8 @@
|
|||
# the root to be `default.nix`
|
||||
{ }:
|
||||
let
|
||||
mkPkgs = args: (import ./pkgs/additional/nixpkgs args).appendOverlays [
|
||||
(import ./overlays/all.nix)
|
||||
];
|
||||
mkPkgs = args: (import ./pkgs/additional/nixpkgs args).extend
|
||||
(import ./overlays/all.nix);
|
||||
inherit (mkPkgs {}) lib;
|
||||
|
||||
evalHost = { name, system, branch ? "master", variant ? null }:
|
||||
|
|
|
@ -12,7 +12,7 @@ let
|
|||
hash = "sha256-MiVokKlpcJmfoGuWAMeW1En7gZ5hk0rCQArYm6P9XCc=";
|
||||
};
|
||||
overlay = import "${src}/overlay/overlay.nix";
|
||||
final = pkgs.appendOverlays [ overlay ];
|
||||
final = pkgs.extend overlay;
|
||||
in src.overrideAttrs (base: {
|
||||
# passthru only mobile-nixos' own packages -- not the whole nixpkgs-with-mobile-nixos-as-overlay:
|
||||
passthru = base.passthru // (overlay final pkgs);
|
||||
|
|
|
@ -21,7 +21,7 @@ let
|
|||
};
|
||||
overlay = evaluated.overlay;
|
||||
|
||||
final = pkgs.appendOverlays [ overlay ];
|
||||
final = pkgs.extend overlay;
|
||||
in src.overrideAttrs (base: {
|
||||
# attributes required by update scripts
|
||||
pname = "nixpkgs-wayland";
|
||||
|
|
|
@ -16,7 +16,7 @@ let
|
|||
nixpkgs-stable = pkgs; #< shameless lie :)
|
||||
};
|
||||
overlay = evaluated.overlays.default;
|
||||
final = pkgs.appendOverlays [ overlay ];
|
||||
final = pkgs.extend overlay;
|
||||
in src.overrideAttrs (base: {
|
||||
# attributes required by update scripts
|
||||
pname = "sops-nix";
|
||||
|
|
|
@ -14,7 +14,7 @@ let
|
|||
inherit (py-final) callPackage;
|
||||
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-data = import ../modules/data { inherit lib sane-lib; };
|
||||
sane-lib = import ../modules/lib final';
|
||||
|
|
Loading…
Reference in New Issue
Block a user