summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ma vncserver: retabmakefu2017-09-071-1/+1
|
* ma nginx-config: forceSSL implies enableSSLmakefu2017-09-067-7/+0
|
* Merge remote-tracking branch 'lass/master'makefu2017-09-066-67/+88
|\
| * ma source: add tpm-fixmakefu2017-09-061-1/+2
| |
| * ma source: apply mitmproxymakefu2017-09-061-1/+2
| |
| * ma drozer: re-enable with protbuf3_2makefu2017-09-062-3/+3
| |
| * ma gen-oath-safe: do not build with yubikey-managermakefu2017-09-061-2/+3
| |
| * ma gen-oath-safe: fix typomakefu2017-09-061-1/+1
| |
| * ma android-pentest: disable due to broken dependencymakefu2017-09-061-1/+2
| |
| * ma zsh-user: krebs.per-user -> users.usersmakefu2017-09-061-1/+1
| |
| * ma configs: use buildCores with maxJobsmakefu2017-09-061-2/+2
| |
| * ma tools: add sec-guimakefu2017-09-064-1/+11
| |
| * ma hw: add tpm to x2x0makefu2017-09-063-1/+10
| |
| * ma umts module: add missing module from stablemakefu2017-09-062-0/+71
| |
| * ma x: enable tpmmakefu2017-09-061-0/+2
| |
| * ma x: use new dnscrypt clientmakefu2017-09-061-1/+1
| |
| * ma gum: enable dnscrypt servermakefu2017-09-061-2/+1
| |
| * ma dnscrypt: provide client and server configmakefu2017-09-062-3/+41
| |
| * ma source: bump to latest unstablemakefu2017-09-061-3/+1
| |
| * ma dnscrypt: prepare client/servermakefu2017-09-061-0/+0
| |
| * ma omo: Rip Reaktor|krebsmakefu2017-09-061-10/+0
| |
| * ma pkgs.u3_tool: init at 0.3makefu2017-09-061-0/+22
| |
| * ma tools/studio: initmakefu2017-09-061-0/+10
| |
| * ma default: remove nix-defexpr activationmakefu2017-09-061-9/+0
| |
| * gitlab-runner: use PrivateTmp to avoid clash with buildbotmakefu2017-09-061-0/+1
| |
| * gitlab-ci: test envmakefu2017-09-061-0/+1
| |
| * gitlab-runner-shackspace: initmakefu2017-09-063-0/+35
| |
| * gitlab-ci: initmakefu2017-09-061-0/+4
| |
| * ma vpngate: add francemakefu2017-09-061-0/+108
| |
| * ma vim: update listcharsmakefu2017-09-061-1/+1
| |
| * ma wiki-irc-bot: use newsbot-js instead of logstashmakefu2017-09-063-87/+58
| |
| * pkgs.newsbot-js: enable patchPhasemakefu2017-09-061-0/+1
| | | | | | | | required for overriding the patchPhase
| * newsbot-js module: add package optionmakefu2017-09-061-1/+6
| | | | | | | | this will be used for the wiki-irc-bot to override the patchPhase
| * ma git: add euer_blogmakefu2017-09-061-0/+1
| |
| * rtorrent: track nginx changeslassulus2017-09-061-3/+20
| |
| * Merge remote-tracking branch 'ni/master'lassulus2017-09-063-0/+62
| |\
| | * Merge remote-tracking branch 'prism/master'tv2017-09-0522-220/+278
| | |\
| | * | krebs configs: enable announce-activationtv2017-09-051-0/+1
| | | |
| | * | krebs.announce-activation: inittv2017-09-052-0/+61
| | | |
| * | | Merge remote-tracking branch 'onondaga-http/master'lassulus2017-09-061-63/+2
| |\ \ \
| | * | | nin onondaga.r: into containernin2017-09-061-63/+2
| | | | |
| * | | | Merge remote-tracking branch 'onondaga/master'lassulus2017-09-051-1/+4
| |\| | | | | |_|/ | |/| |
| | * | nin hosts: enable cinin2017-09-051-1/+4
| | | |
* | | | Merge remote-tracking branch 'lass/master'makefu2017-09-062-20/+19
|\| | |
| * | | Merge remote-tracking branch 'onondaga/master'lassulus2017-09-051-1/+1
| |\| |
| | * | nin nixpkgs: 01c3847 -> 799435bnin2017-09-051-1/+1
| | | |
| * | | news: cleanuplassulus2017-09-051-19/+18
| |/ /
* | | ma source: add tpm-fixmakefu2017-09-051-1/+2
| | |
* | | ma source: apply mitmproxymakefu2017-09-051-1/+2
| | |
* | | ma drozer: re-enable with protbuf3_2makefu2017-09-052-3/+3
| | |