Commit graph

4925 commits

Author SHA1 Message Date
Eelco Dolstra 651274de33 Merge remote-tracking branch 'origin/release-16.09' into staging-16.09 2016-09-30 21:36:20 +02:00
Jörg Thalheim fcd02ec20e containers: fix dynamic hash lookup
we want the content of attribute as a key:
b9df84cd4f broke this

(cherry picked from commit d6ce2e4bcb)
2016-09-30 21:33:26 +02:00
Eelco Dolstra 0b37191f76 samba: Use startup notification
This ensures synchronous unit start.

(cherry picked from commit e993506d4c)
2016-09-30 21:31:07 +02:00
Eelco Dolstra 7c9b9ae7e2 Merge remote-tracking branch 'origin/release-16.09' into staging-16.09 2016-09-30 21:28:44 +02:00
Nikolay Amiantov 9587a856ba switch-to-configuration: fix restart of socket activated services
This fixes two bugs:

* When socket activation is detected, the service itself is added to stop-start list instead of its sockets.
* When service is marked to restart instead of stop (`StopIfChanged = no`) we don't need to restart sockets.

(cherry picked from commit d37458ad06)
2016-09-30 18:33:37 +03:00
Nikolay Amiantov 5598db747f systemd-journald service: restart instead of stop and start
Also restart when configuration is changed.

(cherry picked from commit ff0b8b2225)
2016-09-30 18:33:18 +03:00
Eelco Dolstra baf9c40afb Merge remote-tracking branch 'origin/release-16.09' into staging-16.09 2016-09-30 17:29:09 +02:00
Eelco Dolstra 256b6b2ae1 Fix "undefined variable ‘device’" using autoFormat
(cherry picked from commit 7e8eb6a7c3)
2016-09-30 17:27:19 +02:00
Shea Levy e5bd75f3e6 supplicant: Make the device pull in the supplicant service.
The udev rule should do this. Not sure why it doesn't.

Fixes #19029.

(cherry picked from commit b692e06686)
2016-09-30 09:23:03 -04:00
Graham Christensen b3be1c7e48
Revert "lightdm: obbey services.xserver.{window/desktop}Manager.default"
This reverts commit 6a12ff4cbd.

See: https://github.com/NixOS/nixpkgs/pull/19054
Closes #19054
2016-09-30 08:18:49 -04:00
Eelco Dolstra b6c9c0258b Merge remote-tracking branch 'origin/release-16.09' into staging-16.09 2016-09-30 13:01:38 +02:00
Domen Kožar 1ff2b10f28 changelog for gnupg bump, fixes #18293 2016-09-30 12:00:33 +02:00
Eelco Dolstra f32c4bfecd Add stdenvNoCC
This is a standard environment that doesn't contain a C/C++
compiler. This is mostly to prevent trivial builders like runCommand
and substituteAll from pulling in gcc for simple configuration changes
on NixOS.

(cherry picked from commit 0cb16a6955)
2016-09-30 11:39:20 +02:00
Eelco Dolstra 9ea5e25cd8 kde4: Get rid of some Nepomuk cruft by default
(cherry picked from commit 020e88704a)
2016-09-30 11:37:18 +02:00
Eelco Dolstra 5ba3965c54 kde4: Allow disabling dependency on MariaDB
This reduces the runtime closure of a KDE4 system by ~172 MiB.

(cherry picked from commit c2495261a8)
2016-09-30 11:37:13 +02:00
Peter Hoeg f7215c9b5b dbus: add socket activation but do not enable it
The following changes are included:

1) install user unit files from upstream dbus
2) use absolute paths to config for --system and --session instances
3) make socket activation of user units configurable

There has been a number of PRs to address this, so this one does the
bare minimum, which is to make the functionality available and
configurable but defaults to off.

Related PRs:
 - #18382
 - #18222
2016-09-30 11:26:54 +02:00
Tuomas Tynkkynen 8111a89835 nixos-install: Bug fix for root password not being asked
Since some changes to the setuid wrappers, there is a symlink involved
and it doesn't resolve correctly inside the chroot. Do the check inside
the chroot to make it work again.

(cherry picked from commit a34ec1517f)
2016-09-29 23:21:21 +03:00
Eelco Dolstra e574e7201f firewall: Order before sysinit
Suggested by @aszlig.

(cherry picked from commit e090701e2d)
2016-09-29 20:38:41 +02:00
Eelco Dolstra 773dfd7a3a Fix starting the firewall
Probably as a result of 992c514a20, it
was not being started anymore.

My understanding of systemd.special(7) (section "Special passive
system units") is that the firewall should want network-pre.target,
rather than the other way around (not very intuitive...). This in
itself does not cause the firewall to be wanted, which is why the
wanted-by relationship with multi-user.target is necessary.

http://hydra.nixos.org/build/39965589
(cherry picked from commit abdc5961c3)
2016-09-29 20:38:41 +02:00
Eelco Dolstra 546a5c6225 nfs module: Fix dependency on statd and idmapd
http://hydra.nixos.org/build/40038016
(cherry picked from commit 58b028f9ee)
2016-09-29 20:38:41 +02:00
Eelco Dolstra af2d57a8b6 nfs module: Improve descriptions
(cherry picked from commit 015c984537)
2016-09-29 20:38:41 +02:00
Eelco Dolstra 5f9ef33800 Enable the runuser command from util-linux
Fixes #14701.

(cherry picked from commit 98102ebd92)
2016-09-29 20:38:40 +02:00
Eelco Dolstra 48874b5a9e Fix infinite recursion introduced by f3c32cb2c1
(cherry picked from commit 520cb14f16)
2016-09-29 20:38:40 +02:00
Eelco Dolstra 6f78babb2f Make the default fonts conditional on services.xserver.enable
We were pulling in 44 MiB of fonts in the default configuration, which
is a bit excessive for headless configurations like EC2
instances. Note that dejavu_minimal ensures that remote X11-forwarded
applications still have a basic font regardless.

(cherry picked from commit 5b5c2fb9c0)
2016-09-29 20:38:40 +02:00
Eelco Dolstra 3c97ddc01d Let services.openssh.forwardX11 imply programs.ssh.setXAuthLocation
(cherry picked from commit f3c32cb2c1)
2016-09-29 20:38:40 +02:00
Eelco Dolstra e7d3fe5018 Make it possible to disable "info"
(cherry picked from commit ab49ebe6fa)
2016-09-29 20:30:26 +02:00
Eelco Dolstra 83c40dd971 modules/profiles/minimal.nix: Disable "man"
(cherry picked from commit 5e5df88457)
2016-09-29 20:30:21 +02:00
Eelco Dolstra 705bba2000 no-x-libs.nix: Ensure that dbus doesn't use X11
It appears that packageOverrides no longer overrides aliases, so
aliases like

  dbus_tools = self.dbus.out;
  dbus_daemon = self.dbus.daemon;

now use the old, non-overriden version of dbus. That seems like a
pretty serious regression in general, but for this particular problem,
I've fixed it by replacing dbus_daemon by dbus.daemon and dbus_tools
by dbus.

(cherry picked from commit ba70ce28ae)
2016-09-29 20:30:05 +02:00
Joachim Fasting 8cc072d601 nixos/ids: remove unused connman uid
The static connman uid is not referenced anywhere in NixOS.

(cherry picked from commit 66f50a7631)
2016-09-29 20:17:41 +02:00
Eelco Dolstra 7db7d27e99 nixos-container: Syntax fixes
Get rid of the "or null" stuff. Also change 'cfg . "foo"' to 'cfg.foo'.

Also fixed what appears to be an actual bug: in postStartScript,
cfg.attribute (where attribute is a function argument) should be
cfg.${attribute}.

(cherry picked from commit b9df84cd4f)
2016-09-29 20:15:14 +02:00
Graham Christensen 7767b18506
moodle: mark as broken
https://github.com/NixOS/nixpkgs/issues/18856
(cherry picked from commit e2688e072d)
2016-09-28 16:50:38 -04:00
Vladimír Čunát 5e86b8a1dd nixos system path: add rsync back
I was used anyway, and we did this on master
(I don't think 16.09 should be "ahead of" master). See:
https://github.com/NixOS/nixpkgs/commit/0aa75206705afc
2016-09-28 18:14:48 +02:00
Jörg Thalheim d9e2cd551d zsh: do not export HISTFILE, HISTSIZE, SAVEHIST
Every interactive zsh sources /etc/zshrc (see STARTUP/SHUTDOWN FILES in zshautll(1))
Therefor every interactive zsh process will respect the content of these variables.
Using `export` will also lead to child processes inheriting this value.
This leads to problems, if other interactive shells are spawned such as bash,
because they use an incomptabible history format (without timestamps).
There seems to be also cases, where the local HISTSIZE in ~/.zshrc is
not sourced but /etc/zshrc, which leads to history truncation in other shells.

(cherry picked from commit 9049ab1a3b)
2016-09-28 15:37:18 +01:00
danbst 096cad80cd
tomcat: add danbst as maintainer
(cherry picked from commit a01d4ee3f4)
2016-09-27 21:11:59 -04:00
danbst ede58ee5f9
tomcat: split default webapps to separate output (~6M)
(cherry picked from commit 0c2d943529)
2016-09-27 21:11:58 -04:00
Graham Christensen 99e643ecc1
mediawiki: 1.23.13 -> 1.27.1
(cherry picked from commit 8504237863)
2016-09-27 16:33:40 -04:00
Franz Pletz 8f872dc8bc
gitlab: 8.11.2 -> 8.12.1
(cherry picked from commit 77779323c5)
2016-09-27 18:41:31 +02:00
Graham Christensen c32d890924
wordpress: 4.3.1 -> 4.6.1 + add a test
(cherry picked from commit 4671806183)
2016-09-26 19:36:42 -04:00
Vladimír Čunát 39f77eb8de nixos opengl: use mesa_drivers.out
...instead of mesa_noglu.out. Closures of systems remain unchanged,
as both are in (and the .out output is very small anyway).
This is to make sure that we use lib*GL* that aren't slowed down by grsecurity.

(cherry picked from commit c68850c6be)
2016-09-24 19:22:13 +02:00
Wei-Ming Yang fc1d57a4cf
murmur service: welcome -> welcometext
fixed incorrect option name `welcome` to `welcometext`.

joachifm added a rename for backwards compat.

Closes https://github.com/NixOS/nixpkgs/pull/18570

(cherry picked from commit e330807e1f)
2016-09-24 16:17:05 +02:00
Nikolay Amiantov 7e98bfd752 stage-1 module: remove check that swap device has a label
All swap device option sets "have" a label, it's just that sometimes it's
undefined. Because we set a `device` attribute when we have a label anyway it's
ok to just check device prefix.

Fixes #18891.

(cherry picked from commit a63ca1bf3d)
2016-09-24 13:09:29 +03:00
Eric Sagnes a64de3e17c mongodb service: switch configuration format to YAML
Configuration format has changed from MongoDB 2.6 to
YAML and MongoDB 2.4 is EOL since March 2016.

(cherry picked from commit 5cd565e507)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-22 09:52:43 +02:00
Domen Kožar b9d81859f3 /var/empty: silently ignore errors (if on tmpfs) #18781
(cherry picked from commit 80437576f9)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-21 10:29:40 +02:00
Eric Sagnes c02b9b93f6 cadvisor test: fix (#18671)
* influxdb module: add postStart

* cadvisor module: increase TimeoutStartSec

Under high load, the cadvisor module can take longer than the default 90
seconds to start. This change should hopefully fix the test on Hydra.

(cherry picked from commit 2d2c311304)
2016-09-20 22:00:48 +02:00
Robin Gloster fdec46d115
gitlab module: enable postgres pg_trgm extension
(cherry picked from commit 0fa64b718f)
2016-09-20 17:45:54 +02:00
aszlig 4d076b3681
nixos/networking: Use type lines for localCommands
Using types.str doesn't work if you want to mkBefore/mkAfter across
different module definitions, because it only allows for one definition
for the same priority.

This is especially useful if you deploy Hetzner machines via NixOps,
because the physical specification already defines localCommands.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 97801380b0)
2016-09-20 13:33:44 +02:00
Scott R. Parish 95879e204f rngd: update modalias to match cpu type
It looks like the cpu type part of modalias might have changed, my
systems (4.4.20 and 4.7.2) show something like the following:

```
cpu:type:x86,ven0000fam0006mod003F:feature:,0000,0001,0002,0003,0004,0005,0006,0007,0008,0009,000B,000C,000D,000E,000F,0010,0011,0013,0017,0018,0019,001A,001C,002B,0034,003B,003D,0068,006F,0070,0072,0074,0075,0076,007D,0080,0081,0089,008C,008D,0091,0093,0094,0095,0096,0097,0098,0099,009A,009B,009C,009D,009E,009F,00C0,00C5,0120,0123,0125,0127,0128,0129,012A,0140
```

Update the rngd modalias rule to match this so udev properly has
systemd start rngd.

(cherry picked from commit a560223119)
2016-09-19 19:07:19 -04:00
Jaka Hudoklin 69451eb662 docker module: updates
- logDriver option, use journald for logging by default
- keep storage driver intact by default, as docker has sane defaults
- do not choose storage driver in tests, docker will choose by itself
- use dockerd binary as "docker daemon" command is deprecated and will be
  removed
- add overlay2 to list of storage drivers

(cherry picked from commit 5d9c62541a)
2016-09-18 22:43:53 +02:00
Vladimír Čunát d5ecf9ef52 Merge branch 'staging-16.09' into release-16.09 2016-09-18 21:45:46 +02:00
obadz 7617e7eb74 grub: add boot.loader.grub.efiInstallAsRemovable
Closes #16374

(cherry picked from commit 1c9ac8aabc)

grub: clarify efiInstallAsRemovable docstring

(cherry picked from commit eda4f5d409)

grub: fix manual build

(cherry picked from commit 93974eb98b)
2016-09-18 14:42:18 +01:00