jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,446 Commits 266 Branches 122 Tags 5.3 GiB
6c7793713d
Commit Graph

1762 Commits

Author SHA1 Message Date
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
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
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 26a4001a98322ab903b8186b97f33c5b282828a5. 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
Michael Raskin
1a0d437bf3 Merge pull request #3944 from joshcartwright/gummiboot-timeout-fix 
gummiboot/builder: fix timeout setting when unset
 2014-09-04 20:17:44 +04:00
Luca Bruno
2ba523df24 nixos nat: add description to forwardPorts 2014-09-04 11:33:08 +02:00
Luca Bruno
e6ab680cbf nixos nat: add type for sourcePort and destination of forwardPorts 2014-09-04 10:26:33 +02:00
William A. Kennington III
2de0cf2549 nixos/utils: Don't remove first character if not a / 2014-09-03 18:40:05 -07:00
Luca Bruno
a1ded5c20e nixos-install: use absolute path when running passwd in chroot 2014-09-03 23:12:40 +02:00
Luca Bruno
59ad713288 nixos-install: set umask 0022 2014-09-03 23:12:40 +02:00
Domen Kožar
2e97c06999 nixos-option: enable all flags by default and make output a bit readable cc @nbp 2014-09-03 22:08:25 +02:00
Jaka Hudoklin
43d9f92c82 nixos: docker, create docker group 2014-09-03 21:23:30 +02:00
Michael Raskin
4155121069 Merge pull request #3926 from lethalman/fwdports 
nixos/nat: add forwardPorts for external->internal DNAT
 2014-09-03 21:54:37 +04:00
Nathan Bijnens
00ad134284 Mesos: services 2014-09-03 19:21:49 +02:00
Michael Raskin
ab023cc559 Merge pull request #3843 from wkennington/master.iffix 
nixos/network-interfaces: Sanitize sys-subsystem device names
 2014-09-03 21:15:46 +04:00
Eelco Dolstra
65ef435d7b Merge pull request #3949 from wkennington/master.grub 
grub2: Add localizations
 2014-09-03 19:06:26 +02:00
William A. Kennington III
eee8fd89b3 nixos/install-grub: Correct store path for search 2014-09-03 10:01:00 -07:00
William A. Kennington III
1b63a1b75e nixos/iso-image: Fix grub-mkimage requiring a prefix 2014-09-03 09:26:44 -07:00
Michael Raskin
3e841ef642 Fixing comment case 2014-09-03 20:03:15 +04:00
Eelco Dolstra
46623bfc15 Remove copy-com.nix from the module list 
This is proprietary software, and NixOS is intended as a free software
distribution. We currently don't have a mechanism like allowUnfree for
NixOS modules, so it's better to leave out modules for such
packages. Of couse, they can still be activated by doing:

  imports = [ <nixpkgs/nixos/services/networking/copy-com.nix ];
 2014-09-03 17:09:00 +02:00
Michael Raskin
c4d85240e5 Merge pull request #3267 from Mathnerd314/cpufreq_noise 
Remove non-cpufreq_* modules since they are loaded by udev
 2014-09-03 18:46:01 +04:00
Michael Raskin
94a131b95a Fix forgotten unit entry 2014-09-03 15:47:53 +04:00
Strahinja Popovic
fe3f7716f0 Enabled access to binaries of needed tools, and worker daemons can be enabled for phabricator #3306 2014-09-03 15:46:59 +04:00
Rickard Nilsson
66ee6e03e7 pulseaudio: Use group audio instead of pulse-access 2014-09-03 13:24:47 +02:00
Luca Bruno
e5b7b97a67 nixos tested: only build on supportedSystems 2014-09-03 12:51:10 +02:00
Sergey Mironov
2b72edad9b yandex-disk: fix the url; introduce systemd.service #2228 2014-09-03 12:36:29 +04:00
Rickard Nilsson
56102642fa pulseaudio: Add pulse-access group, controlling access to the system-wide PA daemon 2014-09-03 10:25:36 +02:00
Cray Elliott
4efc03f46f Delete nixos/modules/module-list.nix.orig, extraneous file 2014-09-03 01:20:56 -07:00
Michael Raskin
d1ae15b680 Merge pull request #3804 from ehmry/unbound 
unbound: run in chroot
 2014-09-03 11:45:20 +04:00
Michael Raskin
7a47d21aec Merge pull request #3943 from wkennington/master.grub 
Fix grub zfs build and typo
 2014-09-03 11:39:35 +04:00
William A. Kennington III
d48a7a17df nixos/network-interfaces: Sanitize sys-subsystem device names 
Currently, nixos will allow for interface names with special characters
such as the hyphen to be used. This presents a problem when using
systemd device names as the namespace paths are separated using hyphens.
Within systemd, if a device name has a hyphen it should be replaced with
the escape sequence \x2d.

This patch sanitizes all interface names before they are used in a
systemd device string.
 2014-09-03 00:31:38 -07:00
Michael Raskin
c3e7588367 Merge pull request #3747 from wkennington/master.explicit 
nixos/network-interfaces: Allow explicit virtual interface type setting
 2014-09-03 11:25:28 +04:00
Nathan Bijnens
33a3f76ee4 Copy.com: client #3617 2014-09-03 11:31:51 +04:00
Michael Raskin
8e968b18e4 Merge pull request #2952 from edwtjo/cups-syswide-clientconf 
CUPS system wide client side remote printing.
 2014-09-03 10:51:49 +04:00
Michael Raskin
a82c623c26 Merge pull request #3940 from wkennington/master.dnsmasq 
nixos/dnsmasq: Fix regressions during the systemd update
 2014-09-03 10:06:26 +04:00
Josh Cartwright
626a666da5 gummiboot/builder: fix timeout setting when unset 
The gummiboot-builder.py script is expecting the @timeout@ metavar to be
substituted for either an empty string (in the case where a user has
left the timeout unset) or the actual value set in the system
configuration.

However, the config.boot.loader.gummiboot.timeout option defaults to
'null', and due to the way pkgs.substituteAll works, the substitution
for '@timeout@' is _never_ set to the empty string.  This causes the
builder script to put a bogus line into /boot/loader/loader.conf:

   timeout @timeout@

Fix this by explicitly setting 'timeout' to the empty string when it's
unset in the system configuration.

Signed-off-by: Josh Cartwright <joshc@eso.teric.us>
 2014-09-03 05:36:45 +02:00
William A. Kennington III
ccc758f414 nixos/install-grub: Fix typo 2014-09-02 18:56:53 -07:00
Michael Fellinger
e805c78ed3 diod: remove redundant default doc 2014-09-03 02:55:00 +02:00
Michael Fellinger
0bf05a02f4 diod: add systemd service and config 2014-09-03 02:30:04 +02:00
William A. Kennington III
9659d0f4fb nixos/dnsmasq: Fix regressions during the systemd update 2014-09-02 17:23:55 -07:00
William A. Kennington III
961e9867b3 nixos/generate-config: Only add store search path when kernels are not copied 2014-09-02 09:16:13 -07:00
William A. Kennington III
9467937639 nixos/install-grub: Only check for /nix to be the mountPoint for the store 2014-09-02 09:16:13 -07:00
William A. Kennington III
61908bdd80 nixos/install-grub: Always copy kernels for different devices 2014-09-02 09:16:13 -07:00
William A. Kennington III
4eff4afa3c nixos/installer-test: Use nested subvolumes for root to test detection 2014-09-02 09:16:13 -07:00
William A. Kennington III
87b6232f3a nixos/generate-config: Don't interpret btrfs subvols as bind mounts 2014-09-02 09:16:13 -07:00
William A. Kennington III
3944239362 nixos/tests-installer: Add a test for btrfs default volumes and bind mounts 2014-09-02 09:16:13 -07:00
William A. Kennington III
01ab1d57a3 nixos/install-grub: Detect nested btrfs subvolumes 2014-09-02 09:16:13 -07:00
William A. Kennington III
7fae423522 nixos/generate-config: Support detecting nested subvolumes 2014-09-02 09:16:13 -07:00
William A. Kennington III
0b66483c9a nixos/install-grub: Store path should be /nix/store not /nix 2014-09-02 09:16:13 -07:00
William A. Kennington III
36614ff3e2 Revert "Revert "Merge pull request #2449 from wkennington/master.grub"" 
This reverts commit 94205f5f21c4d9942bb4205c06229438051b6853.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
 2014-09-02 09:16:13 -07:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
 2014-09-02 12:31:03 +02:00
lethalman
a3e91bbfa3 Merge pull request #3901 from vlstill/ssh_ip 
Allow binding sshd to specified addresses.
 2014-09-02 10:38:16 +02:00
Vladimir Still
13bbce96c3 sshd: Fix typo in assetion. 2014-09-02 10:06:04 +02:00
Michael Raskin
3ad91106f1 Merge pull request #3704 from sfultong/upstream-master 
tomcat: update to upstream master
 2014-09-02 02:09:18 +04:00
Michael Raskin
fa55a99701 Load EHCI befor OHCI and UHCI; from patch by Mathnerd314 2014-09-02 02:12:46 +04:00
Chris Farmiloe
08534000a4 Ensure libvirtd is started after vswitch and add ability to configure how libvirtd guests are shutdown 2014-09-02 01:48:50 +04:00
Chris Farmiloe
76a4de68c1 formatting/retab 2014-09-02 01:48:50 +04:00
Chris Farmiloe
8ef11bb0ee add openvswitch package + basic nixos module to enable it 2014-09-02 01:48:50 +04:00
Michael Raskin
2a1a814e53 Make console-getty only used inside container by default 2014-09-02 01:36:10 +04:00
Michael Raskin
d140851472 Merge pull request #3779 from offlinehacker/docker 
full nixos inside docker
 2014-09-02 01:04:05 +04:00
Michael Raskin
419031bcfc Merge pull request #2644 from lethalman/pam_tally 
pam: Add logFailures option for adding pam_tally to su
 2014-09-02 00:58:30 +04:00
Vladimir Still
a2394f09c7 sshd: Add note about listening on port 22 to listenAddresses. 2014-09-01 22:56:35 +02:00
Vladimir Still
ac39d839c3 sshd: Add note about firewall and listenAddresses. 2014-09-01 22:56:35 +02:00
Vladimir Still
e12337156c sshd: Allow to specify ListenAddress. 2014-09-01 22:56:35 +02:00
Michael Raskin
5bbeba3d97 Merge pull request #3911 from vlstill/nfs-port_pullreq 
nfsd: Make it possible to fix rpc.{mountd,statd,lockd} ports.
 2014-09-02 00:53:52 +04:00
Michael Raskin
a6dfb4dc28 Merge pull request #3241 from ehmry/cjdns 
cjdns declarative configuration
 2014-09-02 00:53:18 +04:00
Michael Raskin
8c167b22a5 Merge pull request #3918 from robberer/pkgs/clamav 
clamav: update to version 0.98.4 and run freshclam in daemon mode
 2014-09-02 00:46:25 +04:00
Luca Bruno
b21ac60290 nixos/nat: add forwardPorts for external->internal DNAT 2014-09-01 22:31:56 +02:00
Luca Bruno
31b7cae018 nixos/znc: fix immutable config. 
Fix references to coreutils echo and rm.
Make config writable even if immutable because of
https://github.com/znc/znc/blob/master/src/znc.cpp#L964 .
 2014-09-01 16:21:12 +02:00
aszlig
29f4642284
nixos: Add new service for OpenNTPd. 
This conflicts with the existing reference NTP daemon, so we're using
services.ntp.enable = mkForce false here to make sure both services
aren't enabled in par.

I was already trying to merge the module with services.ntp, but it would
have been quite a mess with a bunch of conditions on the package name.
They both have a bit in common if it comes to the configuration files,
but differ in handling of the state dir (for example, OpenNTPd doesn't
allow it to be owned by anything other than root).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-09-01 16:07:28 +02:00
William A. Kennington III
3e834e1783 nixos/tests: Fix usage of head function without pkgs.lib 2014-09-01 04:39:45 -07:00
Longrin Wischnewski
28fd7ea190 clamav: run freshclam in daemon mode 2014-09-01 09:41:19 +02:00
Emery Hemingway
f5b4eacad6 uhub: initial service expression 2014-09-01 10:53:19 +04:00
Michael Raskin
a49caa77e7 Add IDs for uhub service 2014-09-01 10:53:19 +04:00
Michael Raskin
9e3d1b1a8f Merge pull request #3908 from wkennington/master.ip 
Reapply the multi-ip code
 2014-09-01 10:28:54 +04:00
Jan Malakhovski
26a4001a98 nixos: add setuid wrappers for some networked filesystems' helpers 
So that `user` mount option would work allowing normal users to mount
and umount stuff marked with it in `fileSystems.<name>.options`.
 2014-09-01 10:33:48 +04:00
Jan Malakhovski
8c9b6d932a nixos: add dhcpcd.persistent option 2014-09-01 10:33:48 +04:00
Jan Malakhovski
99243a5c51 nixos: add atftpd service 2014-09-01 10:33:48 +04:00
Jan Malakhovski
8f50d803ef nixos: add support for mkhomedir in PAM 2014-09-01 10:33:48 +04:00
Emery Hemingway
f60ac82cac cjdns: new declarative service expression 
systemd service wants network-interfaces.target rather than network.target
assertion on config.networking.enableIPv6
 2014-08-31 18:14:16 -04:00
Vladimir Still
a735c308b6 nfsd: Make it possible to fix rpc.{mountd,statd,lockd} ports. 2014-08-31 22:00:16 +02:00
Vladimir Still
5588ad472b vpnc: Fix building of system config. 2014-08-31 21:39:03 +02:00
Sam Griffin
ec8e4d23f1 cleanup per Lethalman's suggestions 2014-08-31 13:01:20 -04:00
William A. Kennington III
02ecc98e87 nixos/network-interfaces: Fix bug in converting old ipAddresses 2014-08-31 09:47:18 -07:00
William A. Kennington III
9a697d775a Revert "Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c"" 
This reverts commit 2f697bf6931b24cdd428e22effbf6427a85afd42.
 2014-08-31 09:46:26 -07:00
William A. Kennington III
3d037ebb94 Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6"" 
This reverts commit ea8910652fcecbcd4f21aa1c66b1a0a239408b04.
 2014-08-31 09:46:16 -07:00
Sam Griffin
0667d67c95 Adding vpnc configuration module 2014-08-31 12:44:13 -04:00
Longrin Wischnewski
196c6260be grub: fix grub merge error 2014-08-31 12:29:13 +02:00
Rob Vermaas
ea8910652f Revert "Merge pull request #3182 from wkennington/master.ipv6" 
This reverts commit b23fd6585481a42937e105d5fce630a549900e86, reversing
changes made to 43654cba2c280ce17b81db44993d1c1bcae3a9c6.
 2014-08-31 10:58:54 +02:00
Rob Vermaas
2f697bf693 Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c" 
This reverts commit 704e91bab005eabe968a3b140222fb0cf7afd4db.
 2014-08-31 10:58:50 +02:00
Michael Raskin
94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub" 
This reverts commit 469f22d717e53c48d13a66ca862942e8098accc5, reversing
changes made to 0078bc5d8f87512104902eab00c8a44bef286067.

Conflicts:
	nixos/modules/installer/tools/nixos-generate-config.pl
	nixos/modules/system/boot/loader/grub/install-grub.pl
	nixos/release.nix
	nixos/tests/installer.nix

I tried to keep apparently-safe code in conflicts.
 2014-08-31 12:58:37 +04:00
Suvash Thapaliya
9073a30cee Add extraConfig option for SLiM 
so that various configuration options can be set without having to
expose every single configurable parameter
 2014-08-31 03:21:37 +02:00
Rickard Nilsson
704e91bab0 Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c 2014-08-30 19:54:37 +02:00
Nicolas B. Pierron
a5d6219897 Merge pull request #3864 from nbp/useless-submodules 
Remove useless use of undocumented submodules.
 2014-08-30 18:21:17 +02:00
William A. Kennington III
ef92afe0da nixos/network-interfaces: Fix vlan device coming up during switch 2014-08-30 08:20:14 -07:00
William A. Kennington III
ed6040fc8d nixos/network-interface: Append -netdev for all device units 
Currently, device units are named directly after the name the user
specifies for the device. A bridge device named lan will be defined
within lan.service. This becomes a problem if you want your interface
named nginx but also want to run the nginx service.

This patch fixes the issue by appending netdev to all virtually created
network device units. Therefore, the lan bridge -> lan-netdev.service.
This naming convention is used for all types of network devices in order
to ensure that all network devices are unique.
 2014-08-30 08:20:14 -07:00
William A. Kennington III
1c08efb8ab nixos/network-interfaces: Allow explicit virtual interface type setting 2014-08-30 08:20:14 -07:00
William A. Kennington III
4d8390be60 nixos/network-interfaces: Support the old ip configuration convention 2014-08-30 08:05:00 -07:00
William A. Kennington III
86c0f8c549 Refactor nixos files relying on the old ipAddress / prefixLength / subnetMask attributes 2014-08-30 07:33:38 -07:00
William A. Kennington III
1ff4b83875 nixos/network-interfaces: Add flush upon interface going down 2014-08-30 07:33:38 -07:00
William A. Kennington III
098c8f4c77 nixos/network-interfaces: Add support for multiple ipv4 / ipv6 addresses 2014-08-30 07:33:38 -07:00
Aristid Breitkreuz
032e93b9ab Merge pull request #3863 from wkennington/master.grubfix 
Fix perl indentation
 2014-08-30 15:11:42 +02:00
Michael Raskin
8937b70d07 Merge pull request #3344 from ehmry/privoxy 
privoxy: upstart to systemd conversion, actions file editing
 2014-08-30 14:19:57 +04:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
William A. Kennington III
7d16a429f0 nixos/install-grub: Fix Indentation 2014-08-29 12:19:13 -07:00
William A. Kennington III
4428178847 nixos/generate-config: Fix indentation 2014-08-29 12:19:13 -07:00
Nicolas Pierron
8c19690d99 Remove useless use of optionSet. 2014-08-29 18:43:03 +02:00
Nicolas Pierron
43e52ef001 Remove useless use of undocumented submodules. 2014-08-29 18:28:34 +02:00
Nicolas B. Pierron
7bc9d59303 Merge pull request #3773 from nbp/nixos-maintainers 
NixOS: Add meta.maintainer option to modules.
 2014-08-29 14:57:20 +02:00
Igor Pashev
019bc6bb2b Made Mediawiki rewrite rules work for virtual hosts 
Related to cdd1785cd6380e971ad0413e7ecfd3af7ab38625
 2014-08-29 13:56:23 +02:00
Luca Bruno
01f0b1cf1a Fix evaluation of nixos tested 2014-08-29 11:49:36 +02:00
Luca Bruno
a34a0dfdc5 Revert "nixos/release: Dynamically generate installer tests" 
This reverts commit 5870ae613f42c99456dcbbc4df01abdce3c1f448.

It makes it hard to comment out installer tests.
 2014-08-29 11:49:36 +02:00
Rob Vermaas
b7a0101578 Merge pull request #3838 from oconnorr/master 
Update create-gce.sh
 2014-08-29 10:08:55 +02:00
aszlig
e0e65cbf8e
nixos/users-groups: Fix eval on missing uid/gid. 
This hopefully fixes a regression introduced by 08b214a.

In bf129a2, it was already fixed for normal uid/gid values and it got
reintroduced by sub-uid/gid-handling again, so I've refactored it a bit
into a filterNull function which takes care of also the filtering
introduced by bf129a2.

I have not tested this extensively, but master is already broken for
systems with `mutableUsers = true` and no uid values set.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-29 07:17:19 +02:00
Michael Raskin
844fd2553e Merge pull request #3745 from wkennington/master.dnsmasq 
dnsmasq: Update and enable dbus support
 2014-08-29 01:43:41 +04:00
Russell O'Connor
a7ef1a50cb Replace depricated gcutil with gcloude compute in gce/create-gce.sh 2014-08-28 21:42:49 +00:00
Russell O'Connor
cef0d1a41b Abstract bucket name in gce/create-gce.sh 2014-08-28 21:41:30 +00:00
Michael Raskin
e8badf3c3b Merge pull request #3275 from taku0/gtk-env 
uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt
 2014-08-29 01:35:38 +04:00
Michael Raskin
469f22d717 Merge pull request #2449 from wkennington/master.grub 
Grub Update
 2014-08-29 01:22:47 +04:00
Michael Raskin
c42e7dfc0c Merge pull request #3200 from wkennington/master.dhcpcd 
nixos/dhcpcd: Add an explicit interfaces option
 2014-08-29 01:09:22 +04:00
Michael Raskin
1fd14fa415 Merge pull request #3100 from tailhook/new-shadow 
Upgrade "shadow" to 4.2.1
 2014-08-29 00:42:57 +04:00
Michael Raskin
0036f4d792 Merge pull request #3047 from chrisfarms/freetds 
Simple nixos module to enable configuration of freetds
 2014-08-29 00:38:23 +04:00
William A. Kennington III
cf7f7a5107 nixos/install-grub: Check /boot against /nix/store instead of /nix 2014-08-28 13:35:37 -07:00
William A. Kennington III
36a47733a2 nixos-generate-config: Detect btrfs subvolumes 2014-08-28 13:35:37 -07:00
William A. Kennington III
babcd70c36 nixos/release-combined: Add required installer tests 2014-08-28 13:35:37 -07:00
William A. Kennington III
940c57e4e8 nixos/ova: Grub uuid detection is broken when generating the ova 2014-08-28 13:35:36 -07:00
William A. Kennington III
0f6079d999 nixos/grub: Fix spacing and correct subvolume detection 2014-08-28 13:35:36 -07:00
William A. Kennington III
cc62623b37 tests/installer: Provided test should add symlinks to /dev/disk if udev doesn't 2014-08-28 13:35:36 -07:00
William A. Kennington III
4f096c044f nixos/grub: Simplify detection of labels / uuids for provided device names 2014-08-28 13:35:36 -07:00
William A. Kennington III
c02bc3a9de nixos/grub: Fix regex for getting subvolume name in btrfs 2014-08-28 13:35:36 -07:00
William A. Kennington III
6549bcff96 tests/installer: Fix provided test uuid and label mounts 2014-08-28 13:35:36 -07:00
William A. Kennington III
b651097d19 tests/installer: Swapspace should be larger 2014-08-28 13:35:36 -07:00
William A. Kennington III
7264941a46 tests/installer: Remove unneeded tests 2014-08-28 13:35:36 -07:00
William A. Kennington III
3bf22679b3 nixos/grub: Kernels don't need to be copied if we can read the nix store 2014-08-28 13:35:36 -07:00
William A. Kennington III
87d5e457fe nixos/grub: Grub detection is much simpler using subvol show 2014-08-28 13:35:36 -07:00
William A. Kennington III
429f785135 tests/installer: Fix simple tests 2014-08-28 13:35:36 -07:00
William A. Kennington III
8ff4b3b780 tests/installer: Add swap to the new tests 2014-08-28 13:35:36 -07:00
William A. Kennington III
8b36bf5c59 tests/installer: fix mount 2014-08-28 13:35:36 -07:00
William A. Kennington III
d4a9645ef0 nixos/grub: Needs mount so add utillinux to bin 2014-08-28 13:35:35 -07:00
William A. Kennington III
62fedf6081 installer/btrfs: Typo in subvol 2014-08-28 13:35:35 -07:00
William A. Kennington III
2b703f82d5 tests/installer: Test for more grub configurations 2014-08-28 13:35:35 -07:00
William A. Kennington III
809caa87ab tests/installer: Add btrfs tests for grub and nixos-generate-config 2014-08-28 13:35:35 -07:00
William A. Kennington III
8329d12b79 grub: Change fsIdentifier to str from string 2014-08-28 13:35:35 -07:00
William A. Kennington III
5870ae613f nixos/release: Dynamically generate installer tests 2014-08-28 13:35:35 -07:00
William A. Kennington III
769d2dc6bf nixos/grub: Catch errors from command execution 2014-08-28 13:35:35 -07:00
William A. Kennington III
d4e2040099 nixos/grub: Refactor install-grub.pl and correct perl syntax 2014-08-28 13:35:35 -07:00
William A. Kennington III
99b4792554 nixos/grub: Refactor perl script to remove the Switch module 2014-08-28 13:35:35 -07:00
William A. Kennington III
525acb4d4f nixos/grub: Fix typo 2014-08-28 13:35:35 -07:00
William A. Kennington III
70c11772a6 nixos/grub: Fix some silly perl struct accesses 2014-08-28 13:35:35 -07:00
William A. Kennington III
a6e6c85f06 grub: Add support for detecting btrfs subvolumes 2014-08-28 13:35:35 -07:00
William A. Kennington III
fba9f641a8 grub: Add support for forcing devices to be identified with labels or UUIDs 2014-08-28 13:35:35 -07:00
William A. Kennington III
c5bdb469ce Update the grub configuration script to handle more complex filesystem layouts including full zfs / and /boot 2014-08-28 13:35:35 -07:00
William A. Kennington III
02ab48d0ee Enable grub zfsSupport if zfs is built into the initrd 2014-08-28 13:35:34 -07:00
William A. Kennington III
3c6e2fbba9 Add optional zfsSupport to the nixos grub configuration 2014-08-28 13:35:34 -07:00
William A. Kennington III
4f832b5217 Revert "grub: Allow setting the boot root explicitly" 
This reverts commit e4630c1d41d513eb709bddb39043da84442235a7.
 2014-08-28 13:35:34 -07:00
Paul Colomiets
adbb9ff796 dnsmasq: upgrade to 2.71, fixed dnsmasq module 
* The module now has systemd config

* Add resolveLocalQueries option which sets up it as a dns server for
  local host (including reasonable setup of resolvconf)

* Add "dnsmasq" user for running daemon

* Enabled dbus and dnssec support for the package

Conflicts:
	nixos/modules/misc/ids.nix
 2014-08-28 11:39:03 -07:00
Nicolas Pierron
7b9fa26b10 Quote paths from example & default attributes. 2014-08-28 08:36:55 +02:00
Eelco Dolstra
21ab4e054c nixos-container run: Execute command using ‘su’ 
This ensures that the environment is set up correctly.
 2014-08-28 02:20:31 +02:00
Eelco Dolstra
6773babd5b Containers: Use nsenter to execute commands in containers 
Also remove ‘nixos-container set-root-password’, which is kind of
pointless now.
 2014-08-28 02:20:23 +02:00
aszlig
8a56a55bb4
nixos/manual: Use literalExample when feasible. 
Should bring most of the examples into a better consistency regarding
syntactic representation in the manual.

Thanks to @devhell for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-27 23:41:15 +02:00
aszlig
9667a4067c
nixos: Use literalExample for systemPackages. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-27 22:44:56 +02:00
Emery Hemingway
e7597b12b8 privoxy: upstart to systemd conversion, actions file editing 
fix missing actions and filters
 2014-08-27 11:34:10 -04:00
Jaka Hudoklin
fd52ebd160 Merge pull request #3558 from geerds/trackpoint 
Add "emulateWheel" option for trackpoint configuration
 2014-08-27 13:50:26 +02:00
Nathan Bijnens
ac90177cb1 Zookeeper 2014-08-27 13:01:30 +02:00
Eelco Dolstra
41788255ab Manual: Start of module-specific documentation 2014-08-27 12:24:44 +02:00
Eelco Dolstra
005f78e739 Fix opening NixOS manual 
http://hydra.nixos.org/build/13760576
 2014-08-27 11:08:50 +02:00
Shea Levy
4061c18c98 Revert "grub: removed orphaned mkOption configurationName" 
The configurationName option value is still used by NixOS, this removal
breaks grub users.

This reverts commit bd811d32b4b194b9e551a66069641a76bd8eab58.
 2014-08-27 03:26:40 -04:00
Emery Hemingway
aedbfdff84 unbound: run in chroot 2014-08-26 21:24:09 -04:00
Eelco Dolstra
f6b4214567 /dev/sda1 -> "/dev/sda1" 
Otherwise Nix might try to copy /dev/sda1 under certain circumstances
:-)
 2014-08-26 19:30:45 +02:00
Joachim Schiele
bd811d32b4 grub: removed orphaned mkOption configurationName 2014-08-26 19:14:47 +02:00
Eelco Dolstra
60e6cc81b5 No caps in filenames 2014-08-26 19:04:02 +02:00
Mikey Ariel
a099ca4505 Chunk NixOS manual 
[Squashed commits to make git blame etc. more likely to work. -ED]
 2014-08-26 19:03:49 +02:00
Eelco Dolstra
c72fdf4f48 Manual: Tweak 2014-08-26 15:13:21 +02:00
Eelco Dolstra
81f2749012 Manual: Chunk into separate pages 2014-08-25 19:08:31 +02:00
Rickard Nilsson
8c78986553 Some pkgs.lib -> lib fixes 2014-08-25 14:40:40 +02:00
Eelco Dolstra
d2539605e1 Remove reference to icecat 2014-08-25 14:35:08 +02:00
Eelco Dolstra
b1ce3cc172 Manual: Handle XML files in subdirectories 2014-08-25 14:33:33 +02:00
Rickard Nilsson
684e8b241e Merge pull request #3780 from ip1981/master 
Fixed rewrite rules for Mediawiki
 2014-08-25 12:46:08 +02:00
Jaka Hudoklin
296888b1bc nixos: virtualisation, add basic docker nixos image 2014-08-25 12:00:14 +02:00
Igor Pashev
cdd1785cd6 Fixed rewrite rules for Mediawiki 
If Mediawiki was served from the root directory of the server
it was impossible to serve other directories.

Make sure that URLs defined in servedDirs are not rewritten.
Use case: serving local copy of MathJax
 2014-08-25 11:55:57 +02:00
Eelco Dolstra
619f18956d Bump the amount of memory for the installer test 
It randomly OOMs.

http://hydra.nixos.org/build/13587153
 2014-08-25 10:54:10 +02:00
Jaka Hudoklin
d77150df30 nixos: make-system-tarball, add option for extra arguments for tar 
Sometimes extra arguments when making tarball are required,
for example if making a container owner of files has to be changed
to root.
 2014-08-25 03:29:07 +02:00
Jaka Hudoklin
a4ac9eb22e nixos: add systemd service for getty on /dev/console 2014-08-25 03:29:07 +02:00
Nicolas Pierron
873ab39401 NixOS: Add meta.maintainer option to modules. 2014-08-25 01:04:39 +02:00
aszlig
4a4c051a95
nixos: Remove modprobe.d/nixos.conf from initrd. 
For example in VM tests, this causes firmware to be included in the
initrd. So until we have a better fix for adding early-stage module
options, I'll remove this.

Fixes a regression introduced by 0aa2c1d and closes #3764.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-24 18:19:56 +02:00
Jaka Kranjc
1d67ea1ce3 nixos-install.sh: added --root parameter 
Previously:
- setting the mountpoint was only possible through an environment variable
- a discrepancy from nixos-generate-config, which has --root
 2014-08-24 17:40:20 +02:00
Eelco Dolstra
f002a27a80 Remove obsolete directory 2014-08-24 16:35:28 +02:00
Bjørn Forsman
6949e24366 nixos: add fail2ban to module-list.nix 
Now that the fail2ban service has the ".enable" option, I think it's
time to add it to the module list, so that we can enable it in
configuration.nix like this:

  services.fail2ban.enable = true;
 2014-08-24 13:50:57 +02:00
William A. Kennington III
aa77fe0fb0 nixos/radvd: Convert to a systemd unit 
Additionally, remove the automatic initialization of the ipv6 forwarding
sysctl as this should be handled by the end user. This really should not
be an issue as most people running radvd are likely forwarding ipv6
packets.
 2014-08-24 03:12:55 -07:00
Rickard Nilsson
b1d225b645 Add NixOS module for the Riemann dashboard server 2014-08-23 17:40:22 +02:00
Rickard Nilsson
e9252cb35e Add NixOS module for Riemann monitoring server. 2014-08-23 17:40:22 +02:00
Michael Raskin
9b13792075 Merge pull request #3656 from AndersonTorres/fluxbox 
Fluxbox: new package (1.3.5)
 2014-08-23 13:07:46 +04:00
Jaka Hudoklin
84ea03fa3f nixos: add neo4j database module 2014-08-23 13:11:09 +04:00
Michael Raskin
dec865c88c Merge pull request #3583 from ts468/thermald 
Add thermald: Linux Thermal Daemon
 2014-08-23 12:49:59 +04:00
Michael Raskin
0d95c5c647 Merge pull request #3553 from vcunat/p/keyboards 
initrd.availableKernelModules: add support for keyboards
 2014-08-23 12:49:04 +04:00
Michael Raskin
327074682f Merge pull request #3522 from ryantm/patch-1 
add note about mutableUsers to user management section
 2014-08-23 12:47:42 +04:00
Michael Raskin
4a56121d8e Merge pull request #3505 from Shados/fix-initrd-modprobe 
initrd: Fixed to include/use modprobe config files
 2014-08-23 12:46:28 +04:00
Edward Tjörnhammar
1615be91ef Add mlmmj package and nixos module. 2014-08-23 12:30:45 +04:00
Michael Raskin
c0da615c02 Merge pull request #3230 from robberer/module/httpd 
httpd: disable logging when logFormat = "none"
 2014-08-23 11:37:48 +04:00