Merge branch 'master' into staging

pkgs/development/compilers/ats2/default.nix

@@ -2,22 +2,22 @@
 
 stdenv.mkDerivation rec {
   name    = "ats2-${version}";
-  version = "0.2.4";
+  version = "0.2.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "0dx3r2vxmarj3aqm0xlcmls1h08pll9y9k4820df41awyrwmfvcy";
+    sha256 = "0hfaw8mrxrmb9kdbz5sp4nfjsmncmq6zqwm1n2x2p6arn0za6y9i";
   };
 
   buildInputs = [ gmp ];
 
   setupHook = ./setup-hook.sh;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Functional programming language with dependent types";
     homepage    = "http://www.ats-lang.org";
-    license     = stdenv.lib.licenses.gpl3Plus;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = licenses.gpl3Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ thoughtpolice ttuegel ];
   };
 }

pkgs/development/compilers/ghc/8.0.1.nix

@@ -7,12 +7,12 @@ let
 
 in 
 stdenv.mkDerivation rec {
-  version = "8.0.0.20160421";
+  version = "8.0.1";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/8.0.1-rc4/${name}-src.tar.xz";
-    sha256 = "183p1ilk8rlndi1vmg2vmlx00s18q3j31kin85qpbvicsxb8j1j1";
+    url = "https://downloads.haskell.org/~ghc/8.0.1/${name}-src.tar.xz";
+    sha256 = "0riyry246a6km4mw1q9iiw6p75ww2f8s81i34g151zwwdygk7qpf";
   };
 
   patches = [

pkgs/development/compilers/oraclejdk/jdk-linux-base.nix

@@ -165,8 +165,10 @@ let result = stdenv.mkDerivation rec {
     EOF
 
     # Oracle Java Mission Control needs to know where libgtk-x11 and related is
-    wrapProgram "$out/bin/jmc" \
-        --suffix-each LD_LIBRARY_PATH ':' "${rpath}" \
+    if test -n "$installjdk"; then
+      wrapProgram "$out/bin/jmc" \
+          --suffix-each LD_LIBRARY_PATH ':' "${rpath}"
+    fi
   '';
 
   inherit installjdk pluginSupport;

pkgs/development/compilers/oraclejdk/jdk8-linux.nix

@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "91";
+  patchVersion = "92";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0lndni81vfpz2l6zb8zsshaavk0483q5jc8yzj4fdjv6wnshbkay";
-  sha256_x86_64 = "0lkm3fz1vdi69f34sysavvh3abx603j1frc9hxvr08pwvmm536vg";
+  sha256_i686 = "095j2hh2xas05jajy4qdj9hxq3k460x4m12rcaxkaxw754imj0vj";
+  sha256_x86_64 = "11wrqd3qbkhimbw9n4g9i0635pjhhnijwxyid7lvjv26kdgg58vr";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

pkgs/development/interpreters/groovy/default.nix

@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.4.5";
+  version = "2.4.6";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "1ajcrma18z0zr7h69bg4v2brxnxa4ljc9a55pk4q92vi3ypyks47";
+    sha256 = "0s474wy7db7j1pans5ks986b52bdmn40l29zl6xl44y23fsvagwv";
   };
 
   buildInputs = [ unzip makeWrapper ];

pkgs/development/interpreters/php/default.nix

@@ -302,8 +302,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.5";
-    sha256 = "1s8xnnxwq5big2rnbp3w7zw7wh5d5ra9p2q9bxwylds5wrzsy29c";
+    version = "7.0.6";
+    sha256 = "1dr9cglqvw3n1ln1fmkmp16lmwz2dd2n2akl3s68ap4nm69g3p8l";
   };
 
 }

pkgs/development/libraries/SDL/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
-, openglSupport ? false, mesa_noglu ? null
+, openglSupport ? false, mesa ? null
 , alsaSupport ? true, alsaLib ? null
 , x11Support ? true, xlibsWrapper ? null, libXrandr ? null
 , pulseaudioSupport ? true, libpulseaudio ? null
@@ -10,7 +10,7 @@
 # PulseAudio.
 assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
 
-assert openglSupport -> (mesa_noglu != null && x11Support);
+assert openglSupport -> (mesa != null && x11Support);
 assert x11Support -> (xlibsWrapper != null && libXrandr != null);
 assert alsaSupport -> alsaLib != null;
 assert pulseaudioSupport -> libpulseaudio != null;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     optionals x11Support [ xlibsWrapper libXrandr ] ++
     optional alsaSupport alsaLib ++
     optional stdenv.isLinux libcap ++
-    optional openglSupport mesa_noglu ++
+    optional openglSupport mesa ++
     optional pulseaudioSupport libpulseaudio ++
     optional stdenv.isDarwin Cocoa;
 

pkgs/development/libraries/assimp/default.nix

@@ -1,17 +1,16 @@
-{ stdenv, fetchurl, unzip, cmake, boost, zlib }:
+{ stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }:
 
 let
-  major = "3";
-  minor = "1";
-  revision = "1";
-  version = "${major}.${minor}.${revision}";
+  version = "3.2";
 in
 stdenv.mkDerivation {
   name = "assimp-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/assimp/assimp-${major}.${minor}/assimp-${version}_no_test_models.zip";
-    sha256 = "17nyzsqzqpafamhi779f1bkh5mfgj8rpas034x3v9a0hdy3jg66s";
+  src = fetchFromGitHub{
+    owner = "assimp";
+    repo = "assimp";
+    rev = "v${version}";
+    sha256 = "09fsksbq9a8gykwmw6gaicwh2ladrln1jc1xc5yk7w6x180cbb1x";
   };
 
   buildInputs = [ unzip cmake boost zlib ];

pkgs/development/libraries/libass/default.nix

@@ -5,6 +5,7 @@
 , harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
 , rasterizerSupport ? false # Internal rasterizer
 , largeTilesSupport ? false # Use larger tiles in the rasterizer
+, libiconv
 }:
 
 assert encaSupport -> enca != null;
@@ -38,7 +39,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ freetype fribidi ]
     ++ optional encaSupport enca
     ++ optional fontconfigSupport fontconfig
-    ++ optional harfbuzzSupport harfbuzz;
+    ++ optional harfbuzzSupport harfbuzz
+    ++ optional stdenv.isDarwin libiconv;
 
   meta = {
     description = "Portable ASS/SSA subtitle renderer";

pkgs/development/libraries/libfilezilla/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
-    sha256 = "07f5hk5izqgqjadrwy608gi0w3scm3zvpsv63j7bgfqk67qilslc";
+    sha256 = "1ydpk6i5vjd78i0531cxlkjvlmvvrsfyc7hv7wx81ws3rkp5hnsq";
   };
 
   meta = with stdenv.lib; {

pkgs/development/libraries/libinput/default.nix

@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-1.2.3";
+  name = "libinput-1.3.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "1wp937sn2dzqhrbl2bhapqb0pvybc80z8ynw7yfkm5ycl39skch9";
+    sha256 = "1sn1s1bz06fa49izqkqf519sjclsvhf42i6slzx1w5hx4vxpb2lr";
   };
 
   outputs = [ "dev" "out" ];

pkgs/development/libraries/xgboost/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "xgboost-${version}";
+  version = "2016-05-14";
+
+  # needs submodules
+  src = fetchgit {
+    url = "https://github.com/dmlc/xgboost";
+    rev = "9c26566eb09733423f821f139938ff4105c3775d";
+    sha256 = "0nmhgl70mnc2igkfppdw2in66zdczzsqxrlsb4bknrglpp3axnm1";
+  };
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r include $out
+    install -Dm755 lib/libxgboost.so $out/lib/libxgboost.so
+    install -Dm755 xgboost $out/bin/xgboost
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
+    homepage = "https://github.com/dmlc/xgboost";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

pkgs/development/ocaml-modules/batteries/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchzip, ocaml, findlib, qtest }:
 
-let version = "2.4.0"; in
+let version = "2.5.2"; in
 
 stdenv.mkDerivation {
   name = "ocaml-batteries-${version}";
 
   src = fetchzip {
     url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
-    sha256 = "0bxp5d05w1igwh9vcgvhd8sd6swf2ddsjphw0mkakdck9afnimmd";
+    sha256 = "01v7sp8vsqlfrmpji5pkrsjl43r3q8hk1a4z4lmyy9y2i0fqwl07";
   };
 
   buildInputs = [ ocaml findlib qtest ];

pkgs/development/python-modules/bootstrapped-pip/default.nix

@@ -15,11 +15,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "python-${python.version}-bootstrapped-pip-${version}";
-  version = "8.1.1";
+  version = "8.1.2";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/py2.py3/p/pip/pip-${version}-py2.py3-none-any.whl";
-    sha256 = "0p62v87lm595kwmxrnqxc81dr7h6maaxj1y28b00bf9ag11c7fa4";
+    url = "https://pypi.python.org/packages/9c/32/004ce0852e0a127f07f358b715015763273799bd798956fa930814b60f39/pip-${version}-py2.py3-none-any.whl";
+    sha256 = "18cjrd66mn4a0gwa99zzs89lrb0xn4xmajdzya6zqd7v16cdsr34";
   };
 
   unpackPhase = ''

pkgs/development/python-modules/pyexiv2/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python, exiv2, scons, boost }:
 
-let version = "0.3.0"; in
+let version = "0.3.2"; in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "pyexiv2-${version}";
   
   src = fetchurl {
-    url = "http://launchpad.net/pyexiv2/0.3.x/0.3/+download/pyexiv2-0.3.0.tar.bz2";
-    sha256 = "1y7r2z0ja166cx8fmykq7gaif02drknqqbxaf18fhv9nmgz4jrg9";
+    url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2";
+    sha256 = "09r1ga6kj5cnmrldpkqzvdhh7xi7aad9g4fbcr1gawgsd9y13g0a";
   };
 
   buildPhase = ''

pkgs/development/python-modules/pygobject/3.nix

@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ python pkgconfig glib gobjectIntrospection ];
   propagatedBuildInputs = [ pycairo cairo ];
 
+  passthru.pythonPath = [];
+
   meta = {
     homepage = http://live.gnome.org/PyGObject;
     description = "Python bindings for Glib";

pkgs/development/python-modules/pygobject/default.nix

@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ python pkgconfig glib ];
 
+  passthru.pythonPath = [];
+
   # in a "normal" setup, pygobject and pygtk are installed into the
   # same site-packages: we need a pth file for both. pygtk.py would be
   # used to select a specific version, in our setup it should have no

pkgs/development/python-modules/pyqt/4.x.nix

@@ -40,6 +40,8 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  passthru.pythonPath = [];
+
   meta = {
     description = "Python bindings for Qt";
     license = "GPL";

pkgs/development/python-modules/pyqt/5.x.nix

@@ -53,4 +53,6 @@ in stdenv.mkDerivation {
   '';
 
   enableParallelBuilding = true;
+
+  passthru.pythonPath = [];
 }

pkgs/development/python-modules/sip/4.16.nix

@@ -16,6 +16,8 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" el
 
   buildInputs = [ python ];
 
+  passthru.pythonPath = [];
+
   meta = with stdenv.lib; {
     description = "Creates C++ bindings for Python modules";
     homepage    = "http://www.riverbankcomputing.co.uk/";

pkgs/development/python-modules/sip/default.nix

@@ -19,6 +19,8 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" el
 
   buildInputs = [ python ];
 
+  passthru.pythonPath = [];
+
   meta = with stdenv.lib; {
     description = "Creates C++ bindings for Python modules";
     homepage    = "http://www.riverbankcomputing.co.uk/";

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

@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.17";
+  version = "6.18";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "1cfcjz1fg9ilqqaqlbzd5n7nsx1kzy6sabjp92b9d8mwy15bn5ql";
+    sha256 = "1ls2q6zvnfsvb3b5d9s1p6c5gcdnwm2mlj2dm8jr4nifkymi6q5m";
   };
 
   installPhase = ''

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

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

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

@@ -20,9 +20,14 @@ let ccache = stdenv.mkDerivation rec {
   passthru = {
     # A derivation that provides gcc and g++ commands, but that
     # will end up calling ccache for the given cacheDir
-    links = extraConfig: (runCommand "ccache-links"
-      { passthru.gcc = gcc; passthru.isGNU = true; }
-      ''
+    links = extraConfig: stdenv.mkDerivation rec {
+      name = "ccache-links";
+      passthru = {
+        inherit gcc;
+        isGNU = true;
+      };
+      inherit (gcc.cc) lib;
+      buildCommand = ''
         mkdir -p $out/bin
         if [ -x "${gcc.cc}/bin/gcc" ]; then
           cat > $out/bin/gcc << EOF
@@ -48,7 +53,8 @@ let ccache = stdenv.mkDerivation rec {
         for file in $(ls ${gcc.cc} | grep -vw bin); do
           ln -s ${gcc.cc}/$file $out/$file
         done
-      '');
+      '';
+    };
   };
 
   meta = with stdenv.lib; {

pkgs/development/tools/packer/default.nix

@@ -1,35 +1,53 @@
-{ stdenv, lib, go, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
+{ stdenv, lib, go, gox, goPackages, fetchFromGitHub
+, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 stdenv.mkDerivation rec {
-  name = "packer-0.8.6";
+  name = "packer-${version}";
+  version = "0.10.1";
 
   src = import ./deps.nix {
-    inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
+    inherit stdenv lib go gox goPackages fetchgit fetchhg fetchbzr fetchsvn;
   };
 
-  buildInputs = [ go gox ];
+  buildInputs = [ go gox goPackages.tools ];
+
+  configurePhase = ''
+    export GOPATH=$PWD/share/go
+    export XC_ARCH=$(go env GOARCH)
+    export XC_OS=$(go env GOOS)
+
+    mkdir $GOPATH/bin
+
+    cd $GOPATH/src/github.com/mitchellh/packer
+
+    # Don't fetch the deps
+    substituteInPlace "Makefile" --replace ': deps' ':'
+
+    # Avoid using git
+    sed \
+      -e "s|GITBRANCH:=.*||" \
+      -e "s|GITSHA:=.*|GITSHA=${src.rev}|" \
+      -i Makefile
+    sed \
+      -e "s|GIT_COMMIT=.*|GIT_COMMIT=${src.rev}|" \
+      -e "s|GIT_DIRTY=.*|GIT_DIRTY=|" \
+      -i "scripts/build.sh"
+  '';
+
+  buildPhase = ''
+    make generate releasebin
+  '';
 
   installPhase = ''
-    export GOPATH=$src
-    XC_ARCH=$(go env GOARCH)
-    XC_OS=$(go env GOOS)
-
     mkdir -p $out/bin
-
-    cd $src/src/github.com/mitchellh/packer
-    gox \
-        -os="''${XC_OS}" \
-        -arch="''${XC_ARCH}" \
-        -output "$out/bin/packer-{{.Dir}}" \
-        ./...
-    mv $out/bin/packer{*packer*,}
+    mv bin/* $out/bin
   '';
 
   meta = with stdenv.lib; {
     description = "A tool for creating identical machine images for multiple platforms from a single source configuration";
-    homepage    = "http://www.packer.io";
+    homepage    = http://www.packer.io;
     license     = licenses.mpl20;
-    maintainers = with maintainers; [ cstrahan ];
+    maintainers = with maintainers; [ cstrahan zimbatm ];
     platforms   = platforms.unix;
   };
 }

pkgs/development/tools/postiats-utilities/default.nix

@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, python3, python3Packages }:
+
+stdenv.mkDerivation {
+  name = "postiats-utilities-2.0.1";
+  src = fetchurl {
+    url = "https://github.com/Hibou57/PostiATS-Utilities/archive/v2.0.1.tar.gz";
+    sha256 = "12jlzqigmaa9m37x0nq5v3gq8v61m73i5kzdnsm06chf0przpaix";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/Hibou57/PostiATS-Utilities";
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.ttuegel ];
+  };
+
+  buildInputs = [ python3 python3Packages.wrapPython ];
+
+  phases = "unpackPhase patchPhase installPhase";
+
+  postPatch = ''
+    for f in pats-* postiats/*.py; do
+      sed -i "$f" -e "1 s,python3,python,"
+    done
+  '';
+
+  installPhase = ''
+    libdir="$out/lib/${python3.libPrefix}/site-packages"
+    mkdir -p "$libdir"
+    cp -r postiats "$libdir"
+
+    mkdir -p "$out/bin"
+    install pats-* "$out/bin"
+
+    wrapPythonPrograms
+  '';
+}

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

@@ -0,0 +1,34 @@
+{ stdenv, fetchgit, rustPlatform, makeWrapper }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "racerd-${version}";
+  version = "0.1.1";
+  src = fetchgit {
+    url = "git://github.com/jwilm/racerd.git";
+    rev = "dcbb7885e84eb5e2fbb2072e185701ad1abbd93a";
+    sha256 = "18c6a1x0li5yxif9qqnsnyas6if0m6srbqh0h0nywgx0lm8bpgly";
+  };
+
+  doCheck = false;
+
+  depsSha256 = "0ca0lc8mm8kczll5m03n5fwsr0540c2xbfi4nn9ksn0s4sap50yn";
+
+  buildInputs = [ makeWrapper ];
+
+  RUST_SRC_PATH = ''${rustc.src}/src'';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -p target/release/racerd $out/bin/
+    wrapProgram $out/bin/racerd --set RUST_SRC_PATH "$RUST_SRC_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs";
+    homepage = "https://github.com/jwilm/racerd";
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}