···

       
11
       
11
       
 
       
  # FIXME: should introduce an option like

     

       
12
       
12
       
 
       
  # ‘hardware.video.nvidia.package’ for overriding the default NVIDIA

     

       
13
       
13
       
 
       
  # driver.

     

       
14
       
14
       
-
       
  enabled = elem "nvidia" drivers || elem "nvidiaLegacy173" drivers || elem "nvidiaLegacy304" drivers;

     

       
14
       
14
       
+
       
  enabled = elem "nvidia" drivers || elem "nvidiaLegacy173" drivers

     

       
15
       
15
       
+
       
    || elem "nvidiaLegacy304" drivers || elem "nvidiaLegacy340" drivers;

     

       
15
       
16
       
 
       


     

       
16
       
17
       
 
       
  nvidia_x11 =

     

       
17
       
18
       
 
       
    if elem "nvidia" drivers then

     
···

       
20
       
21
       
 
       
      config.boot.kernelPackages.nvidia_x11_legacy173

     

       
21
       
22
       
 
       
    else if elem "nvidiaLegacy304" drivers then

     

       
22
       
23
       
 
       
      config.boot.kernelPackages.nvidia_x11_legacy304

     

       
24
       
24
       
+
       
    else if elem "nvidiaLegacy340" drivers then

     

       
25
       
25
       
+
       
      config.boot.kernelPackages.nvidia_x11_legacy340

     

       
23
       
26
       
 
       
    else throw "impossible";

     

       
24
       
27
       
 
       


     

       
25
       
28
       
 
       
in

     

···

       
91
       
91
       
 
       
      # Execute commands via the root shell.

     

       
92
       
92
       
 
       
      $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;

     

       
93
       
93
       
 
       


     

       
94
       
94
       
+
       
      # Stop and start (regression test for #4989)

     

       
95
       
95
       
+
       
      $machine->succeed("nixos-container stop $id1");

     

       
96
       
96
       
+
       
      $machine->succeed("nixos-container start $id1");

     

       
97
       
97
       
+
       


     

       
98
       
98
       
+
       
      # Execute commands via the root shell.

     

       
99
       
99
       
+
       
      $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;

     

       
100
       
100
       
+
       


     

       
94
       
101
       
 
       
      # Destroy the containers.

     

       
95
       
102
       
 
       
      $machine->succeed("nixos-container destroy $id1");

     

       
96
       
103
       
 
       
      $machine->succeed("nixos-container destroy $id2");

     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
stdenv.mkDerivation rec {

     

       
6
       
6
       
 
       
  name = "oiio-${version}";

     

       
7
       
7
       
-
       
  version = "1.4.13";

     

       
7
       
7
       
+
       
  version = "1.4.14";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  src = fetchurl {

     

       
10
       
10
       
 
       
    url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";

     

       
11
       
11
       
-
       
    sha256 = "1idscm2qqdjgv362l7xk9v162axji7hqh7xdnd3i0wcxwjpgygca";

     

       
11
       
11
       
+
       
    sha256 = "1wn51d7044wyh25bwykxiw8rysb0v0sy2cfj6pyk5fg6rsr9cx51";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  buildInputs = [

     

···

       
13
       
13
       
 
       
stdenv.mkDerivation rec {

     

       
14
       
14
       
 
       
  name = "pidgin-${version}";

     

       
15
       
15
       
 
       
  majorVersion = "2";

     

       
16
       
16
       
-
       
  version = "${majorVersion}.10.10";

     

       
16
       
16
       
+
       
  version = "${majorVersion}.10.11";

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  src = fetchurl {

     

       
19
       
19
       
 
       
    url = "mirror://sourceforge/pidgin/${name}.tar.bz2";

     

       
20
       
20
       
-
       
    sha256 = "0bc2bk2g3w90mpz9sn9j95c71z4i2i3wxaqa2zpmmixf5r8rasyw";

     

       
20
       
20
       
+
       
    sha256 = "01s0q30qrjlzj7kkz6f8lvrwsdd55a9yjh2xjjwyyxzw849j3bpj";

     

       
21
       
21
       
 
       
  };

     

       
22
       
22
       
 
       


     

       
23
       
23
       
 
       
  inherit nss ncurses;

     

···

       
12
       
12
       
 
       


     

       
13
       
13
       
 
       
let

     

       
14
       
14
       
 
       


     

       
15
       
15
       
-
       
  versionNumber = "340.32";

     

       
16
       
16
       
-
       


     

       
15
       
15
       
+
       
  versionNumber = "340.58";

     

       
16
       
16
       
+
       
  /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them.

     

       
17
       
17
       
+
       
    Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs,

     

       
18
       
18
       
+
       
    will be included in 340.* legacy releases through the end of 2019.

     

       
19
       
19
       
+
       
  */

     

       
17
       
20
       
 
       
  inherit (stdenv.lib) makeLibraryPath;

     

       
18
       
21
       
 
       
in

     

       
19
       
22
       
 
       


     

       
20
       
23
       
 
       
stdenv.mkDerivation {

     

       
21
       
24
       
 
       
  name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";

     

       
22
       
25
       
 
       


     

       
23
       
23
       
-
       
  builder = ./builder.sh;

     

       
26
       
26
       
+
       
  builder = ./builder-legacy340.sh;

     

       
24
       
27
       
 
       


     

       
25
       
28
       
 
       
  src =

     

       
26
       
29
       
 
       
    if stdenv.system == "i686-linux" then

     

       
27
       
30
       
 
       
      fetchurl {

     

       
28
       
31
       
 
       
        url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";

     

       
29
       
29
       
-
       
        sha256 = "1xcm8czz4bmnlzkl3al58flw6jmbrg1y77cxjjdjqcsvbk1qj10x";

     

       
32
       
32
       
+
       
        sha256 = "0nzvfqn3cv2n486i38r3badd5jlmfv7x6k9s47calrqnd3q8zi3w";

     

       
30
       
33
       
 
       
      }

     

       
31
       
34
       
 
       
    else if stdenv.system == "x86_64-linux" then

     

       
32
       
35
       
 
       
      fetchurl {

     

       
33
       
36
       
 
       
        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";

     

       
34
       
34
       
-
       
        sha256 = "1nfrpx73817y1z0wkqqh02xjg65r0f05h9801mqm8ki2gxqv9vq0";

     

       
37
       
37
       
+
       
        sha256 = "0h78wmb1yyr1xah6x22ifk9gzd2jvg3vhhg091nvyhcvpmbjq806";

     

       
35
       
38
       
 
       
      }

     

       
36
       
39
       
 
       
    else throw "nvidia-x11 does not support platform ${stdenv.system}";

     

       
37
       
40
       
 
       


     

···

       
1
       
1
       
 
       
{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
-
       
let 

     

       
3
       
3
       
+
       
let

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
  versionNumber = "173.14.39";

     

       
6
       
6
       
 
       


     
···

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
stdenv.mkDerivation {

     

       
10
       
10
       
 
       
  name = "nvidia-x11-${versionNumber}-${kernel.version}";

     

       
11
       
11
       
-
       
  

     

       
12
       
12
       
-
       
  builder = ./builder-legacy.sh;

     

       
13
       
13
       
-
       
  

     

       
11
       
11
       
+
       


     

       
12
       
12
       
+
       
  builder = ./builder-legacy173.sh;

     

       
13
       
13
       
+
       


     

       
14
       
14
       
 
       
  src =

     

       
15
       
15
       
 
       
    if stdenv.system == "i686-linux" then

     

       
16
       
16
       
 
       
      fetchurl {

     

···

       
44
       
44
       
 
       
index b6d9bc6..04fbe57 100644

     

       
45
       
45
       
 
       
--- a/src/nspawn/nspawn.c

     

       
46
       
46
       
 
       
+++ b/src/nspawn/nspawn.c

     

       
47
       
47
       
+
       
@@ -758,7 +758,7 @@ static int mount_binds(const char *dest,

     

       
48
       
48
       
+
       
                  * and char devices. */

     

       
49
       
49
       
+
       
                 if (S_ISDIR(source_st.st_mode)) {

     

       
50
       
50
       
+
       
                         r = mkdir_label(where, 0755);

     

       
51
       
51
       
+
       
-                        if (r < 0) {

     

       
52
       
52
       
+
       
+                        if (r < 0 && r != -EEXIST) {

     

       
53
       
53
       
+
       
                                 log_error("Failed to create mount point %s: %s", where, strerror(-r));

     

       
54
       
54
       
+
       


     

       
55
       
55
       
+
       
                                 return r;

     

       
47
       
56
       
 
       
@@ -3073,6 +3073,7 @@ int main(int argc, char *argv[]) {

     

       
48
       
57
       
 
       
                                 goto finish;

     

       
49
       
58
       
 
       
                         }

     

···

       
8290
       
8290
       
 
       


     

       
8291
       
8291
       
 
       
    nvidiabl = callPackage ../os-specific/linux/nvidiabl { };

     

       
8292
       
8292
       
 
       


     

       
8293
       
8293
       
-
       
    nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };

     

       
8293
       
8293
       
+
       
    nvidia_x11 = self.nvidia_x11_legacy340;

     

       
8294
       
8294
       
 
       


     

       
8295
       
8295
       
 
       
    nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };

     

       
8296
       
8296
       
 
       
    nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { };

     

       
8297
       
8297
       
+
       
    nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { };

     

       
8297
       
8298
       
 
       


     

       
8298
       
8299
       
 
       
    openafsClient = callPackage ../servers/openafs-client { };

     

       
8299
       
8300