summaryrefslogtreecommitdiffstats
path: root/krebs/default.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-11-28 18:55:08 +0100
committerlassulus <lassulus@lassul.us>2018-11-28 18:55:08 +0100
commita69175a719b34222c8fb734478f04190a50d70e8 (patch)
tree765b2521aab1ab789ff56ce1550c7dcce881b3ac /krebs/default.nix
parentf69a078f90d3cddfd5d3146ce39fbd294a14fb57 (diff)
parentd1f81ace7241cf751f8a02c102b02bc1c8ad6c07 (diff)
Merge remote-tracking branch 'ni/master' into ci
Diffstat (limited to 'krebs/default.nix')
-rw-r--r--krebs/default.nix16
1 files changed, 9 insertions, 7 deletions
diff --git a/krebs/default.nix b/krebs/default.nix
index d99f60aaa..7ec791529 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -1,12 +1,14 @@
-{ config, lib, pkgs, ... }:
-with import <stockholm/lib>;
{
+
imports = [
./3modules
- {
- nixpkgs.config.packageOverrides =
- import ../submodules/nix-writers/pkgs pkgs;
- }
];
- nixpkgs.config.packageOverrides = import ./5pkgs pkgs;
+
+ nixpkgs = {
+ overlays = [
+ (import ./5pkgs)
+ (import ../submodules/nix-writers/pkgs)
+ ];
+ };
+
}