From 061e702a6fc0e6046d39c3975c9034a69499c45f Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 23 May 2017 23:44:17 +0200 Subject: turn krebs/5pkgs into an overlay --- krebs/5pkgs/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 8bb244cd..81481e14 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -1,11 +1,6 @@ -{ config, lib, pkgs, ... }@args: +pkgs: oldpkgs: with import ; -{ - 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 ; 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 ; test = { infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {}; }; - }; -} + } -- cgit v1.2.3