From 2b7571a7a055d20b0fb9b8cadf994b96d912ee12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 29 Aug 2024 09:16:03 -0400 Subject: [PATCH 1/4] mpvScripts.mpv-notify-send: fix build when wrapping --- pkgs/applications/video/mpv/scripts/mpv-notify-send.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index b103a45d275b..523914543900 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -31,7 +31,7 @@ buildLua rec { "--prefix" "PATH" ":" - (lib.makeBinPath libnotify) + (lib.makeBinPath [ libnotify ]) ]; passthru.updateScript = unstableGitUpdater { }; From f003a26a14d71eb7b7ec21f49842ed006ce69793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 29 Aug 2024 09:16:10 -0400 Subject: [PATCH 2/4] mpvScripts.mpv-notify-send: modernise --- .../applications/video/mpv/scripts/mpv-notify-send.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index 523914543900..4bc2bedde8f4 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -13,9 +13,9 @@ buildLua rec { src = fetchFromGitHub { owner = "emilazy"; - repo = pname; + repo = "mpv-notify-send"; rev = "a2bab8b2fd8e8d14faa875b5cc3a73f1276cd88a"; - sha256 = "sha256-EwVkhyB87TJ3i9xJmmZMSTMUKvfbImI1S+y1vgRWbDk="; + hash = "sha256-EwVkhyB87TJ3i9xJmmZMSTMUKvfbImI1S+y1vgRWbDk="; }; patches = [ @@ -36,10 +36,10 @@ buildLua rec { passthru.updateScript = unstableGitUpdater { }; - meta = with lib; { + meta = { description = "Lua script for mpv to send notifications with notify-send"; homepage = "https://github.com/emilazy/mpv-notify-send"; - license = licenses.wtfpl; - maintainers = with maintainers; [ r3n3gad3p3arl ]; + license = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ r3n3gad3p3arl ]; }; } From 3c005b2730522e22bb293131fc8e601579979d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 29 Aug 2024 10:08:30 -0400 Subject: [PATCH 3/4] mpvScripts.mpv-notify-send: update repo url --- pkgs/applications/video/mpv/scripts/mpv-notify-send.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index 4bc2bedde8f4..60ca030c5720 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -12,7 +12,7 @@ buildLua rec { version = "0-unstable-2020-02-24"; src = fetchFromGitHub { - owner = "emilazy"; + owner = "Parranoh"; repo = "mpv-notify-send"; rev = "a2bab8b2fd8e8d14faa875b5cc3a73f1276cd88a"; hash = "sha256-EwVkhyB87TJ3i9xJmmZMSTMUKvfbImI1S+y1vgRWbDk="; @@ -38,7 +38,7 @@ buildLua rec { meta = { description = "Lua script for mpv to send notifications with notify-send"; - homepage = "https://github.com/emilazy/mpv-notify-send"; + homepage = "https://github.com/Parranoh/mpv-notify-send"; license = lib.licenses.wtfpl; maintainers = with lib.maintainers; [ r3n3gad3p3arl ]; }; From e9f0695f3c6ff588f2691e76adea4dd17006090c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 29 Aug 2024 10:08:57 -0400 Subject: [PATCH 4/4] mpvScripts.mpv-notify-send: 0-unstable-2020-02-24 -> 0-unstable-2024-07-11 --- .../video/mpv/scripts/mpv-notify-send.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index 60ca030c5720..0a00b04c7192 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -9,24 +9,15 @@ buildLua rec { pname = "mpv-notify-send"; - version = "0-unstable-2020-02-24"; + version = "0-unstable-2024-07-11"; src = fetchFromGitHub { owner = "Parranoh"; repo = "mpv-notify-send"; - rev = "a2bab8b2fd8e8d14faa875b5cc3a73f1276cd88a"; - hash = "sha256-EwVkhyB87TJ3i9xJmmZMSTMUKvfbImI1S+y1vgRWbDk="; + rev = "d98d9fe566b222c5b909e3905e9e201eaec34959"; + hash = "sha256-H8WIKfQnle27eiwnz2sxC8D1EwQplY4N7Qg5+c1e/uU="; }; - patches = [ - # show title of online videos instead of url - (fetchpatch { - name = "6.patch"; # https://github.com/emilazy/mpv-notify-send/pull/6 - url = "https://github.com/emilazy/mpv-notify-send/commit/948347e14890e15e89cd1e069beb1140e2d01dce.patch"; - hash = "sha256-7aXQ8qeqG4yX0Uyn09xCIESnwPZsb6Frd7C49XgbpFw="; - }) - ]; - passthru.extraWrapperArgs = [ "--prefix" "PATH"