From eab2d27e22601c15de88a21038a36168bf248159 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 22 Jun 2022 23:37:09 +0200 Subject: [PATCH 1/4] hydrus: 488d -> 489 --- pkgs/applications/graphics/hydrus/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index dcebff3fcf3a..207bc48779d8 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "488d"; + version = "489"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-FWiopOf+eabiWAfjQW83V7I/e5lOLUVW3djoQePHPRs="; + sha256 = "sha256-+5QKeDm/bJemGX/45YN4COtJmSMCy0dxIlqGNHEc8HA="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ python3Packages.buildPythonPackage rec { pyopenssl pyside2 pysocks - pythonPackages.mpv + python3Packages.mpv pyyaml qtpy requests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3ce352d912d..27322acfa420 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27199,7 +27199,8 @@ with pkgs; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; - hydrus = python3Packages.callPackage ../applications/graphics/hydrus { + hydrus = python39Packages.callPackage ../applications/graphics/hydrus { + python3Packages = python39Packages; inherit miniupnpc_2 swftools; inherit (qt5) wrapQtAppsHook; }; From 76562ec8d93f2373c024de917f0ba50b4cabeec2 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 27 Jun 2022 02:43:03 +0200 Subject: [PATCH 2/4] hydrus: unpin python version --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27322acfa420..c3ce352d912d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27199,8 +27199,7 @@ with pkgs; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; - hydrus = python39Packages.callPackage ../applications/graphics/hydrus { - python3Packages = python39Packages; + hydrus = python3Packages.callPackage ../applications/graphics/hydrus { inherit miniupnpc_2 swftools; inherit (qt5) wrapQtAppsHook; }; From 250157ab541816eb9f18d42b74721db8a22a4c0a Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 3 Jul 2022 01:29:06 +0200 Subject: [PATCH 3/4] hydrus: 489 -> 490 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 207bc48779d8..5bdb36135bc3 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "489"; + version = "490"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-+5QKeDm/bJemGX/45YN4COtJmSMCy0dxIlqGNHEc8HA="; + sha256 = "sha256-jlLP5y0onSHN0QnbaCnQsSKP7Fj+LS408MPCUxi29yc="; }; nativeBuildInputs = [ From cec2f720952958de5b4d02afdfd6cd6a0816f275 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 13 Jul 2022 23:48:11 +0200 Subject: [PATCH 4/4] hydrus: 490 -> 491 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 5bdb36135bc3..d44ef1f9cf50 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "490"; + version = "491"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-jlLP5y0onSHN0QnbaCnQsSKP7Fj+LS408MPCUxi29yc="; + sha256 = "sha256-ceKawn2jyfZPP4HzhkB1jIQoStCPRO/Ni/+Ys1R2FJQ="; }; nativeBuildInputs = [