From f69011949c17784865bffc3859a3bb5efefacc24 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 8 Sep 2022 00:30:30 +0200 Subject: [PATCH 1/4] python3Packages.mpv: 0.5.2 -> 1.0.1 --- pkgs/development/python-modules/mpv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index 11d0bed476af..01d9d58b23db 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "mpv"; - version = "0.5.2"; + version = "1.0.1"; disabled = isPy27; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - sha256 = "0ffskpynhl1252h6a05087lvpjgn1cn2z3caiv3i666dn1n79fjd"; + sha256 = "sha256-UCJ1PknnWQiFciTEMxTUqDzz0Z8HEWycLuQqYeyQhoM="; }; buildInputs = [ mpv ]; From f605651615b594590162326d95eb77a3d4ba7481 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 8 Sep 2022 00:20:53 +0200 Subject: [PATCH 2/4] hydrus: 497 -> 499 --- 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 6b991e8dd398..d37b066bfa50 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 = "497"; + version = "499"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-dQ6a3jys6V1ihT6q8FUaX7jOA1ZDZdX5EUy03ILk7vM="; + sha256 = "sha256-G3aWg06sUD9uHSLPTnUk0CvFqrRe5nvIAKBoQqlWwYA="; }; nativeBuildInputs = [ From 482999e6fce63537040a192acc266a427c5cc951 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 8 Sep 2022 10:17:09 +0200 Subject: [PATCH 3/4] python3Packages.sublime-music: relax python-mpv dependency --- pkgs/applications/audio/sublime-music/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 3f7e1e038f8e..4b50ff3e7ea0 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -28,9 +28,14 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection python3Packages.poetry-core + python3Packages.pythonRelaxDepsHook wrapGAppsHook ]; + # Can be removed in later versions + # https://gitlab.com/sublime-music/sublime-music/-/issues/343 + pythonRelaxDeps = [ "python-mpv" ]; + buildInputs = [ gtk3 pango From 41a6b4d1e58e91c63b587c3ccf064154caa98edb Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 28 Sep 2022 21:13:52 +0200 Subject: [PATCH 4/4] hydrus: 499 -> 500 Also removes nose from propagatedBuildInputs --- pkgs/applications/graphics/hydrus/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index d37b066bfa50..4b421b41d9a3 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 = "499"; + version = "500"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-G3aWg06sUD9uHSLPTnUk0CvFqrRe5nvIAKBoQqlWwYA="; + sha256 = "sha256-gsOto37++++ucpDC0ri3HhROp7v6qlHENjFvsbuyM6k="; }; nativeBuildInputs = [ @@ -33,7 +33,6 @@ python3Packages.buildPythonPackage rec { html5lib lxml lz4 - nose numpy opencv4 pillow