Merge master into staging-next

pkgs/tools/misc/dijo/default.nix

@@ -1,5 +1,5 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }:
-let version = "0.2.6"; in
+let version = "0.2.7"; in
 rustPlatform.buildRustPackage {
   pname = "dijo";
   inherit version;
@@ -8,9 +8,9 @@ rustPlatform.buildRustPackage {
     owner = "NerdyPepper";
     repo = "dijo";
     rev = "v${version}";
-    sha256 = "sha256-fdPl+3NjgVE2MRopzeN/bxbVP6HaTnyJTGFWsLhlRoQ=";
+    sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE=";
   };
-  cargoSha256 = "sha256-45YfZWncT7hNiOhlAatpdFdxgBaF83sih67B/DPNHcs=";
+  cargoSha256 = "sha256-3V94bOixYMznkCQu90+E/68Sfl9GvHp9LNxwWwk4xZQ=";
 
   meta = with lib; {
     description = "Scriptable, curses-based, digital habit tracker";

pkgs/tools/misc/yad/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yad";
-  version = "7.3";
+  version = "8.0";
 
   src = fetchFromGitHub {
     owner = "v1cont";
     repo = "yad";
     rev = "v${version}";
-    sha256 = "sha256-3y3QLqUWBSJ9BLI8gd0LQ9SxNhcj5dXpz8Y2Hi2iCwU=";
+    sha256 = "sha256-KntJtli1PtqH/9XOTq4FkVJYklp0L7bChwQQGCBTLDA=";
   };
 
   configureFlags = [

pkgs/tools/misc/ytfzf/default.nix

@@ -2,25 +2,34 @@
 , stdenv
 , fetchFromGitHub
 , makeWrapper
+, coreutils
 , curl
 , dmenu
 , fzf
+, gnused
 , jq
 , mpv
+, ncurses
+, ueberzug
 , youtube-dl
 }:
 
 stdenv.mkDerivation rec {
   pname = "ytfzf";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "pystardust";
     repo = "ytfzf";
     rev = "v${version}";
-    sha256 = "1i9ya38zcaj1vkfgy1n4gp5vqb59zlrd609pdmz4jqinrb0c5fgv";
+    sha256 = "sha256-ATQRXYaIp1MKCO/EAPsopzFEZeNJzdk73/OcgjsMdkg=";
   };
 
+  patches = [
+    # Updates have to be installed through Nix.
+    ./no-update.patch
+  ];
+
   nativeBuildInputs = [ makeWrapper ];
 
   makeFlags = [ "PREFIX=${placeholder "out"}/bin" ];
@@ -29,7 +38,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [
-      curl dmenu fzf jq mpv youtube-dl
+      coreutils curl dmenu fzf gnused jq mpv ncurses ueberzug youtube-dl
     ]}
   '';
 

pkgs/tools/misc/ytfzf/no-update.patch

@@ -0,0 +1,30 @@
+diff --git a/ytfzf b/ytfzf
+index 5238682..c5c3a1a 100755
+--- a/ytfzf
++++ b/ytfzf
+@@ -757,23 +757,8 @@ clear_history () {
+ }
+ 
+ update_ytfzf () {
+-	branch="$1"
+-	updatefile="/tmp/ytfzf-update"
+-	curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile"
+-
+-	if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh' ; then
+-		chmod 755 "$updatefile"
+-		if [ "$(uname)" = "Darwin" ]; then
+-			sudo cp "$updatefile" "/usr/local/bin/ytfzf"
+-		else
+-			sudo cp "$updatefile" "/usr/bin/ytfzf"
+-		fi
+-	else
+-		printf "%bFailed to update ytfzf. Try again later.%b" "$c_red" "$c_reset"
+-	fi
+-
+-	rm "$updatefile"
+-	exit
++	printf "%bUpdates have to be installed through Nix.%b\n" "$c_red" "$c_reset"
++	exit 1
+ }
+ 
+