diff options
| -rw-r--r-- | default.nix | 16 | ||||
| -rw-r--r-- | release.nix | 4 |
2 files changed, 17 insertions, 3 deletions
diff --git a/default.nix b/default.nix new file mode 100644 index 00000000..c85ef72a --- /dev/null +++ b/default.nix @@ -0,0 +1,16 @@ +{ system ? builtins.currentSystem, ... }@args: + +with (import <nixpkgs> { inherit system; }).lib; + +{ + machines = mapAttrsRecursiveCond (m: !(m ? build)) (path: attrs: + attrs.build.config.system.build.toplevel + ) (import ./machines { inherit system; }); + + pkgs = import ./pkgs { + pkgs = import <nixpkgs> args; + }; + + # Inherit upstream lib until we have our own lib. + lib = import <nixpkgs/lib>; +} diff --git a/release.nix b/release.nix index df290475..5dd77653 100644 --- a/release.nix +++ b/release.nix @@ -19,9 +19,7 @@ in with pkgsUpstream.lib; with builtins; { pkgs = let releaseLib = import <nixpkgs/pkgs/top-level/release-lib.nix> { inherit supportedSystems; - packageSet = attrs: (import ./pkgs { - pkgs = import <nixpkgs> attrs; - }) // { inherit (pkgsUpstream) lib; }; + packageSet = attrs: (import ./default.nix attrs).pkgs; }; in with releaseLib; mapTestOn (packagePlatforms releaseLib.pkgs); |