Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'gum/master' | lassulus | 2017-09-07 | 7 | -7/+0 |
|\ | |||||
| * | ma nginx-config: forceSSL implies enableSSL | makefu | 2017-09-06 | 7 | -7/+0 |
| | | |||||
| * | Merge remote-tracking branch 'lass/master' | makefu | 2017-09-06 | 6 | -67/+88 |
| |\ | |||||
| | * | ma source: add tpm-fix | makefu | 2017-09-06 | 1 | -1/+2 |
| | | | |||||
| | * | ma source: apply mitmproxy | makefu | 2017-09-06 | 1 | -1/+2 |
| | | | |||||
| | * | ma drozer: re-enable with protbuf3_2 | makefu | 2017-09-06 | 2 | -3/+3 |
| | | | |||||
| | * | ma gen-oath-safe: do not build with yubikey-manager | makefu | 2017-09-06 | 1 | -2/+3 |
| | | | |||||
| | * | ma gen-oath-safe: fix typo | makefu | 2017-09-06 | 1 | -1/+1 |
| | | | |||||
| | * | ma android-pentest: disable due to broken dependency | makefu | 2017-09-06 | 1 | -1/+2 |
| | | | |||||
| | * | ma zsh-user: krebs.per-user -> users.users | makefu | 2017-09-06 | 1 | -1/+1 |
| | | | |||||
| | * | ma configs: use buildCores with maxJobs | makefu | 2017-09-06 | 1 | -2/+2 |
| | | | |||||
| | * | ma tools: add sec-gui | makefu | 2017-09-06 | 4 | -1/+11 |
| | | | |||||
| | * | ma hw: add tpm to x2x0 | makefu | 2017-09-06 | 3 | -1/+10 |
| | | | |||||
| | * | ma umts module: add missing module from stable | makefu | 2017-09-06 | 2 | -0/+71 |
| | | | |||||
| | * | ma x: enable tpm | makefu | 2017-09-06 | 1 | -0/+2 |
| | | | |||||
| | * | ma x: use new dnscrypt client | makefu | 2017-09-06 | 1 | -1/+1 |
| | | | |||||
| | * | ma gum: enable dnscrypt server | makefu | 2017-09-06 | 1 | -2/+1 |
| | | | |||||
| | * | ma dnscrypt: provide client and server config | makefu | 2017-09-06 | 2 | -3/+41 |
| | | | |||||
| | * | ma source: bump to latest unstable | makefu | 2017-09-06 | 1 | -3/+1 |
| | | | |||||
| | * | ma dnscrypt: prepare client/server | makefu | 2017-09-06 | 1 | -0/+0 |
| | | | |||||
| | * | ma omo: Rip Reaktor|krebs | makefu | 2017-09-06 | 1 | -10/+0 |
| | | | |||||
| | * | ma pkgs.u3_tool: init at 0.3 | makefu | 2017-09-06 | 1 | -0/+22 |
| | | | |||||
| | * | ma tools/studio: init | makefu | 2017-09-06 | 1 | -0/+10 |
| | | | |||||
| | * | ma default: remove nix-defexpr activation | makefu | 2017-09-06 | 1 | -9/+0 |
| | | | |||||
| | * | gitlab-runner: use PrivateTmp to avoid clash with buildbot | makefu | 2017-09-06 | 1 | -0/+1 |
| | | | |||||
| | * | gitlab-ci: test env | makefu | 2017-09-06 | 1 | -0/+1 |
| | | | |||||
| | * | gitlab-runner-shackspace: init | makefu | 2017-09-06 | 3 | -0/+35 |
| | | | |||||
| | * | gitlab-ci: init | makefu | 2017-09-06 | 1 | -0/+4 |
| | | | |||||
| | * | ma vpngate: add france | makefu | 2017-09-06 | 1 | -0/+108 |
| | | | |||||
| | * | ma vim: update listchars | makefu | 2017-09-06 | 1 | -1/+1 |
| | | | |||||
| | * | ma wiki-irc-bot: use newsbot-js instead of logstash | makefu | 2017-09-06 | 3 | -87/+58 |
| | | | |||||
| | * | pkgs.newsbot-js: enable patchPhase | makefu | 2017-09-06 | 1 | -0/+1 |
| | | | | | | | | | | | | required for overriding the patchPhase | ||||
| | * | newsbot-js module: add package option | makefu | 2017-09-06 | 1 | -1/+6 |
| | | | | | | | | | | | | this will be used for the wiki-irc-bot to override the patchPhase | ||||
| | * | ma git: add euer_blog | makefu | 2017-09-06 | 1 | -0/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'lass/master' | makefu | 2017-09-06 | 2 | -20/+19 |
| |\ \ | |||||
* | \ \ | Merge remote-tracking branch 'ni/master' | lassulus | 2017-09-06 | 1 | -1/+9 |
|\ \ \ \ | |||||
| * | | | | tv: NIX_PATH += nixpkgs-overlays | tv | 2017-09-06 | 1 | -1/+9 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'gum/master' | lassulus | 2017-09-06 | 33 | -129/+400 |
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | ma source: add tpm-fix | makefu | 2017-09-05 | 1 | -1/+2 |
| | | | | |||||
| * | | | ma source: apply mitmproxy | makefu | 2017-09-05 | 1 | -1/+2 |
| | | | | |||||
| * | | | ma drozer: re-enable with protbuf3_2 | makefu | 2017-09-05 | 2 | -3/+3 |
| | | | | |||||
| * | | | ma gen-oath-safe: do not build with yubikey-manager | makefu | 2017-09-04 | 1 | -2/+3 |
| | | | | |||||
| * | | | ma gen-oath-safe: fix typo | makefu | 2017-09-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | ma android-pentest: disable due to broken dependency | makefu | 2017-09-04 | 1 | -1/+2 |
| | | | | |||||
| * | | | ma zsh-user: krebs.per-user -> users.users | makefu | 2017-09-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | ma configs: use buildCores with maxJobs | makefu | 2017-09-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | ma tools: add sec-gui | makefu | 2017-09-04 | 4 | -1/+11 |
| | | | | |||||
| * | | | ma hw: add tpm to x2x0 | makefu | 2017-09-04 | 3 | -1/+10 |
| | | | | |||||
| * | | | ma umts module: add missing module from stable | makefu | 2017-09-04 | 2 | -0/+71 |
| | | | | |||||
| * | | | ma x: enable tpm | makefu | 2017-09-04 | 1 | -0/+2 |
| | | | |