divnix/digga
1
1
Fork 0
mirror of https://github.com/divnix/digga.git synced 2024-12-23 08:02:21 +03:00
Code Issues Projects Releases Wiki Activity

flake: update utils input

Browse Source 
includes api changes to fup
This commit is contained in:
Pacman99 2021-05-18 07:45:05 -07:00 committed by Parthiv Seetharaman
parent 9113d8641e
commit 2796d59a84
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -163,11 +163,11 @@
"flake-utils": "flake-utils"
},
"locked": {
"lastModified": 1620801141,
"narHash": "sha256-XPJ+/nP/s218E11R+4LJyvkrQXvdT3D6TzNjfWVYZnI=",
"lastModified": 1621276777,
"narHash": "sha256-XTPgcxtqhgKJ8e+ENca71nlT5m/yGW6wM3h+Gyf/CsI=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "1a742047f3f7c97b22768ba7738ac5a01052099e",
"rev": "e0278428df2de106d5a773875dc52792c8f7dc5e",
"type": "github"
},
"original": {

8
src/mkFlake/default.nix
View File

@ -71,11 +71,11 @@ lib.systemFlake (lib.mergeAny
});
};
nixosModules = lib.exporter.modulesFromList cfg.nixos.hostDefaults.modules;
nixosModules = lib.exporters.modulesFromList cfg.nixos.hostDefaults.modules;
homeModules = lib.exporter.modulesFromList cfg.home.modules;
homeModules = lib.exporters.modulesFromList cfg.home.modules;
overlays = lib.exporter.overlaysFromChannelsExporter {
overlays = lib.exporters.internalOverlays {
# since we can't detect overlays owned by self
# we have to filter out ones exported by the inputs
# optimally we would want a solution for NixOS/nix#4740
@ -83,7 +83,7 @@ lib.systemFlake (lib.mergeAny
inherit (self) pkgs;
};
packagesBuilder = lib.builder.packagesFromOverlaysBuilderConstructor self.overlays;
packagesBuilder = lib.exporters.fromOverlays self.overlays;
checksBuilder = channels:
lib.pkgs-lib.tests.mkChecks {

4
src/pkgs-lib/shell/default.nix
View File

@ -28,11 +28,11 @@ let
# Add all packages from overlays to shell
# Follow same logic as exporting packages except don't filter out inputs
allOverlays = lib.exporter.overlaysFromChannelsExporter {
allOverlays = lib.exporters.internalOverlays {
# function requires system-spaced and channel-spaced package set
pkgs.${pkgs'.system}.channel = pkgs';
};
customPackages = lib.builder.packagesFromOverlaysBuilderConstructor allOverlays { pkgs = pkgs'; };
customPackages = lib.exporters.fromOverlays allOverlays { pkgs = pkgs'; };
configuration = {
imports = [ (pkgs'.devshell.importTOML ./devshell.toml) ] ++ extraModules;