Commit graph

1699 commits

Author SHA1 Message Date
Luca Bruno 0927405a37 fontconfig: update 2.10.2 -> 2.11.1. Close #4410, #2050 2014-10-23 10:40:26 +02:00
Vladimír Čunát 359dd3b8ac nixos: fix two pipefail problems
It failed since 3c6efec2c0, i.e. #4453.
Now it should "work" the same as before.
2014-10-19 19:29:28 +02:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Rickard Nilsson 135d677690 nixos/logrotate: Fix spelling mistake 2014-10-16 08:20:43 +02:00
Rickard Nilsson cdba59d0f2 nixos/syslog-ng: Add option configHeader 2014-10-16 08:14:45 +02:00
Rickard Nilsson 2ffe274486 nixos/logrotate: Specify type for config option 2014-10-15 16:52:50 +02:00
Mathnerd314 938f92e8b2 Fix the driver for qemu ("vesa" -> "modesetting")
Signed-off-by: Domen Kožar <domen@dev.si>
2014-10-15 12:24:50 +02:00
Domen Kožar bc015be0f3 fix eval 2014-10-15 12:00:20 +02:00
Lluís Batlle i Rossell f594033822 nixos nfs: allow setting the lockd ports.
This helps in setting a fixed firewall open port for NFS lockd.

Based on:
http://rlworkman.net/howtos/NFS_Firewall_HOWTO

(cherry picked from commit b32ca0616ff70795f71995fa79ea508b82f30b3a)

Conflicts:
	nixos/modules/services/network-filesystems/nfsd.nix
2014-10-15 10:59:33 +02:00
Joachim Schiele 13298fcbb9 Merge pull request #4535 from flosse/lua-bitop
lua-packages: added lua-bitop to add websocket support for prosody
2014-10-15 09:41:32 +02:00
Markus Kohlhase 5308d3284b prosody: added websocket support 2014-10-15 03:57:00 +02:00
Rickard Nilsson 54a0ac090c nixos/syslog-ng: Replace option serviceName with listenToJournal. Fix socket activation 2014-10-14 15:38:42 +02:00
Rob Vermaas 8523d0e44c Dohh
(cherry picked from commit b7451d91e8ecb70651fd2de81b2ec0faa8173aec)
2014-10-14 11:43:51 +02:00
Rob Vermaas 028807c3a0 amazon-image.nix: Pass --option build-users-group '' to nix tools to make Amazon generation work with nix-1.8+
(cherry picked from commit 654eaeb2ca709908b0e6fdcc8eabd3af6b3c0a5d)
2014-10-14 11:40:04 +02:00
Mateusz Kowalczyk b9c2fe5fd8 Merge pull request #4400 from matejc/seeksservice
seeks: update and write nixos module
2014-10-13 21:37:11 +01:00
Michael Raskin 2ef0a17561 Merge pull request #4387 from 1126/refactor-stumpwm
stumpwm: update and refactoring
2014-10-13 17:50:46 +04:00
Matej Cotman 561d3b3860 seeks: nixos module 2014-10-13 13:10:49 +02:00
Jaka Hudoklin dd0758ab6b Merge pull request #4392 from cstrahan/logstash
logstash service improvements
2014-10-12 23:02:52 +02:00
Joachim Schiele df95acd13c Merge pull request #3960 from flosse/prosody-service
Prosody service
2014-10-11 23:10:05 +02:00
Markus Kohlhase d86c2c30c5 prosody: packaged as a service
Conflicts:
	nixos/modules/misc/ids.nix
2014-10-11 18:53:43 +02:00
William A. Kennington III a5bed86fa4 zfs: zpool-import service must be wanted to start 2014-10-11 01:53:24 -07:00
Eelco Dolstra 058bf4ccc4 Create a udev rule for /dev/root
In the installation CD, this ensures that systemd will see a proper
udev node for /dev/root.

Fixes #4399.

Borrowed from

  http://lists.freedesktop.org/archives/systemd-devel/2014-July/020988.html
2014-10-10 17:18:04 +02:00
Eelco Dolstra a97e1ee52d Add a Hydra job to track the size of the initrd 2014-10-09 18:40:37 +02:00
Eelco Dolstra 5614b000ed Add some more stuff to the small channel
(cherry picked from commit 8cf528174465c195dc9807075ef889d91994f018)
2014-10-09 16:35:34 +02:00
Eelco Dolstra 93ff0d5496 Add an entire NixOS build to the channel
This causes some cruft to be uploaded (such as unit files) but it
ensures that every package used by the base system ends up in the
channel, not just environment.systemPackages.

(cherry picked from commit 4dfca8e14a5d1c2e62bb5ad267163a7a32ef872f)
2014-10-09 16:35:28 +02:00
Eelco Dolstra c7a1944ad9 Remove missing attribute
(cherry picked from commit f963f57b6230679c6194889a05fcb7741883af70)
2014-10-09 16:35:13 +02:00
Eelco Dolstra a0fd8e8066 Add a jobset for a "nixos-small" channel
This channel only builds a small subset of Nixpkgs, mostly suitable
for servers. Since the channel update doesn't require thousands of
packages to be built first, it should provide much faster turnaround
in case of security updates.

(cherry picked from commit 2c7acc6731ad4b05b1bbc3e632cdfcad4560ac22)
2014-10-09 16:34:50 +02:00
William A. Kennington III 362699376a nixos/network-interfaces: Bond interface configuration must wait for the bond device service
Also fixes some formatting and removal of slave devices.
2014-10-07 23:07:10 -07:00
Domen Kožar 4941b96f0c eval fix 2014-10-07 21:46:15 +02:00
Shea Levy 92837f2dbf Ditch efi installer tests
They've been broken forever due to weirdness in qemu tests, and they don't add much over installer tests
2014-10-07 12:20:56 -04:00
Domen Kožar b0b9e5d50c tests.bittorrent: use opentracker as bittorrent tracker 2014-10-07 17:22:42 +02:00
Domen Kožar 1992bd1331 Merge pull request #4409 from iElectric/redmine
Add Redmine package and NixOS Service
2014-10-07 13:41:46 +02:00
Shea Levy 3432414808 Merge branch 'nixos-cronfiles' of git://github.com/rickynils/nixpkgs
nixos: Add option services.cron.cronFiles
2014-10-07 05:59:03 -04:00
Domen Kožar b4a335cd59 nixos: add redmine service 2014-10-07 10:55:50 +02:00
Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Charles Strahan fc7098abf7 logstash service improvements
* add logstash-contrib plugins package
* add additional options to the logstash service
2014-10-05 21:53:05 -04:00
Bjørn Forsman fca51849ec nixos/lighttpd: add services.lighttpd.enableModules option
This option makes the coupling between lighttpd and its sub-services
more "loose".

While the option is a list, its purpose is to provide a "set" of needed
modules to load for lighttpd to function correctly with its config. The
NixOS lighttpd module ensures that lighttpd modules are loaded no more
than once (because lighttpd dislikes that), and in the correct order.

Also add an assertion that all modules listed in .enableModules are
valid.
2014-10-05 19:15:19 +02:00
Vladimír Čunát e4436ad841 FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf
Any reasonably new version of fontconfig does search that path by default,
and setting this globally causes problems, as 2.10 and 2.11 need
incompatible configs.

Tested: slim+xfce desktop, chrootenv-ed steam.
I have no idea why we were setting the global variable;
e.g., neither Fedora nor Ubuntu does that.
2014-10-05 17:05:27 +02:00
_1126 7536d41287 stumpwm: update and refactoring
This commit updates the stumpwm to version 0.9.8. Futhermore, it
refactors the expression quite a lot:

* stumpwm has been moved from lisp modules to window-managers.
* stumpwm has been added to the window managers NixOS knows about, this
  enables the user to add stumpwm as a default window manager in his
  NixOS configuration like with Xmonad or i3.
* the package has been split into stumpwm and stumpwmContrib. This is
  due to the fact that development of stumpwm and its extension modules
  has been split into two repositories. As of today, the release is the
  last one before this split. This split into two packages only reflect
  those upcoming upstream changes already.

It is planned to make the addition of the extension modules voluntarily,
like with Xmonads option "enableContribAndExtras". Furthermore it might
be possible to add an option to compile stumpwm with clisp instead of
sbcl.
2014-10-05 14:50:08 +02:00
William A. Kennington III f1572d37c3 network-interfaces: Bonding fixes 2014-10-04 18:37:00 -07:00
William A. Kennington III 93eb325004 network-interface: Add extra bond options 2014-10-04 17:59:10 -07:00
Eelco Dolstra 97220c973f Replace hasAttr/getAttr calls with the ? and . operators
For NixOS evaluation, this gives a ~21% reduction in the number of
values allocated and a ~4% speedup. It's also more readable.
2014-10-05 01:11:06 +02:00
Nathaniel Baxter 0c8ad65560 pulseaudio: Add support for 32bit alsa apps on 64bit systems. 2014-10-04 14:48:58 +02:00
Nathaniel Baxter ab8ef63ff4 alsa: Add multilib plugin support via "libs" entry in asound config.
alsa: Remove unused $ALSA_PLUGIN_DIRS support.
2014-10-04 14:48:58 +02:00
Austin Seipp 8cc3460a87 Merge pull request #4294 from daogames/tb/psql-port-fix
postgresql: use configured port when invoking psql
2014-10-01 18:56:39 -05:00
Rickard Nilsson 57721a2888 nixos: Add option services.cron.cronFiles
This allows you to configure extra files that should be appended to your
crontab. Implemented by writing to /etc/crontab when the cron service starts.
Would be nicer to use a cron that supports /etc/cron.d but that would require
us to patch vixie-cron.
2014-10-01 17:33:38 +02:00
Shea Levy f5aaefbb6c More pkgs.lib -> lib fixes 2014-09-29 09:45:59 -04:00
Eelco Dolstra 7f043ffbbe tests/kde4.nix: Don't build kdeedu
This prevents a dependency on liblapack (which randomly fails) and
TeXlive (which is huge).

http://hydra.nixos.org/build/14897240
(cherry picked from commit b9bde98161d09496421efbaafe5219cc84d05f5b)
2014-09-29 13:32:55 +02:00
Domen Kožar 63280c511e nixos: munin/jenkins: specify timeout correctly 2014-09-28 14:25:11 +02:00
Domen Kožar 1e05bbaa96 nixos: increase timeout for jenkins/munin systemd services 2014-09-27 23:28:49 +02:00