jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,424 Commits 266 Branches 122 Tags 5.3 GiB
c0727fb751
Commit Graph

1315 Commits

Author SHA1 Message Date
Arseniy Seroka
c0727fb751 Merge pull request #7788 from Lassulus/charybdis 
add charybdis nixos module
 2015-05-11 12:57:58 +03:00
lassulus
304cab2b46 add charybdis nixos module 2015-05-11 11:38:53 +02:00
Domen Kožar
bb4d658f64 Merge branch 'master' into staging 
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
 2015-05-11 10:05:23 +02:00
Charles Strahan
ba186ec4b9 mesos service: only pass --zk if quorum > 0 
The ZooKeeper URL is not necessary when using in-memory slave
registration.
 2015-05-10 19:36:20 -04:00
Charles Strahan
760169663e mesos: fix indentation in service definition 2015-05-10 17:23:33 -04:00
Jascha Geerds
19dbe42aeb Revert "cups: Rename "browsing" config option to "advertise"" 
This reverts commit 48e65cec4ecd6bef08233460cf5ffedb023cc7c6.
 2015-05-10 20:47:50 +02:00
Jascha Geerds
652d06207d cups: Rename "browsing" config option to "advertise" 2015-05-10 13:46:32 +02:00
Jascha Geerds
6f69dd46d7 cups: Add defaultShared, browsing and webInterace config option 2015-05-10 13:46:32 +02:00
Jascha Geerds
f4d9c9043c cups: Remove deprecated config options from cupsd.conf 2015-05-10 13:46:32 +02:00
Jascha Geerds
e9cf6cd34f cups: Use systemd files provided by CUPS 2015-05-10 13:46:32 +02:00
Jascha Geerds
48e65cec4e cups: Rename "browsing" config option to "advertise" 2015-05-10 12:41:21 +02:00
Jascha Geerds
2cc8d15653 cups: Add defaultShared, browsing and webInterace config option 2015-05-10 12:41:21 +02:00
Jascha Geerds
3710dbec05 cups: Remove deprecated config options from cupsd.conf 2015-05-10 12:41:20 +02:00
Jascha Geerds
4ac95ab328 cups: Use systemd files provided by CUPS 2015-05-10 12:41:20 +02:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Joachim Schiele
7aed6ddbb4 Merge pull request #7482 from qknight/mysql_socket_permissions 
/run/mysqld now 0755 (instead 0700)
 2015-05-07 01:55:00 +02:00
Joachim Schiele
db79335c07 mysql: /run/mysql now 0755 (instead 0700) 
see https://github.com/NixOS/nixpkgs/pull/7482
 2015-05-07 01:51:05 +02:00
Pascal Wittmann
40b9e938b6 postfix service: description enhancement 
closes #7651
 2015-05-06 21:53:39 +02:00
Stephen Weinberg
a6ebccfbb8 Sane default configuration for sabnzbd module 
Added option to set user. Use unpriviledged user by default. Add sane
default for configuration location.
 2015-05-05 00:18:22 -04:00
Aristid Breitkreuz
5ccbfb2dcc tarsnap: fix up permissions of existing cache directories 2015-05-04 18:58:35 +00:00
Thomas Tuegel
2325791c2b plasma53: patch upstream startkde 
Rather than shipping our own startkde script, we will go back to
patching upstream's script. This will be less confusing to potential
contributors.
 2015-05-03 17:09:50 -05:00
Domen Kožar
00ef77f426 Merge pull request #7565 from offlinehacker/nixos/confd/module 
nixos: add confd module
 2015-05-02 14:43:02 +02:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Charles Strahan
ba50d48400 mbpfan: service improvements 
* add verbosity setting
* don't set mbpfan as a setuid program
 2015-05-01 17:11:55 -04:00
Charles Strahan
d83399dcd9 mgpfan: new service 2015-04-30 21:21:15 -04:00
Bram Duvigneau
9a535b9023 Added BRLTTY package 2015-04-29 23:02:09 +02:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Arseniy Seroka
8150cf11b0 Merge pull request #7605 from ip1981/wiki 
Mediawiki updates
 2015-04-28 19:00:27 +03:00
Jaka Hudoklin
f5bc58d733 Merge pull request #7545 from offlinehacker/pkgs/kubernetes/fixes 
kubernetes: update to 0.15, module fixes
 2015-04-28 14:12:53 +02:00
Jaka Hudoklin
7b878a7ca9 Merge pull request #7555 from offlinehacker/nixos/nginx/reload 
nixos/nginx: enable service/config reload
 2015-04-28 14:12:21 +02:00
Jaka Hudoklin
ef6b88690d Merge pull request #7549 from offlinehacker/nixos/ripple-data-api/importmode 
nixos/ripple-data-api: add import mode option
 2015-04-28 14:10:50 +02:00
Igor Pashev
4855b0b3fb Mediawiki 1.23.9 2015-04-28 08:05:16 +00:00
Igor Pashev
bca76e46f0 Apache servedFiles: fixed a typo in example 2015-04-28 08:05:15 +00:00
Igor Pashev
8388bd3280 wiki: do not rewrite served files 2015-04-28 08:05:08 +00:00
Herwig Hochleitner
c600f5af25 gnome3: move definition of package sets into pkgs 2015-04-28 02:54:14 +02:00
Eelco Dolstra
534b84a9ac Don't require sslServerChain to be set 2015-04-27 18:24:16 +02:00
lethalman
9807dbc142 Merge pull request #7486 from oxij/actkbd-and-media-keys 
add actkbd; nixos: add support for volume control with media keys
 2015-04-27 12:31:15 +02:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Domen Kožar
ff12c3274a Merge pull request #7548 from offlinehacker/etcdfix 
nixos/etcd: fix enable type, so it could be enabled on multiple places
 2015-04-25 22:14:55 +02:00
Jaka Hudoklin
a9cd286cd0 Merge pull request #7546 from offlinehacker/nixos/panamax/reload 
nixos/fluentd: add support for config reload
 2015-04-25 16:29:34 +02:00
Jaka Hudoklin
ffea231652 Merge pull request #7550 from offlinehacker/nixos/rippled/changes 
nixos/rippled: new options, fixes
 2015-04-25 16:28:15 +02:00
Jaka Hudoklin
6ca12344b3 nixos: add confd module 2015-04-25 16:10:49 +02:00
Emery Hemingway
34f1c39fe0 nixos: fix cjdns json config 
filter extraneous attributes from config modules
 2015-04-25 09:40:44 -04:00
Jaka Hudoklin
fb8bc4da21 nixos/etcd: fix enable type, so it could be enabled on multiple places 2015-04-25 15:21:49 +02:00
Jaka Hudoklin
494d1820e3 nixos/nginx: enable service/config reload 2015-04-25 15:17:06 +02:00
Jaka Hudoklin
54ddf2176b nixos/rippled: new options, fixes 2015-04-25 14:39:24 +02:00
Jaka Hudoklin
5984c04f1f nixos/ripple-data-api: add import mode option 2015-04-25 14:38:05 +02:00
Jaka Hudoklin
f6bb49ad4a nixos/fluentd: add support for config reload 2015-04-25 14:21:27 +02:00
Jaka Hudoklin
6cb195a83d nixos/kubernetes: fix module 2015-04-25 14:18:25 +02:00
Luca Bruno
db3b86560f GNOME 3.16.1, closes #7357 2015-04-25 12:02:33 +02:00