jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,487 Commits 266 Branches 122 Tags 5.3 GiB
9d3fbcd054
Commit Graph

551 Commits

Author SHA1 Message Date
aszlig
9d3fbcd054
tomcat: Fix evaluation after e27dcff. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-03 16:09:45 +02:00
Sander van der Burg
2e44bb9ead Merge pull request #3425 from luke-clifton/lc-tomcat-jdk 
Allows the JDK to be chosen in services.tomcat
 2014-08-03 14:55:46 +02:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates 
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-08-02 05:08:07 +02:00
Shea Levy
7fec575976 Fix lib functions taken from pkgs.lib instead of lib in nixos 2014-08-01 16:23:56 -04:00
Luke Clifton
e27dcfff1b Allows the JDK to be chosen in services.tomcat 2014-08-01 16:52:19 +08:00
Danny Groenewegen
51494f2c33 Restore extraWorkersProperties option for apache httpd tomcat-connector, issue https://github.com/NixOS/nixpkgs/issues/2202 2014-07-31 16:51:51 +02:00
Rickard Nilsson
f5d0d8dbf1 elasticsearch: Fix error in NixOS module, systemd ExecStart path must be absolute. 2014-07-28 20:12:19 +02:00
Rickard Nilsson
212f476c97 Add NixOS module for Mopidy, a music player daemon 2014-07-28 19:52:32 +02:00
Jaka Hudoklin
cbb6948b4e Merge pull request #3369 from matejc/fixcpufreqmodule 
fix e18 cpufreq module: set setuid to freqset
 2014-07-26 14:24:23 +02:00
Evgeny Egorochkin
be2cec24ed RabbitMQ service: add properties essential for clusters 2014-07-26 14:33:53 +03:00
lethalman
de59b6d7cd Merge pull request #3262 from bjornfor/znc-module-types 
nixos/znc-service: don't use types.string (it's deprecated)
 2014-07-26 12:41:25 +02:00
Jaka Hudoklin
b035be7b44 Merge pull request #3292 from offlinehacker/elasticsearch_plugins 
elasticsearch: add support for plugins
 2014-07-26 02:23:46 +02:00
Bjørn Forsman
0a750e0f39 nixos/munin: change activationScript to preStart script 
All activation scripts run in serial upon boot and nixos-rebuild switch
etc., in contrast to preStart which run before a service starts, and can
run in parallel with other services.

The munin(-node) activation script is particularly slow. Change it to a
preStart script so that it can run in parallel with other services and
not slow down boot (or nixos-rebuild switch).

This reduces (repeated) "nixos-rebuild test" time from ~16 seconds to ~8
on my (old) laptop.
 2014-07-26 00:31:34 +02:00
Jaka Hudoklin
7eb4d306fb elasticsearch: add support for plugins 2014-07-25 17:28:59 +02:00
Eelco Dolstra
72af71d626 nix-ssh: Don't use a shell that refers to a store path 2014-07-25 14:29:08 +02:00
Eelco Dolstra
77dbe2f46e Add convenience option nix.sshServe.keys 
This is equivalent to setting
users.extraUsers.nix-cache.openssh.authorizedKeys.keys.
 2014-07-25 14:29:08 +02:00
Eelco Dolstra
3e9c2bf4b5 nix-ssh-serve.nix: Remove unnecessary check 
ForceCommand ensures that we always run nix-store --serve, so there is
no need to check SSH_ORIGINAL_COMMAND.
 2014-07-25 14:29:08 +02:00
Matej Cotman
5b97751a8f fix e18 cpufreq module: set setuid to freqset 2014-07-25 12:49:31 +02:00
Bjørn Forsman
162cb556f6 nixos/lighttpd: improve sub-service option types (cgit, gitweb) 2014-07-23 22:18:37 +02:00
Bjørn Forsman
35ebc72f1c nixos/lighttpd-service: don't use types.string (it's deprecated) 2014-07-23 22:12:38 +02:00
Vladimír Čunát
644c9eb6f7 Revert "Merge #3054: add kde 4.13.2" 
This is due to breaking evaluation; see the PR discussion.

This reverts commit 6a77d5fd3e3eef8c9eafb53f70a9448c25d2f517, reversing
changes made to 07a09fbe63192de7b62468d38f7ed8b7981062a4.

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
 2014-07-22 17:48:14 +02:00
Pascal Wittmann
261ecebfaf Merge pull request #3323 from wjlroe/logstash-1.4.2 
Logstash 1.4.2
 2014-07-21 20:02:11 +02:00
William Roe
8f31b13938 Fix service to use logstash new directory layout 2014-07-21 16:24:18 +01:00
Vladimír Čunát
9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Matej Cotman
1afb26fb17 e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
Vladimír Čunát
16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Peter Simons
75bbad8abe Merge pull request #3285 from ehmry/polipo 
Polipo
 2014-07-16 18:29:11 +02:00
Emery Hemingway
e5988bf4dd polipo: new service expression 2014-07-16 11:29:40 -04:00
Bjørn Forsman
a4cf5e903b nixos/redis: fix evaluation 
Commit 89fee1006c03d40052842b49f5cdbbeb755d081b ("nixos/redis: clean up
option types") broke nixos evaluation:

  error: attempt to call something which is not a function but a set, at .../nixpkgs/nixos/modules/services/databases/redis.nix:111:28

Fix it.

Reported by Oliver Charles (thanks!).
 2014-07-15 17:05:54 +02:00
Bjørn Forsman
89fee1006c nixos/redis: clean up option types 
Some options lack a type and some use the deprecated "string" type. Fix
it.
 2014-07-15 15:45:52 +02:00
Bjørn Forsman
3a4498ab07 nixos/znc-service: don't use types.string (it's deprecated) 
Apart from s/types.string/types.str/ (or types.lines where appropriate):

* port is changed from string to int.

* extraFlags is changed from types.string (with unfortunate merge
  semantics) into a list of strings. A list of strings merge better:
  one space is added between elements.
 2014-07-13 20:33:15 +02:00
Vladimír Čunát
5979d428b4 Merge recent master into x-updates 
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
 2014-07-09 22:13:29 +02:00
Marc Weber
672adc126e nixos: add 'firebird' group 
The firebird module complains without missing 'firebird' group, add it.
 2014-07-08 00:00:33 +02:00
Sönke Hahn
09448101c3 mediawiki: add patch for fixing postgresql errors 2014-07-07 23:19:31 +08:00
lethalman
789c9508c2 Merge pull request #2582 from chexxor/feature/add-znc-module 
Add ZNC module
 2014-07-06 11:23:08 +02:00
Igor Pashev
d4a320cd12 Updated Mediawiki to 1.23.1 2014-07-04 17:34:37 +02:00
Alex Berg
7b768ba2f5 Merge remote-tracking branch 'nixos/master' into feature/add-znc-module 
Conflicts:
	nixos/modules/misc/ids.nix
 2014-07-03 11:30:11 -05:00
Vladimír Čunát
aceb30cd93 Merge master into x-updates 
Adds the mass-rebuilding python update.
 2014-07-02 22:54:41 +02:00
Shea Levy
b3cfb9084b Get all lib functions from lib, not pkgs.lib, in modules 2014-07-02 12:28:18 -04:00
Vladimír Čunát
6a77d5fd3e Merge #3054: add kde 4.13.2 2014-06-30 21:26:49 +02:00
Michael Raskin
02266194ea Merge pull request #2894 from kirelagin/fixusergroup 
Fix conditional handling of users and groups in some services
 2014-06-30 10:16:20 +04:00
Michael Raskin
b403893aa2 Merge pull request #2778 from edwtjo/radicale 
Adding Radicale package and service
 2014-06-30 10:11:23 +04:00
aszlig
da32f052b1
Revert "nixos/sshd: drop mode from auth keys file". 
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>
 2014-06-27 09:22:07 +02:00
John Wiegley
8eedf968eb Merge pull request #3093 from lethalman/sshkeys 
nixos/sshd: drop mode from auth keys file. Closes #2559
 2014-06-26 10:26:47 -07:00
Luca Bruno
a3331eb87b nixos/sshd: drop mode from auth keys file. Closes #2559 2014-06-26 10:15:34 +02:00
Austin Seipp
13162e8cdb Fix gitolite docs 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-25 22:55:43 -05:00
Austin Seipp
3eb2d1e03e nixos: add gitolite module 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-25 22:54:18 -05:00
Alex Berg
9af1e2ab51 Add ZNC module. Has zncConfOptions or specify full conf file. 2014-06-26 05:44:32 +02:00
Bjørn Forsman
4def9a762f nixos: add some missing '.' in option descriptions 2014-06-24 21:25:11 +02:00
Bjørn Forsman
f78ce19d8c nixos/elasticsearch: capitalize systemd service description 2014-06-24 21:11:12 +02:00