Commit Graph

4910 Commits

Author SHA1 Message Date
tv
e4969bf3e7 Merge remote-tracking branch 'prism/master' 2017-09-07 22:51:48 +02:00
tv
66738262ee populate: 1.2.3 -> 1.2.4 2017-09-07 22:51:12 +02:00
makefu
54feede990
ma vncserver: retab 2017-09-07 21:51:24 +02:00
lassulus
46a3f4c243 l nixpkgs: fe46ffc -> d151161 2017-09-07 10:47:45 +02:00
lassulus
d484ad3c57 Merge remote-tracking branch 'gum/master' 2017-09-07 10:38:16 +02:00
makefu
b8434d3099
ma nginx-config: forceSSL implies enableSSL 2017-09-06 11:32:10 +02:00
makefu
4399e8ee64
Merge remote-tracking branch 'lass/master' 2017-09-06 11:12:24 +02:00
lassulus
8e2aba195e Merge remote-tracking branch 'ni/master' 2017-09-06 11:10:29 +02:00
lassulus
428a5f037e Merge remote-tracking branch 'gum/master' 2017-09-06 11:07:59 +02:00
makefu
99ecdb4dab ma source: add tpm-fix 2017-09-06 11:05:45 +02:00
lassulus
6218a259a9 rtorrent: track nginx changes 2017-09-06 11:05:45 +02:00
makefu
1b5b59d826 ma source: apply mitmproxy 2017-09-06 11:05:45 +02:00
makefu
5964b74a65 ma drozer: re-enable with protbuf3_2 2017-09-06 11:05:45 +02:00
makefu
0703c8a41d ma gen-oath-safe: do not build with yubikey-manager 2017-09-06 11:05:45 +02:00
makefu
190c5946e4 ma gen-oath-safe: fix typo 2017-09-06 11:05:45 +02:00
makefu
507160be64 ma android-pentest: disable due to broken dependency 2017-09-06 11:05:45 +02:00
makefu
24eefb7453 ma zsh-user: krebs.per-user -> users.users 2017-09-06 11:05:45 +02:00
makefu
3402b8faa4 ma configs: use buildCores with maxJobs 2017-09-06 11:05:45 +02:00
makefu
1874d35381 ma tools: add sec-gui 2017-09-06 11:05:45 +02:00
makefu
3e429bdead ma hw: add tpm to x2x0 2017-09-06 11:05:45 +02:00
makefu
9646fa5cf7 ma umts module: add missing module from stable 2017-09-06 11:05:45 +02:00
makefu
e28c8c3d3e ma x: enable tpm 2017-09-06 11:05:45 +02:00
makefu
7346a10e32 ma x: use new dnscrypt client 2017-09-06 11:05:45 +02:00
makefu
35c12b1f70 ma gum: enable dnscrypt server 2017-09-06 11:05:45 +02:00
makefu
9125cd77da ma dnscrypt: provide client and server config 2017-09-06 11:05:45 +02:00
makefu
f179880a0f ma source: bump to latest unstable 2017-09-06 11:05:45 +02:00
makefu
ed75ad26bf ma dnscrypt: prepare client/server 2017-09-06 11:05:45 +02:00
makefu
736519b61d ma omo: Rip Reaktor|krebs 2017-09-06 11:05:45 +02:00
makefu
ab30917d84 ma pkgs.u3_tool: init at 0.3 2017-09-06 11:05:45 +02:00
makefu
45ed510231 ma tools/studio: init 2017-09-06 11:05:45 +02:00
makefu
a6c7102c01 ma default: remove nix-defexpr activation 2017-09-06 11:05:45 +02:00
makefu
2f852df56a gitlab-runner: use PrivateTmp to avoid clash with buildbot 2017-09-06 11:05:45 +02:00
makefu
a627e844c3 gitlab-ci: test env 2017-09-06 11:05:45 +02:00
makefu
40260dc273 gitlab-runner-shackspace: init 2017-09-06 11:05:45 +02:00
makefu
eaa79454d4 gitlab-ci: init 2017-09-06 11:05:45 +02:00
makefu
8980f4229a ma vpngate: add france 2017-09-06 11:05:45 +02:00
makefu
fca1cca6e8 ma vim: update listchars 2017-09-06 11:05:45 +02:00
makefu
33dae609d0 ma wiki-irc-bot: use newsbot-js instead of logstash 2017-09-06 11:05:45 +02:00
makefu
665021f4c1 pkgs.newsbot-js: enable patchPhase
required for overriding the patchPhase
2017-09-06 11:05:45 +02:00
makefu
164e22ca5f newsbot-js module: add package option
this will be used for the wiki-irc-bot to override the patchPhase
2017-09-06 11:05:45 +02:00
makefu
425b67daf1 ma git: add euer_blog 2017-09-06 11:05:45 +02:00
makefu
d12b4d8631
Merge remote-tracking branch 'lass/master' 2017-09-06 10:14:25 +02:00
tv
3f11771a7f tv: NIX_PATH += nixpkgs-overlays 2017-09-06 00:45:55 +02:00
lassulus
b17fa29b88 Merge remote-tracking branch 'ni/master' 2017-09-06 00:37:51 +02:00
lassulus
ae39c40137 Merge remote-tracking branch 'onondaga-http/master' 2017-09-06 00:25:10 +02:00
nin
6ed58852c0 nin onondaga.r: into container 2017-09-06 00:20:22 +02:00
tv
1436781119 Merge remote-tracking branch 'prism/master' 2017-09-05 23:00:23 +02:00
tv
77e9bd83e2 krebs configs: enable announce-activation 2017-09-05 23:00:00 +02:00
tv
3704f9c341 krebs.announce-activation: init 2017-09-05 22:58:25 +02:00
lassulus
b70d29eb45 Merge remote-tracking branch 'onondaga/master' 2017-09-05 22:55:43 +02:00