diff options
| author | lassulus <lass@aidsballs.de> | 2015-10-17 15:59:58 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-10-17 15:59:58 +0200 |
| commit | 21b6854a15a827850b50040f52c853ca8ba56024 (patch) | |
| tree | 2a45e2393be9980d0c485dc6cf726d1601454a04 /krebs/5pkgs/default.nix | |
| parent | 62af75a108efa64683532f949110bf412ffecfd9 (diff) | |
| parent | 8cfdca6b6d6eed24953c1259b11239260e5a849f (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/5pkgs/default.nix')
| -rw-r--r-- | krebs/5pkgs/default.nix | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index a8a1b5853..84fb8725b 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -1,6 +1,6 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: -with import ../4lib { inherit lib; }; +with import ../4lib { inherit (pkgs) lib; }; let subdirs = mapAttrs (_: flip pkgs.callPackage {}) (subdirsOf ./.); @@ -9,6 +9,20 @@ in subdirs // rec { + 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; }; @@ -30,7 +44,7 @@ subdirs // rec { execveBin = name: cfg: execve name (cfg // { destination = "/bin/${name}"; }); writeC = name: { destination ? "" }: src: pkgs.runCommand name {} '' - PATH=${lib.makeSearchPath "bin" (with pkgs; [ + PATH=${makeSearchPath "bin" (with pkgs; [ binutils coreutils gcc |