Tuomas Tynkkynen
19225bf5cc
Merge remote-tracking branch 'upstream/master' into staging
2016-10-02 10:36:47 +03:00
Eric Sagnes
a67b597b22
container module: allowedDevices type to submodule
...
The optionSet type is deprecated in favor of submodule
2016-10-02 14:07:00 +09:00
Thomas Tuegel
854e00943b
Merge pull request #19142 from laMudri/ibus-table-doc-2
...
ibus: explain ibus-table in the docs
2016-10-01 16:59:17 -05:00
Svein Ove Aas
54fdd0cf9c
java program: Init.
...
Mostly just provides a shell hook for the jdk's setup-hook.
Tested with openjdk and jre.
2016-10-01 23:53:28 +02:00
laMudri
b403b22f4a
ibus: explain ibus-table in the docs
2016-10-01 20:13:47 +01:00
Anmol Sethi
6891bb1c59
openssh: support prohibit-password for permitRootLogin
...
See 1dc8d93ce6
I also made it the default.
2016-10-01 13:23:56 -04:00
Jörg Thalheim
7d3143990f
Merge pull request #19136 from nhooyr/powerdns
...
powerdns: removed PrivateTmp=true in serviceConfig
2016-10-01 18:28:34 +02:00
Anmol Sethi
489ca7e5c0
powerdns: removed PrivateTmp=true in serviceConfig
...
As discussed in #18718 PrivateTmp is unnecessary because powerdns is
chrooted to /var/lib/powerdns.
I also added myself as co-maintainer.
2016-10-01 12:27:23 -04:00
Joachim F
7e80c42b0e
Merge pull request #18511 from ericsagnes/feat/remove-optionSet
...
modules: optionSet -> submodule
2016-10-01 17:57:45 +02:00
Jaka Hudoklin
98a8146428
Merge pull request #19016 from offlinehacker/pkgs/flannel/update/0.6.2
...
flannel: update, add nixos module, add tests
2016-10-01 17:22:34 +02:00
Jaka Hudoklin
feb9fc3aff
flannel service: init
2016-10-01 17:08:48 +02:00
Jörg Thalheim
f2f7420e2b
Merge pull request #19115 from Ralith/matrix-synapse
...
matrix-synapse: 0.17.1 -> 0.18.0
2016-10-01 14:54:41 +02:00
Jörg Thalheim
a8c172ca4b
Merge pull request #18822 from wlhlm/containers-dev-tun
...
Allow access to /dev/net/tun inside containers
2016-10-01 00:19:02 +02:00
Eelco Dolstra
e993506d4c
samba: Use startup notification
...
This ensures synchronous unit start.
2016-09-30 21:22:58 +02:00
Robert Helgesson
db3579c332
ddclient service: minor spelling fix
2016-09-30 19:26:21 +02:00
Thomas Bereknyei
5bca9297ff
ddclient: add configFile option
...
ddclient: improve documentation
Adopted @joachifm's suggestions.
ddclient additional refinement
2016-09-30 19:13:56 +02:00
Nikolay Amiantov
d37458ad06
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.
2016-09-30 17:49:31 +03:00
Nikolay Amiantov
ff0b8b2225
systemd-journald service: restart instead of stop and start
...
Also restart when configuration is changed.
2016-09-30 17:49:30 +03:00
Joachim F
1ddc08a3ac
Merge pull request #18452 from bendlas/init-postgrey
...
postgrey: init at 1.36
2016-09-30 15:31:44 +02:00
Shea Levy
b692e06686
supplicant: Make the device pull in the supplicant service.
...
The udev rule should do this. Not sure why it doesn't.
Fixes #19029 .
2016-09-30 09:22:49 -04:00
Eelco Dolstra
7e8eb6a7c3
Fix "undefined variable ‘device’" using autoFormat
2016-09-30 15:04:36 +02:00
Jörg Thalheim
8bb4551273
systemd-boot: inline add_entry function
2016-09-30 13:56:19 +02:00
Jörg Thalheim
4e0423467a
systemd-boot: port builder to python3
...
see #18185
2016-09-30 13:28:42 +02:00
Domen Kožar
50be1a1765
changelog for gnupg bump, fixes #18293
...
(cherry picked from commit 1ff2b10f282d7ae694b70b713cfefcdee467f873)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-30 13:14:53 +02:00
Peter Hoeg
639e5401ff
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
(cherry picked from commit f7215c9b5b47dfb0a6dbe87ff33d7730729a32e5)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-30 13:14:53 +02:00
Tuomas Tynkkynen
a34ec1517f
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.
2016-09-29 23:17:53 +03:00
Eelco Dolstra
020e88704a
kde4: Get rid of some Nepomuk cruft by default
2016-09-29 20:03:54 +02:00
Eelco Dolstra
c2495261a8
kde4: Allow disabling dependency on MariaDB
...
This reduces the runtime closure of a KDE4 system by ~172 MiB.
2016-09-29 20:03:50 +02:00
Joachim F
e2c7f7135d
Merge pull request #19060 from bachp/confd-etcd-port
...
confd service: change default etcd port 4001 -> 2379
2016-09-29 14:59:51 +02:00
Joachim F
4d3282a8fe
Merge pull request #18993 from ericsagnes/mod/php-fpm
...
php-fpm module: cleanup
2016-09-29 13:14:32 +02:00
Eelco Dolstra
97bfc2fac9
runCommand: Use stdenvNoCC
...
This ensures that most "trivial" derivations used to build NixOS
configurations no longer depend on GCC. For commands that do invoke
gcc, there is runCommandCC.
2016-09-29 13:06:43 +02:00
Eelco Dolstra
0cb16a6955
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.
2016-09-29 13:06:41 +02:00
Eelco Dolstra
518340624d
Merge remote-tracking branch 'origin/master' into staging
2016-09-29 13:06:14 +02:00
Eelco Dolstra
75a1ec8a65
NixOS: Use runCommand instead of mkDerivation in a few places
2016-09-29 13:05:28 +02:00
Peter Hoeg
1049fd49ed
systemd: add user target support
...
This allows us to define system user targets in addition to the existing
services, timers and sockets.
Furthermore, we add a top-level configuration keyword:
- Documentation
2016-09-29 17:02:10 +08:00
Pascal Bach
7d6c02d45a
confd service: change default etcd port 4001 -> 2379
...
New versions of etcd listen on 2379 by default.
This is also the official IANA assigned port.
2016-09-28 23:35:54 +02:00
Graham Christensen
9ebc98e53d
Merge pull request #19040 from grahamc/broken-mast
...
Mark packages as broken: asterisk, cryptopp, redmine, moodle, opera, openstack-neutron, mesos
2016-09-28 16:50:05 -04:00
Peter Simons
7c7e88b45e
Merge pull request #19046 from rycee/bump/bash-completion
...
Bump bash completion to 2.4
2016-09-28 18:39:24 +02:00
Robert Helgesson
e8817a2d20
bash-completion: change attribute name
...
This changes the attribute name of bash-completion from `bashCompletion`
to `bash-completion`. Keeps `bashCompletion` as an alias for the new
name.
2016-09-28 17:46:29 +02:00
Vladimír Čunát
77604964b6
Merge branch 'master' into staging
2016-09-28 17:13:59 +02:00
zimbatm
60cdc8c1f8
Merge pull request #19015 from Mic92/zsh
...
zsh: do not export HISTFILE, HISTSIZE, SAVEHIST
2016-09-28 15:36:07 +01:00
Graham Christensen
e2688e072d
moodle: mark as broken
...
https://github.com/NixOS/nixpkgs/issues/18856
2016-09-28 08:52:18 -04:00
Graham Christensen
310b3d39f7
Merge pull request #18994 from grahamc/mediawiki
...
mediawiki: 1.23.13 -> 1.27.1
2016-09-27 16:33:31 -04:00
Jörg Thalheim
9049ab1a3b
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.
2016-09-27 22:19:53 +02:00
Franz Pletz
a6d4ea4c2c
treewide: remove executable flags from .nix files
2016-09-27 22:15:00 +02:00
Franz Pletz
77779323c5
gitlab: 8.11.2 -> 8.12.1
2016-09-27 18:41:02 +02:00
Herwig Hochleitner
5fa7cf9f97
postgrey: add types to service
2016-09-27 15:35:02 +02:00
Herwig Hochleitner
5609fe521d
postgrey: init at 1.36 (includes service)
2016-09-27 15:35:02 +02:00
Graham Christensen
8504237863
mediawiki: 1.23.13 -> 1.27.1
2016-09-26 21:53:36 -04:00
Eric Sagnes
b14ecbb96f
php-fpm module: cleanup
...
- Added example for the pool option
- Unified PHP-FPM spelling
2016-09-27 10:20:22 +09:00