diff options
author | tv <tv@krebsco.de> | 2016-04-17 05:24:33 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-04-17 05:24:33 +0200 |
commit | 6ec3d922a48ad6a583315a4433a7170e6850c676 (patch) | |
tree | e66cc9279d2524e9b0caf0a963e00f2479f008cb /krebs/5pkgs/default.nix | |
parent | affb69250d13f64d2be14327c1b47d23cadcb987 (diff) |
krebs.backup network-ssh-port -> pkgs.get-ssh-port
Diffstat (limited to 'krebs/5pkgs/default.nix')
-rw-r--r-- | krebs/5pkgs/default.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 0c39324a7..5ec0d54e9 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -14,7 +14,16 @@ with config.krebs.lib; then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override else override; - in { + in {} + // import ./builders.nix args + // mapAttrs (_: flip callPackage {}) + (filterAttrs (_: dir.has-default-nix) + (subdirsOf ./.)) + // { + get-ssh-port = callPackage ./get-ssh-port { + inherit config; + }; + haskellPackages = pkgs.haskellPackages.override { overrides = self: super: mapAttrs (name: path: self.callPackage path {}) @@ -29,18 +38,10 @@ with config.krebs.lib; (builtins.readDir ./haskell-overrides)); }; - push = callPackage ./push { - inherit (subdirs) get; - }; - ReaktorPlugins = callPackage ./Reaktor/plugins.nix {}; test = { infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {}; }; - } - // import ./builders.nix args - // mapAttrs (_: flip callPackage {}) - (filterAttrs (_: dir.has-default-nix) - (subdirsOf ./.)); + }; } |