Merge branch 'master' into staging

10 files changed, 145 insertions, 9 deletions

diff --git a/pkgs/tools/misc/capture/0001-eval-fix.patch b/pkgs/tools/misc/capture/0001-eval-fix.patch
new file mode 100644
index 000000000000..4b5bdc6a0bcf
--- /dev/null
+++ b/pkgs/tools/misc/capture/0001-eval-fix.patch
@@ -0,0 +1,10 @@
+diff --git a/src/capture.sh b/src/capture.sh
+index a32b018..82d1f15 100755
+--- a/src/capture.sh
++++ b/src/capture.sh
+@@ -103,4 +103,4 @@ capture () {
+ 
+ 
+ # remove this line if you want to source this file instead
+-eval " ${0##*/}" "$@"
++capture "$@"
diff --git a/pkgs/tools/misc/capture/0002-sane-defaults.patch b/pkgs/tools/misc/capture/0002-sane-defaults.patch
new file mode 100644
index 000000000000..1bd49ae41e38
--- /dev/null
+++ b/pkgs/tools/misc/capture/0002-sane-defaults.patch
@@ -0,0 +1,22 @@
+diff --git a/src/capture.sh b/src/capture.sh
+index a32b018..42f3936 100755
+--- a/src/capture.sh
++++ b/src/capture.sh
+@@ -9,7 +9,7 @@ set -e
+ #
+ 
+ scale="-1:-1"
+-fps="15"
++fps="30"
+ raw_video="-vf fps=$fps -c:v utvideo -f nut"
+ raw_video_container=".nut"
+ 
+@@ -18,7 +18,7 @@ raw_video_container=".nut"
+ # https://stackoverflow.com/questions/41372045/vp9-encoding-limited-to-4-threads
+ webm_video="-pix_fmt yuv420p -c:v libvpx-vp9 -crf 25 -b:v 0 -f webm -tile-columns 6 -frame-parallel 1 -threads 8"
+ 
+-tmpdir="/var/tmp"
++tmpdir="/tmp"
+ 
+ 
+ # capture_raw ./foo.nut
diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix
new file mode 100644
index 000000000000..49c238b0bd0f
--- /dev/null
+++ b/pkgs/tools/misc/capture/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, pkgs, slop, ffmpeg, fetchFromGitHub, makeWrapper}:
+
+stdenv.mkDerivation rec {
+  name = "capture-${version}";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "buhman";
+    repo = "capture";
+    rev  = "4be986f17462b8d520559429c74da6bf3a436259";
+    sha256 = "172y06vs993x5v78zwl81xma1gkvjq1ad9rvmf3a217fyxsz4nhh";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  patches = [ ./0001-eval-fix.patch ./0002-sane-defaults.patch ];
+
+  installPhase = ''
+    install -Dm755 src/capture.sh $out/bin/capture
+
+    patchShebangs $out/bin/capture
+    wrapProgram $out/bin/capture \
+      --prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg ]}'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A no bullshit screen capture tool";
+    homepage = "https://github.com/buhman/capture";
+    maintainers = [ maintainers.ar1a ];
+  };
+}
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index df5a9e80f38a..0a3ae5c28e97 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [
   ];
 in stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.112";
+  version = "1.0.114";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "1p7skj8821dhwgjq3f2v1fplzv5y6xfma6bh9ai6f8ry6vz0hvha";
+    sha256 = "14lw18bhxap1g15q0rhslacj1bcrl69wrqcx6azmbvd92rl4bqd8";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix
index edb5973fbb70..2c19facd1d36 100644
--- a/pkgs/tools/misc/hebcal/default.nix
+++ b/pkgs/tools/misc/hebcal/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "4.15";
+  version = "4.16";
   name = "hebcal-${version}";
 
   src = fetchFromGitHub {
     owner = "hebcal";
     repo = "hebcal";
     rev = "v${version}";
-    sha256 = "1s9iardqyzn42hs0x9p4rig2m87v87jvzcrbb9arcci7nds66y3i";
+    sha256 = "081h3dan0v14camv6j3swl9y31yzfwjfkp2h8xz5qmrh0scv8azr";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix
new file mode 100644
index 000000000000..6d508a48901a
--- /dev/null
+++ b/pkgs/tools/misc/oci-image-tool/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "oci-image-tool-${version}";
+  version = "1.0.0-rc1";
+
+  goPackagePath = "github.com/opencontainers/image-tools";
+  subPackages = [ "cmd/oci-image-tool" ];
+
+  src = fetchFromGitHub {
+    owner = "opencontainers";
+    repo = "image-tools";
+    rev = "v${version}";
+    sha256 = "0c4n69smqlkf0r6khy9gbg5f810qh9g8jqsl9kibb0dyswizr14r";
+  };
+
+  meta = {
+    description = "A collection of tools for working with the OCI image format specification";
+    homepage = https://github.com/opencontainers/image-tools;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nzhang-zh ];
+  };
+}
diff --git a/pkgs/tools/misc/pb_cli/0001-eval-fix.patch b/pkgs/tools/misc/pb_cli/0001-eval-fix.patch
new file mode 100644
index 000000000000..7188cf372977
--- /dev/null
+++ b/pkgs/tools/misc/pb_cli/0001-eval-fix.patch
@@ -0,0 +1,10 @@
+diff --git a/src/pb.sh b/src/pb.sh
+index be1e472..eb9e6f9 100755
+--- a/src/pb.sh
++++ b/src/pb.sh
+@@ -61,4 +61,4 @@ pb () {
+   esac
+ }
+
+-eval " ${0##*/}" "$@"
++pb "$@"
diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix
new file mode 100644
index 000000000000..6fab44891c52
--- /dev/null
+++ b/pkgs/tools/misc/pb_cli/default.nix
@@ -0,0 +1,40 @@
+{ screenshots ? true, video ? false, clipboard ? true
+, stdenv, pkgs, jq, curl, fetchFromGitHub, makeWrapper, maim ? null, xclip ? null, capture ? null }:
+
+assert screenshots -> maim != null;
+assert video -> capture != null;
+assert clipboard -> xclip != null;
+
+stdenv.mkDerivation rec {
+  name = "pb_cli-${version}";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "ptpb";
+    repo = "pb_cli";
+    rev  = "5242382b3d6b5c0ddaf6e4843a69746b40866e57";
+    sha256 = "0543x3377apinhxnsfq82zlp5sm8g1bf6hmsvvcwra5rsshv2ybk";
+  };
+
+  patches = [ ./0001-eval-fix.patch ];
+
+  buildInputs = [ makeWrapper ];
+
+  liveDeps = [ jq curl ] ++ stdenv.lib.optional screenshots maim
+                         ++ stdenv.lib.optional video capture
+                         ++ stdenv.lib.optional clipboard xclip;
+
+  installPhase = ''
+    install -Dm755 src/pb.sh $out/bin/pb
+
+    patchShebangs $out/bin/pb
+    wrapProgram $out/bin/pb \
+      --prefix PATH : '${stdenv.lib.makeBinPath liveDeps}'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A no bullshit ptpb client";
+    homepage = "https://github.com/ptpb/pb_cli";
+    maintainers = [ maintainers.ar1a ];
+  };
+}
diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix
index 1dca7f4a70bd..9912202f867e 100644
--- a/pkgs/tools/misc/termtosvg/default.nix
+++ b/pkgs/tools/misc/termtosvg/default.nix
@@ -2,20 +2,20 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "termtosvg";
-  version = "0.7.0";
+  version = "0.8.0";
 
   # tests are not available when fetching from pypi
   src = fetchFromGitHub {
     owner = "nbedos";
     repo = pname;
     rev = version;
-    sha256 = "17hhdrsn9ggcrwqp2c1h2la9cwhdazfrczd7nnm5mz7w6rk25lx3";
+    sha256 = "0si5l8cdbzapcibr4yavhld2vhfrpk7qj4cy7m4ws7js8g9iwzd4";
   };
 
   propagatedBuildInputs = with python3.pkgs; [ lxml pyte ];
 
   meta = with lib; {
-    homepage = https://github.com/nbedos/termtosvg;
+    homepage = https://nbedos.github.io/termtosvg/;
     description = "Record terminal sessions as SVG animations";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ma27 ];
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 23cbfd3428fe..dd210498fe75 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,5 +1,5 @@
 { lib, fetchurl, buildPythonPackage
-, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
+, zip, ffmpeg_4, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
 , fetchpatch
 # Pandoc is required to build the package's man page. Release tarballs contain a
 # formatted man page already, though, it will still be installed. We keep the
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   makeWrapperArgs = let
       packagesToBinPath =
         [ atomicparsley ]
-        ++ lib.optional ffmpegSupport ffmpeg
+        ++ lib.optional ffmpegSupport ffmpeg_4
         ++ lib.optional rtmpSupport rtmpdump
         ++ lib.optional phantomjsSupport phantomjs2;
     in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];