nixpkgs - Downstream nixpkgs tree for Spectrum

	Commit message (Expand)	Author	Age
*	Merge remote-tracking branch 'upstream/master' into staging	John Ericson	2018-05-18
\|\
\| *	nixos/xss-lock: add module (#40619)	Maximilian Bosch	2018-05-18
* \|	Merge remote-tracking branch 'upstream/master' into staging	Tuomas Tynkkynen	2018-05-16
\|\\|
\| *	Merge pull request #33371 from jtojnar/flatpak	Jan Tojnar	2018-05-15
\| \|\
\| \| *	nixos/xdg-desktop-portal: add test	Jan Tojnar	2018-05-15
\| \| *	nixos/flatpak: add test	Jan Tojnar	2018-05-15
\| * \|	nexus: fix setup and nixos test (#40522)	Maximilian Bosch	2018-05-15
* \| \|	Merge remote-tracking branch 'upstream/master' into staging	John Ericson	2018-05-14
\|\\| \|
\| * \|	nixos/tests: prevent stateVersion warnings in eval	Uli Baum	2018-05-15
* \| \|	Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging	John Ericson	2018-05-13
\|\\| \|
\| * \|	nixos/tests/kafka: fix and refactor tests	Uli Baum	2018-05-12
\| \|/
* \|	Merge remote-tracking branch 'upstream/master' into staging	Matthew Bauer	2018-05-08
\|\\|
\| *	Merge pull request #39526 (improve dhparams)	aszlig	2018-05-08
\| \|\
\| \| *	nixos/dhparams: Add a VM test	aszlig	2018-04-26
\| * \|	fleet: remove package, module, test	Uli Baum	2018-05-05
\| * \|	panamax: remove packages, module and test	Uli Baum	2018-05-05
* \| \|	Merge branch 'staging' into fix-ncurses-darwin-extensions	Matthew Justin Bauer	2018-05-02
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	nixos/release.nix: add tests.gdk-pixbuf	Jan Tojnar	2018-04-25
* \| \|	hitch: init at 1.4.8 + service + test (#39358)	Julien Langlois	2018-05-01
* \| \|	nixos/osquery: add test	Maximilian Bosch	2018-04-30
* \| \|	nixos docs: Add a makefile for hacking on the nixos docs	Graham Christensen	2018-04-28
\| \|/ \|/\|
* \|	Merge pull request #33679 from flokli/deluge-module	Matthew Justin Bauer	2018-04-25
\|\ \ \| \|/ \|/\|
\| *	deluge: add test	Florian Klink	2018-04-13
* \|	Merge pull request #27958 from LumiGuide/strongswan-swanctl	Matthew Justin Bauer	2018-04-21
\|\ \
\| * \|	nixos: add the strongswan-swanctl service	Bas van Dijk	2018-02-28
* \| \|	Merge pull request #37786 from woffs/fixing-quagga	Matthew Justin Bauer	2018-04-17
\|\ \ \
\| * \| \|	quagga service: fix service and re-enable test	Frank Doepper	2018-03-25
* \| \| \|	nixos/release.nix: Add SD images for ARMv6 + ARMv7	Tuomas Tynkkynen	2018-04-16
* \| \| \|	docker-tools: add a test for permissions issues with AUFS/overlay	Daiderd Jordan	2018-04-14
\| \|_\|/ \|/\| \|
* \| \|	nixos/iftop: add module	Maximilian Bosch	2018-04-07
* \| \|	nixos/transmission: add basic nixos test	Corey O'Connor	2018-04-05
* \| \|	Merge pull request #37218 from cstrahan/kube-test-fix	Charles Strahan	2018-04-04
\|\ \ \
\| * \| \|	nixos: kubernetes fixes	Charles Strahan	2018-03-30
\| \|/ /
* / /	nixos/release.nix: Add Hydra job for AArch64 SD image	Tuomas Tynkkynen	2018-04-02
\|/ /
* \|	Merge pull request #32960 from florianjacob/prosody-0.10	Robin Gloster	2018-03-22
\|\ \
\| * \|	prosody: add test to release.nix	Robin Gloster	2018-03-22
* \| \|	Merge remote-tracking branch 'upstream/master' into fix-cross-jobs	John Ericson	2018-03-19
\|\ \ \
\| * \| \|	xautolock: implement basic test to confirm functionality	Maximilian Bosch	2018-03-13
\| \|/ /
\| * \|	nixos release: more evaluation fixes	Vladimír Čunát	2018-03-07
\| * \|	18.03 -> 18.09	Vladimír Čunát	2018-03-05
* \| \|	release-lib: Filter supportedSystems with `meta.platforms`-style patterns	John Ericson	2018-03-19
\|/ /
* \|	Merge pull request #32248 from awakesecurity/parnell/fetchdocker	Franz Pletz	2018-03-04
\|\ \
\| * \	Merge remote-tracking branch 'upstream/master' into parnell/fetchdocker	Parnell Springmeyer	2018-02-13
\| \|\ \
\| * \ \	Merge remote-tracking branch 'upstream/master' into parnell/fetchdocker	Parnell Springmeyer	2018-01-10
\| \|\ \ \
\| \| * \| \|	Revert "nixos/dnscrypt-proxy: remove"	rnhmjoj	2018-01-08
\| \| * \| \|	nixos/dnscrypt-proxy: remove	Joachim Fasting	2018-01-07
\| * \| \| \|	fetchdocker: Integration test exercising hocker and fetchdocker	Parnell Springmeyer	2017-12-01
* \| \| \| \|	Merge #35454: nixos/pump.io: remove	Vladimír Čunát	2018-03-04
\|\ \ \ \ \
\| * \| \| \| \|	nixos/pump.io: remove	Rodney Lorrimar	2018-02-27
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #36249 from Ekleog/openldap-module-declarative-contents	Jörg Thalheim	2018-03-03
\|\ \ \ \ \