summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gum/master'lassulus2017-09-077-7/+0
|\
| * 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
| | * newsbot-js module: add package optionmakefu2017-09-061-1/+6
| | * ma git: add euer_blogmakefu2017-09-061-0/+1
| * | Merge remote-tracking branch 'lass/master'makefu2017-09-062-20/+19
| |\ \
* | \ \ Merge remote-tracking branch 'ni/master'lassulus2017-09-061-1/+9
|\ \ \ \
| * | | | tv: NIX_PATH += nixpkgs-overlaystv2017-09-061-1/+9
* | | | | Merge remote-tracking branch 'gum/master'lassulus2017-09-0633-129/+400
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | 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
| * | | ma gen-oath-safe: do not build with yubikey-managermakefu2017-09-041-2/+3
| * | | ma gen-oath-safe: fix typomakefu2017-09-041-1/+1
| * | | ma android-pentest: disable due to broken dependencymakefu2017-09-041-1/+2
| * | | ma zsh-user: krebs.per-user -> users.usersmakefu2017-09-041-1/+1
| * | | ma configs: use buildCores with maxJobsmakefu2017-09-041-2/+2
| * | | ma tools: add sec-guimakefu2017-09-044-1/+11
| * | | ma hw: add tpm to x2x0makefu2017-09-043-1/+10
| * | | ma umts module: add missing module from stablemakefu2017-09-042-0/+71
| * | | ma x: enable tpmmakefu2017-09-041-0/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 08:57:24 +0000