Merge branch 'master' into staging

More larger rebuilds from master, unfortunately.

pkgs/tools/bootloaders/refind/default.nix

@@ -139,6 +139,7 @@ EOF
     homepage = http://refind.sourceforge.net/;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = [ "i686-linux" "x86_64-linux" ];
+    broken = true;
   };
 
 }

pkgs/tools/misc/crudini/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, python2Packages }:
+
+python2Packages.buildPythonApplication rec {
+  name = "crudini-${version}";
+  version = "0.9";
+
+  src = fetchFromGitHub {
+    owner  = "pixelb";
+    repo   = "crudini";
+    rev    = version;
+    sha256 = "0x9z9lsygripj88gadag398pc9zky23m16wmh8vbgw7ld1nhkiav";
+  };
+
+  propagatedBuildInputs = with python2Packages; [ iniparse ];
+
+  checkPhase = ''
+    patchShebangs .
+    pushd tests >/dev/null
+    ./test.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A utility for manipulating ini files ";
+    homepage = http://www.pixelbeat.org/programs/crudini/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}

pkgs/tools/misc/entr/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "entr-${version}";
-  version = "3.6";
+  version = "3.7";
 
   src = fetchurl {
     url = "http://entrproject.org/code/${name}.tar.gz";
-    sha256 = "1sy81np6kgmq04kfn2ckf4fp7jcf5d1963shgmapx3al3kc4c9x4";
+    sha256 = "0bx2ivx9hwixjwmk7aqlx20mwmn3cvryppnmc285d7byiw6dbvwl";
   };
 
   postPatch = ''

pkgs/tools/misc/nixbot/default.nix

@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    desciption = "Github bot for reviewing/testing pull requests with the help of Hydra";
+    description = "Github bot for reviewing/testing pull requests with the help of Hydra";
     maintainers = with maintainers; [ domenkozar fpletz globin ];
     license = licenses.asl20;
     homepage = https://github.com/domenkozar/nixbot;

pkgs/tools/networking/haproxy/default.nix

@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   pname = "haproxy";
   majorVersion = "1.7";
-  minorVersion = "2";
+  minorVersion = "3";
   version = "${majorVersion}.${minorVersion}";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.haproxy.org/download/${majorVersion}/src/${name}.tar.gz";
-    sha256 = "0bsb5q3s1k5gqybv5p8zyvl6zh8iyidv3jb3wfmgwqad5bsl0nzr";
+    sha256 = "ebb31550a5261091034f1b6ac7f4a8b9d79a8ce2a3ddcd7be5b5eb355c35ba65";
   };
 
   buildInputs = [ openssl zlib ];

pkgs/tools/package-management/disnix/DisnixWebService/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
 
 stdenv.mkDerivation {
-  name = "DisnixWebService-0.6";
+  name = "DisnixWebService-0.7";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/36899117/download/4/DisnixWebService-0.6.tar.bz2;
-    sha256 = "0yvwjnzk1q4y3wj8pi6z3i7akw83ah9xm2v93ni1ri70z5930mdz";
+    url = https://github.com/svanderburg/DisnixWebService/files/842861/DisnixWebService-0.7.tar.gz;
+    sha256 = "1zqy0badqqw8pzp9ky2aayi27v6znd64zafacvywjrn185fjz17g";
   };
   buildInputs = [ apacheAnt jdk ];
   PREFIX = ''''${env.out}'';

pkgs/tools/package-management/disnix/default.nix

@@ -1,21 +1,19 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.6.1";
+  name = "disnix-0.7";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/40497264/download/4/disnix-0.6.1.tar.gz;
-    sha256 = "123y8vp31sl394rl7pg2xy13ng9i3pk4s7skyqhngjbqzjl72lhj";
+    url = https://github.com/svanderburg/disnix/files/842828/disnix-0.7.tar.gz;
+    sha256 = "120iaqpj7zcy94dpizzdxjwf8qb2rfrx5394jghmhc6jy88vdp71";
   };
   
   buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
 
-  dontStrip = true;
-  
   meta = {
     description = "A Nix-based distributed service deployment tool";
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/tools/package-management/disnix/disnixos/default.nix

@@ -1,17 +1,15 @@
 { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.5";
+  name = "disnixos-0.6";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/36899006/download/3/disnixos-0.5.tar.gz;
-    sha256 = "0pl3j8kwcz90as5cs0yipfbg555lw3z6xsylk6g2ili878mni1aq";
+    url = https://github.com/svanderburg/disnixos/files/842874/disnixos-0.6.tar.gz;
+    sha256 = "0pgqsk8qndn614z02jq3vbxzpx6fmgsm6pr1g0iqz55pzwamw9j7";
   };
   
   buildInputs = [ socat pkgconfig dysnomia disnix getopt ];
   
-  dontStrip = true;
-  
   meta = {
     description = "Provides complementary NixOS infrastructure deployment to Disnix";
     license = stdenv.lib.licenses.lgpl21Plus;

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.6.1";
+  name = "dysnomia-0.7";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/40438996/download/1/dysnomia-0.6.1.tar.gz;
-    sha256 = "0apwh80hi09bvmzy0cs7sljzjd5ximj1smhrdi3hvhm3wr48jvbi";
+    url = https://github.com/svanderburg/dysnomia/files/842819/dysnomia-0.7.tar.gz;
+    sha256 = "0nlb7fvndnxs878aah30cac4gqf2w9qq4bdpqj4m0j3d9nhpak2j";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";