Commit Graph

1762 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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