From 0cf6d065f43c66efadd0a364c3414e6ecdae0004 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 11 Feb 2016 03:47:26 +0100 Subject: *: turn 5pkgs into a(n optional) module --- krebs/5pkgs/default.nix | 50 +++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'krebs/5pkgs/default.nix') diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 89e19dff..1cf3de56 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -1,31 +1,33 @@ { lib, pkgs, ... }@args: with lib; { - haskellPackages = pkgs.haskellPackages.override { - overrides = self: super: - mapAttrs (name: path: self.callPackage path {}) - (mapAttrs' - (name: type: - if hasSuffix ".nix" name - then { - name = removeSuffix ".nix" name; - value = ./haskell-overrides + "/${name}"; - } - else null) - (builtins.readDir ./haskell-overrides)); - }; + nixpkgs.config.packageOverrides = pkgs: { + haskellPackages = pkgs.haskellPackages.override { + overrides = self: super: + mapAttrs (name: path: self.callPackage path {}) + (mapAttrs' + (name: type: + if hasSuffix ".nix" name + then { + name = removeSuffix ".nix" name; + value = ./haskell-overrides + "/${name}"; + } + else null) + (builtins.readDir ./haskell-overrides)); + }; - push = pkgs.callPackage ./push { - inherit (subdirs) get jq; - }; + push = pkgs.callPackage ./push { + inherit (subdirs) get jq; + }; - ReaktorPlugins = pkgs.callPackage ./Reaktor/plugins.nix {}; + ReaktorPlugins = pkgs.callPackage ./Reaktor/plugins.nix {}; - test = { - infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {}; - }; + test = { + infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {}; + }; + } + // import ./builders.nix args + // mapAttrs (_: flip pkgs.callPackage {}) + (filterAttrs (_: dir.has-default-nix) + (subdirsOf ./.)); } -// import ./builders.nix args -// mapAttrs (_: flip pkgs.callPackage {}) - (filterAttrs (_: dir.has-default-nix) - (subdirsOf ./.)) -- cgit v1.2.3