From ec7dc8a5ace37cdf1005cabd5a8554f4dc73727e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 8 Feb 2016 00:46:17 +0100
Subject: [PATCH] krebs pkgs: callPackages only subdirs with a defaut.nix
---
krebs/5pkgs/default.nix | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index a0ccdcf49..cf81a96c5 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -2,8 +2,9 @@
with lib;
let
- subdirs = mapAttrs (_: flip pkgs.callPackage {}) (subdirsOf ./.);
- pkgs' = pkgs // subdirs;
+ subdirs = mapAttrs (_: flip pkgs.callPackage {})
+ (filterAttrs (_: dir.has-default-nix)
+ (subdirsOf ./.));
in
subdirs // rec {
@@ -22,7 +23,7 @@ subdirs // rec {
(builtins.readDir ./haskell-overrides));
};
- push = pkgs'.callPackage ./push {
+ push = pkgs.callPackage ./push {
inherit (subdirs) get jq;
};