summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gum/master'tv2017-06-2922-51/+324
|\
| * ma sources: bump musnixmakefu2017-06-291-1/+1
| * ma audio: use latest kernel for musnixmakefu2017-06-291-1/+1
| * ma jack-on-pulse: include jack_capturemakefu2017-06-291-1/+4
| * ma vbob: realtime kernel with jack-audiomakefu2017-06-291-0/+10
| * ma vbob: remove videodrivers workaroundmakefu2017-06-281-2/+0
| * ma lancache-dns: initmakefu2017-06-281-0/+55
| * ma: mv {,lanparty}/lancachemakefu2017-06-281-0/+0
| * Merge remote-tracking branch 'lass/master'makefu2017-06-284-27/+33
| |\
| | * Merge remote-tracking branch 'ni/master'lassulus2017-06-274-22/+29
| | |\
| | * \ Merge remote-tracking branch 'gum/master'lassulus2017-06-273-0/+81
| | |\ \
| | * \ \ Merge remote-tracking branch 'ni/master'lassulus2017-06-271-5/+4
| | |\ \ \
| * | | | | ma lancache: fix nginx prefix issuesmakefu2017-06-281-17/+11
| | |_|/ / | |/| | |
| * | | | Merge branch 'master' of prism:stockholmmakefu2017-06-279-9/+6
| |\| | |
| | * | | Merge remote-tracking branch 'ni/master'lassulus2017-06-271-1/+1
| | |\ \ \
| | * | | | l nixpkgs: e84de79 -> 0a4db15lassulus2017-06-271-1/+1
| | * | | | Merge remote-tracking branch 'gum/master'lassulus2017-06-2714-45/+177
| | |\ \ \ \
| | * | | | | l nixpkgs: 4847963 -> e84de79lassulus2017-06-271-1/+1
| | * | | | | Merge remote-tracking branch 'ni/master'lassulus2017-06-277-7/+4
| | |\ \ \ \ \
| * | | | | | | make led-fader: after networ-online.targetmakefu2017-06-271-0/+1
| * | | | | | | make x.r: init lancachemakefu2017-06-272-0/+80
| | |_|/ / / / | |/| | | | |
| * | | | | | k 4 infest: prepare Regression for stockholmmakefu2017-06-271-10/+4
| * | | | | | ma arduino-user-env: initmakefu2017-06-271-0/+35
| * | | | | | ma task-client: systemPackages -> per-usermakefu2017-06-271-0/+14
| * | | | | | doc/makefu: init logbookmakefu2017-06-272-0/+33
| * | | | | | ma docker: init configmakefu2017-06-271-0/+4
| * | | | | | ma tools: add more softwaremakefu2017-06-272-1/+6
| * | | | | | ma x.r: cleanup importsmakefu2017-06-271-31/+18
| * | | | | | ma hw: refactormakefu2017-06-273-2/+5
| * | | | | | doc: init Commit Messages Guidelinemakefu2017-06-271-0/+53
| * | | | | | m 2 dirctator: bump to latest logstash5makefu2017-06-271-1/+5
| |/ / / / /
* | | | | / whatsupnix: use gawk and nix-store explicitlytv2017-06-281-5/+2
| |_|_|_|/ |/| | | |
* | | | | krebs.build.source: stockholm default is <stockholm>tv2017-06-272-1/+2
* | | | | tv: stockholm is really just <stockholm>tv2017-06-271-4/+1
* | | | | make test: use build and evaluatetv2017-06-271-6/+5
* | | | | Makefile: call build with whatsupnixtv2017-06-271-6/+12
* | | | | tv: configure stockholm for buildbottv2017-06-271-9/+13
* | | | | tv mu: chromiumDev -> chromiumtv2017-06-271-1/+1
| |_|_|/ |/| | |
* | | | tv mu: kde4 -> plasma5, maybetv2017-06-271-4/+3
* | | | tv mu: security.wrappers.slock.{slock => source}tv2017-06-271-1/+1
| |_|/ |/| |
* | | tv alnus nixpkgs: e924319 -> 9b948eatv2017-06-271-1/+1
* | | Merge remote-tracking branch 'prism/master'tv2017-06-2719-119/+165
|\| | | |/ |/|
| * l 2 nixpkgs: e84de79 -> 4847963lassulus2017-06-241-1/+1
| * l: set symlinkJoin pkgs in correct orderlassulus2017-06-245-5/+5
| * k 4 infest prepare: add stockholm as supported OSlassulus2017-06-241-0/+7
| * k 3 setuid: activate only if cfg is not emptylassulus2017-06-241-1/+1
| * l 2 nixpkgs: 0a4db15 -> e84de79lassulus2017-06-231-1/+1
| * l 1 mors: use virtualbox instead of libvirtlassulus2017-06-201-1/+1
| * l 1 prism: activate pyloadlassulus2017-06-201-0/+3
| * l 2 websites domsen: remove obsolete 360video.tvlassulus2017-06-201-3/+1