summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'cd/master'lassulus2016-10-234-6/+40
|\
| * m 1 vbob:disable dockermakefu2016-10-221-3/+1
| * m 1 x: disable docker for nowmakefu2016-10-221-3/+6
| * m 1 gum: remove mattermostmakefu2016-10-221-2/+2
| * m 2 default: bump to latest stable (dirtycow)makefu2016-10-221-1/+2
| * l 2 nixpkgs: b8ede35 -> 686bc9classulus2016-10-221-1/+1
| * l: import <stockholm/lib>lassulus2016-10-226-8/+6
| * l 1 shodan: add sokratess userlassulus2016-10-221-0/+20
| * l 2 websites domsen: remove obsolete codelassulus2016-10-221-32/+0
| * l 2 c-base: add cifs-utilslassulus2016-10-221-0/+4
| * l 1 mors: activate redislassulus2016-10-221-0/+3
| * k 3 l: add sokratess userlassulus2016-10-221-0/+2
| * tv djbdns: init at 1.05tv2016-10-221-0/+20
| * tv pkgs: callPackage all subdirstv2016-10-222-5/+19
| * tv nixpkgs: 31c72ce -> cd41bfetv2016-10-221-1/+1
* | l 1 helios: remove jre from pkgslassulus2016-10-231-1/+0
* | l 1 helios: oraclejre -> jrelassulus2016-10-221-1/+1
* | Merge remote-tracking branch 'gum/master'lassulus2016-10-224-9/+11
|\ \
| * | m 1 vbob:disable dockermakefu2016-10-221-3/+1
| * | m 1 x: disable docker for nowmakefu2016-10-221-3/+6
| * | m 1 gum: remove mattermostmakefu2016-10-211-2/+2
| * | m 2 default: bump to latest stable (dirtycow)makefu2016-10-211-1/+2
* | | l 2 nixpkgs: b8ede35 -> 686bc9classulus2016-10-221-1/+1
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-224-43/+2
|\ \ \ | | |/ | |/|
| * | ire: RIPtv2016-10-223-42/+1
| * | tv nixpkgs: b8ede35 -> 31c72cetv2016-10-211-1/+1
* | | l: import <stockholm/lib>lassulus2016-10-206-8/+6
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-201-1/+1
|\| |
| * | Merge remote-tracking branch 'gum/master'tv2016-10-201-1/+1
| |\|
| | * Merge remote-tracking branch 'prism/lassulus'makefu2016-10-204-26/+7
| | |\
| | * | m 2 laptop-utils: binwalk now in pythonPackagesmakefu2016-10-201-1/+1
* | | | Merge remote-tracking branch 'cd/master'lassulus2016-10-20171-264/+224
|\| | |
| * | | drop config.krebs.libtv2016-10-20165-182/+166
| * | | krebs.lib: use <stockholm/lib>tv2016-10-201-1/+1
| * | | Merge remote-tracking branch 'prism/master'tv2016-10-2038-129/+431
| |\ \ \ | | | |/ | | |/|
| * | | lib: import bulk of krebs/4libtv2016-10-206-81/+56
| * | | tv nixpkgs: 354fd37 -> b8ede35tv2016-10-201-1/+1
| * | | tv URxvt.saveLines: 4096tv2016-10-161-0/+1
* | | | l 1 shodan: add sokratess userlassulus2016-10-201-0/+20
* | | | l 2 websites domsen: remove obsolete codelassulus2016-10-201-32/+0
* | | | l 2 c-base: add cifs-utilslassulus2016-10-201-0/+4
* | | | l 1 mors: activate redislassulus2016-10-201-0/+3
* | | | k 3 l: add sokratess userlassulus2016-10-201-0/+2
| |/ / |/| |
* | | remove haskellPackges.megaparseclassulus2016-10-202-21/+0
* | | m 5 newsbot-js: buildNodePackage via callPackagelassulus2016-10-201-3/+3
* | | Merge remote-tracking branch 'gum/master'lassulus2016-10-201-3/+3
|\ \ \ | | |/ | |/|
| * | m 5 go: buildNodePackage via callPackagemakefu2016-10-201-3/+3
* | | Merge remote-tracking branch 'gum/master'lassulus2016-10-196-34/+71
|\| |
| * | m 2 default: bump ref to stablemakefu2016-10-191-4/+7
| * | m 5 devpi: bumpmakefu2016-10-192-20/+61