stockholm - Make all the systems into 1systems!

	Commit message (Expand)	Author	Age	Files	Lines
*	l 1 helios: oraclejre -> jre	lassulus	2016-10-22	1	-1/+1
*	Merge remote-tracking branch 'gum/master'	lassulus	2016-10-22	4	-9/+11
\|\
\| *	m 1 vbob:disable docker	makefu	2016-10-22	1	-3/+1
\| *	m 1 x: disable docker for now	makefu	2016-10-22	1	-3/+6
\| *	m 1 gum: remove mattermost	makefu	2016-10-21	1	-2/+2
\| *	m 2 default: bump to latest stable (dirtycow)	makefu	2016-10-21	1	-1/+2
* \|	l 2 nixpkgs: b8ede35 -> 686bc9c	lassulus	2016-10-22	1	-1/+1
* \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-10-22	4	-43/+2
\|\ \
\| * \|	ire: RIP	tv	2016-10-22	3	-42/+1
\| * \|	tv nixpkgs: b8ede35 -> 31c72ce	tv	2016-10-21	1	-1/+1
* \| \|	l: import <stockholm/lib>	lassulus	2016-10-20	6	-8/+6
* \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-10-20	1	-1/+1
\|\\| \|
\| * \|	Merge remote-tracking branch 'gum/master'	tv	2016-10-20	1	-1/+1
\| \|\\|
\| \| *	Merge remote-tracking branch 'prism/lassulus'	makefu	2016-10-20	4	-26/+7
\| \| \|\
\| \| * \|	m 2 laptop-utils: binwalk now in pythonPackages	makefu	2016-10-20	1	-1/+1
* \| \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-10-20	171	-264/+224
\|\\| \| \|
\| * \| \|	drop config.krebs.lib	tv	2016-10-20	165	-182/+166
\| * \| \|	krebs.lib: use <stockholm/lib>	tv	2016-10-20	1	-1/+1
\| * \| \|	Merge remote-tracking branch 'prism/master'	tv	2016-10-20	38	-129/+431
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	lib: import bulk of krebs/4lib	tv	2016-10-20	6	-81/+56
\| * \| \|	tv nixpkgs: 354fd37 -> b8ede35	tv	2016-10-20	1	-1/+1
\| * \| \|	tv URxvt.saveLines: 4096	tv	2016-10-16	1	-0/+1
* \| \| \|	l 1 shodan: add sokratess user	lassulus	2016-10-20	1	-0/+20
* \| \| \|	l 2 websites domsen: remove obsolete code	lassulus	2016-10-20	1	-32/+0
* \| \| \|	l 2 c-base: add cifs-utils	lassulus	2016-10-20	1	-0/+4
* \| \| \|	l 1 mors: activate redis	lassulus	2016-10-20	1	-0/+3
* \| \| \|	k 3 l: add sokratess user	lassulus	2016-10-20	1	-0/+2
\| \|/ / \|/\| \|
* \| \|	remove haskellPackges.megaparsec	lassulus	2016-10-20	2	-21/+0
* \| \|	m 5 newsbot-js: buildNodePackage via callPackage	lassulus	2016-10-20	1	-3/+3
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-10-20	1	-3/+3
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	m 5 go: buildNodePackage via callPackage	makefu	2016-10-20	1	-3/+3
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-10-19	6	-34/+71
\|\\| \|
\| * \|	m 2 default: bump ref to stable	makefu	2016-10-19	1	-4/+7
\| * \|	m 5 devpi: bump	makefu	2016-10-19	2	-20/+61
\| * \|	s 2: fix obsolete option	makefu	2016-10-19	2	-3/+3
\| * \|	m 5 default: remove cups fallback	makefu	2016-10-19	1	-7/+0
* \| \|	l 1 uriel: gummiboot -> systemd-boot	lassulus	2016-10-19	1	-2/+2
* \| \|	l 1 uriel: add pavucontrol to pkgs	lassulus	2016-10-19	1	-0/+1
* \| \|	l 1 uriel: set defaultLocale to de_DE	lassulus	2016-10-19	1	-0/+1
\|/ /
* \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-10-19	1	-1/+1
\|\ \
\| * \|	k 3 rtorrent: revert .bin	makefu	2016-10-19	1	-1/+1
* \| \|	l 2 nixpkgs: 354fd37 -> b8ede35	lassulus	2016-10-19	1	-1/+1
* \| \|	l 2 exim-smarthost: add art@lassul.us	lassulus	2016-10-19	1	-0/+1
* \| \|	l 2 exim-smarthost: add feed@lassul.us	lassulus	2016-10-19	1	-0/+1
* \| \|	l 1 prism: remove obsolete key	lassulus	2016-10-19	1	-1/+0
* \| \|	l 2 websites domsen: dma@apanowicz.de -> gmx	lassulus	2016-10-19	1	-1/+1
* \| \|	l 2 repo-sync: sync lassulus-blog from github	lassulus	2016-10-19	1	-0/+1
* \| \|	l 2 baseX: add youtube-tools to pkgs	lassulus	2016-10-19	1	-0/+2
* \| \|	l: add lassulus-blog config, repair ssl for cgit	lassulus	2016-10-19	2	-48/+92
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-10-19	20	-14/+243
\|\\| \|