From 399243e54b7804cd901a5e583239ece84c9eace7 Mon Sep 17 00:00:00 2001
From: "bors[bot]" <bors[bot]@users.noreply.github.com>
Date: Sat, 27 Mar 2021 17:33:20 +0000
Subject: [PATCH] deploy: ef1ee6e6b8778b1b4f371712b579d115ee415045

---
 flake.nix            | 7 +++++--
 lib/devos/mkPkgs.nix | 8 +++-----
 shell/default.nix    | 6 +++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8f899d9..6c6e0a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,8 +34,11 @@
       inherit (lib) os;
 
       extern = import ./extern { inherit inputs; };
+      overrides = import ./overrides;
 
-      multiPkgs = os.mkPkgs;
+      multiPkgs = os.mkPkgs {
+        inherit extern overrides;
+      };
 
       outputs = {
         nixosConfigurations =
@@ -90,7 +93,7 @@
           packages = lib.filterPackages system legacyPackages;
 
           devShell = import ./shell {
-            inherit self system;
+            inherit self system extern overrides;
           };
         }
       );
diff --git a/lib/devos/mkPkgs.nix b/lib/devos/mkPkgs.nix
index 991f1f0..f3126ea 100644
--- a/lib/devos/mkPkgs.nix
+++ b/lib/devos/mkPkgs.nix
@@ -1,13 +1,11 @@
-{ lib, dev, nixos, self, ... }:
+{ lib, dev, nixos, self, inputs, ... }:
 
-let inherit (self) inputs;
-in
+{ extern, overrides }:
 (inputs.utils.lib.eachDefaultSystem
   (system:
     let
-      extern = import ../../extern { inherit inputs; };
       overridePkgs = dev.os.pkgImport inputs.override [ ] system;
-      overridesOverlay = (import ../../overrides).packages;
+      overridesOverlay = overrides.packages;
 
       overlays = [
         (final: prev: {
diff --git a/shell/default.nix b/shell/default.nix
index 72ac09e..0b132f9 100644
--- a/shell/default.nix
+++ b/shell/default.nix
@@ -1,8 +1,12 @@
 { self ? (import ../compat).defaultNix
 , system ? builtins.currentSystem
+, extern ? import ../extern { inherit (self) inputs; }
+, overrides ? import ../overrides
 }:
 let
-  pkgs = (self.lib.os.mkPkgs).${system};
+  pkgs = (self.lib.os.mkPkgs {
+    inherit overrides extern;
+  }).${system};
 
   inherit (pkgs) lib;