Skip to content

use realChannel to overlay #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 4, 2022
Merged

use realChannel to overlay #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41f5b9f
use realChannel instead
GTrunSec Aug 3, 2022
c55f079
darwin: add the darwin-only `mas` package to an example config
montchr Aug 3, 2022
24cb8eb
add flake-utils-plus patch
GTrunSec Aug 3, 2022
0192432
get channel from channels
GTrunSec Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion examples/devos/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,13 @@
};
nixpkgs-darwin-stable = {
imports = [ (digga.lib.importOverlays ./overlays) ];
overlays = [ ];
overlays = [
# TODO: restructure overlays directory for per-channel overrides
# `importOverlays` will import everything under the path given
(channels: final: prev: {
inherit (channels.latest) mas;
} // prev.lib.optionalAttrs true { })
];
};
latest = { };
};
Expand Down
4 changes: 4 additions & 0 deletions examples/devos/hosts/darwin/Mac.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@
{
imports = with suites;
base;

# The `mas` package is included here as a test for platform-specific package
# support in Digga. Feel free to remove it in your config.
environment.systemPackages = with pkgs; [mas];
}
7 changes: 4 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
devshell.url = "github:numtide/devshell";
devshell.inputs.nixpkgs.follows = "nixpkgs";

flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus";
flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/?ref=refs/pull/120/head";

flake-compat = {
url = "github:edolstra/flake-compat";
Expand Down
7 changes: 6 additions & 1 deletion src/mkFlake/fup-adapter.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ let
})
];

unifyOverlays = channels: map (o: if builtins.isFunction (o null null) then o channels else o);
unifyOverlays = channels:
let
getChannel = inputs."${channelName}".legacyPackages.x86_64-linux;
channelName = builtins.elemAt (builtins.attrNames channels) 0;
in
map (o: if builtins.isFunction (o getChannel getChannel) then o channels else o);

stripChannel = channel: removeAttrs channel [
# arguments in our channels api that shouldn't be passed to fup
Expand Down