summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/5pkgs/default.nix14
-rw-r--r--krebs/5pkgs/writers.nix8
-rw-r--r--krebs/default.nix2
3 files changed, 8 insertions, 16 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 8bb244cd3..81481e14b 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -1,11 +1,6 @@
-{ config, lib, pkgs, ... }@args:
+pkgs: oldpkgs:
with import <stockholm/lib>;
-{
- imports = [
- ./writers.nix
- ];
- nixpkgs.config.packageOverrides = oldpkgs: let
-
+ let
# This callPackage will try to detect obsolete overrides.
callPackage = path: args: let
override = pkgs.callPackage path args;
@@ -16,8 +11,8 @@ with import <stockholm/lib>;
compareVersions upstream.name override.name != -1
then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
else override;
-
in {}
+ // import ./writers.nix pkgs oldpkgs
// mapAttrs (_: flip callPackage {})
(filterAttrs (_: dir: pathExists (dir + "/default.nix"))
(subdirsOf ./.))
@@ -60,5 +55,4 @@ with import <stockholm/lib>;
test = {
infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};
};
- };
-}
+ }
diff --git a/krebs/5pkgs/writers.nix b/krebs/5pkgs/writers.nix
index d14090323..8ea9c37d5 100644
--- a/krebs/5pkgs/writers.nix
+++ b/krebs/5pkgs/writers.nix
@@ -1,7 +1,6 @@
-{ pkgs, ... }:
+pkgs: oldpkgs:
with import <stockholm/lib>;
-{
- nixpkgs.config.packageOverrides = _: {
+ {
# Combine a list of derivations using symlinks. Paths in later derivations
# take precedence over earlier ones.
@@ -323,5 +322,4 @@ with import <stockholm/lib>;
};
writeSed = pkgs.makeScriptWriter "${pkgs.gnused}/bin/sed -f";
- };
-}
+ }
diff --git a/krebs/default.nix b/krebs/default.nix
index e5e8cbc49..55bf66f77 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -3,6 +3,6 @@ with import <stockholm/lib>;
{
imports = [
./3modules
- ./5pkgs
];
+ nixpkgs.config.packageOverrides = import ./5pkgs pkgs;
}