From 74359df6e5cc13561205a7d6674574ac0b5d4e77 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Fri, 12 Nov 2021 23:41:11 +0000 Subject: [PATCH 1/3] droopy: Fix Python 3.9 compatiblity --- pkgs/applications/networking/droopy/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 63afa5ce76f1d..60f0a26ebd87a 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/30.patch"; sha256 = "Y6jBraKvVQAiScbvLwezSKeWY3vaAbhaNXEGNaItigQ="; }) + (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/31.patch"; + sha256 = "1dn8wym9378d8kiz32snvl6cksp7ydrg0c5pgm2mp46nmnz45r6i"; + }) ]; nativeBuildInputs = [ wrapPython ]; From 523b833052d8de179832b6fcb5c4f00dcf1c5fe3 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Fri, 12 Nov 2021 23:57:57 +0000 Subject: [PATCH 2/3] Fix hash --- pkgs/applications/networking/droopy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 60f0a26ebd87a..7b1debe8cf8cd 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { }) (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/31.patch"; - sha256 = "1dn8wym9378d8kiz32snvl6cksp7ydrg0c5pgm2mp46nmnz45r6i"; + sha256 = "1ig054rxn5r0ph4w4fhmrxlh158c97iqqc7dbnc819adn9nw96l5"; }) ]; From 0c205792935849b9cc76b3d72293d0e33c221169 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Sat, 13 Nov 2021 12:25:04 +0000 Subject: [PATCH 3/3] Unqualify fetchpatch --- pkgs/applications/networking/droopy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 7b1debe8cf8cd..e6dca02dace73 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/30.patch"; sha256 = "Y6jBraKvVQAiScbvLwezSKeWY3vaAbhaNXEGNaItigQ="; }) - (pkgs.fetchpatch { + (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/31.patch"; sha256 = "1ig054rxn5r0ph4w4fhmrxlh158c97iqqc7dbnc819adn9nw96l5"; })