Merge branch 'master' into staging

Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.

pkgs/development/tools/build-managers/gup/build.nix

@@ -1,30 +1,14 @@
-# NOTE: the `nixpkgs` version of this file is copied from the upstream repository
-# for this package. Please make any changes to https://github.com/timbertson/gup/
+# NOTE: this file is copied from the upstream repository for this package.
+# Please submit any changes you make here to https://github.com/timbertson/gup/
 
-{ stdenv, lib, pythonPackages }:
-{ src, version, meta ? {}, passthru ? {}, forceTests ? false }:
-let
-  testInputs = [
-    pythonPackages.mocktest or null
-    pythonPackages.whichcraft
-    pythonPackages.nose
-    pythonPackages.nose_progressive
-  ];
-  pychecker = pythonPackages.pychecker or null;
-  usePychecker = forceTests || pychecker != null;
-  enableTests = forceTests || (lib.all (dep: dep != null) testInputs);
-in
+{ stdenv, lib, python, which, pychecker ? null }:
+{ src, version, meta ? {} }:
 stdenv.mkDerivation {
-  inherit src meta passthru;
+  inherit src meta;
   name = "gup-${version}";
-  buildInputs = [ pythonPackages.python ]
-    ++ (lib.optionals enableTests testInputs)
-    ++ (lib.optional usePychecker pychecker)
-  ;
-  SKIP_PYCHECKER = !usePychecker;
+  buildInputs = lib.remove null [ python which pychecker ];
+  SKIP_PYCHECKER = pychecker == null;
   buildPhase = "make python";
-  inherit pychecker;
-  testPhase = if enableTests then "make test" else "true";
   installPhase = ''
     mkdir $out
     cp -r python/bin $out/bin

pkgs/development/tools/build-managers/gup/build.nix.gup

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -eu
-if [ -n "${GUP_TARGET:-}" ]; then
-	gup --always
-fi
-curl -LSs -o "$1" https://raw.githubusercontent.com/timbertson/gup/master/nix/gup-python.nix

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

@@ -1,21 +1,21 @@
-{ stdenv, fetchFromGitHub, lib, pythonPackages, nix-update-source, curl }:
+{ stdenv, fetchFromGitHub, lib, python, which }:
+let
+  version = "0.6.0";
+  src = fetchFromGitHub {
+    sha256 = "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr";
+    rev = "version-${version}";
+    repo = "gup";
+    owner = "timbertson";
+  };
+in
 import ./build.nix
-  { inherit stdenv lib pythonPackages; }
-  { inherit (nix-update-source.fetch ./src.json) src version;
+  { inherit stdenv lib python which; }
+  { inherit src version;
     meta = {
-      homepage = https://github.com/timbertson/gup/;
+      inherit (src.meta) homepage;
       description = "A better make, inspired by djb's redo";
       license = stdenv.lib.licenses.lgpl2Plus;
       maintainers = [ stdenv.lib.maintainers.timbertson ];
       platforms = stdenv.lib.platforms.all;
     };
-    passthru = {
-      updateScript = ''
-        set -e
-        echo
-        cd ${toString ./.}
-        ${nix-update-source}/bin/nix-update-source --prompt version src.json
-        ./build.nix.gup build.nix
-      '';
-    };
   }

pkgs/development/tools/build-managers/gup/src.json

@@ -1,17 +0,0 @@
-{
-  "fetch": {
-    "args": {
-      "owner": "timbertson",
-      "repo": "gup",
-      "rev": "version-0.6.0",
-      "sha256": "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr"
-    },
-    "fn": "fetchFromGitHub",
-    "rev": "version-0.6.0",
-    "version": "0.6.0"
-  },
-  "owner": "timbertson",
-  "repo": "gup",
-  "rev": "version-{version}",
-  "type": "fetchFromGitHub"
-}

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

@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "bashdb-4.4-0.92";
+
+  src = fetchurl {
+    url =  "mirror://sourceforge/bashdb/${name}.tar.bz2";
+    sha256 = "6a8c2655e04339b954731a0cb0d9910e2878e45b2fc08fe469b93e4f2dbaaf92";
+  };
+
+  meta = { 
+    description = "Bash script debugger";
+    homepage = http://bashdb.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

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

@@ -1,5 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
+let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in
+
 stdenv.mkDerivation rec {
   name = "lsof-${version}";
   version = "4.89";
@@ -24,20 +26,19 @@ stdenv.mkDerivation rec {
   };
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
- 
+
   patches = [ ./dfile.patch ];
 
-  configurePhase = ''
-    # Stop build scripts from searching global include paths
-    export LSOF_INCLUDE=${stdenv.cc.libc}/include
-    ./Configure -n ${if stdenv.isDarwin then "darwin" else "linux"}
-  '';
-  
+  # Stop build scripts from searching global include paths
+  LSOF_INCLUDE = "${stdenv.cc.libc}/include";
+  configurePhase = "./Configure -n ${dialect}";
   preBuild = ''
     sed -i Makefile -e 's/^CFGF=/&	-DHASIPv6=1/;' -e 's/-lcurses/-lncurses/'
+    for filepath in $(find dialects/${dialect} -type f); do
+      sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath
+    done
   '';
 
-
   installPhase = ''
     mkdir -p $out/bin $out/man/man8
     cp lsof.8 $out/man/man8/
@@ -53,6 +54,6 @@ stdenv.mkDerivation rec {
       from it).
     '';
     maintainers = [ stdenv.lib.maintainers.mornfall ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }