summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* l nixpkgs: e84de79 -> 0a4db15lassulus2017-06-271-1/+1
* Merge remote-tracking branch 'gum/master'lassulus2017-06-2714-45/+177
|\
| * 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
* | l nixpkgs: 4847963 -> e84de79lassulus2017-06-271-1/+1
* | Merge remote-tracking branch 'ni/master'lassulus2017-06-277-7/+4
|\ \ | |/ |/|
| * tv: add htop to default systemPackagestv2017-06-275-5/+2
| * tv: properly use symlinkJoin pathstv2017-06-252-2/+2
* | 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
* | l 2 radio: join #krebslassulus2017-06-201-1/+4
* | l 1 mors: add brain to pkgslassulus2017-06-201-0/+1
* | l: add ciko.nix for ciko's mail setuplassulus2017-06-202-0/+24
* | l 1 mors: remove obsolete powersaving scriptslassulus2017-06-201-9/+0
* | Merge remote-tracking branch 'ni/master'lassulus2017-06-2010-159/+164
|\|
| * concat: RIPtv2017-06-2010-159/+164
* | brain: rename brain-pass -> brainlassulus2017-06-201-2/+2
* | Merge remote-tracking branch 'gum/master' into HEADlassulus2017-06-202-1/+2
|\ \
| * | m 2 default: revert to working refmakefu2017-06-182-1/+2
* | | l 2 buildbot: set NIX_PATH in nix-shelllassulus2017-06-201-3/+1
* | | l 2 buildbot: build tv hostslassulus2017-06-201-0/+8
* | | l 2 buildbot: introduce build_host functionlassulus2017-06-201-32/+15
* | | l 2 buildbot: set pollinterval to 10lassulus2017-06-201-1/+1
* | | l 2 buildbot: remove build-pkgslassulus2017-06-201-58/+1
* | | Merge remote-tracking branch 'ni/master' into HEADlassulus2017-06-2019-69/+348
|\ \ \ | |/ / |/| / | |/
| * tv dummy_secrets: inittv2017-06-205-1/+16
| * gitrepos: don't announce brain's cgit linktv2017-06-191-5/+7
| * pkgs.git-hooks.irc-announce: make cgit_endpoint configurabletv2017-06-191-14/+26
| * tv gitrepos: announce braintv2017-06-191-9/+12
| * tv: add whatsupnixtv2017-06-191-0/+1
| * tv nixpkgs: 99dfb6d -> 412b0a1tv2017-06-191-1/+1
| * tv: admit dummy_secretstv2017-06-191-1/+4
| * krebs-pages: import from painloadtv2017-06-193-0/+183
| * bling: import krebs-v2 from painloadtv2017-06-181-0/+56
| * urlwatch: add pycodestyletv2017-06-181-0/+1
| * urlwatch: 2.5 -> 2.6tv2017-06-181-3/+4