From a4683911af0a0ee74d94cec90fb2e5c1524b6006 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 9 Feb 2017 15:31:25 +0100 Subject: krebs builders: turn file into module --- krebs/5pkgs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index ec9b6bdba..379022b64 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -1,6 +1,9 @@ { config, lib, pkgs, ... }@args: with import ; { + imports = [ + ./builders.nix + ]; nixpkgs.config.packageOverrides = oldpkgs: let # This callPackage will try to detect obsolete overrides. @@ -15,7 +18,6 @@ with import ; else override; in {} - // import ./builders.nix args // mapAttrs (_: flip callPackage {}) (filterAttrs (_: dir: pathExists (dir + "/default.nix")) (subdirsOf ./.)) -- cgit v1.2.3 From bf81d1b6b97703c9e5f08c73b8a8490d25bca277 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 9 Feb 2017 15:43:13 +0100 Subject: krebs builders -> krebs writers --- krebs/5pkgs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 379022b64..8bb244cd3 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -2,7 +2,7 @@ with import ; { imports = [ - ./builders.nix + ./writers.nix ]; nixpkgs.config.packageOverrides = oldpkgs: let -- cgit v1.2.3