From 909311b65022df121a7cd49af1a3439e03fbeaa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 24 Nov 2014 22:17:00 +0100 Subject: [PATCH 1/6] openimageio: update from 1.4.13 to 1.4.14 --- pkgs/applications/graphics/openimageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 00ba14d98af..b0abecc7cae 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "oiio-${version}"; - version = "1.4.13"; + version = "1.4.14"; src = fetchurl { url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "1idscm2qqdjgv362l7xk9v162axji7hqh7xdnd3i0wcxwjpgygca"; + sha256 = "1wn51d7044wyh25bwykxiw8rysb0v0sy2cfj6pyk5fg6rsr9cx51"; }; buildInputs = [ From bba575ff7a66706efbf918c2f7949ada322a0e64 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Thu, 20 Nov 2014 17:12:32 -0500 Subject: [PATCH 2/6] nvidia_x11: update to 340.58 Picked from #5070. --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index c89846db72c..1a56545cab0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "340.32"; + versionNumber = "340.58"; inherit (stdenv.lib) makeLibraryPath; in @@ -26,12 +26,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1xcm8czz4bmnlzkl3al58flw6jmbrg1y77cxjjdjqcsvbk1qj10x"; + sha256 = "0nzvfqn3cv2n486i38r3badd5jlmfv7x6k9s47calrqnd3q8zi3w"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1nfrpx73817y1z0wkqqh02xjg65r0f05h9801mqm8ki2gxqv9vq0"; + sha256 = "0h78wmb1yyr1xah6x22ifk9gzd2jvg3vhhg091nvyhcvpmbjq806"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From d39c6ceffcf6787dbfd813ffe4ef14788d0f2ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 24 Nov 2014 22:34:00 +0100 Subject: [PATCH 3/6] nvidia_x11: current long-lived becomes a new legacy CC: #5070. --- nixos/modules/hardware/video/nvidia.nix | 5 ++++- .../{builder-legacy.sh => builder-legacy173.sh} | 0 .../linux/nvidia-x11/{builder.sh => builder-legacy340.sh} | 0 pkgs/os-specific/linux/nvidia-x11/legacy173.nix | 8 ++++---- .../linux/nvidia-x11/{default.nix => legacy340.nix} | 7 +++++-- pkgs/top-level/all-packages.nix | 3 ++- 6 files changed, 15 insertions(+), 8 deletions(-) rename pkgs/os-specific/linux/nvidia-x11/{builder-legacy.sh => builder-legacy173.sh} (100%) rename pkgs/os-specific/linux/nvidia-x11/{builder.sh => builder-legacy340.sh} (100%) rename pkgs/os-specific/linux/nvidia-x11/{default.nix => legacy340.nix} (86%) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 2b9221ec5d7..325aa5f093f 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -11,7 +11,8 @@ let # FIXME: should introduce an option like # ‘hardware.video.nvidia.package’ for overriding the default NVIDIA # driver. - enabled = elem "nvidia" drivers || elem "nvidiaLegacy173" drivers || elem "nvidiaLegacy304" drivers; + enabled = elem "nvidia" drivers || elem "nvidiaLegacy173" drivers + || elem "nvidiaLegacy304" drivers || elem "nvidiaLegacy340" drivers; nvidia_x11 = if elem "nvidia" drivers then @@ -20,6 +21,8 @@ let config.boot.kernelPackages.nvidia_x11_legacy173 else if elem "nvidiaLegacy304" drivers then config.boot.kernelPackages.nvidia_x11_legacy304 + else if elem "nvidiaLegacy340" drivers then + config.boot.kernelPackages.nvidia_x11_legacy340 else throw "impossible"; in diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh similarity index 100% rename from pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh rename to pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh similarity index 100% rename from pkgs/os-specific/linux/nvidia-x11/builder.sh rename to pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 0014a5d2ee5..9182139c0a8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}: -let +let versionNumber = "173.14.39"; @@ -8,9 +8,9 @@ in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}-${kernel.version}"; - - builder = ./builder-legacy.sh; - + + builder = ./builder-legacy173.sh; + src = if stdenv.system == "i686-linux" then fetchurl { diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix similarity index 86% rename from pkgs/os-specific/linux/nvidia-x11/default.nix rename to pkgs/os-specific/linux/nvidia-x11/legacy340.nix index 1a56545cab0..ad0c0c0b367 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -13,14 +13,17 @@ assert (!libsOnly) -> kernel != null; let versionNumber = "340.58"; - + /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them. + Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs, + will be included in 340.* legacy releases through the end of 2019. + */ inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - builder = ./builder.sh; + builder = ./builder-legacy340.sh; src = if stdenv.system == "i686-linux" then diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29f1dea4a4a..54483719f11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8294,10 +8294,11 @@ let nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; + nvidia_x11 = self.nvidia_x11_legacy340; nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; + nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; openafsClient = callPackage ../servers/openafs-client { }; From b216e2b8e6f933e3b0651e99f0b090aa59a2ac0d Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 24 Nov 2014 22:11:37 +0100 Subject: [PATCH 4/6] systemd-nspawn: Ignore existing directories when trying to create mount-points (#4989) --- pkgs/os-specific/linux/systemd/fixes.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch index 592ea59ad6c..ff31b4a75d4 100644 --- a/pkgs/os-specific/linux/systemd/fixes.patch +++ b/pkgs/os-specific/linux/systemd/fixes.patch @@ -44,6 +44,15 @@ diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index b6d9bc6..04fbe57 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c +@@ -758,7 +758,7 @@ static int mount_binds(const char *dest, + * and char devices. */ + if (S_ISDIR(source_st.st_mode)) { + r = mkdir_label(where, 0755); +- if (r < 0) { ++ if (r < 0 && r != -EEXIST) { + log_error("Failed to create mount point %s: %s", where, strerror(-r)); + + return r; @@ -3073,6 +3073,7 @@ int main(int argc, char *argv[]) { goto finish; } From 82f2be6a2601291f8d207eafd9b84a8229df6ad0 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 24 Nov 2014 23:19:34 +0100 Subject: [PATCH 5/6] containers: add test that stopping and starting a container works (#4989) --- nixos/tests/containers.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix index 331324139a1..e0add8a936f 100644 --- a/nixos/tests/containers.nix +++ b/nixos/tests/containers.nix @@ -91,6 +91,13 @@ import ./make-test.nix { # Execute commands via the root shell. $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die; + # Stop and start (regression test for #4989) + $machine->succeed("nixos-container stop $id1"); + $machine->succeed("nixos-container start $id1"); + + # Execute commands via the root shell. + $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die; + # Destroy the containers. $machine->succeed("nixos-container destroy $id1"); $machine->succeed("nixos-container destroy $id2"); From 7e94263c6d9b620d47fa4dc4c7eff06cfe32ee9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 24 Nov 2014 23:32:40 +0100 Subject: [PATCH 6/6] pidgin: minor update --- .../networking/instant-messengers/pidgin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index a5f286d4705..5e8f266930f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "pidgin-${version}"; majorVersion = "2"; - version = "${majorVersion}.10.10"; + version = "${majorVersion}.10.11"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "0bc2bk2g3w90mpz9sn9j95c71z4i2i3wxaqa2zpmmixf5r8rasyw"; + sha256 = "01s0q30qrjlzj7kkz6f8lvrwsdd55a9yjh2xjjwyyxzw849j3bpj"; }; inherit nss ncurses;