Commit graph

115786 commits

Author SHA1 Message Date
Rostislav Beneš
33494a75d7
nixos/xserver,gdm: let GDM handle X server verbosity.
(cherry picked from commit 0cad98dde1)
2017-09-28 00:44:54 +02:00
Rostislav Beneš
4500e11fda
nixos/gdm,nvidia: new options to enable GDM on Wayland and disabling it for nvidia drivers.
(cherry picked from commit 4ef82339c9)
2017-09-28 00:44:53 +02:00
Rostislav Beneš
9e280b0c16
nixos/nvidia: populating /dev with nvidia devices at boot
(cherry picked from commit 4f91397c98)
2017-09-28 00:44:53 +02:00
Joachim Fasting
46c4c62373
nixos/release-notes: notable changes to the dnscrypt-proxy service
(cherry picked from commit a06f839439)
2017-09-28 00:44:53 +02:00
Franz Pletz
f76d2aa6e3
kbd service: systemd-vconsole-setup is triggered by udev
cc #22470

(cherry picked from commit 0ee866ed72)
2017-09-28 00:44:53 +02:00
Franz Pletz
2ae16ef5d7
wpa_supplicant service: restart instead of stop & start
We now wait for dhcpcd to acquire a lease but dhcpcd is restarted on
system activation. As wpa_supplicant is stopped while dhcpcd is
restarting a significant delay is introduced on systems with wireless
network connections only. This changes the wpa_supplicant service to
also be restarted together with dhcpcd in case both services were
changed.

(cherry picked from commit 725dee203a)
2017-09-28 00:44:52 +02:00
Alexander Ried
48465ae259
Revert "kbd service: use /dev/tty1 for systemd-vconsole-setup"
This reverts commit 0c81594a29.

It's no longer needed since systemd-vconsole-setup enumerates all ttys
until it finds a suitable one since systemd v234.

(cherry picked from commit 4a2442032e)
2017-09-28 00:44:52 +02:00
Marius Bergmann
b9935c7c5d znc: fix openFirewall option
The current version is broken:
- there's no `openFirewall` attribute directly in the `cfg` set
- the `port` option is an attribute of the `confOptions` set

I used the proper attribute for the firewall port and moved the `openFirewall`
option directly up to the `services.znc` set, as it's rather a general option
for the whole service than a znc-specific option (which are located inside the
`confOptions` set).
2017-09-27 23:09:56 +01:00
Joerg Thalheim
24f0aecab7 nixos: skip restarting systemd-logind to not break x11
(cherry picked from commit 23f398012b)

fixes #29579
2017-09-27 22:29:04 +01:00
Robin Gloster
455ed26f20
17.09 release notes: redis cluster mass-restart needed
see #29516

(cherry picked from commit 34750bb51c)
2017-09-27 22:15:28 +02:00
Franz Pletz
6f938a1115
postgresql: default to 9.6 like in the nixos module
(cherry picked from commit 259df64ef5)
2017-09-27 22:06:41 +02:00
Robin Gloster
81a229e0f9
Revert "postgresql: Add dev output"
Firstly this creates a cycle in 9.6 .out <-> .dev after fixing the PGXS
path.

Secondly this breaks extension handling and the pg_config as it
resolves a lot of paths relatively resulting in the following bogus
output:

BINDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/bin
DOCDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc
HTMLDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc
INCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include
PKGINCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include
INCLUDEDIR-SERVER = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include/server
LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
LOCALEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/locale
MANDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/man
SHAREDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share
SYSCONFDIR = /etc/postgresql
PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc'
CC = gcc
CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2
CFLAGS_SL = -fPIC
LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm
VERSION = PostgreSQL 9.5.9

This can probably only be properly fixed by rewriting pg_config in large
parts as it does not in any way respect splitting the postgres tree and
assumes it can simply resolve paths relative to its location. This does
not even handle symlinks:

$ result-dev/bin/pg_config
BINDIR = /home/robin/dev/nixpkgs-upstream/result-dev/bin
DOCDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc
HTMLDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc
INCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include
PKGINCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include
INCLUDEDIR-SERVER = /home/robin/dev/nixpkgs-upstream/result-dev/include/server
LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
LOCALEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/locale
MANDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/man
SHAREDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share
SYSCONFDIR = /etc/postgresql
PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc'
CC = gcc
CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2
CFLAGS_SL = -fPIC
LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm
VERSION = PostgreSQL 9.5.9

cc @edolstra

Revert "bacula: fix after postgresql output splitting"

This reverts commit 13c9cbacdd.

Revert "postgresql: fix pgxs dir in pg_config"

This reverts commit 21998d597b.

Revert "rubyGems.pg: fix postgresql path"

This reverts commit e253ae7d3a.

Revert "kea: fix path to pg_config"

This reverts commit 086c636eb7.

Revert "php: fix build wrt. new postgres.dev build output"

This reverts commit 2f23a83920.

Revert "gdal: fix path to pg_config"

This reverts commit 032c50d45b.

Revert "postgresql: Add dev output"

This reverts commit b0280f598e.

(cherry picked from commit 6b05651c20)
2017-09-27 21:59:45 +02:00
Robin Gloster
ef52776f70
bluez: remove unneeded dependencies and fix test bins
(cherry picked from commit 50fb62994b)
2017-09-27 21:27:00 +02:00
Lancelot SIX
394aa5af2b
ibus-engines.hangul: add python dependency
(cherry picked from commit f39ead7c74)
2017-09-27 20:48:54 +02:00
Vladimír Čunát
9fbad9bf16
manuals: document removal of newStdcpp from steam
/cc #29180.
(cherry-picked from 4013b381b3 and f2955e4fde)
2017-09-27 20:35:16 +02:00
Lancelot SIX
86e35b7b9b
ibus-anthy: fix pygobject3 dependency
(cherry picked from commit be697dca4c)
2017-09-27 20:31:56 +02:00
Michael Weiss
c35be631b4
wlc: Downgrade back to 0.0.9
Unfortunately wlc 0.0.10 seems to be the cause for segfaults on sway,
way-cooler and orbment.

This will also build wlc with all optional packages (i.e. zlib,
valgrind and doxygen).

(cherry picked from commit 2d640b9d6e)
2017-09-27 20:25:27 +02:00
Stefan Siegl
53068f41ad
kea: fix path to pg_config
refs commit b0280f598e

(cherry picked from commit 086c636eb7)
2017-09-27 20:20:31 +02:00
Robin Gloster
cdf4d69b1c
bacula: fix after postgresql output splitting
(cherry picked from commit 13c9cbacdd)
2017-09-27 20:10:06 +02:00
Robin Gloster
ba86884c61
Revert "ibus: Move ibus-setup to .dev"
This reverts commit af44f99dca.

ibus-with-plugins was broken by this.

cc @edolstra

(cherry picked from commit e0771a2410)
2017-09-27 19:42:53 +02:00
Robin Gloster
645c591949
postgresql: fix pgxs dir in pg_config
(cherry picked from commit 21998d597b)
2017-09-27 19:20:44 +02:00
Tim Steinbach
165bc51f41
linux: 4.13.3 -> 4.13.4
(cherry picked from commit ab3ff4af9f)
2017-09-27 13:08:51 -04:00
Tim Steinbach
67402a34d3
linux: 4.9.51 -> 4.9.52
(cherry picked from commit 2ca84cfa29)
2017-09-27 13:08:50 -04:00
Tim Steinbach
65a718c4d4
linux: Remove 4.12 (EOL)
(cherry picked from commit 964672dde5)
2017-09-27 13:08:50 -04:00
Rodney Lorrimar
86528f928a
mysqlBackup service: let it work with default settings
* Grants enough privileges to the configured user so that it can run
  mysqldump.

* Adds a nixos test.

* Use systemd timers instead of a cronjob (by @fadenb).

* Creates a new user for backups by default, instead of using mysql
  user.

* Ensures that backup user has write permissions on backup location.

* Write backup to a temporary file before renaming so that a failed
  backup won't overwrite the previous backup, and so that the backup
  location will never contain a partial backup.

Breaking changes:

 * Renamed period to calendar to reflect the change in how to
   configure the backup time.

 * A failed backup will no longer result in cron sending an e-mail --
   users' monitoring systems must be updated.

Resolves #24728

(cherry picked from commit 56eba66f77)
2017-09-27 18:46:21 +02:00
Rodney Lorrimar
d2cb5cd0cd
nixos/release-notes: MySQL backup service breaking changes
(cherry picked from commit 34eefdfb9d)
2017-09-27 18:46:02 +02:00
Joerg Thalheim
e8278f584f
nixos/tinc: remove useless script argument
ExecStart is sufficient and more transparent to the user.

(cherry picked from commit 75ba415fbc)
2017-09-27 18:21:27 +02:00
Joerg Thalheim
3615636fa0
nixos/tinc: do not add Device= by default
tinc can figure this out based on DeviceType.
I also got `/dev/net/tun FD in bad state` after a particular upgrade.

(cherry picked from commit ad8cb0917f)
2017-09-27 18:21:22 +02:00
Joerg Thalheim
b7ebe55ea2
metasploit: use makeWrapper instead
(cherry picked from commit b775b2cd4f)
2017-09-27 18:21:14 +02:00
Eelco Dolstra
861987c70e
nix-daemon: Bump the default number of build users
While it's annoying to pollute the user database with a lot of nixbld*
users, 10 users is really too low for many modern systems.

(cherry picked from commit 79d547b4bb)
2017-09-27 18:20:55 +02:00
Tristan Helmich
dc4c56ab7f
emby: 3.2.30.0 -> 3.2.32.0
(cherry picked from commit 71cc54300e)
2017-09-27 18:20:38 +02:00
Robin Gloster
e6e7c0fe5a
libnfs: fix eval
(cherry picked from commit c0235ef611)
2017-09-27 18:20:27 +02:00
Peter Simons
930759d024
libnfs: fix broken meta.license attribute
A license called "bsd" does not exist. Ping @peterhoeg.

(cherry picked from commit 4398872523)
2017-09-27 18:20:19 +02:00
makefu
9fc37e24dd
gdal: fix path to pg_config
(cherry picked from commit 032c50d45b)
2017-09-27 17:41:51 +02:00
Tim Steinbach
57e1610901
docker: add 17.09.0-ce
(cherry picked from commit 825e417457)
2017-09-27 11:36:00 -04:00
Tim Steinbach
8f09851a98
openjdk: Fix build
(cherry picked from commit 24bed29809)
2017-09-27 11:33:50 -04:00
Matt McHenry
20aa2dc228
openjdk9: init at 9.0.0+180
* openjdk 8: code cleanup

as recommended by 0xABAB in #27194

* openjdk 9: init at ea build 176

this starts with copy of 8.nix and just updates hashes and replaces 8
with 9.  it also tweaks the version handling because we aren't dealing
with an update version yet.

* openjdk 9: adapt patches from openjdk 8

fix-java-home: surrounding code changed slightly

swing-use-gtk-jdk9: location of the file being patched changed due to
modularization

read-truststore-from-env: the code that handles the trustStore was
refactored out into a helper class in upstream commit
904861872c

adlc_updater: this isn't present anymore

* openjdk 9: make two more warnings-as-errors non-fatal

this requires that we switch to configureFlagsArray to deal with
whitespace

the errors being suppressed are show below:

* For target support_native_java.desktop_libawt_xawt_awt_Robot.o:
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c: In function 'isXCompositeDisplay':
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c:152:50: error: embedded '\0' in format
[-Werror=format-contains-nul]
     snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0", screenNumber);
                                                  ^
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c:152:50: error: embedded '\0' in format
[-Werror=format-contains-nul]
cc1: all warnings being treated as errors
* For target support_native_jdk.hotspot.agent_libsa_ps_core.o:
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c: In function 'read_exec_segments':
/tmp/nix-build-openjdk-9ea-b176.drv-0/jdk9-jdk-9+176/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c:834:7: error: ignoring return value of 'pread', declared
with attribute warn_unused_result [-Werror=unused-result]
       pread(ph->core->exec_fd, interp_name, exec_php->p_filesz, exec_php->p_offset);
       ^
cc1: all warnings being treated as errors

* openjdk 9: ea+176 -> ea+180

* openjdk 9: TODO disable infinality patches, at least to start

the code being patched here seems to have changed substantially or
perhaps even disappeared altogether.  need to investigate whether
these patches are still relevant.

* openjdk 9: update installPhase for modularization

* separate jdk and jre images are now present under build/*/images

* samples have been removed (JEP 298)
  -- TODO that JEP says demos will be gone too, but it seems some are still present?

* bina directory is no longer present

* openjdk 9: TODO handle *.pf files or purge this code completely

* openjdk 9: update minimal jre components

in particular, the name of the config option for headless has changed,
per https://bugs.openjdk.java.net/browse/JDK-8163102

* TODO about echo -n vs printWords, #27427

(cherry picked from commit 02fe1207ab)
2017-09-27 11:33:49 -04:00
Robin Gloster
4d59b04bd9
rubyGems.pg: fix postgresql path
(cherry picked from commit e253ae7d3a)
2017-09-27 17:26:10 +02:00
Robin Gloster
794a22bfed
urllib3: revert multiple outputs
only moved propagated build inputs to dev which broke packages depending
on it e.g. glusterfs

cc @edolstra

(cherry picked from commit d0d992a9a0)
2017-09-27 17:11:21 +02:00
WilliButz
9da34752a7
splUnstable: fix hash
(cherry picked from commit 43b7e69d13)
2017-09-27 15:35:17 +02:00
makefu
cbe02b52ba
pyramid: fix propagated builds
hupper and plaster need to be propagated to dependent packages

(cherry picked from commit 3abee357e6)
2017-09-27 15:35:16 +02:00
Tristan Helmich
15c5cfd600
pythonPackages.phonenumbers: 8.8.1 -> 8.8.2
(cherry picked from commit b015f62965)
2017-09-27 15:35:16 +02:00
Rodney Lorrimar
9dd4263464
bower2nix: 3.1.1 -> 3.2.0
(cherry picked from commit 3d4ed0181e)
2017-09-27 15:35:16 +02:00
Peter Hoeg
f79ef8d63d
cwiid: boy scout cleanups
(cherry picked from commit eba5dd84ef)
2017-09-27 15:35:16 +02:00
Peter Hoeg
c6ca4c3ce9
libnfs: init at 2.0.0
(cherry picked from commit 97e586b812)
2017-09-27 15:35:16 +02:00
Peter Simons
11d0942d66 nixos(spamassassin): fix trailing whitespace
(cherry picked from commit 99e24590cb)
2017-09-27 14:51:42 +02:00
Peter Simons
a30571c1cf nixos(spamassassin): provide /etc/spamassassin to fix sa-learn et al
Spamassassin expects its system-wide configuration at /etc/spamassassin, and
some user tools (like sa-learn) need to read those configuration files.
Therefore, we provide a symlink from /etc/spamassassin to the appropriate Nix
store path to make sure those tools work without the user having to pass an
elaborate --siteconfig path that, potentially, changes every time the system
updates.

Fixes https://github.com/NixOS/nixpkgs/issues/29414.

(cherry picked from commit bfab392e6e)
2017-09-27 14:51:42 +02:00
Florian Jacob
d30e143c05
mariadb: 10.1.25 -> 10.1.26
(cherry picked from commit e911e39c26)
2017-09-27 07:30:34 -04:00
Stefan Siegl
9b4b940fb6 php: fix build wrt. new postgres.dev build output
Refs commit b0280f598e

(cherry picked from commit 2f23a83920)
2017-09-27 12:33:27 +02:00
Eelco Dolstra
ea6947d6d2 Add even more dev outputs
(cherry picked from commit 28299f669a)
2017-09-27 12:33:12 +02:00