Nikolay Amiantov
f35568e705
Merge pull request #5277 from abbradar/uwsgi
...
Add uWSGI application server
2015-02-05 17:10:37 +03:00
Edward Tjörnhammar
83925c33f6
i2pd: 0.6.0 -> 0.7.0
...
nixos: i2pd.service, fix string escaping
2015-02-05 12:09:59 +01:00
William A. Kennington III
9ddb6c9cc9
nixos/tinc: Add daemon configuration
2015-02-04 18:19:04 -08:00
William A. Kennington III
bae5faa82d
nixos/dhcpd: Also try restarting openntpd as it suffers the same dns resolution problem
2015-02-04 17:33:14 -08:00
William A. Kennington III
43d8b1ef3c
openntpd: Fixes
2015-02-04 17:30:22 -08:00
William A. Kennington III
a9f1329d2d
nixos/openntpd: Add openntpd to the environment for ntpctl
2015-02-04 17:27:03 -08:00
Nikolay Amiantov
b22a1ff683
Merge pull request #4485 from abbradar/parsoid
...
Add "parsoid" service
2015-02-04 23:08:28 +03:00
Lukas Lihotzki
c848d05de9
gitlab: Fix typo
2015-02-03 22:08:10 +01:00
lethalman
49b67bb9cb
Merge pull request #6078 from boothead/sabnzbd
...
sabnzbd Change service to systemd
2015-02-03 13:32:59 +01:00
Peter Simons
b7ecd5e729
Merge pull request #5025 from abbradar/xmonad-wrapper
...
nixos/xmonad: make a wrapper
2015-02-03 11:52:09 +01:00
Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Nikolay Amiantov
b7bb524f04
nixos/xmonad: move to haskell-ng and make a wrapper
2015-02-03 01:05:23 +03:00
Nikolay Amiantov
51681449da
uwsgi: add nixos module
2015-02-02 22:23:42 +03:00
Nikolay Amiantov
9a04482af7
parsoid: add service
2015-02-02 22:21:45 +03:00
Thomas Tuegel
0fee7a2b21
fontconfig: stringify dpi correctly
2015-02-01 16:18:48 -06:00
Bjørn Forsman
ee52a61e3a
nixos/tftpd: add option types and fixup descriptions
...
The first description is a (incorrect) copy/paste from the 'vsftpd'
module, and the second option lacks a 'dot' at the end.
2015-02-01 15:57:28 +01:00
lethalman
9576ff49d8
Merge pull request #5737 from matthiasbeyer/add-gitolite_admin_pubkey_oneline_note
...
Add note that admin-pub-key for gitolite has to be written in one line
2015-01-30 11:24:06 +01:00
lethalman
41cca7d2d6
Merge pull request #6045 from ragnard/apache-kafka
...
apache-kafka: New package and service
2015-01-30 10:50:14 +01:00
Shea Levy
52d4b9d982
Merge branch 'tlsdate' of git://github.com/4z3/nixpkgs
2015-01-30 01:07:59 -05:00
Ragnar Dahlén
17bd96ea25
apache-kafka: New service for Apache Kafka
2015-01-29 11:10:22 +00:00
Tobias Geerinckx-Rice
ff5eae075a
Add freefall NixOS service module
2015-01-28 15:59:21 +01:00
Eelco Dolstra
b61d4ac6a5
ntpd: Fork into the background
...
With -n, ntpd will write log messages to both syslog and stderr, which
is ugly.
2015-01-28 15:34:42 +01:00
Thomas Tuegel
63ec1a9677
add stable attrs for plasma5, kf5, and kdeApps
2015-01-26 21:01:07 -06:00
Thomas Tuegel
a55543711e
kde5: simplify package list
2015-01-26 21:01:06 -06:00
Thomas Tuegel
3a97ea592f
kdm: install default backgrounds
2015-01-26 21:01:06 -06:00
Thomas Tuegel
726b80bc87
startkde: don't split script between NixOS module and package
2015-01-26 21:01:06 -06:00
Thomas Tuegel
e7508b831f
kde5: warn if enabled with kde4
2015-01-26 21:01:05 -06:00
Thomas Tuegel
16b54d19d3
kde5: rename plasma5 desktop module
2015-01-26 21:01:05 -06:00
Thomas Tuegel
5c52354ee8
add NixOS module for Plasma desktop
2015-01-26 21:00:38 -06:00
Domen Kožar
9df1bdefef
Merge pull request #5982 from robberer/pkgs/openldap
...
openldap: add dataDir, use cfg.user and cfg.group to run slapd
2015-01-26 10:33:57 +01:00
Domen Kožar
c1ce67561d
openldap: correct directory hint
2015-01-26 10:03:25 +01:00
Longrin Wischnewski
a4af32eec3
openldap: add dataDir, use cfg.user and cfg.group to run slapd
2015-01-26 09:35:56 +01:00
aszlig
d110f5adf7
nixos/gitlab: Fix evaluation.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-26 08:20:14 +01:00
Jaka Hudoklin
6e7d708bcc
nixos/rabbitmq: fix module
2015-01-26 02:09:04 +01:00
Charles Strahan
6eaa419920
gitlab: fix evaluation
2015-01-25 16:28:18 -05:00
Domen Kožar
2daba83828
openldap: add example config
2015-01-25 21:15:29 +01:00
Edward Tjörnhammar
6bbec634a7
Merge pull request #5850 from edwtjo/kodi-plugins
...
XBMC to Kodi migrations
2015-01-24 14:17:14 +01:00
Domen Kožar
fde45d217e
Merge pull request #5531 from abbradar/tlp
...
tlp: add package
2015-01-24 07:10:48 +01:00
Nikolay Amiantov
b7b3a0972d
nixos/tlp: add service
2015-01-24 02:56:21 +03:00
Eelco Dolstra
11a0344e13
Merge pull request #5918 from robberer/openntpd
...
openntpd: add extraConfig and extraOptions
2015-01-23 16:43:15 +01:00
Longrin Wischnewski
4fa5d1f626
openntpd: add extraConfig and extraOptions
2015-01-23 16:15:20 +01:00
aszlig
127c928c23
nixos/rename: Fix merging multiple destinations.
...
The renaming of options define the original value for the new attribute
path. This works well if there is only *one* target, but if there are
more, we end up recursing into the attribute set of the option
definition itself.
We now check for that within the parent recursion node (we can't check
that from the subnode, because we lack that information about whether
it's defined multiple times) and if the subnode consist entirely of a
list of definitions, we use mkMerge on it.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-22 14:08:28 +01:00
Charles Strahan
8d49e87dec
Merge pull request #4677 from cstrahan/pleasant-ruby
...
Pleasant ruby
2015-01-21 23:27:38 -05:00
Matej Cotman
3ed3977166
owncloud: make .htaccess available
2015-01-21 22:49:22 +01:00
Matej Cotman
7494bd389e
apache-httpd: add owncloud
2015-01-21 22:49:22 +01:00
Matej Cotman
6630e3e4fe
apache-httpd: add restartSec option
2015-01-21 22:49:22 +01:00
tv
3fdd925063
nixos: Add tlsdated service
2015-01-21 05:09:47 +01:00
Charles Strahan
dfc225d143
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/git-and-tools/default.nix
pkgs/applications/version-management/git-and-tools/hub/default.nix
pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Joachim Fasting
7023e03d77
firewall service: fix pingLimit example value
...
The example uses single dashes, whereas iptables requires double dashes.
2015-01-20 08:47:11 +01:00
Edward Tjörnhammar
5b1c9417a8
Add Kodi desktop-manager
2015-01-19 22:14:36 +01:00
