Vladimír Čunát
d957b4bd78
Merge recent master into staging
...
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +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
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
Igor Pashev
5c6e4e7433
Updated Mediawiki to 1.23.3
...
Removed mediawiki-postgresql-fixes.patch (fixed upstream)
2014-09-07 17:50:51 +02: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
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
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
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
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
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