Merge branch 'master' of git://github.com/NixOS/nixpkgs into origin/gromacs

pkgs/applications/editors/emacs-modes/nxml/builder.sh

@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/emacs/site-lisp
-cd $out/emacs/site-lisp
-tar xvfz $src
-mv nxml-mode-*/* .
-rmdir nxml-mode-*

pkgs/applications/editors/emacs-modes/nxml/default.nix

@@ -1,8 +0,0 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "nxml-mode-20041004";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nixos.org/tarballs/nxml-mode-20041004.tar.gz;
-    md5 = "ac137024cf337d6f11d8ab278d39b4db";
-  };
-}

pkgs/development/tools/analysis/valgrind/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gdb }:
 
 stdenv.mkDerivation (rec {
-  name = "valgrind-3.8.0";
+  name = "valgrind-3.8.1";
 
   src = fetchurl {
     url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "1310lxmzidrbv0l3hrf45ampkf61gv2vb8msnqm684lp41gmh5px";
+    sha256 = "1nsqk70ry3221sd62s4f0njcrncppszs4xxjcak13lxyfq2y0fs7";
   };
 
   # Perl is needed for `cg_annotate'.

pkgs/os-specific/linux/nvidia-x11/builder.sh

@@ -28,8 +28,8 @@ installPhase() {
 
     # Install libGL and friends.
     mkdir -p $out/lib
-    cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libXv* libvdpau_nvidia* tls $out/lib/
-    
+    cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libvdpau_nvidia* tls $out/lib/
+
     ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so
     ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so.1
     ln -snf libGL.so.$versionNumber $out/lib/libGL.so
@@ -37,18 +37,16 @@ installPhase() {
     ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1
     ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1
     ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1
-    ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1
     ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1
     ln -snf libcuda.so.1 $out/lib/libcuda.so
     ln -snf libvdpau_nvidia.so.$versionNumber $out/lib/libvdpau_nvidia.so
 
     patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.*
     patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
     patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-    
+
     if test -z "$libsOnly"; then
-        
+
         # Install the kernel module.
         mkdir -p $out/lib/modules/$kernelVersion/misc
         cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
@@ -74,7 +72,7 @@ installPhase() {
 	    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
 	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
         done
-    
+
         # Header files etc.
         mkdir -p $out/include/nvidia
         cp -p *.h $out/include/nvidia

pkgs/os-specific/linux/nvidia-x11/default.nix

@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "304.60"; in
+let versionNumber = "310.19"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -19,12 +19,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 = "0h64wxivh4kmqqhyklvkfwy9nxddqhc0whrw1skpczyjblr2ranr";
+        sha256 = "0bqcg2zlp42msz1pghrpmjy6bw1abm6xxh129m8pz80ydb085l45";
       }
     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 = "1jkgvpd7c760bn34zvq6iinidmbmn70ymh635c3sy9nnx2gr2f7m";
+        sha256 = "0wjwm8m6hakr22xn2fm59abr1by65p987h7jgaa8q5zvmzgrxd87";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

pkgs/top-level/all-packages.nix

@@ -6900,8 +6900,6 @@ let
 
     notmuch = callPackage ../applications/networking/mailreaders/notmuch { };
 
-    nxml = callPackage ../applications/editors/emacs-modes/nxml { };
-
     # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
     # we want it to have higher precedence.
     org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
@@ -6916,8 +6914,8 @@ let
 
     proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral {
       texLive = pkgs.texLiveAggregationFun {
-                  paths = [ pkgs.texLive pkgs.texLiveCMSuper ];
-                };
+        paths = [ pkgs.texLive pkgs.texLiveCMSuper ];
+      };
     };
 
     quack = callPackage ../applications/editors/emacs-modes/quack { };

pkgs/top-level/node-packages.nix

@@ -494,6 +494,19 @@ let self = {
     ];
   };
 
+  "jsontool" = self."jsontool-*";
+
+  "jsontool-*" = self.buildNodePackage rec {
+    name = "jsontool-5.1.1";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsontool/-/${name}.tgz";
+      sha256 = "f7c12a0de635905f8134dfc8385f237135494d8c99fc0a5f112ee9735c2b6d05";
+    };
+    deps = [
+
+    ];
+  };
+
   "knox" = self."knox-*";
 
   "knox-*" = self.buildNodePackage rec {