use __dontExport property for lib and overrides

This commit is contained in:
Pacman99 2021-04-29 11:53:45 -07:00
parent a5dcb5fae9
commit 23ee58d2d0
5 changed files with 21 additions and 8 deletions

View File

@ -12,10 +12,15 @@ You can add overlays to any channel to override packages from other channels.
Pulling the manix package from the `latest` channel: Pulling the manix package from the `latest` channel:
```nix ```nix
channels: final: prev: { channels: final: prev: {
__dontExport = true;
inherit (pkgs.latest) manix; inherit (pkgs.latest) manix;
} }
``` ```
It is recommended to set the `__dontExport` property for override specific
overlays. `overlays/overrides.nix` is the best place to consolidate all package
overrides and the property is already set for you.
## Modules ## Modules
You can also pull modules from other channels. All modules have access to the You can also pull modules from other channels. All modules have access to the

View File

@ -79,7 +79,7 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"narHash": "sha256-hpvEXcpq85cDKi0F5UUsuMVISKlk8hgVJiz5FF29RwA=", "narHash": "sha256-TQvd6TvSuT0sJCLlGsV65YjB+nIfDdDKZ1F94pCfkTw=",
"path": "./lib", "path": "./lib",
"type": "path" "type": "path"
}, },
@ -351,11 +351,11 @@
"flake-utils": "flake-utils" "flake-utils": "flake-utils"
}, },
"locked": { "locked": {
"lastModified": 1619532520, "lastModified": 1619714004,
"narHash": "sha256-+xIFAW5J0AcxwAflAX1gg/C8kfaqeZbS4XAZusCrZPY=", "narHash": "sha256-xoP81rWAM2cVpEFrQv9sUEIvNxGXAg4UH9kBt83a5u4=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "8eb7f9206713a528174c20c5133521dc37e2bfb1", "rev": "0642ac572a87a0beb78a7c6ddce1267aa5817d05",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -146,11 +146,11 @@
"flake-utils": "flake-utils" "flake-utils": "flake-utils"
}, },
"locked": { "locked": {
"lastModified": 1619532520, "lastModified": 1619714004,
"narHash": "sha256-+xIFAW5J0AcxwAflAX1gg/C8kfaqeZbS4XAZusCrZPY=", "narHash": "sha256-xoP81rWAM2cVpEFrQv9sUEIvNxGXAg4UH9kBt83a5u4=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "8eb7f9206713a528174c20c5133521dc37e2bfb1", "rev": "0642ac572a87a0beb78a7c6ddce1267aa5817d05",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -40,7 +40,7 @@ let
hosts = lib.mapAttrs (_: stripHost) cfg.nixos.hosts; hosts = lib.mapAttrs (_: stripHost) cfg.nixos.hosts;
hostDefaults = stripHost cfg.nixos.hostDefaults; hostDefaults = stripHost cfg.nixos.hostDefaults;
in in
lib.systemFlake (lib.recursiveUpdate lib.systemFlake (lib.mergeAny
otherArguments otherArguments
{ {
inherit self inputs hosts; inherit self inputs hosts;
@ -55,6 +55,12 @@ lib.systemFlake (lib.recursiveUpdate
) )
cfg.channels; cfg.channels;
sharedOverlays = [
(final: prev: {
__dontExport = true;
devlib = lib;
})
];
hostDefaults = lib.mergeAny hostDefaults { hostDefaults = lib.mergeAny hostDefaults {
specialArgs.suites = cfg.nixos.suites; specialArgs.suites = cfg.nixos.suites;
modules = cfg.nixos.hostDefaults.externalModules ++ defaultModules; modules = cfg.nixos.hostDefaults.externalModules ++ defaultModules;

View File

@ -1,5 +1,7 @@
channels: final: prev: { channels: final: prev: {
__dontExport = true; # overrides clutter up actual creations
inherit (channels.latest) inherit (channels.latest)
cachix cachix
dhall dhall