Merge remote-tracking branch 'upstream/master' into hardened-stdenv

12 files changed, 308 insertions, 37 deletions

diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index cb365b9b4f76..cd9499d9146d 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchzip, curl  }:
+{ stdenv, fetchFromGitHub, curl  }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.2";
+  version = "1.7.0";
   name = "clib-${version}";
 
-  src = fetchzip {
-    url = "https://github.com/clibs/clib/archive/${version}.zip";
-    sha256 = "0hbi5hf4w0iim96h89j7krxv61x92ffxjbldxp3zk92m5sgpldnm";
+  src = fetchFromGitHub {
+    rev    = version;
+    owner  = "clibs";
+    repo   = "clib";
+    sha256 = "08n2i3dyh5vnrb74a6wlqqn67c9nwkq0v0v651zzha495mqbciq7";
   };
 
   hardeningDisable = [ "fortify" ];
diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index a4599cf049f9..7819cc2be776 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
 
 stdenv.mkDerivation {
-  name = "DisnixWebService-0.5";
+  name = "DisnixWebService-0.6";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/31143438/download/4/DisnixWebService-0.5.tar.bz2;
-    sha256 = "0wddrb9cf62hzfcrnyq5jn2pb8vc0bzfcl5z53aczkij0rbamw7k";
+    url = http://hydra.nixos.org/build/36899117/download/4/DisnixWebService-0.6.tar.bz2;
+    sha256 = "0yvwjnzk1q4y3wj8pi6z3i7akw83ah9xm2v93ni1ri70z5930mdz";
   };
   buildInputs = [ apacheAnt jdk ];
   PREFIX = ''''${env.out}'';
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index bd215b769d41..7ef047aeb260 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.5";
+  name = "disnix-0.6";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/31143411/download/4/disnix-0.5.tar.gz;
-    sha256 = "0v0gbbcspaj67sn8ncrripa5af0m2xykyjjn2n55smz5fwx6d124";
+    url = http://hydra.nixos.org/build/36897417/download/4/disnix-0.6.tar.gz;
+    sha256 = "1i3wxp7zn765gg0sri2jsdabkj0l7aqi8cxp46pyybdf4852d6gd";
   };
   
   buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index bc1472576759..71666f4d9697 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
+{ stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.4.1";
+  name = "disnixos-0.5";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/33130082/download/3/disnixos-0.4.1.tar.gz;
-    sha256 = "1r6b73qhz64z7xms6hkmm495yz0114pqa61b2qzlmzmlywhhy15b";
+    url = http://hydra.nixos.org/build/36899006/download/3/disnixos-0.5.tar.gz;
+    sha256 = "0pl3j8kwcz90as5cs0yipfbg555lw3z6xsylk6g2ili878mni1aq";
   };
   
-  buildInputs = [ socat pkgconfig disnix getopt ];
+  buildInputs = [ socat pkgconfig dysnomia disnix getopt ];
   
   dontStrip = true;
   
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index e9bb704c7725..77235bca36c9 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null;
 assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
 
 stdenv.mkDerivation {
-  name = "dysnomia-0.5.1";
+  name = "dysnomia-0.6";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/33508870/download/1/dysnomia-0.5.1.tar.gz;
-    sha256 = "0mrbg0wirixqzx0qw8lg6mklr8npr29ghbj7lq1mygjgzr1hyhzm";
+    url = http://hydra.nixos.org/build/36895408/download/1/dysnomia-0.6.tar.gz;
+    sha256 = "1gg2avj57amxf2qi5zjk0rjyakvy5bqaar2r2151cvjlas1z1alw";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 78ab51bfaacf..15ec4e879089 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dpkg-${version}";
-  version = "1.18.7";
+  version = "1.18.9";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "0yxqv7b5a1qhhas9dzxr5gwj22jqxisrwzvrmwms8l67dlx6vqxc";
+    sha256 = "14r011vpzcfsglzl2dr2ywrdxl9r2jhs0iy9nswmxrz92zwlmb46";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix
new file mode 100644
index 000000000000..89d795c8e505
--- /dev/null
+++ b/pkgs/tools/package-management/gx/default.nix
@@ -0,0 +1,30 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "gx-${version}";
+  version = "20160601-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "f84ddf792ceb329e20c857731154798e1ce87314";
+
+  goPackagePath = "github.com/whyrusleeping/gx";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/whyrusleeping/gx";
+    sha256 = "10a6p9ba526jr6m66x3vsa3xsjlnzv7yma8vyp8d0bf0hs44bpih";
+  };
+
+  prePatch = ''
+    substituteInPlace tests/lib/random-dep.go \
+      --replace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" "github.com/jbenet/go-random"
+  '';
+
+  goDeps = ./deps.json;
+
+  meta = with stdenv.lib; {
+    description = "A packaging tool built around IPFS";
+    homepage = https://github.com/whyrusleeping/gx;
+    license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/tools/package-management/gx/deps.json b/pkgs/tools/package-management/gx/deps.json
new file mode 100644
index 000000000000..3dd8e8f6ab31
--- /dev/null
+++ b/pkgs/tools/package-management/gx/deps.json
@@ -0,0 +1,200 @@
+[
+  {
+    "goPackagePath": "github.com/anacrolix/missinggo",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/anacrolix/missinggo",
+      "rev": "e40875155efce3d98562ca9e265e152c364ada3e",
+      "sha256": "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg"
+    }
+  },
+  {
+    "goPackagePath": "github.com/anacrolix/sync",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/anacrolix/sync",
+      "rev": "812602587b72df6a2a4f6e30536adc75394a374b",
+      "sha256": "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l"
+    }
+  },
+  {
+    "goPackagePath": "github.com/anacrolix/utp",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/anacrolix/utp",
+      "rev": "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0",
+      "sha256": "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7"
+    }
+  },
+  {
+    "goPackagePath": "github.com/blang/semver",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/blang/semver",
+      "rev": "aea32c919a18e5ef4537bbd283ff29594b1b0165",
+      "sha256": "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd"
+    }
+  },
+  {
+    "goPackagePath": "github.com/bradfitz/iter",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/bradfitz/iter",
+      "rev": "454541ec3da2a73fc34fd049b19ee5777bf19345",
+      "sha256": "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i"
+    }
+  },
+  {
+    "goPackagePath": "github.com/codegangsta/cli",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/codegangsta/cli",
+      "rev": "e5bef42c62aa7d25aba4880dc02b7624f01e9e19",
+      "sha256": "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq"
+    }
+  },
+  {
+    "goPackagePath": "github.com/ipfs/go-ipfs-api",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/ipfs/go-ipfs-api",
+      "rev": "7c354892da3abdaafb6ac576c100b259b1a73dac",
+      "sha256": "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-base58",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-base58",
+      "rev": "6237cf65f3a6f7111cd8a42be3590df99a66bc7d",
+      "sha256": "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-multiaddr",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-multiaddr",
+      "rev": "f3dff105e44513821be8fbe91c89ef15eff1b4d4",
+      "sha256": "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-multiaddr-net",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-multiaddr-net",
+      "rev": "d4cfd691db9f50e430528f682ca603237b0eaae0",
+      "sha256": "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-multihash",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-multihash",
+      "rev": "e8d2374934f16a971d1e94a864514a21ac74bf7f",
+      "sha256": "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-os-rename",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-os-rename",
+      "rev": "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2",
+      "sha256": "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-random",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-random",
+      "rev": "384f606e91f542a98e779e652eed88051618f0f7",
+      "sha256": "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jbenet/go-random-files",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jbenet/go-random-files",
+      "rev": "737479700b40b4b50e914e963ce8d9d44603e3c8",
+      "sha256": "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"
+    }
+  },
+  {
+    "goPackagePath": "github.com/kr/fs",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/kr/fs",
+      "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b",
+      "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/go-homedir",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/go-homedir",
+      "rev": "1111e456ffea841564ac0fa5f69c26ef44dafec9",
+      "sha256": "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23"
+    }
+  },
+  {
+    "goPackagePath": "github.com/sabhiram/go-git-ignore",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/sabhiram/go-git-ignore",
+      "rev": "228fcfa2a06e870a3ef238d54c45ea847f492a37",
+      "sha256": "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/go-multipart-files",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/go-multipart-files",
+      "rev": "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2",
+      "sha256": "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/json-filter",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/json-filter",
+      "rev": "e9937f5649231265a56d0a419f062530425401a1",
+      "sha256": "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/stump",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/stump",
+      "rev": "206f8f13aae1697a6fc1f4a55799faf955971fc5",
+      "sha256": "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n"
+    }
+  },
+  {
+    "goPackagePath": "github.com/whyrusleeping/tar-utils",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/whyrusleeping/tar-utils",
+      "rev": "beab27159606f5a7c978268dd1c3b12a0f1de8a7",
+      "sha256": "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/crypto",
+    "fetch": {
+      "type": "git",
+      "url": "https://go.googlesource.com/crypto",
+      "rev": "f3241ce8505855877cc8a9717bd61a0f7c4ea83c",
+      "sha256": "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq"
+    }
+  }
+]
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix
new file mode 100644
index 000000000000..912c870c27b0
--- /dev/null
+++ b/pkgs/tools/package-management/gx/go/default.nix
@@ -0,0 +1,34 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchgit
+, gx
+}:
+
+buildGoPackage rec {
+  name = "gx-go-${version}";
+  version = "20160611-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "639fc0be1a153c59d8946904cceecf0b66ab2944";
+
+  goPackagePath = "github.com/whyrusleeping/gx-go";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/whyrusleeping/gx-go";
+    sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l";
+  };
+
+  goDeps = ../deps.json;
+
+  extraSrcs = [
+    {
+      goPackagePath = gx.goPackagePath;
+      src = gx.src;
+    }
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A tool for importing go packages into gx";
+    homepage = https://github.com/whyrusleeping/gx-go;
+    license = licenses.mit;
+    maintainer = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix
index 8dfc9e6333eb..43d0d60ac311 100644
--- a/pkgs/tools/package-management/nix-repl/default.nix
+++ b/pkgs/tools/package-management/nix-repl/default.nix
@@ -1,15 +1,15 @@
 { lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }:
 
-let rev = "8a2f5f0607540ffe56b56d52db544373e1efb980"; in
+let rev = "a1ea85e92b067a0a42354a28355c633eac7be65c"; in
 
 stdenv.mkDerivation {
-  name = "nix-repl-${lib.getVersion nix}-${lib.substring 0 7 rev}";
+  name = "nix-repl-${lib.getVersion nix}-2016-02-28";
 
   src = fetchFromGitHub {
     owner = "edolstra";
     repo = "nix-repl";
     inherit rev;
-    sha256 = "0cjablz01i0g9smnavhf86imwx1f9mnh5flax75i615ml71gsr88";
+    sha256 = "0rf9711day64lgg6g6yqc5709x4sgj137zpqyn019k764i7m2xs8";
   };
 
   buildInputs = [ nix readline ];
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 3a20fdc0fac3..1e3579b197e9 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -1,23 +1,28 @@
-{ lib, stdenv, fetchFromGitHub, perl, nix, perlPackages }:
+{ stdenv, fetchFromGitHub,
+  bzip2, nix, perl, perlPackages,
+}:
 
-let rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d"; in
+with stdenv.lib;
+
+let
+  rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d";
+  sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj";
+in
 
 stdenv.mkDerivation rec {
-  name = "nix-serve-0.2-${lib.substring 0 7 rev}";
+  name = "nix-serve-0.2-${substring 0 7 rev}";
 
   src = fetchFromGitHub {
     owner = "edolstra";
     repo = "nix-serve";
-    inherit rev;
-    sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj";
+    inherit rev sha256;
   };
 
-  buildInputs = [ perl nix ]
+  buildInputs = [ bzip2 perl nix ]
     ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]);
 
-  dontBuild = false;
+  dontBuild = true;
 
-  # FIXME: unfortunate cut&paste.
   installPhase = ''
     mkdir -p $out/libexec/nix-serve
     cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi
@@ -25,7 +30,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cat > $out/bin/nix-serve <<EOF
     #! ${stdenv.shell}
-    PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@"
+    PATH=${makeBinPath [ bzip2 nix ]}:\$PATH PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@"
     EOF
     chmod +x $out/bin/nix-serve
   '';
@@ -33,8 +38,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://github.com/edolstra/nix-serve;
     description = "A utility for sharing a Nix store as a binary cache";
-    maintainers = [ lib.maintainers.eelco ];
-    license = lib.licenses.gpl3;
+    maintainers = [ maintainers.eelco ];
+    license = licenses.gpl3;
     platforms = nix.meta.platforms;
   };
 }
diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index d66ce319aca7..04a31bd30b7c 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "nox-${version}";
-  version = "0.0.3";
+  version = "0.0.4";
   namePrefix = "";
 
   src = fetchurl {
     url = "mirror://pypi/n/nix-nox/nix-nox-${version}.tar.gz";
-    sha256 = "0bbd8nyvxwwz56qp82h3bln960bmpy2lczxr00h2jva1gpz5a964";
+    sha256 = "11f6css8rnh7qz55z7i81cnb5h9ys98fqxq3fps3hsh64zlydj52";
   };
 
   buildInputs = [ pythonPackages.pbr ];