Commit graph

1961 commits

Author SHA1 Message Date
Bob van der Linden 455db168b3 nixos: iso-image: use syslinux bootloader for USB booting support
This changes the bootloader for iso generation from Grub to
syslinux. In addition this adds USB booting support, so that
"dd" can be used to burn the generated ISO to USB thumbdrives
instead of needing applications like UnetBootin.
2014-11-02 17:35:16 +01:00
lethalman 560fd3a5b7 Merge pull request #4742 from abbradar/bcache-stage1
Support bcache volumes in initrd
2014-11-02 17:29:38 +01:00
Nikolay Amiantov 775f381a9e stage-1: add bcache support
This adds necessary udev rule into initrd to support autodetecting
bcache partitions in stage-1. It also fixes 'sh' path for the new
rule to work.
2014-11-02 19:03:50 +03:00
Luca Bruno 5d2b3ff8cf nixos: increase allocated memory for gnome tests. Closes #4651 2014-11-02 16:33:10 +01:00
Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Luca Bruno 6bb278659f kde installer: enable networkmanager. Closes #3433 2014-11-02 15:23:22 +01:00
Mathijs Kwik f356cee747 sudo: allow adding extra configuration options to the bottom of sudoers
from sudoers (5):
When multiple entries match for a user, they are applied in order.
Where there are multiple matches, the last match is used (which is not necessarily the most specific match).
2014-11-02 13:27:05 +01:00
Peter Simons 415f41bf68 nixos/modules/services/monitoring/graphite.nix: strip trailing whitespace 2014-11-02 12:40:00 +01:00
Peter Simons 96a7e65c37 nixos/modules/services/monitoring/graphite.nix: don't create graphite user unconditionally
I'm not sure what exactly this user is needed for, i.e. under what circumstances
it must exist or not, but creating it unconditionally seems like the wrong thing
to do. I complained to @offlinehacker about this on Github, but got no response
for a week or so. I'm disabling the extraUsers bit to put out the fire, and now
hope that someone who actually knows about Graphite implements a proper solution
later.
2014-11-02 12:34:16 +01:00
Nikolay Amiantov 5423f62373 gitolite: add dataDir 2014-11-02 02:24:41 +03:00
lethalman f079cd1721 Merge pull request #4750 from abbradar/nix-maxcores
Add buildCores option to nix
2014-11-01 22:01:39 +01:00
Nikolay Amiantov e8dace201f nix-daemon: add maxCores option 2014-11-01 23:58:21 +03:00
William A. Kennington III ba53392bce nixos/nat: Fix override so that sysctls are properly preserved 2014-10-31 16:50:25 -07:00
Eelco Dolstra a9f5e77e2f update-users-groups.pl: Generate hashed passwords internally
I.e. don't call "passwd" to update /etc/shadow from the "password"
option. This has the side-effect of not updating the password if
mutableUsers = true (since the code path for "hashedPassword" has a
check for mutableUsers).

Fixes #4747.
2014-10-31 17:42:09 +01:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Peter Simons e18e77fbcd Merge pull request #4746 from abbradar/synaptics-fingers
Add "fingersMap" option to Synaptics
2014-10-31 11:06:58 +01:00
Nikolay Amiantov 118096fc0b synaptics: add fingersMap option 2014-10-31 12:45:54 +03:00
Nikolay Amiantov 0eb86647b3 synaptics: add types to options 2014-10-31 12:45:54 +03:00
Aristid Breitkreuz 93f2c180d0 rsnapshot: add git version & make it configurable in the nixos module 2014-10-27 20:38:39 +01:00
Kirill Elagin 0c6d49da7d xsession: Start the right pulseaudio binary
Fixes #4663.
2014-10-27 15:43:19 +03:00
Rickard Nilsson e2ada42623 syslog-ng: Update from 3.5.6 to 3.6.1
Also update the NixOS module, syslog-ng now automatically listens to
the systemd journal, so we don't have to set up syslog.socket.
2014-10-27 12:22:22 +01:00
Rob Vermaas 5a23232edf Refactor EC2 image generation script. Now uses same procedure for both hvm and pv-grub
images. Root disks are now SSD backed and 20GB by default, both on hvm and pv-grub
(previously was 8GB for HVM). Added new eu-central region to the locations to copy images
to. Also the root disk for HVM instances was not deleted on termination with previous
images, this is fixed as well.
2014-10-27 11:48:43 +01:00
Eelco Dolstra 63d7ad74e7 Add nodejs to the small channel
(cherry picked from commit d927ce03e4ad3d65f64eb2ddad970ec08f47fffc)
2014-10-27 10:40:49 +01:00
lethalman 40b5aa1d33 Merge pull request #4506 from cstrahan/logstash-config
logstash service: make log verbosity configurable.
2014-10-26 20:10:03 +01:00
William A. Kennington III 8636d93f54 Merge pull request #4213 from wkennington/master.zfsiso
[Dont Merge] nixos-iso: Add zfs / btrfs to supportedFilesystems
2014-10-25 18:01:17 -07:00
Aristid Breitkreuz dabdab8dce Merge pull request #4640 from lethalman/installer-icons
kde installer: Add gparted, nixos manual and konsole in the desktop
2014-10-25 16:32:56 +02:00
Eelco Dolstra f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Luca Bruno 9e1ab43459 gnome3: Add cantarell fonts. Closes #4633 2014-10-24 11:50:47 +02:00
Luca Bruno e553e27f48 kde installer: Add gparted, nixos manual and konsole in the desktop 2014-10-23 18:59:25 +02:00
Vladimír Čunát 2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Domen Kožar 3b133beb7a Merge pull request #4553 from ehmry/polipo
drop permission prestart from polipo service module
2014-10-23 12:51:36 +02:00
Peter Simons 5986bb2199 Merge pull request #4631 from robberer/tmp1
passwordFile: update description
2014-10-23 11:36:30 +02:00
Luca Bruno 0927405a37 fontconfig: update 2.10.2 -> 2.11.1. Close #4410, #2050 2014-10-23 10:40:26 +02:00
Longrin Wischnewski a2c65d447f passwordFile: update description 2014-10-23 04:52:50 +02:00
Thomas Tuegel da77d9f409 Merge pull request #4614 from geerds/kde4-plasma-nm
kde4: Use plasma-nm instead of knetworkmanager
2014-10-22 20:28:36 -05:00
Aristid Breitkreuz 608aeede89 Merge pull request #4597 from ehmry/cjdns
Cjdns
2014-10-22 20:49:20 +02:00
Ricardo M. Correia 10348a0f2c grsecurity: Update documentation to mention correct kernels 2014-10-22 16:50:36 +02:00
Domen Kožar 5858ac57a8 next release will be 14.11 2014-10-22 15:41:30 +02:00
Jascha Geerds 83ae3042a7 kde4: Use plasma-nm instead of knetworkmanager 2014-10-22 13:27:19 +02:00
aszlig 57aaf3d36e
Merge branch 'nixpart-1.0-preparations'.
Partially and temporarily addresses NixOS/nixops#228.

We now have an up-to-date version of Blivet and a bunch of its dependen-
cies as well as the old nixpart 0.4 with all its old and crappy
dependencies, which should fix _simple_ partitioning layouts for NixOps.

Also, nixpart 1.0 is now marked as broken, because it is not yet
released and this branch is more of a preparation and "damage control"
in case I shouldn't manage to finish nixpart + nixos-assimilate in time
for the next NixOS release.
2014-10-22 08:23:31 +02:00
aszlig 78ef5f9c14
nixpart: Move all 0.4 dependencies into one dir.
Once nixpart 1.0 is released we then only need to delete one single
directory rather than searching for needles in a haystack, that is, all
of <nixpkgs>. Also, it keeps my sanity at an almost healthy level.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:59 +02:00
aszlig 7676ff5973
nixpart: Bring back requirements for version 0.4.
Quite a mess but at least the mdraid tests succeed now. However, the
lvm2 tests are still failing, so we need to bring back a few more old
crap :-(

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig 9d2e514f46
nixos/tests/partition: Fix typo in F2FS tests.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig cff26e2d38
nixos: Add VM test for blivet.
I'm really not sure whether these tests are actually run upstream,
because there are quite a few oddities which either are my fault by just
missing something important or upstream really doesn't bother to run
those tests.

One example of this are testDiskChunk1 and testDiskChunk2, which create
two non-existing partitions and tries to allocate them. Now, in
allocatePartitions(), the partedPartition attributes are reset to None
and shortly afterwards a for loop is expecting it to be NOT None.

So, for now I'm disabling these tests and will see if we stumble on them
during work on nixpart 1.0, so we're really sure whether it's my fault
or a real bug in blivet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:58 +02:00
aszlig 23160383e3
nixos: Add a filesystem module for JFS.
I'm not using JFS, but this is to mainly make jfsutils available if you
have defined a JFS filesystem in your configuration.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:57 +02:00
aszlig cb2c34f1bb
blivet: Update to new upstream version 0.67.
Put a copy of old version 0.17 expression into 0.17.nix and update the
pointers from nixpart0 accordingly.

This also means, that plain nixpart is now way more broken than
nixpart0 (we might want to temporarily fix 0.4 anyway).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 08:22:57 +02:00
Emery Hemingway a3338abcfe cjdns: add peer hostnames to extraHosts, option for external config 2014-10-21 13:16:04 -04:00
Georges Dubus 50be0d5447 Removed the kde4_next nixos module
Merged its differences into kde4. This commit fixes #4519.
2014-10-21 14:04:28 +02:00
Domen Kožar 14631cec82 nixos: prosody was clashing with seeks unix ids 2014-10-20 17:22:01 +02:00
Jaka Hudoklin 594f354bc7 nixos/graphite: fix grahite api documentation url 2014-10-20 13:32:58 +02:00
Jaka Hudoklin 09c8d909fb nixos/graphite: update docs, add graphite pager 2014-10-20 13:27:21 +02:00
Eelco Dolstra a3b873924b Let the kernel load firmware directly
Loading firmware via udevd is obsolete. Fixes #4552.
2014-10-20 13:25:00 +02:00
Eelco Dolstra 4ecb762ee5 Add openjdk to the small channel 2014-10-20 08:39:58 +02:00
William A. Kennington III f020a26164 nixos/systemd: Also escape \ characters 2014-10-19 16:34:53 -07: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
Domen Kožar 2fa662c957 systemd: replace @ when generating unit command name 2014-10-19 17:20:37 +02:00
Domen Kožar 0854836fd2 systemd: include name of the unit when generating nix store path 2014-10-19 15:49:55 +02:00
Aristid Breitkreuz bda39ae4de remove unused parameter from nixos module that is causing trouble with nixops 1.2 2014-10-19 14:10:28 +02:00
Jaka Hudoklin 988ed87e70 nixos/neo4j: add package option 2014-10-18 13:18:37 +02:00
Franz Pletz 2c321bf296 Add support for global LXC config files 2014-10-18 05:02:39 +02:00
Emery Hemingway 32d6ae7ed9 drop permission prestart from polipo service module
chowning the cache directory can timeout the service, permissions
on this directory should never change without user intervention
2014-10-16 10:57:16 -04: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
William A. Kennington III 5118dcf4fb nixos-iso: Add zfs / btrfs to supportedFilesystems 2014-10-14 20:24:43 -07: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
Charles Strahan dc2fac7c0c logstash service: make log verbosity configurable. 2014-10-13 15:48:41 -04: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
Vladimír Čunát 4bcae6dc96 merge #4265: add KDE 4.14.1 2014-09-27 18:15:00 +02:00
Tino Breddin eb7bbb4862 postgresql: use configured port when invoking psql 2014-09-27 14:37:11 +02:00
Jaka Hudoklin ff8f23ab26 Merge pull request #4280 from wkennington/master.consul
nixos/consul: Add module
2014-09-27 07:00:39 +02:00
Attila Sztupak 90a326eecd crashplan: nixos module for backup service 2014-09-26 15:33:36 +01:00
William A. Kennington III 36f9b9c284 nixos/consul: Add module 2014-09-26 03:25:14 -07:00
Matej Cotman 5e18182a30 mailpile: add module 2014-09-26 10:49:09 +02:00
William A. Kennington III 9a90ce0bf7 nixos/ids: Add consul 2014-09-26 01:44:14 -07:00
William A. Kennington III d084245e74 iproute: Fix regressions introduced in 3.16.0
3.16.0 introduced a regression where vlan and veth devices could not be
created due to a check in the code for existing devices. This applies
the upstream patch which fixes the issue.

Additionally, this corrects the nixos network-interfaces task which now
needs to specify the name parameter when adding links.
2014-09-26 00:45:38 -07:00
Eelco Dolstra 1cd727180e Add all default NixOS packages to the channel
The job ‘dummy’ depends on the default contents of
‘environment.systemPackages’, thus ensuring that those packages all
end up in the channel.
2014-09-25 00:25:54 +02:00
Eelco Dolstra 0a967b9268 Installer test: Use the minimal ISO
So we don't depend on KDE etc. (which we don't even test here).
2014-09-25 00:07:35 +02:00
Eelco Dolstra 51c349d0cc test-driver: Use netpbm instead of imagemagick
Imagemagick pulls in 100s of megabytes of dependencies.
2014-09-25 00:07:30 +02:00
ambrop7@gmail.com bea503ec36 kde: Allow kde_next as a desktop environment
This is the same as
93fda9e353
2014-09-24 23:50:23 +02:00
Bjørn Forsman 9ce2cca6aa nixos: mark services.samba.defaultShare as obsolete
It was removed in 753d9d4e4f
("nixos/samba: remove services.samba.defaultShare option").
2014-09-24 23:07:04 +02:00
Franz Pletz 30690d05bc Add cryptodisk support for Grub
Closes #4193
2014-09-24 21:48:55 +01:00
Bjørn Forsman 3ebe3df4d0 nixos/samba: add services.samba.configText option
The .configText option is for providing verbatim content of smb.conf.

I'm adding this because I cannot seem to find any other way to override
(with mkForce) the generated smb.conf with the current samba module. All
attempts ends with errors ("duplicate entry samba/smb.conf").
2014-09-24 18:31:20 +02:00
Bjørn Forsman 753d9d4e4f nixos/samba: remove services.samba.defaultShare option
It's not that difficult to define shares using standard samba config
file syntax, so why do we need the semi-configurable .defaultShare
option?

Also:
 * It uses /home/smbd and I think /home should be reserved
   for real human users.
 * If enabled, it breaks the assumption that .extraConfig continues in
   the [global] section.

Without .defaultShare there is no need for the "smbguest" user and group
either, mark them as unused.
2014-09-24 18:31:20 +02:00
Eelco Dolstra 38d57b4a94 Merge pull request #4244 from abbradar/resume
Replace resumeDevice with autodetection of hibernation partition
2014-09-24 18:05:53 +02:00
Nikolay Amiantov ba31749458 stage-1: Use udevadm instead of blkid 2014-09-24 20:00:51 +04:00
Nikolay Amiantov 18bd9917ed stage-1: autodetect resume swap partitions 2014-09-24 18:51:44 +04:00
Emil Rangden c7b73b2b12 include thermald service in module list
Closes #4230
2014-09-23 22:41:24 +01:00
Emery Hemingway 61f0d9b251 cjdns: update from 20140919 20140922
package installs to .../bin
fix service module to look in .../bin

Closes #4240
2014-09-23 22:30:53 +01:00
William A. Kennington III 13ca3708b5 Fix #4236 2014-09-23 10:18:05 -07:00
Rickard Nilsson 5be23fe888 nixos/install-grub: Don't run GrubFs(/nix/store) if copyKernels is true 2014-09-23 14:34:44 +02:00
Luca Bruno 8ef7b83ca7 Fix nixos-rebuild evaluation 2014-09-23 14:01:25 +02:00
Mateusz Kowalczyk cd5f4e7f85 Merge pull request #4211 from ehmry/cpuminer-cryptonight
Cpuminer cryptonight
2014-09-22 19:26:35 +01:00
Emery Hemingway c8109488b3 cpuminer-cryptonight: new service module 2014-09-22 13:37:47 -04:00
Rickard Nilsson a59df1e567 nixos: Add also group.members to group 2014-09-22 19:18:08 +02:00
Eelco Dolstra a2971118ac scrubDrv: Don't scrub the system and meta attributes 2014-09-22 16:58:02 +02:00
Mateusz Kowalczyk 1ffe41b34f Merge branch 'dev/ati-drivers' of https://github.com/nathanielbaxter/nixpkgs 2014-09-22 01:27:00 +01:00
AndersonTorres 9c25f350a8 Ratpoison: updated for 1.4.8
Also, adding the infamous service file

Closes #4192
2014-09-21 20:05:12 +01:00
Mateusz Kowalczyk 7fedb1baa6 Try fixing #4084 2014-09-21 07:04:01 +01:00
Dmitry Malikov 08cc8da65a mpd service: add network.{host,port} options
Closes #4084
2014-09-21 01:43:06 +01:00
Ronny Esterluss 473ffd9eae extended gitolite service to take custom hooks
Closes #4160
2014-09-21 00:08:40 +01:00
AndersonTorres 90fcd66599 AfterStep (version 2.2.12): New Package
AfterStep is a beautiful window manager, inspired by NEXTStep interface

Closes #4177
2014-09-21 00:03:44 +01:00
AndersonTorres c6f28f988c Windowmaker: adding system service file, and a long description
Closes #4066
2014-09-20 23:36:07 +01:00
Domen Kožar 2247f3a8d3 Merge pull request #4168 from lostdj/ltp/master/btsyncfix
bittorrentsync: fix storage_path
2014-09-20 10:53:57 +02:00
lostdj f02d4ec9ed bittorrentsync: fix storage_path.
If this path is a symlink, btsync won't be able to read it if it's not ending with "/".
2014-09-19 18:19:04 +04:00
William A. Kennington III 8250059a9f nixos/tests/nat: Add tests for standalone and firewall based nat 2014-09-18 14:39:46 -07:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
William A. Kennington III b047f2ddec nixos/tests/nat: Modify test to accomodate for firewall consolidation 2014-09-18 11:28:58 -07:00
William A. Kennington III ae195727b7 nixos/nat: Don't flush tables, create subchains for autogenerated rules 2014-09-18 11:28:58 -07:00
Eelco Dolstra 0de982d75b httpd: Add option for specifying robots.txt 2014-09-18 19:05:26 +02:00
Eelco Dolstra 837a0c05e5 httpd: Don't emit robots.txt if there are no robots entries 2014-09-18 18:48:28 +02:00
Eelco Dolstra 9b66e1f7b1 Fix the manual jobs 2014-09-18 16:21:26 +02:00
Eelco Dolstra ec4f38c56f Manual: Remove some option defaults that refer to store paths
Option defaults should not refer to store paths, because they cause
the manual to be rebuilt gratuitously. It's especially bad to refer to
a highly variable path like a computed configuration file.
2014-09-18 16:21:26 +02:00
Eelco Dolstra 97a8e959b4 Remove some ISOs 2014-09-18 12:19:09 +02:00
Rickard Nilsson 8fc777ffd6 syslog-ng module: Add package option 2014-09-17 19:48:51 +02:00
Jaka Hudoklin 9c3c7a75d3 collectd: add pidFile option, change default pid to /var/run/collectd.pid 2014-09-17 19:21:05 +02:00
Eelco Dolstra e6b9656e24 Quick hack to reduce Hydra memory consumption 2014-09-17 19:13:01 +02:00
Jaka Hudoklin 1cdb6cfb00 nixos/graphite: add package option to graphiteApi 2014-09-17 18:33:51 +02:00
Jaka Hudoklin 75aaeca9d2 nixos/graphite: add seyren service, graphite alerting dashboard 2014-09-17 18:33:50 +02:00
Jaka Hudoklin c396ee9912 nixos: add collectd module 2014-09-17 18:33:50 +02:00
William A. Kennington III ec9c4143a7 nixos/firewall: Cleanup in case reload fails 2014-09-16 15:51:57 -07:00
lethalman 3224b32e64 Merge pull request #4101 from ts468/e19
Add package: Enlightenment E19!!!!
2014-09-16 16:13:56 +02:00
Rickard Nilsson 66bbbc205d nixos/nfs: Fix configuration merge 2014-09-16 13:53:18 +02:00
Jaka Hudoklin 9bd66b24d9 nixos/graphiteApi: add example config for influxdb backend 2014-09-16 10:41:56 +02:00
Jaka Hudoklin 996da030b6 nixos/mongodb: service fixes
- Log to syslog, so journal picks-up logs
- Start as foring service, so systemd will wait for service to start
- Add extraConfig option
2014-09-16 10:28:04 +02:00
Jaka Hudoklin 271e0f7488 nixos/graphite: add host and port options for graphiteApi 2014-09-16 10:28:04 +02:00
William A. Kennington III 1321fd175d nixos/nat: Leverage firewall module 2014-09-15 21:31:27 -07:00
William A. Kennington III 6a43d51291 nixos/firewall: Support extraStopCommands 2014-09-15 21:31:26 -07:00
William A. Kennington III 43c2bc0f8c Merge pull request #4108 from wkennington/master.firewall
Firewall: Don't allow traffic during nixos-switch / reload
2014-09-15 20:42:40 -07:00
William A. Kennington III fd7b9b4291 nixos/firewall: Don't allow traffic during reload 2014-09-15 20:40:16 -07:00
William A. Kennington III 4d193b7262 systemd: Support reload scripts 2014-09-15 20:04:49 -07:00
Thomas Strobel 1613d6cca6 Add package: Enlightenment E19!
Wayland desktop shell is not enabled, yet.
2014-09-15 23:34:28 +02:00
Bjørn Forsman 0bfd27535f nixos/libvirtd: refresh LXC emulator path on startup
This fixes the issue when the LXC emulator binary is garbage collected
and breaks libvirtd containers, because libvirtd XML file still refers
to GC'ed store path.

We already have a fix for QEMU, this commit extends the fix to cover LXC
too.
2014-09-15 23:03:20 +02:00
Michael Raskin d05684be21 Merge pull request #3694 from matejc/cmst
new package: cmst - qt gui for connman
2014-09-15 23:12:01 +04:00
Aristid Breitkreuz 69c95e3fdf Merge pull request #4041 from nbp/disable-fuppes
Disable fuppes module
2014-09-14 22:29:30 +02:00
Vladimír Čunát d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Jaka Hudoklin d6f9878fbf nixos/elasticsearch: wait for start 2014-09-13 02:21:31 +02:00
Jaka Hudoklin f7ba3d833f nixos/znc: fix module, createUser option does not exist anymore 2014-09-13 02:20:32 +02:00
Jaka Hudoklin 74122464da nixos/influxdb: wait for start 2014-09-13 02:19:39 +02:00
Jaka Hudoklin 26fd945151 nixos/rabbitmq: wait for start 2014-09-13 02:16:53 +02:00
Jaka Hudoklin a23e4997d3 Merge pull request #4034 from offlinehacker/graphiteApi
nixos: add graphite api to graphite functionality
2014-09-13 00:05:36 +00:00
Bjørn Forsman ec59929c9f nixos/jekins: add services.jenkins.extraGroups option
This makes it easy to give jenkins extra privileges by adding group
memberships. Use with care :-)
2014-09-12 15:25:15 +02:00
Matej Cotman 99a46a0eca set network manager as default true 2014-09-12 13:52:26 +02:00
William A. Kennington III bab5efd237 nixos/ssh: Allow user to configure the package that provides ssh/sshd 2014-09-11 22:07:39 -07:00
Nicolas B. Pierron ca02c60cb8 Disable fuppes module
fuppes has not been compiling for a long moment, and the ffmpeg version on
which it depends is no longer listed in nixpkgs.
2014-09-11 23:46:20 +02:00
Bjørn Forsman a44de69d06 nixos/tomcat: make package version configurable 2014-09-11 22:32:16 +02:00
aszlig d394d095ab
containers: Don't descend into mounts on destroy.
This tells the sad tale of @the-kenny who had bind-mounted his home
directory into a container. After doing `nixos-container destroy` he
discovered that his home directory went from "full of precious data" to
"no more data".

We want to avoid having similar sad tales in the future, so this now also
check this in the containers VM test.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-11 18:12:35 +02:00
aszlig 859f049d1b
containers: Remove check for var/lib/startup-done.
Fixes a leftover from 330fadb706.

We're using systemd dbus notifications now and this leftover caused the
startup notification to fail.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-11 18:12:35 +02:00
Jaka Hudoklin bc6b180d90 nixos/statsd: add support for external backends, fix a few options 2014-09-11 18:11:16 +02:00
Jaka Hudoklin 19ea435cf8 nixos: add graphite api to graphite functionality 2014-09-11 18:09:40 +02:00
Eelco Dolstra 32fa5ee2c5 Manual: Fix build product 2014-09-10 15:03:59 +02:00
Eelco Dolstra 05163e99db nixos-rebuild: Don't pass -K by default 2014-09-10 14:57:26 +02:00
Eelco Dolstra 624efa4224 Support users-groups.json referring to store paths
Fixes #4016.
2014-09-10 11:50:45 +02:00
Luca Bruno ac724e7bbc Added TORQUE package and nixos module
Resource management system for submitting and controlling
jobs on supercomputers, clusters, and grids

http://www.adaptivecomputing.com/products/open-source/torque
2014-09-09 18:24:46 +02:00
Bjørn Forsman e84b0c94f0 nixos/jekins: rename option services.jenkins.{extraOpts => extraOptions}
I noticed "extraOptions" is infinitely more used than "extraOpts" in
NixOS.
2014-09-09 17:40:53 +02:00
Bjørn Forsman cb614ef4ad nixos/jenkins: remove use of types.string (it's deprecated) 2014-09-09 17:36:25 +02:00
Bjørn Forsman cf7b782ea9 nixos/jenkins: add services.jenkins.extraOpts option
Allows passing extra command line arguments to Jenkins.
2014-09-09 17:36:25 +02:00
Michael Fellinger 33aaa7ac54 fix location of options.xml 2014-09-09 13:43:23 +02:00
Luca Bruno e4e39f26ba Change default from gnome 3.10 to gnome 3.12 2014-09-08 18:35:45 +02:00
Eelco Dolstra 68d88a75fc Merge pull request #3997 from bjornfor/nixos-test-report
nixos/test-reports: use local copy of jquery
2014-09-08 15:24:31 +02:00
Eelco Dolstra 1a9c27c092 Typo 2014-09-08 13:58:44 +02:00
Eelco Dolstra 152ae27aac Merge remote-tracking branch 'origin/systemd-216' into staging 2014-09-08 13:53:33 +02:00
Luca Bruno dfa6f03ea3 Do not assert absolute path for nodev grub device. Closes #3996 2014-09-08 12:00:34 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Nicolas Pierron becde6132b Replace environment.profileVariables by environment.profileRelativeEnvVars 2014-09-07 19:41:00 +02:00
Nicolas B. Pierron a4e60ebacf Merge pull request #3811 from nbp/options-json
Export the list of options to XML & JSON, such that external tools can use it.
2014-09-07 10:39:03 -07:00
Nicolas Pierron 79411db08b Export options.json & options.xml for building tools for NixOS. 2014-09-07 18:39:24 +02:00
Igor Pashev 5c6e4e7433 Updated Mediawiki to 1.23.3
Removed mediawiki-postgresql-fixes.patch (fixed upstream)
2014-09-07 17:50:51 +02:00
Bjørn Forsman 8e8f95beda nixos/test-reports: use local copy of jquery
The current way test reports get jquery,

  src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"

only works when getting reports over http:// or https://, not file://.
Change it so that it works for all protocols by using a local copy of
jquery.

This fixes the issue where locally created and browsed test reports
cannot be navigated properly; clicking the '+' symbol to expand
sub-sections doesn't work.
2014-09-07 15:47:59 +02:00
Domen Kožar 130e56cd42 nixos.tests.gnome3: wait 20sec for the screenshot 2014-09-07 14:51:10 +02:00
Nathaniel Baxter 5856fbc7d2 nixos-manual: Fix reference to obsolete configuration option 2014-09-07 11:58:06 +02:00
Nathaniel Baxter fb9a6221b6 ati_unfree: Update nixos-manual for AMD driver support 2014-09-07 12:42:32 +10:00
Nathaniel Baxter 45f4b8b3ad ati_unfree: Towards using ati unfree 32bit binary libs 2014-09-07 12:40:40 +10:00
Nathaniel Baxter c16874c4c0 ati_unfree: Create a nixos module for the ati_unfree x11 driver and
blacklist the radeon driver when ati_unfree is installed.
2014-09-07 12:40:32 +10:00
Rob Vermaas f14d1d76bb Azure: Fix authorized_keys 2014-09-06 22:54:15 +02:00
Rob Vermaas e9c1fb0c89 Azure: Mount metadata 'CD' on /metadata 2014-09-06 21:53:10 +02:00
Rob Vermaas 81046b9e5d Initial configuration + image generation script for Micro$oft Azure. Work in progress for #3986. 2014-09-06 21:37:46 +02:00
Domen Kožar 18d9904433 nixos-option: fixes as suggested by @nbp 2014-09-06 20:59:14 +02:00
Vladimír Čunát 06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Aristid Breitkreuz c3fe942a57 start dhcpcd after network-interfaces 2014-09-06 13:52:09 +02:00
Aristid Breitkreuz 958c1c68c2 Merge pull request #3977 from manveru/diod
diod: fix service
2014-09-06 12:31:00 +02:00
Thomas Tuegel 53fa517176 Merge pull request #3961 from wkennington/master.grub
nixos/install-grub: Read correct mountpoints
2014-09-05 20:01:08 -05:00
Eelco Dolstra 0dc8d73d17 Fix munin test evaluation 2014-09-06 00:54:40 +02:00
Bjørn Forsman db86b03b1c nixos/apcupsd: add systemd documentation hint
systemctl has the ability to display a list of documentation URLs in the
output of "systemctl status <service-name>".
2014-09-06 00:14:42 +02:00
Bjørn Forsman b7a889759d nixos/fail2ban: don't use types.string (it's deprecated)
I'm not really sure which one of types.lines or types.str that fit
better, but I'm going for types.lines because it behaves more like the
current type (i.e. have the ability to merge).
2014-09-05 22:56:30 +02:00
Domen Kožar b420eeba44 remove bittorrent package since it's obsolete 2014-09-05 22:49:31 +02:00
William A. Kennington III 6fb6ba48f8 nixos/installer-test: nixos-option syntax correction 2014-09-05 09:49:05 -07:00
William A. Kennington III e07e1c3fdf nixos/installer-test: Add writable store test 2014-09-05 09:48:58 -07:00
Luca Bruno 718106e958 Fix initrd after recent busybox upgrades 2014-09-05 18:42:53 +02:00
Eelco Dolstra 20be024d1b Fix subuid/subgid generation
I don't think we need to filter users with an unset uid, because
mkSubuidEntry/mkSubgidEntry don't references the uid.
2014-09-05 17:40:09 +02:00
Eelco Dolstra 59edfd61ad Increase systemd timeout on Jenkins and Munin tests
These were timing out a lot.

http://hydra.nixos.org/build/13991108
http://hydra.nixos.org/build/13991107
2014-09-05 15:50:55 +02:00
Eelco Dolstra da4fb08959 Disable the logstash test
It's broken because it uses the "grep" plugin, which is no longer
included in the standard distribution.
2014-09-05 15:28:55 +02:00
Eelco Dolstra b0855d59a1 Improve option descriptions a bit 2014-09-05 15:28:24 +02:00
Eelco Dolstra bb9ee6a13f Remove some setuid wrappers for non-standard programs 2014-09-05 14:46:36 +02:00
Eelco Dolstra cd7129a037 Revert "nixos: add setuid wrappers for some networked filesystems' helpers"
This reverts commit 26a4001a98. It
breaks the NFS test:

  http://hydra.nixos.org/build/13943148

Also, having more setuid programs is a bad thing security-wise.
2014-09-05 14:43:11 +02:00
Michael Fellinger 00887dc3f8 diod: fix service 2014-09-05 14:39:55 +02:00
Eelco Dolstra 1f7c775910 Remove unrar from the installation CD since it's unfree 2014-09-05 14:25:17 +02:00
Eelco Dolstra daebba2c97 Fix container test 2014-09-05 14:08:35 +02:00
Eelco Dolstra 002b067750 Merge pull request #3953 from lethalman/combined
release: don't build broken packages, don't build tested on unsupported systems
2014-09-05 10:46:42 +02:00
aszlig c9d1c0d8d1
nixos/tests: Add basic test for nsd module.
Currently only tests basic resource record lookup against IPv4 and IPv6.
Nothing special yet, but probably enough for most setups.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-05 02:54:39 +02:00
aszlig e8c4fde22d
nixos/nsd: Improve support for journald/systemd.
Don't fork into the background and just log to stderr.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-05 02:54:39 +02:00
aszlig 141cb70d5c
nixos/networking: Fix typo in ipv6prefixLength.
Within the module it's referenced with an uppercase "P" and ipv6Address
also begins with an uppercase "A" after the "6", so let's make it
consistent.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-05 02:54:39 +02:00
aszlig 6386df1645
nixos/nsd: Fix indentation/coding style.
For Nix, we indent using two spaces, but in this module somehow 4 spaces
were snuck in. Other than that, remoteControl and ratelimit are just
nested attribute sets, so we don't need to make another submodule type
for no particular reason.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-05 02:54:39 +02:00
Michael Fellinger d62e848cc9 virtualbox: vboxusers may use /dev/vboxnetctl 2014-09-04 22:44:38 +02:00
William A. Kennington III c6bd6d6d89 nixos/grub: Assert devices should be absolute paths 2014-09-04 10:31:39 -07:00
William A. Kennington III f73f7ccc6e nixos/install-grub: Read correct mountpoints 2014-09-04 10:31:39 -07:00
Michael Raskin a3b9bf6c87 Merge pull request #3653 from iyzsong/nixos/xfce4-mixer
nixos: don't set variables for gstreamer-0.10 (fix #3652)
2014-09-04 20:54:57 +04:00