nixpkgs - Downstream nixpkgs tree for Spectrum

	Commit message (Collapse)	Author	Age
*	Merge remote-tracking branch 'origin/master' into staging	Eelco Dolstra	2014-07-07
\|\
\| *	Merge pull request #2582 from chexxor/feature/add-znc-module	lethalman	2014-07-06
\| \|\ \| \| \| \| \| \|	Add ZNC module
\| \| *	Merge remote-tracking branch 'nixos/master' into feature/add-znc-module	Alex Berg	2014-07-03
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: nixos/modules/misc/ids.nix
\| \| * \|	Add ZNC module. Has zncConfOptions or specify full conf file.	Alex Berg	2014-06-26
\| \| \| \|
\| * \| \|	Updated Mediawiki to 1.23.1	Igor Pashev	2014-07-04
\| \| \|/ \| \|/\|
\| * \|	Merge pull request #3079 from wmertens/patch-4	lethalman	2014-07-03
\| \|\ \ \| \| \| \| \| \| \| \|	virtualbox: Fix permissions for /dev/vboxdrvu
\| \| * \|	virtualbox: Fix permissions for /dev/vboxdrvu	wmertens	2014-06-25
\| \| \| \| \| \| \| \| \| \| \| \|	See https://bugs.archlinux.org/task/38314 and https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Installer/linux/installer-common.sh?rev=47894#L28
\| * \| \|	Get all lib functions from lib, not pkgs.lib, in modules	Shea Levy	2014-07-02
\| \| \| \|
\| * \| \|	Try fixing the nixos mumble tests, again	Luca Bruno	2014-07-02
\| \| \| \|
\| * \| \|	Fix evaluation	Eelco Dolstra	2014-07-01
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/master' into staging	Eelco Dolstra	2014-07-01
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: pkgs/servers/serfdom/default.nix
\| * \| \|	nixos/pam: make pam_loginuid optional if in container	Jaka Hudoklin	2014-06-30
\| \| \| \|
\| * \| \|	Merge pull request #2888 from nilcons/no-random-arch-downgrades	Michael Raskin	2014-06-30
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fix nixos-rebuild.sh to depend on Nix
\| \| * \| \|	Fix nixos-rebuild.sh to depend on Nix	Gergely Risko	2014-06-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And therefore always choose the correct architecture for the rebuilt system regardless for the PATH setting of the user.
\| * \| \| \|	Merge pull request #2894 from kirelagin/fixusergroup	Michael Raskin	2014-06-30
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix conditional handling of users and groups in some services
\| \| * \| \| \|	Fix trying to add users to non-existent groups	Kirill Elagin	2014-06-11
\| \| \| \| \| \|
\| \| * \| \| \|	Fix configuring apache with extra user/group	Kirill Elagin	2014-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fix is consistent with all the other modules.
\| \| * \| \| \|	Revert "Fix configuring httpd with custom user/group."	Kirill Elagin	2014-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45.
\| * \| \| \| \|	Merge pull request #2778 from edwtjo/radicale	Michael Raskin	2014-06-30
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding Radicale package and service
\| \| * \| \| \| \|	Adding Radicale package and service	Edward Tjörnhammar	2014-05-28
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #2283 from wizeman/u/sysctl-merge	Michael Raskin	2014-06-30
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nixos: Fix sysctl option merging
\| \| * \| \| \| \| \|	nixos: Fix sysctl option merging	Ricardo M. Correia	2014-04-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using pkgs.lib.mkOverride in a sysctl option would throw a bogus error. Also, if you defined a sysctl multiple times in the same configuration, only one of the values would be picked up, while the others were silently discarded. This patch should fix both issues. If you define a sysctl multiple times at your highest defined priority level, you will get a proper error with detailed location information.
\| * \| \| \| \| \| \|	name nixos tests, close #3078	Florian Friesdorf	2014-06-28
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	support for nixos test names	Florian Friesdorf	2014-06-28
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	nixos/log2html: Remove schema from jQuery URLs.	aszlig	2014-06-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows viewing test logs for example when using a Hydra running with HTTPS. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
\| * \| \| \| \| \| \|	Revert "nixos/sshd: drop mode from auth keys file".	aszlig	2014-06-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit a3331eb87b25d954766af9652e1415a783dae76c. See https://github.com/NixOS/nixpkgs/issues/2559#issuecomment-47313334 for a description why this is not a good idea. I guess it's better to implement a sane way to remove all files in authorized_keys.d, especially because it is also backwards-compatible. Reopens #2559. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
\| * \| \| \| \| \| \|	nixos/tests/openssh: Test configured auth keys.	aszlig	2014-06-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So far the test only uses an authorized key that is copied over to the target machine instead of being set by the target's configuration. Now, we cover both cases. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
\| * \| \| \| \| \| \|	Merge pull request #3093 from lethalman/sshkeys	John Wiegley	2014-06-26
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nixos/sshd: drop mode from auth keys file. Closes #2559
\| \| * \| \| \| \| \| \|	nixos/sshd: drop mode from auth keys file. Closes #2559	Luca Bruno	2014-06-26
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix gitolite docs	Austin Seipp	2014-06-25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Austin Seipp <aseipp@pobox.com>
\| * \| \| \| \| \| \| \|	nixos: add gitolite module	Austin Seipp	2014-06-25
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Austin Seipp <aseipp@pobox.com>
\| * \| \| \| \| \| \|	nixos: change EDITOR and PAGER environment variables to mkDefaults	Jan Malakhovski	2014-06-25
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Domen Kožar <domen@dev.si>
\| * \| \| \| \| \|	nixos: add some missing '.' in option descriptions	Bjørn Forsman	2014-06-24
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	nixos/elasticsearch: capitalize systemd service description	Bjørn Forsman	2014-06-24
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	nixos/elasticsearch: add '.' at end of description strings	Bjørn Forsman	2014-06-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nixos option descriptions should be full sentences, ending in a full stop. (Package descriptions, on the other hand, should not.)
\| * \| \| \| \| \|	Merge pull request #3005 from offlinehacker/nixos/logstash/enableWeb	lethalman	2014-06-24
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nixos/logstash: add enableWeb option to enable kibana web interface
\| \| * \| \| \| \| \|	nixos/logstash: add enableWeb option to enable kibana web interface	Jaka Hudoklin	2014-06-18
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Another attempt to eradicate ensureDir	Eelco Dolstra	2014-06-30
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See c556a6ea46e71e1907d78b71fab36df30297b3ad.
* \| \| \| \| \| \|	elasticsearch: Add option specifying extra command line options	Rickard Nilsson	2014-06-24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	nixos: Add option hardware.sane.configDir	Rickard Nilsson	2014-06-24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	grsecurity: update stable/testing kernels, refactoring	Austin Seipp	2014-06-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This updates the new stable kernel to 3.14, and the new testing kernel to 3.15. This also removes the vserver kernel, since it's probably not nearly as used. Signed-off-by: Austin Seipp <aseipp@pobox.com>
* \| \| \| \| \| \|	accountsservice: be consistent in naming (always two 's')	Bjørn Forsman	2014-06-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The package is (correctly) named 'accountsservice' (with two 's'), but the attribute and expression path lacked one 's'. Fix it.
* \| \| \| \| \| \|	sane: environment.variables -> environment.sessionVariables	Cillian de Róiste	2014-06-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See 13befa3979d6ac98a96880fba9a3239bc333e644 for details
* \| \| \| \| \| \|	nagios: significant upgrades	Austin Seipp	2014-06-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Upgrade Nagios Core to 4.x - Expose mainConfigFile and cgiConfigFile in module for finer configuration control. - Upgrade Plugins to 2.x - Remove default objectDefs, which users probably want to customize. - Systemd-ify Nagios module and simplify directory structure - Upgrade Nagios package with more modern patch, and ensure the statedir is set to /var/lib/nagios Signed-off-by: Austin Seipp <aseipp@pobox.com>
* \| \| \| \| \| \|	Implement per-user socket units	Paul Colomiets	2014-06-20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Change size of Amazon EC2 S3-backed images to 8GB (was 4GB).	Rob Vermaas	2014-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 05543ef6e038a834aa323d467c9ef02ad99c5adb)
* \| \| \| \| \| \|	EC2: allow building S3-backed HVM ami's	Rob Vermaas	2014-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit e007559e9580c134f43ea9dc2279ff41cb3bd015)
* \| \| \| \| \| \|	nixos/shadow: Add an example for defaultUserShell.	aszlig	2014-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks to @devhell for the suggestion. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* \| \| \| \| \| \|	Merge pull request #2990 from third3ye/patch-3	Austin Seipp	2014-06-18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor logic fix
\| * \| \| \| \| \| \|	Minor logic fix	third3ye	2014-06-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	music_directory "${cfg.musicDirectory}" playlist_directory "${cfg.dataDir}/playlists" db_file "${cfg.dataDir}/tag_cache" state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" all refer to ${cfg.datadir}, which by default is "/var/lib/mpd/". Parsing for instance ${cfg.datadir}/playlists results in: /var/lib/mpd//playlists - NOT FOUND.