diff options
Diffstat (limited to 'third_party/nixpkgs')
| -rw-r--r-- | third_party/nixpkgs/default.nix | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 4007d00f9db1..73b3b8b9538a 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -16,6 +16,20 @@ }: let + # Arguments passed to both the stable nixpkgs and the main, unstable one. + # Includes everything but overlays which are only passed to unstable nixpkgs. + commonNixpkgsArgs = { + # allow users to inject their config into builds (e.g. to test CA derivations) + config = + (if externalArgs ? nixpkgsConfig then externalArgs.nixpkgsConfig else { }) + // { + allowUnfree = true; + allowBroken = true; + }; + + inherit localSystem; + }; + # import the nixos-unstable package set, or optionally use the # source (e.g. a path) specified by the `nixpkgsBisectPath` # argument. This is intended for use-cases where the depot is @@ -25,7 +39,7 @@ let # Stable package set is imported, but not exposed, to overlay # required packages into the unstable set. - stableNixpkgs = import depot.third_party.sources.nixpkgs-stable { }; + stableNixpkgs = import depot.third_party.sources.nixpkgs-stable commonNixpkgsArgs; # Overlay for packages that should come from the stable channel # instead (e.g. because something is broken in unstable). @@ -44,17 +58,7 @@ let }; }; in -import nixpkgsSrc { - # allow users to inject their config into builds (e.g. to test CA derivations) - config = - (if externalArgs ? nixpkgsConfig then externalArgs.nixpkgsConfig else { }) - // { - allowUnfree = true; - allowBroken = true; - }; - - inherit localSystem; - +import nixpkgsSrc (commonNixpkgsArgs // { overlays = [ commitsOverlay stableOverlay @@ -65,4 +69,4 @@ import nixpkgsSrc { depot.third_party.overlays.ecl-static depot.third_party.overlays.dhall ] else [ ]); -} +}) |