diff options
author | lassulus <lass@lassul.us> | 2017-05-29 10:54:07 +0200 |
---|---|---|
committer | lassulus <lass@lassul.us> | 2017-05-29 10:54:07 +0200 |
commit | 35bc9f03a9bea7c6f864b95c95f5c095fa53e92b (patch) | |
tree | 059b5dc3b4fee6838b35f272a75dde3bd2ac785b /krebs | |
parent | 6e93f661e0b31c95f69d1bd3a6f208d26e3e0958 (diff) | |
parent | 4d1de57df5800879e7fcfcc38e5a10f0c1b993d7 (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs')
-rw-r--r-- | krebs/5pkgs/default.nix | 77 | ||||
-rw-r--r-- | krebs/5pkgs/haskell/blessings.nix (renamed from krebs/5pkgs/haskell-overrides/blessings.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/haskell/default.nix | 15 | ||||
-rw-r--r-- | krebs/5pkgs/haskell/email-header.nix (renamed from krebs/5pkgs/haskell-overrides/email-header.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/haskell/hyphenation.nix (renamed from krebs/5pkgs/haskell-overrides/hyphenation.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/haskell/kirk.nix (renamed from krebs/5pkgs/haskell-overrides/kirk.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/haskell/news.nix (renamed from krebs/5pkgs/haskell-overrides/news.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/haskell/scanner.nix (renamed from krebs/5pkgs/haskell-overrides/scanner.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/haskell/xmonad-stockholm.nix (renamed from krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/Reaktor/default.nix (renamed from krebs/5pkgs/Reaktor/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/Reaktor/plugins.nix (renamed from krebs/5pkgs/Reaktor/plugins.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh (renamed from krebs/5pkgs/Reaktor/scripts/random-emoji.sh) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh (renamed from krebs/5pkgs/Reaktor/scripts/random-issue.sh) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py (renamed from krebs/5pkgs/Reaktor/scripts/sed-plugin.py) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh (renamed from krebs/5pkgs/Reaktor/scripts/shack-correct.sh) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/apt-cacher-ng/default.nix (renamed from krebs/5pkgs/apt-cacher-ng/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/bepasty-client-cli/default.nix (renamed from krebs/5pkgs/bepasty-client-cli/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/buildbot/default.nix (renamed from krebs/5pkgs/buildbot/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/buildbot/worker.nix (renamed from krebs/5pkgs/buildbot/worker.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/cac-api/default.nix (renamed from krebs/5pkgs/cac-api/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/cac-cert/cac.pem (renamed from krebs/5pkgs/cac-cert/cac.pem) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/cac-cert/default.nix (renamed from krebs/5pkgs/cac-cert/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/cac-panel/default.nix (renamed from krebs/5pkgs/cac-panel/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/collectd-connect-time/default.nix (renamed from krebs/5pkgs/collectd-connect-time/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/default.nix | 24 | ||||
-rw-r--r-- | krebs/5pkgs/simple/dic/default.nix (renamed from krebs/5pkgs/dic/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/drivedroid-gen-repo/default.nix (renamed from krebs/5pkgs/drivedroid-gen-repo/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/empty.nix | 2 | ||||
-rw-r--r-- | krebs/5pkgs/simple/fortclientsslvpn/default.nix (renamed from krebs/5pkgs/fortclientsslvpn/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/games-user-env/default.nix (renamed from krebs/5pkgs/games-user-env/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/get/default.nix (renamed from krebs/5pkgs/get/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/git-hooks/default.nix (renamed from krebs/5pkgs/git-hooks/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/github-hosts-sync/default.nix (renamed from krebs/5pkgs/github-hosts-sync/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/go-shortener/default.nix (renamed from krebs/5pkgs/go-shortener/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/go-shortener/packages.nix (renamed from krebs/5pkgs/go-shortener/packages.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/goify/default.nix (renamed from krebs/5pkgs/goify/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/hashPassword/default.nix (renamed from krebs/5pkgs/hashPassword/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/htgen/default.nix (renamed from krebs/5pkgs/htgen/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/irc-announce/default.nix (renamed from krebs/5pkgs/irc-announce/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/kpaste/default.nix (renamed from krebs/5pkgs/kpaste/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/krebspaste/default.nix (renamed from krebs/5pkgs/krebspaste/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/krebszones/default.nix (renamed from krebs/5pkgs/krebszones/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/logf/default.nix (renamed from krebs/5pkgs/logf/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/much/cabal.nix (renamed from krebs/5pkgs/much/cabal.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/much/default.nix (renamed from krebs/5pkgs/much/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/netcup/default.nix (renamed from krebs/5pkgs/netcup/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/newsbot-js/default.nix (renamed from krebs/5pkgs/newsbot-js/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/newsbot-js/packages.nix (renamed from krebs/5pkgs/newsbot-js/packages.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/noVNC/default.nix (renamed from krebs/5pkgs/noVNC/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/painload/default.nix (renamed from krebs/5pkgs/painload/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/passwdqc-utils/default.nix (renamed from krebs/5pkgs/passwdqc-utils/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/populate/default.nix (renamed from krebs/5pkgs/populate/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/posix-array/default.nix (renamed from krebs/5pkgs/posix-array/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/pssh/default.nix (renamed from krebs/5pkgs/pssh/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/push/default.nix (renamed from krebs/5pkgs/push/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/realwallpaper/default.nix (renamed from krebs/5pkgs/realwallpaper/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/repo-sync/default.nix (renamed from krebs/5pkgs/repo-sync/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/retiolum-bootstrap/default.nix (renamed from krebs/5pkgs/retiolum-bootstrap/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/rutorrent/default.nix (renamed from krebs/5pkgs/rutorrent/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/tarantool/default.nix (renamed from krebs/5pkgs/tarantool/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/tinc_graphs/default.nix (renamed from krebs/5pkgs/tinc_graphs/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/translate-shell/default.nix (renamed from krebs/5pkgs/translate-shell/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/treq/default.nix (renamed from krebs/5pkgs/treq/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/untilport/default.nix (renamed from krebs/5pkgs/untilport/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/urlwatch/default.nix (renamed from krebs/5pkgs/urlwatch/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/weechat/default.nix (renamed from krebs/5pkgs/weechat/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/whatsupnix/default.nix (renamed from krebs/5pkgs/whatsupnix/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/whatsupnix/whatsupnix.bash (renamed from krebs/5pkgs/whatsupnix/whatsupnix.bash) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/with-tmpdir/default.nix (renamed from krebs/5pkgs/with-tmpdir/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/youtube-tools/default.nix (renamed from krebs/5pkgs/youtube-tools/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/simple/zandronum-bin/default.nix (renamed from krebs/5pkgs/zandronum-bin/default.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/test/default.nix | 9 |
72 files changed, 76 insertions, 51 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 81481e14b..39e89a4b6 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -1,58 +1,33 @@ -pkgs: oldpkgs: with import <stockholm/lib>; - let - # This callPackage will try to detect obsolete overrides. - callPackage = path: args: let - override = pkgs.callPackage path args; - upstream = optionalAttrs (override ? "name") - (oldpkgs.${(parseDrvName override.name).name} or {}); - in if upstream ? "name" && - override ? "name" && - 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 ./.)) - // { - empty = pkgs.runCommand "empty-1.0.0" {} "mkdir $out"; - 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)); - }; +self: super: - ReaktorPlugins = callPackage ./Reaktor/plugins.nix {}; +# Import files and subdirectories like they are overlays. +foldl' mergeAttrs {} + (map + (name: import (./. + "/${name}") self super) + (filter + (name: name != "default.nix" && !hasPrefix "." name) + (attrNames (readDir ./.)))) - buildbot = callPackage ./buildbot {}; - buildbot-full = callPackage ./buildbot { - plugins = with pkgs.buildbot-plugins; [ www console-view waterfall-view ]; - }; - buildbot-worker = callPackage ./buildbot/worker.nix {}; +// - # https://github.com/proot-me/PRoot/issues/106 - proot = pkgs.writeDashBin "proot" '' - export PROOT_NO_SECCOMP=1 - exec ${oldpkgs.proot}/bin/proot "$@" - ''; +{ + ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {}; - # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d - symlinkJoin = { name, paths, ... }@args: let - x = oldpkgs.symlinkJoin args; - in if typeOf x != "lambda" then x else oldpkgs.symlinkJoin name paths; + buildbot-full = self.callPackage ./simple/buildbot { + plugins = with self.buildbot-plugins; [ www console-view waterfall-view ]; + }; + buildbot-worker = self.callPackage ./simple/buildbot/worker.nix {}; - test = { - infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {}; - }; - } + # https://github.com/proot-me/PRoot/issues/106 + proot = self.writeDashBin "proot" '' + export PROOT_NO_SECCOMP=1 + exec ${super.proot}/bin/proot "$@" + ''; + + # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d + symlinkJoin = { name, paths, ... }@args: let + x = super.symlinkJoin args; + in if typeOf x != "lambda" then x else super.symlinkJoin name paths; +} diff --git a/krebs/5pkgs/haskell-overrides/blessings.nix b/krebs/5pkgs/haskell/blessings.nix index f852b4a44..f852b4a44 100644 --- a/krebs/5pkgs/haskell-overrides/blessings.nix +++ b/krebs/5pkgs/haskell/blessings.nix diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix new file mode 100644 index 000000000..1120356a7 --- /dev/null +++ b/krebs/5pkgs/haskell/default.nix @@ -0,0 +1,15 @@ +with import <stockholm/lib>; + +self: super: +{ + haskellPackages = super.haskellPackages.override { + overrides = self: super: + listToAttrs + (map + (name: nameValuePair (removeSuffix ".nix" name) + (self.callPackage (./. + "/${name}") {})) + (filter + (name: name != "default.nix" && !hasPrefix "." name) + (attrNames (readDir ./.)))); + }; +} diff --git a/krebs/5pkgs/haskell-overrides/email-header.nix b/krebs/5pkgs/haskell/email-header.nix index b54240809..b54240809 100644 --- a/krebs/5pkgs/haskell-overrides/email-header.nix +++ b/krebs/5pkgs/haskell/email-header.nix diff --git a/krebs/5pkgs/haskell-overrides/hyphenation.nix b/krebs/5pkgs/haskell/hyphenation.nix index 6e5fe9455..6e5fe9455 100644 --- a/krebs/5pkgs/haskell-overrides/hyphenation.nix +++ b/krebs/5pkgs/haskell/hyphenation.nix diff --git a/krebs/5pkgs/haskell-overrides/kirk.nix b/krebs/5pkgs/haskell/kirk.nix index 073e5d505..073e5d505 100644 --- a/krebs/5pkgs/haskell-overrides/kirk.nix +++ b/krebs/5pkgs/haskell/kirk.nix diff --git a/krebs/5pkgs/haskell-overrides/news.nix b/krebs/5pkgs/haskell/news.nix index ba5e7a5e1..ba5e7a5e1 100644 --- a/krebs/5pkgs/haskell-overrides/news.nix +++ b/krebs/5pkgs/haskell/news.nix diff --git a/krebs/5pkgs/haskell-overrides/scanner.nix b/krebs/5pkgs/haskell/scanner.nix index 071fd757f..071fd757f 100644 --- a/krebs/5pkgs/haskell-overrides/scanner.nix +++ b/krebs/5pkgs/haskell/scanner.nix diff --git a/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix b/krebs/5pkgs/haskell/xmonad-stockholm.nix index bf19e7d66..bf19e7d66 100644 --- a/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix +++ b/krebs/5pkgs/haskell/xmonad-stockholm.nix diff --git a/krebs/5pkgs/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix index fc3710820..fc3710820 100644 --- a/krebs/5pkgs/Reaktor/default.nix +++ b/krebs/5pkgs/simple/Reaktor/default.nix diff --git a/krebs/5pkgs/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix index e85e41cfe..e85e41cfe 100644 --- a/krebs/5pkgs/Reaktor/plugins.nix +++ b/krebs/5pkgs/simple/Reaktor/plugins.nix diff --git a/krebs/5pkgs/Reaktor/scripts/random-emoji.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh index 386aa68b9..386aa68b9 100644 --- a/krebs/5pkgs/Reaktor/scripts/random-emoji.sh +++ b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh diff --git a/krebs/5pkgs/Reaktor/scripts/random-issue.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh index 5c47c6156..5c47c6156 100644 --- a/krebs/5pkgs/Reaktor/scripts/random-issue.sh +++ b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh diff --git a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py index da8e2f726..da8e2f726 100644 --- a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py +++ b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py diff --git a/krebs/5pkgs/Reaktor/scripts/shack-correct.sh b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh index 3b4d04f80..3b4d04f80 100644 --- a/krebs/5pkgs/Reaktor/scripts/shack-correct.sh +++ b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/simple/apt-cacher-ng/default.nix index e3986713b..e3986713b 100644 --- a/krebs/5pkgs/apt-cacher-ng/default.nix +++ b/krebs/5pkgs/simple/apt-cacher-ng/default.nix diff --git a/krebs/5pkgs/bepasty-client-cli/default.nix b/krebs/5pkgs/simple/bepasty-client-cli/default.nix index c58e637b3..c58e637b3 100644 --- a/krebs/5pkgs/bepasty-client-cli/default.nix +++ b/krebs/5pkgs/simple/bepasty-client-cli/default.nix diff --git a/krebs/5pkgs/buildbot/default.nix b/krebs/5pkgs/simple/buildbot/default.nix index 37eea5fd9..37eea5fd9 100644 --- a/krebs/5pkgs/buildbot/default.nix +++ b/krebs/5pkgs/simple/buildbot/default.nix diff --git a/krebs/5pkgs/buildbot/worker.nix b/krebs/5pkgs/simple/buildbot/worker.nix index 34e526858..34e526858 100644 --- a/krebs/5pkgs/buildbot/worker.nix +++ b/krebs/5pkgs/simple/buildbot/worker.nix diff --git a/krebs/5pkgs/cac-api/default.nix b/krebs/5pkgs/simple/cac-api/default.nix index e2bd8c148..e2bd8c148 100644 --- a/krebs/5pkgs/cac-api/default.nix +++ b/krebs/5pkgs/simple/cac-api/default.nix diff --git a/krebs/5pkgs/cac-cert/cac.pem b/krebs/5pkgs/simple/cac-cert/cac.pem index 9d02b6bcf..9d02b6bcf 100644 --- a/krebs/5pkgs/cac-cert/cac.pem +++ b/krebs/5pkgs/simple/cac-cert/cac.pem diff --git a/krebs/5pkgs/cac-cert/default.nix b/krebs/5pkgs/simple/cac-cert/default.nix index d99019dca..d99019dca 100644 --- a/krebs/5pkgs/cac-cert/default.nix +++ b/krebs/5pkgs/simple/cac-cert/default.nix diff --git a/krebs/5pkgs/cac-panel/default.nix b/krebs/5pkgs/simple/cac-panel/default.nix index fd4799535..fd4799535 100644 --- a/krebs/5pkgs/cac-panel/default.nix +++ b/krebs/5pkgs/simple/cac-panel/default.nix diff --git a/krebs/5pkgs/collectd-connect-time/default.nix b/krebs/5pkgs/simple/collectd-connect-time/default.nix index 525388029..525388029 100644 --- a/krebs/5pkgs/collectd-connect-time/default.nix +++ b/krebs/5pkgs/simple/collectd-connect-time/default.nix diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix new file mode 10064 |