Merge remote-tracking branch 'origin/master' into systemd-219

pkgs/development/tools/analysis/massif-visualizer/default.nix

@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, kdelibs, kgraphviewer, gettext }:
+{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
+, kdelibs, kgraphviewer }:
 
 stdenv.mkDerivation rec {
   name = "massif-visualizer-${version}";
@@ -9,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "9940fa90137ca5eef08b9ec220825fadbf03db423a670a2c7fe3edab271d9922";
   };
 
-  buildInputs = [ kdelibs kgraphviewer gettext ];
+  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
+  buildInputs = [ kdelibs kgraphviewer ];
 
   meta = with stdenv.lib; {
     description = "Tool that visualizes massif data generated by valgrind";

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

@@ -1,19 +1,21 @@
 { stdenv, fetchurl, fetchpatch, perl, gdb }:
 
 stdenv.mkDerivation rec {
-  name = "valgrind-3.10.1";
+  name = "valgrind-3.11.0";
 
   src = fetchurl {
     url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "15xrzhfnwwn7n1sfbkwvdbvs6zk0zx718n6zd5i1nrnvdp13s9gs";
+    sha256 = "0hiv871b9bk689mv42mkhp76za78l5773glszfkdbpf1m1qn4fbc";
   };
 
-  patches = [(fetchpatch {
-    name = "glibc-2.21.patch";
-    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
-      + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69";
-    sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19";
-  }) ./linux-4.0.patch];
+  patches =
+    [ (fetchpatch {
+        name = "glibc-2.21.patch";
+        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
+          + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69";
+        sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19";
+      })
+    ];
 
   outputs = [ "out" "doc" ];
 

pkgs/development/tools/analysis/valgrind/linux-4.0.patch

@@ -1,12 +0,0 @@
-diff -Naur valgrind-3.10.1/configure valgrind-3.10.1-patch/configure
---- valgrind-3.10.1/configure	2014-11-25 11:42:25.000000000 -0800
-+++ valgrind-3.10.1-patch/configure	2015-04-21 09:45:37.656113841 -0700
-@@ -5553,7 +5553,7 @@
-         kernel=`uname -r`
- 
-         case "${kernel}" in
--             2.6.*|3.*)
-+             2.6.*|3.*|4.*)
-         	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x family (${kernel})" >&5
- $as_echo "2.6.x/3.x family (${kernel})" >&6; }
- 

pkgs/development/tools/build-managers/cargo/default.nix

@@ -1,20 +1,21 @@
 { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
 , cmake, zlib }:
 
-with ((import ./common.nix) { inherit stdenv; version = "0.3.0"; });
+with ((import ./common.nix) { inherit stdenv; version = "0.5.0"; });
 
 with rustPlatform;
 
 buildRustPackage rec {
   inherit name version meta;
 
+  # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules
   src = fetchgit {
-    url = "https://github.com/rust-lang/cargo.git";
-    rev = "refs/tags/0.3.0";
-    sha256 = "0p7p7yivydjkpqb53a8i7pjl719z3gxa6czi0255ccwsh6n9z793";
+    url = "git://github.com/rust-lang/cargo";
+    rev = "refs/tags/${version}";
+    sha256 = "1wg7vr6fpk9n76ly65lf2z9w1dj5nhykffbwrv46lybd8m3r8x3w";
   };
 
-  depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w";
+  depsSha256 = "1q92q63g9pz7fy9fhx8y0kqarsshmzv1dq18ki3hdd7d5pcbczna";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
 

pkgs/development/tools/build-managers/cmake/default.nix

@@ -11,7 +11,7 @@ assert wantPS -> (ps != null);
 let
   os = stdenv.lib.optionalString;
   majorVersion = "3.3";
-  minorVersion = "1";
+  minorVersion = "2";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1mp32dqywk4dfw7zmpgp31axszv7h74yk69g273z21q7d8n04rfd";
+    sha256 = "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7";
   };
 
   enableParallelBuilding = true;

pkgs/development/tools/build-managers/dub/default.nix

@@ -1,15 +1,17 @@
-{stdenv, fetchurl, curl, dmd, gcc, unzip }:
+{ stdenv, fetchFromGitHub, curl, dmd, gcc }:
 
+let version = "0.9.24"; in
 stdenv.mkDerivation {
-  name = "dub-0.9.23";
+  name = "dub-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/D-Programming-Language/dub/archive/v0.9.23.tar.gz";
-    sha256 = "7ecbce89c0e48b43705d7c48003394f383556f33562c4b5d884a786cd85814d1";
+  src = fetchFromGitHub {
+    sha256 = "1j2cs2mvaj6bjjicabq6lh97nx0v4b2k6pj4cmywki7hf3i1p8yy";
+    rev = "v${version}";
+    repo = "dub";
+    owner = "D-Programming-Language";
   };
 
-  buildInputs = [ unzip curl ];
-
+  buildInputs = [ curl ];
   propagatedBuildInputs = [ gcc dmd ];
 
   buildPhase = ''
@@ -26,9 +28,10 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Build tool for D projects";
     homepage = http://code.dlang.org/;
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
     platforms = platforms.unix;
   };
 }

pkgs/development/tools/continuous-integration/jenkins/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "1.594";
+  version = "1.631";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "1ypinl78avvir9499xargjbrzxv2b8kspjicsg8xzk5wsymzybn1";
+    sha256 = "0bfh5gv3yk9awkzf660jxf9vzzdcr6qa9hl0hkivaj4gmp5f9sp8";
   };
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";

pkgs/development/tools/electron/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
 , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip
+, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, unzip
 , systemd
 }:
 let
@@ -9,9 +9,9 @@ let
     paths = [
       stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
       fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
-      xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
-      xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
-      xlibs.libXcursor libcap systemd
+      xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
+      xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
+      xorg.libXcursor libcap systemd
     ];
   };
 in stdenv.mkDerivation rec {

pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix

@@ -1,16 +1,17 @@
-{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs
-, fetchFromGitHub, language-nix, lens, optparse-applicative, pretty, pretty-show
-, stdenv, nix-prefetch-scripts, makeWrapper
+{ mkDerivation, ansi-wl-pprint, base, Cabal, containers
+, distribution-nixpkgs, language-nix, lens, optparse-applicative
+, pretty, pretty-show, stdenv, text, yaml
+, nix-prefetch-scripts, makeWrapper, fetchFromGitHub
 }:
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150903";
+  version = "20150922";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
+    sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
@@ -18,7 +19,7 @@ mkDerivation rec {
   enableSharedExecutables = false;
   executableHaskellDepends = [
     ansi-wl-pprint base Cabal containers distribution-nixpkgs
-    language-nix lens optparse-applicative pretty pretty-show
+    language-nix lens optparse-applicative pretty pretty-show text yaml
   ];
   executableToolDepends = [ makeWrapper ];
   postInstall = ''

pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix

@@ -1,31 +1,33 @@
 { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
-, deepseq-generics, directory, doctest, fetchFromGitHub, filepath
-, hackage-db, hspec, language-nix, lens, pretty, process, SHA
-, split, stdenv, transformers, utf8-string
+, deepseq-generics, directory, doctest, filepath, hackage-db
+, hashable, hspec, language-nix, lens, pretty, process, QuickCheck
+, SHA, split, stdenv, text, transformers, unordered-containers
+, utf8-string, yaml, fetchFromGitHub
 }:
 
 mkDerivation rec {
   pname = "distribution-nixpkgs";
-  version = "20150903";
+  version = "20150922";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
+    sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
-    aeson base bytestring Cabal containers deepseq deepseq-generics
-    directory doctest filepath hackage-db hspec language-nix lens
-    pretty process SHA split transformers utf8-string
+    aeson base bytestring Cabal containers deepseq-generics directory
+    filepath hackage-db hashable language-nix lens pretty process SHA
+    split text transformers unordered-containers utf8-string yaml
   ];
   testHaskellDepends = [
     aeson base bytestring Cabal containers deepseq deepseq-generics
-    directory doctest filepath hackage-db hspec language-nix lens
-    pretty process SHA split transformers utf8-string
+    directory doctest filepath hackage-db hashable hspec language-nix
+    lens pretty process QuickCheck SHA split text transformers
+    unordered-containers utf8-string yaml
   ];
   homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Convert Cabal files into Nix build instructions";
+  description = "Data types and functions to manipulate the Nixpkgs distribution";
   license = stdenv.lib.licenses.bsd3;
   maintainers = with stdenv.lib.maintainers; [ simons ];
 }

pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix

@@ -1,24 +1,28 @@
-{ mkDerivation, base, Cabal, containers, distribution-nixpkgs
-, fetchFromGitHub, filepath, language-nix, lens, monad-par
-, monad-par-extras, mtl, optparse-applicative, pretty, stdenv
+{ mkDerivation, aeson, base, bytestring, Cabal, containers
+, deepseq-generics, directory, distribution-nixpkgs, filepath
+, language-nix, lens, monad-par, monad-par-extras, mtl
+, optparse-applicative, pretty, SHA, split, stackage-types, stdenv
+, text, time, utf8-string, yaml, fetchFromGitHub
 }:
 
 mkDerivation rec {
   pname = "hackage2nix";
-  version = "20150903";
+  version = "20150922";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
+    sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
   isExecutable = true;
   enableSharedExecutables = false;
   executableHaskellDepends = [
-    base Cabal containers distribution-nixpkgs filepath language-nix
-    lens monad-par monad-par-extras mtl optparse-applicative pretty
+    aeson base bytestring Cabal containers deepseq-generics directory
+    distribution-nixpkgs filepath language-nix lens monad-par
+    monad-par-extras mtl optparse-applicative pretty SHA split
+    stackage-types text time utf8-string yaml
   ];
   postInstall = ''
     exe=$out/bin/${pname}

pkgs/development/tools/haskell/ihaskell/wrapper.nix

@@ -1,4 +1,4 @@
-{ stdenv, writeScriptBin, buildEnv, ghcWithPackages, ihaskell, ipython, packages }:
+{ stdenv, writeScriptBin, makeWrapper, buildEnv, ghcWithPackages, ihaskell, ipython, packages }:
 let
   ihaskellEnv = ghcWithPackages (self: [
     self.ihaskell
@@ -18,6 +18,10 @@ buildEnv {
   name = "ihaskell-with-packages";
   paths = [ ihaskellEnv ipython ];
   postBuild = ''
+    . "${makeWrapper}/nix-support/setup-hook"
     ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/.
+    for prg in $out/bin"/"*;do
+      wrapProgram $prg --set PYTHONPATH "$(echo ${ipython}/lib/*/site-packages)"
+    done
   '';
 }

pkgs/development/tools/misc/autoconf-archive/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xz }:
 stdenv.mkDerivation rec {
   name = "autoconf-archive-${version}";
-  version = "2015.02.24";
+  version = "2015.09.25";
 
   src = fetchurl {
     url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
-    sha256 = "1i8d5cvijkfqhjdnb7imy36qpjqi7ra992j9bsl2qmcg0zfmnwb9";
+    sha256 = "02im1jn0igzn2qpxkgiwxvcm3jgvjaypg955pi9h2d6jvfjnf13w";
   };
   buildInputs = [ xz ];
 

pkgs/development/tools/misc/autogen/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "autogen-${version}";
-  version = "5.18.5";
+  version = "5.18.6";
 
   src = fetchurl {
-    url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
-    sha256 = "1flnbnmkbqmbfgammkl8m36wrlk6rhpgnf9pdm6gdfhqalxvggbv";
+    url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz";
+    sha256 = "0sfmmy19k9z0j3f738fyk6ljf6b66410cvd5zzyplxi2683j10qs";
   };
 
   nativeBuildInputs = [ which pkgconfig perl ];

pkgs/development/tools/misc/d-feet/default.nix

@@ -1,6 +1,5 @@
 { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
-, pango, gdk_pixbuf, atk, pep8, python, makeWrapper, gnome3
-, pygobject3, gobjectIntrospection, libwnck3 }:
+, pep8, python, makeWrapper, gnome3, pygobject3, libwnck3 }:
 
 let
   version = "${major}.10";
@@ -17,8 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libxml2 itstool intltool glib gtk3 pep8 python
-    gnome3.defaultIconTheme
-    makeWrapper pygobject3 libwnck3
+    gnome3.defaultIconTheme makeWrapper pygobject3 libwnck3
   ];
 
   preFixup =

pkgs/development/tools/misc/dbench/default.nix

@@ -1,22 +1,29 @@
-{stdenv, fetchgit, autoconf, popt, zlib}: 
+{ stdenv, fetchgit, autoconf, popt, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "dbench-20101121";
+  name = "dbench-2013-01-01";
 
-  buildInputs = [autoconf popt zlib];
+  src = fetchgit {
+    url = git://git.samba.org/sahlberg/dbench.git;
+    rev = "65b19870ed8d25bff14cafa1c30beb33f1fb6597";
+    sha256 = "0hzn7xr58y7f01hp02d0ciy2n5awskypfbdc56ff1vkr1b12i2p9";
+  };
+
+  buildInputs = [ autoconf popt zlib ];
 
   preConfigure = ''
     ./autogen.sh
   '';
 
-  src = fetchgit {
-    url = git://git.samba.org/sahlberg/dbench.git;
-    rev = "8b5143bcc0f4409553392fdf12fd21c95a075fae";
-    sha256 = "607a62b7ff2e9b1393980777e0ba239215dd8145bc1a34649bcbe2b1e567006d";
-  };
-
   postInstall = ''
-    cp -R loadfiles/* $out/share
+    cp -R loadfiles/ $out/share/
   '';
 
+  meta = with stdenv.lib; {
+    description = "Filesystem benchmark tool based on load patterns";
+    homepage = https://dbench.samba.org/;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
 }

pkgs/development/tools/misc/kibana/default.nix

@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kibana-${version}";
-  version = "4.2.0";
+  version = "4.1.2";
 
   src = fetchurl {
     url = "http://download.elastic.co/kibana/kibana-snapshot/kibana-4.2.0-snapshot-linux-x86.tar.gz";
-    sha256 = "01v35iwy8y6gpbl0v9gikvbx3zdxkrm60sxann76mkaq2al3pv0i";
+    sha256 = "1sa92laawxc05abiysvp12v5nzrqggmls592mkprwnbkkkbwsm5x";
   };
 
   buildInputs = [ makeWrapper ];

pkgs/development/tools/misc/swig/2.x.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
   name = "swig-${version}";
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
     # Licensing is a mess: http://www.swig.org/Release/LICENSE .
     license = "BSD-style";
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud ];
+    maintainers = [ lib.maintainers.urkud ];
   };
 }

pkgs/development/tools/misc/swig/3.x.nix

@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
   name = "swig-${version}";
-  version = "3.0.6";
+  version = "3.0.7";
 
   src = fetchFromGitHub {
     owner = "swig";
     repo = "swig";
     rev = "rel-${version}";
-    sha256 = "1y8rlrkqs9h5cyp75s1i9rvrj35kkcwjjw65dyv3xy1skgfxb6w8";
+    sha256 = "18zp9546d5xfq88nyykk5v3hh0iyp8r59i2ridbavxn3z914mhyv";
   };
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
@@ -25,24 +25,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
-
-    longDescription = ''
-       SWIG is an interface compiler that connects programs written in C and
-       C++ with languages such as Perl, Python, Ruby, Scheme, and Tcl.  It
-       works by taking the declarations found in C/C++ header files and using
-       them to generate the wrapper code that scripting languages need to
-       access the underlying C/C++ code.  In addition, SWIG provides a variety
-       of customization features that let you tailor the wrapping process to
-       suit your application.
-    '';
-
     homepage = http://swig.org/;
-
     # Licensing is a mess: http://www.swig.org/Release/LICENSE .
     license = "BSD-style";
-
-    platforms = stdenv.lib.platforms.unix;
-
-    maintainers = with stdenv.lib.maintainers; [ urkud ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = [ lib.maintainers.urkud lib.maintainers.wkennington ];
   };
 }

pkgs/development/tools/node-webkit/nw11.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
-, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
+, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
 , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap
 , libnotify}:
 let
@@ -9,10 +9,10 @@ let
   nwEnv = buildEnv {
     name = "node-webkit-env";
     paths = [
-      xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf
-      freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage
-      xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc
-      xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap
+      xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf
+      freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
+      xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc
+      xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
       libnotify
     ];
   };

pkgs/development/tools/node-webkit/nw12.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
-, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
+, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
 , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap
 , libnotify}:
 let
@@ -9,10 +9,10 @@ let
   nwEnv = buildEnv {
     name = "nwjs-env";
     paths = [
-      xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf
-      freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage
-      xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc
-      xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap
+      xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf
+      freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
+      xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc
+      xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
       libnotify
     ];
   };

pkgs/development/tools/node-webkit/nw9.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
-, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
+, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
 , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev}:
 let
   bits = if stdenv.system == "x86_64-linux" then "x64"
@@ -8,10 +8,10 @@ let
   nwEnv = buildEnv {
     name = "node-webkit-env";
     paths = [
-      xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf
-      freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage
-      xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.cc
-      xlibs.libXtst xlibs.libXi
+      xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf
+      freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
+      xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc
+      xorg.libXtst xorg.libXi
     ];
   };
 

pkgs/development/tools/ocaml/camlp5/default.nix

@@ -7,11 +7,11 @@ in
 
 stdenv.mkDerivation {
 
-  name = "camlp5${if transitional then "_transitional" else ""}-6.12";
+  name = "camlp5${if transitional then "_transitional" else ""}-6.14";
 
   src = fetchurl {
-    url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.12.tgz;
-    sha256 = "00jwgp6w4g64lfqjx77xziy532091fy00c42fsy0b4i892rch5mp";
+    url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.14.tgz;
+    sha256 = "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89";
   };
 
   buildInputs = [ ocaml ];

pkgs/development/tools/rust/racer/default.nix

@@ -1,17 +1,18 @@
-{stdenv, fetchgit, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
 
 with rustPlatform;
 
 buildRustPackage rec {
-  #TODO add emacs support
-  name = "racer-git-2015-05-18";
-  src = fetchgit {
-    url = https://github.com/phildawes/racer;
-    rev = "c2d31ed49baa11f06ffc0c7bc8f95dd00037d035";
-    sha256 = "0g420cbqpknhl61a4mpk3bbia8agf657d9vzzcqr338lmni80qz7";
+  name = "racer-${version}";
+  version = "1.0.0";
+  src = fetchFromGitHub {
+    owner = "phildawes";
+    repo = "racer";
+    rev = "v${version}";
+    sha256 = "1b6829nqx0sqw1akcid61izw8mah1dfx2nxldkmmg4scnydhvw1l";
   };
 
-  depsSha256 = "0s951apqcr96lvc1jamk6qw3631gwnlnfgcx55vlznfm7shnmywn";
+  depsSha256 = "1hfqr1kidl77lq3djbhfn37whvv6k0hg9g5gcnl6pgl6kn669hdc";
 
   buildInputs = [ makeWrapper ];
 
@@ -24,13 +25,13 @@ buildRustPackage rec {
     cp -p target/release/racer $out/bin/
     wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src"
     install -d $out/share/emacs/site-lisp
-    install "editors/"*.el $out/share/emacs/site-lisp
+    install "editors/emacs/"*.el $out/share/emacs/site-lisp
   '';
 
   meta = with stdenv.lib; {
     description = "A utility intended to provide Rust code completion for editors and IDEs";
     homepage = https://github.com/phildawes/racer;
     license = stdenv.lib.licenses.mit;
-    maintainers = [ maintainers.jagajaga ];
+    maintainers = with maintainers; [ jagajaga globin ];
   };
 }

pkgs/development/tools/rust/rustfmt/default.nix

@@ -1,16 +1,18 @@
-{stdenv, fetchgit, rustUnstable, makeWrapper }:
+{ stdenv, fetchgit, rustUnstable, makeWrapper, llvmPackages_37 }:
 
 with rustUnstable;
 
 buildRustPackage rec {
-  name = "rustfmt-git-2015-09-05";
+  name = "rustfmt-git-2015-09-23";
   src = fetchgit {
     url = https://github.com/nrc/rustfmt;
-    rev = "6c5d3500bb805b37865fe961a7054f8435d176fc";
-    sha256 = "0y506viir1klzvspi49qawrfd2g12p9ff2fyy1ndba6zixf69a90";
+    rev = "c14cfca0e3de3dfa5fd91d39a85c5b452e7756e3";
+    sha256 = "0q72mfj2ph2n4cd0cs4p2mpyr2ixd6ss607kjlgfinjv6klk1i3b";
   };
 
-  depsSha256 = "1kfc9l176qkimaag9p650sfpaz50p263rw2021gq5kjw8cyndlx8";
+  buildInputs = [ llvmPackages_37.llvm ];
+
+  depsSha256 = "13i9qaia1wn18lgfl69rrxw7b24bq1bpqhdck2jzxpv3wi2xshlw";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";

pkgs/development/tools/selenium/server/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xlibs
+{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg
 , chromedriver, chromeSupport ? true }:
 
 with stdenv.lib;
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xlibs.libX11}/lib" \
+      --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \
       launchers/launcher-linux-${arch}
     ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch}
   '';

pkgs/development/tools/thrust/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk
 , pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss
-, xlibs, libcap, unzip
+, xorg, libcap, unzip
 }:
 
 let
@@ -8,9 +8,9 @@ let
     name = "env-thrust";
     paths = [
       stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf
-      cairo cups expat alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11
-      xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite
-      xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcursor libcap
+      cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11
+      xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite
+      xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap
     ];
   };
 in stdenv.mkDerivation rec {