Commit Graph

91127 Commits

Author SHA1 Message Date
Eelco Dolstra
2bc8f13a7c libofa: Use multiple outputs
(cherry picked from commit f84806d84f)
2016-09-30 11:32:05 +02:00
Eelco Dolstra
dc48723697 libarchive: Use multiple outputs
(cherry picked from commit 37f2679e73)
2016-09-30 11:31:48 +02:00
Eelco Dolstra
f6822c4d30 libraw: Use multiple outputs
(cherry picked from commit 8b31b91a22)
2016-09-30 11:28:45 +02:00
Eelco Dolstra
7500894082 Merge remote-tracking branch 'origin/release-16.09' into staging-16.09 2016-09-30 11:26:26 +02:00
Eelco Dolstra
564be60dad systemd: Apply various upstream bug fixes
This includes the fix for the assertion failure in
https://github.com/systemd/systemd/issues/4234.

(cherry picked from commit 8b09ba32d3)
2016-09-30 11:26:10 +02:00
Tuomas Tynkkynen
f714cda163 usbredir: Fix 32-bit build
Avoid these warnings from being errors:

usbredirhost.c: In function 'usbredirhost_can_write_iso_package':
usbredirhost.c:1023:19: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}' [-Wformat=]
             DEBUG("START dropping isoc packets %lu buffer > %lu hi threshold",
                   ^
usbredirhost.c:1023:19: warning: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'uint64_t {aka long long unsigned int}' [-Wformat=]
             DEBUG("START dropping isoc packets %lu buffer > %lu hi threshold",
                   ^
usbredirhost.c:1028:19: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}' [-Wformat=]
             DEBUG("STOP dropping isoc packets %lu buffer < %lu low threshold",
                   ^
usbredirhost.c:1028:19: warning: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'uint64_t {aka long long unsigned int}' [-Wformat=]
             DEBUG("STOP dropping isoc packets %lu buffer < %lu low threshold",
                   ^
usbredirhost.c: In function 'usbredirhost_set_iso_threshold':
usbredirhost.c:1162:11: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}' [-Wformat=]
     DEBUG("higher threshold is %lu bytes | lower threshold is %lu bytes",
           ^
usbredirhost.c:1162:11: warning: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'uint64_t {aka long long unsigned int}' [-Wformat=]
     DEBUG("higher threshold is %lu bytes | lower threshold is %lu bytes",

I think in all of these cases, the incorrect format modifier just causes
wrong debug prints on i686.

(cherry picked from commit b3af42011b)
2016-09-30 12:22:20 +03:00
Tuomas Tynkkynen
5abb36baa0 freerdp: Switch main attribute to freerdpUnstable
Not much point having it as a broken package. Fixes eval error of KDE4
test.

(cherry picked from commit bd05f4ff6d)
2016-09-30 12:01:30 +03:00
Lancelot SIX
f3f0a604fa
pythonPackages.django_1_8: 1.8.14 -> 1.8.15
This is a security release.

It fixes CVE-2016-7401.

See https://www.djangoproject.com/weblog/2016/sep/26/security-releases/
for upstream announcement.

(cherry picked from commit 7e37d4bbf8)
2016-09-29 23:54:59 +02:00
Lancelot SIX
8368831543
pythonPackages.django_1_9: 1.9.9 -> 1.9.10
This is a security release.

It fixes CVE-2016-7401.

See https://www.djangoproject.com/weblog/2016/sep/26/security-releases/
for upstream announcement.

(cherry picked from commit dd553b6ef5)
2016-09-29 23:54:59 +02:00
Franz Pletz
bf041b3e9b
cryptopp: 5.6.2 -> 5.6.4
Fix CVE-2016-3995. #18856

Remove broken flag. #19040

cc #19009

(cherry picked from commit eb6a1c9238)
2016-09-29 23:43:03 +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
f0dbca03b8 pam_usb: Fix evaluation
(cherry picked from commit fe9e5f9f55)
2016-09-29 20:38:43 +02:00
Eelco Dolstra
3851322da2 cudatoolkit: Fix building dependent packages
- Set a cmake flag to allow cmake to find CUDA automatically.

- Pass -D_FORCE_INLINES to work around

    /nix/store/8sl4jfs3nq0pkq4gg655s3axrxdx7z29-glibc-2.24-dev/include/string.h: In function 'void* __mempcpy_inline(void*, const void*, size_t)':
    /nix/store/8sl4jfs3nq0pkq4gg655s3axrxdx7z29-glibc-2.24-dev/include/string.h:650:42: error: 'memcpy' was not declared in this scope

  https://github.com/BVLC/caffe/issues/4046

This fixes OpenSubdiv and Blender.

(cherry picked from commit 5ade8fff79)
2016-09-29 20:38:43 +02:00
Eelco Dolstra
1f6fd508ed opensubdiv: 3.0.4 -> 3.0.5
(cherry picked from commit 09f58645ca)
2016-09-29 20:38:43 +02:00
Eelco Dolstra
d5a47a77b6 nix: Enable install check
Looks like this got disabled accidentally in
ec5b66eb4a.

(cherry picked from commit 6a9fb8b9e0)
2016-09-29 20:38:43 +02:00
Eelco Dolstra
7d67325976 runInMachine: Unset another variable
Thanks @cstrahan.

(cherry picked from commit 4dcb685af9)
2016-09-29 20:38:42 +02:00
Eelco Dolstra
d97b17b136 gdrivefs: 0.14.3 -> 0.14.8
(cherry picked from commit 5d670ed65c)
2016-09-29 20:38:42 +02:00
Eelco Dolstra
569d531e60 runInMachine: Support passAsFile
We need to rewrite attributes passed via files to their location in
/tmp/xchg in the VM. Otherwise functions like runCommand don't work.

(cherry picked from commit 75baee8523)
2016-09-29 20:38:42 +02:00
Eelco Dolstra
392374235b minio-client: Init at 20160821
(cherry picked from commit 039ac38d1e)
2016-09-29 20:38:42 +02:00
Eelco Dolstra
68ce118c55 minio: Init at 20160821
(cherry picked from commit 2597562d42)
2016-09-29 20:38:42 +02:00
Eelco Dolstra
2cda536ea5 go: Remove unused version
(cherry picked from commit 587348743c)
2016-09-29 20:38:42 +02: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
fed1753bae Make the NFSv4 tests release-critical
We can probably drop NFSv3...

(cherry picked from commit d8625f6d25)
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
14df509f3e openresolv: 3.7.0 -> 3.8.1
(cherry picked from commit d0857bb1e6)
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
77bc2bb60a shadow: Separate man output
This removes ~2 MiB from the minimal config.

(cherry picked from commit e8315cb1ca)
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
Eelco Dolstra
397764035e mariadb: Don't install mysqlbug
This causes a dependency on gcc.

(cherry picked from commit 33da338bde)
2016-09-29 20:29:42 +02:00
Eelco Dolstra
eb8e1d16b5 google-talk-plugin: Use mesa_noglu instead of mesa
(cherry picked from commit 62f055af47)
2016-09-29 20:25:02 +02:00
Eelco Dolstra
29e57d8d3f glxinfo: Drop dependency on mesa-noglu.dev and glu.dev
(cherry picked from commit 9354e0e518)
2016-09-29 20:24:14 +02:00
Eelco Dolstra
451a468d34 Move useSetUID to pam_usb, the only place where it's used
(cherry picked from commit c5ddb7dd56)
2016-09-29 20:23:57 +02:00
Eelco Dolstra
1077c83cd0 Add a warning about using requireFile
(cherry picked from commit 030e20f759)
2016-09-29 20:23:54 +02:00
Eelco Dolstra
97953b455c subversion: Remove openssl.dev from the runtime closure
(cherry picked from commit 81447b6a59)
2016-09-29 20:19:19 +02:00
Eelco Dolstra
642e5bd611 xscreensaver: Drop runtime dependency on mesa_noglu.dev and glu.dev
(cherry picked from commit cd901eac5f)
2016-09-29 20:19:02 +02:00
Eelco Dolstra
962738a045 apr-util: Drop dependency on openssl.dev in out
(cherry picked from commit 6abfb2bd64)
2016-09-29 20:18:24 +02:00
Eelco Dolstra
0f1d8f63da Fix unknown licenses
(cherry picked from commit 85c070e85a)
2016-09-29 20:18:03 +02:00
Eelco Dolstra
fdd68a73ab Net::Amazon::S3: 0.60 -> 0.80
(cherry picked from commit 6776882b30)
2016-09-29 20:17:57 +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
Eelco Dolstra
9614a32f73 virtualbox: Drop dontPatchELF hack
However, this also requires ad8f31df7f
to get rid of gcc_multi.out in the closure.

(cherry picked from commit ddd41a509a)
2016-09-29 20:14:35 +02:00
Eelco Dolstra
85d4480e3e strigi: Fix libraries being installed in $out/$out/lib
Since we don't strip binaries in $out/$out, this was causing strigi to
have a dependency on gcc in its closure.

(cherry picked from commit 3143f39e5a)
2016-09-29 20:14:22 +02:00
Eelco Dolstra
068018b672 cmake-2_8 -> cmake_2_8
(cherry picked from commit 1dd3ece50e)
2016-09-29 20:14:08 +02:00