diff options
author | tv <tv@krebsco.de> | 2017-05-24 01:57:28 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-05-24 01:57:28 +0200 |
commit | eae210f8ff05b7f59ab62ba161c86971dbd7f50e (patch) | |
tree | 037d7ad582303b21230a323c2e3e500ed454c911 /krebs/5pkgs/default.nix | |
parent | 17df5f0c453d891b29dbb6a9d189fc8dcf88fac0 (diff) |
krebs/5pkgs: move haskell stuff to a subdir
Diffstat (limited to 'krebs/5pkgs/default.nix')
-rw-r--r-- | krebs/5pkgs/default.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 9fe2fea3c..eab059165 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -12,23 +12,10 @@ with import <stockholm/lib>; then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override else override; in {} + // import ./haskell pkgs oldpkgs // import ./simple pkgs oldpkgs // import ./writers.nix pkgs oldpkgs // { - haskellPackages = oldpkgs.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)); - }; - ReaktorPlugins = callPackage ./simple/Reaktor/plugins.nix {}; buildbot-full = callPackage ./simple/buildbot { |