summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'prism/master'tv2016-12-018-72/+110
|\| |
| * | l 2 nixpkgs: ece0cea -> e360c72lassulus2016-12-011-1/+1
| * | l 2 games: add doom{1,2} wrapperslassulus2016-12-011-0/+18
| * | l 2 baseX: add ncdu to pkgslassulus2016-12-011-0/+1
| * | k 3: remove Mic92 from eloop-mllassulus2016-12-011-2/+1
| * | Merge remote-tracking branch 'gum/master'lassulus2016-11-291-17/+20
| |\|
| | * Merge remote-tracking branch 'lass/master'makefu2016-11-289-82/+16
| | |\
| | * | m 1 x: shuffle imports ;)makefu2016-11-281-17/+20
| * | | l 2 buildbot: rename build-all -> build-hostslassulus2016-11-291-3/+3
| * | | l 2 buildbot: add shared hosts to build-alllassulus2016-11-291-0/+11
| * | | l 2 buildbot: fix indentationlassulus2016-11-291-24/+50
| | |/ | |/|
| * | l 2 vim: add trailing space to buffer bindingslassulus2016-11-281-2/+2
| * | l 2 nixpkgs: ee52e98 -> ece0cealassulus2016-11-281-1/+1
| * | l 3 iptables: set defaults correctlylassulus2016-11-281-25/+5
* | | tv nixpkgs: 728a957 -> e360c72tv2016-12-011-1/+1
|/ /
* | Merge remote-tracking branch 'gum/master'lassulus2016-11-274-1/+303
|\|
| * s 1 wolf: use auth.anonymous.enable instead of extraOptionsmakefu2016-11-271-1/+1
| * m 1 sdev: initmakefu2016-11-271-0/+56
| * Merge remote-tracking branch 'lass/master'makefu2016-11-2725-107/+193
| |\
| | * l 1 helios: enable pulseaudiolassulus2016-11-271-0/+3
| * | m 2 elchos/search.nix: initmakefu2016-11-251-0/+211
| * | m 5 elchhub: bumpmakefu2016-11-251-0/+35
* | | l 2 websites util: more power to owncloudlassulus2016-11-271-3/+5
* | | l 2 downloading: uriel -> helioslassulus2016-11-271-1/+1
* | | l 2 buildbot: fix buildbot finally (please)lassulus2016-11-271-1/+1
* | | l 2 baseX: add dic to pkgslassulus2016-11-271-0/+1
* | | l 1 mors: remove obsolete chromium-patchedlassulus2016-11-272-49/+0
* | | l 1 helios: enable pulseaudiolassulus2016-11-271-0/+3
| |/ |/|
* | Merge remote-tracking branch 'ni/master'lassulus2016-11-261-2/+2
|\ \
| * | dic: 1.0.0 -> 1.0.1tv2016-11-251-2/+2
* | | l 2: reject the correct way with iptableslassulus2016-11-261-1/+3
* | | k 3 iptables: add v4 and v6 options per rulelassulus2016-11-261-1/+10
* | | k 3 iptables: remove obsolete asserts & stylelassulus2016-11-261-33/+7
* | | l 2 repo-sync: use FQDN for tv's repolassulus2016-11-251-1/+1
* | | l 2 mail: SC2068lassulus2016-11-251-1/+1
* | | Merge remote-tracking branch 'ni/master'lassulus2016-11-2515-36/+81
|\| |
| * | writeBash*: use shellcheck (for warnings only)tv2016-11-251-1/+11
| * | writeOut: add support for text checkingtv2016-11-251-0/+4
| * | cd: bring back mx23tv2016-11-241-1/+2
| * | github-hosts-sync: add nettools for painload-8df031f's use of hostnametv2016-11-241-0/+1
| * | tv binary-cache: replace wu by xu and use hosts.binary-cache.pubkeytv2016-11-247-16/+20
| * | tv: use gnupg21 everywheretv2016-11-241-4/+1
| * | tv git: bumptv2016-11-241-7/+11
| * | tv backup: {xu,zu} pull ni {ejabberd,home}tv2016-11-241-0/+24
| * | painload: 8df031f -> c113487tv2016-11-241-2/+2
| * | tv nixpkgs: a6728e1 -> 728a957tv2016-11-241-1/+1
| * | blessings: 1.0.0 -> 1.1.0tv2016-11-221-4/+4
* | | l 3 usershadow: update passwd to behave correctlylassulus2016-11-251-9/+20
* | | l 2 websites util: disable deprecated ssl stufflassulus2016-11-251-20/+21
* | | l 2 nixpkgs: 0195ab8 -> ee52e98lassulus2016-11-241-1/+1