summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'tv2016-12-2213-24/+52
|\
| * Merge remote-tracking branch 'ni/master'lassulus2016-12-203-7/+19
| |\
| * | l 2 nixpkgs: 953889b -> 2a97e14lassulus2016-12-201-1/+1
| * | l 2 nixpkgs: 76f346d -> 953889blassulus2016-12-141-1/+1
| * | Merge remote-tracking branch 'gum/master'lassulus2016-12-124-4/+24
| |\ \
| | * \ Merge remote-tracking branch 'lass/master'makefu2016-12-129-37/+106
| | |\ \
| | * | | m 2 default: bump revisionmakefu2016-12-121-2/+1
| | * | | m 5 tw-upload-plugin: updatemakefu2016-12-071-2/+2
| | * | | m 5 acdcli: initmakefu2016-12-062-0/+21
| * | | | l 2: remove teamviewerlassulus2016-12-122-7/+0
| * | | | l 1 mors: import ircdlassulus2016-12-121-0/+1
| * | | | l 2 websites domsen: add domsen to download grouplassulus2016-12-121-1/+1
| | |/ / | |/| |
| * | | l 2 exim-smarthost: add irgendwas@lassul.uslassulus2016-12-081-0/+1
| * | | l 2 nixpkgs: 6a9f087 -> 76f346dlassulus2016-12-071-1/+1
| * | | l 2 games: use zandronum-bin instead of zandronumlassulus2016-12-071-1/+1
| * | | l 2 games: add vdoom{1,2} to pkgslassulus2016-12-071-2/+16
| * | | l 2 privoxy-retiolum: open for dns0lassulus2016-12-041-0/+1
| * | | l 2 baseX: add terminals to pkgslassulus2016-12-041-0/+3
| * | | l 2 baseX: use pulse.nixlassulus2016-12-041-4/+1
| * | | l 1 mors: use libvirtd instead of virtualboxlassulus2016-12-041-1/+3
| * | | l 2 nixpkgs: e360c72 -> 6a9f087lassulus2016-12-041-1/+1
| * | | k 5 urlwatch: remove obsolete postFixuplassulus2016-12-021-4/+0
* | | | tv nixpkgs: 81428dd -> 1dd0fb6tv2016-12-221-1/+1
* | | | tv netcup: bump rev/sha256tv2016-12-221-2/+2
| |_|/ |/| |
* | | tv nixpkgs: e360c72 -> 81428ddtv2016-12-161-1/+1
* | | nomic: keep using grubtv2016-12-031-0/+10
* | | zu: define gg23tv2016-12-031-5/+7
* | | nomic: AO753 -> x220tv2016-12-031-1/+1
* | | 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