Merge branch 'da-add-overlays' into da-add-hostname-management

numtide · Oct 9, 2020 · 972da7b · 972da7b
2 parents 1eb7c1a + 92cd0e3
commit 972da7b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/default.nix b/default.nix
@@ -1,10 +1,8 @@
 { nixpkgs ? import ./nix/nixpkgs.nix
 , system ? builtins.currentSystem
+, overlays ? [ ]
 }:
 import nixpkgs {
   inherit system;
-  overlays = [
-    (import ./overlay.nix)
-    (import ./extensions/overlay.nix)
-  ];
+  overlays = [ (import ./overlay.nix) ] ++ overlays;
 }
diff --git a/shell.nix b/shell.nix
@@ -1,6 +1,9 @@
 #!/usr/bin/env nix-build
 # Used to test the shell
-{ pkgs ? import ./. { } }:
+{ pkgs ? import ./. {
+    overlays = [ (import ./extensions/overlay.nix) ];
+  }
+}:
 pkgs.mkDevShell {
   imports = [
     (pkgs.mkDevShell.importTOML ./devshell.toml)