Merge staging-next into staging

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

@@ -1,13 +1,22 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "bashdb-4.4-0.94";
+  name = "bashdb-${version}";
+  version = "4.4-1.0.0";
 
   src = fetchurl {
     url =  "mirror://sourceforge/bashdb/${name}.tar.bz2";
-    sha256 = "01n0dml866sacls7q8h1c6mm4nc47lq3vrar9idmkajky71aycar";
+    sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml";
   };
 
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/bashdb --prefix PYTHONPATH ":" "$(toPythonPath ${python3Packages.pygments})"
+  '';
+
   meta = {
     description = "Bash script debugger";
     homepage = http://bashdb.sourceforge.net/;

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

@@ -0,0 +1,21 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "elfinfo-${version}";
+  version = "0.7.4";
+
+  goPackagePath = "github.com/xyproto/elfinfo";
+  src = fetchFromGitHub {
+    rev = version;
+    owner = "xyproto";
+    repo = "elfinfo";
+    sha256 = "12n86psri9077v7s6b4j7djg5kijf9gybd80f9sfs0xmgkbly3gv";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Small utility for showing information about ELF files";
+    homepage = https://elfinfo.roboticoverlords.org/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}

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

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     #! $SHELL -e
     export PERL5LIB=\''${PERL5LIB:+:}$gettext_perl
     ${stdenv.lib.optionalString stdenv.hostPlatform.isCygwin
-        "export PATH=\''${PATH:+:}${gettext}/bin"}
+        ''export PATH=\''${PATH:+:}${gettext}/bin''}
     exec -a \$0 $out/bin/.help2man-wrapped "\$@"
     EOF
     chmod +x $out/bin/help2man

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

@@ -1,30 +1,22 @@
-{ fetchurl, stdenv, jre, ctags, makeWrapper, coreutils, git }:
+{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git }:
 
 stdenv.mkDerivation rec {
   name = "opengrok-${version}";
   version = "1.0";
 
-  # 1.0 is the latest distributed as a .tar.gz file.
-  # Newer are distribued as .zip so a source build is required.
-
-  # if builded from source
-  #src = fetchurl {
-  #  url = "https://github.com/OpenGrok/OpenGrok/archive/${version}.tar.gz";
-  #  sha256 = "01r7ipnj915rnyxyqrnmjfagkip23q5lx9g787qb7qrnbvgfi118";
-  #};
-
   # binary distribution
   src = fetchurl {
-    url = https://github.com/OpenGrok/OpenGrok/files/213268/opengrok-0.12.1.5.tar.gz;
-    sha256 = "1bafiq4s9sqldinl6fy931rm0x8zj2magfdlbi3nqlnidsghgkn3";
+    url = "https://github.com/oracle/opengrok/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0h4rwfh8m41b7ij931gcbmkihri25m48373qf6ig0714s66xwc4i";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     mkdir -p $out
     cp -a * $out/
-    substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname
+    substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname"
+    substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!/bin/sh"
     wrapProgram $out/bin/OpenGrok \
       --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \
       --set JAVA_HOME "${jre}" \