From de5025f85ed39f5eeb30c2b0a77bbbc79272735c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Aug 2023 22:50:09 +0200 Subject: [PATCH 1/4] python311Packages.zeroconf: 0.74.0 -> 0.79.0 Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.74.0...0.79.0 Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.79.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 6cd8253cfc32..3c5e81813c40 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.74.0"; + version = "0.79.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-0QmAq1+dRfRkomZgh4Q0YF20omQBDUTgGt8cP1L6cx0="; + hash = "sha256-mIAWh5W8iDsSRTyIEot4xsLK5409tq7u/x6ULJS/bDE="; }; nativeBuildInputs = [ From 7d988081a8d3122410d328823345f5947245e629 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 12:19:25 +0200 Subject: [PATCH 2/4] python311Packages.zeroconf: 0.79.0 -> 0.80.0 Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.79.0...0.80.0 Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.80.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 3c5e81813c40..10e7cc86b84f 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.79.0"; + version = "0.80.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-mIAWh5W8iDsSRTyIEot4xsLK5409tq7u/x6ULJS/bDE="; + hash = "sha256-+NxLQGgTFHOPyOs8yoZvtZj0D42V6qma+PHgTGwPJsg="; }; nativeBuildInputs = [ From 184ef4c61c15156cb69ef7eea5f336590ae1391a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 13:13:52 +0200 Subject: [PATCH 3/4] python311Packages.librespot: relax all requirements --- .../python-modules/librespot/default.nix | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/librespot/default.nix b/pkgs/development/python-modules/librespot/default.nix index 21a25729fa4b..97277f68a981 100644 --- a/pkgs/development/python-modules/librespot/default.nix +++ b/pkgs/development/python-modules/librespot/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage -, fetchFromGitHub , defusedxml +, fetchFromGitHub , protobuf -, pythonRelaxDepsHook -, websocket-client -, pyogg -, zeroconf -, requests , pycryptodomex +, pyogg , pytestCheckHook +, pythonRelaxDepsHook +, requests +, websocket-client +, zeroconf }: buildPythonPackage rec { @@ -20,10 +20,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kokarare1212"; repo = "librespot-python"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM="; }; + pythonRelaxDeps = true; + nativeBuildInputs = [ pythonRelaxDepsHook ]; @@ -38,13 +40,6 @@ buildPythonPackage rec { zeroconf ]; - pythonRelaxDeps = [ - "protobuf" - "pyogg" - "requests" - "zeroconf" - ]; - # Doesn't include any tests doCheck = false; @@ -55,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open Source Spotify Client"; homepage = "https://github.com/kokarare1212/librespot-python"; + changelog = "https://github.com/kokarare1212/librespot-python/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ onny ]; }; From 2b22c7d93cd46242594978fdaee06f14a08a0c09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 13:14:46 +0200 Subject: [PATCH 4/4] onthespot: specify license - add changelog to meta --- pkgs/applications/misc/onthespot/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/onthespot/default.nix b/pkgs/applications/misc/onthespot/default.nix index 642c76563329..2a37f90d3bf3 100644 --- a/pkgs/applications/misc/onthespot/default.nix +++ b/pkgs/applications/misc/onthespot/default.nix @@ -1,9 +1,9 @@ { lib -, python3 -, fetchFromGitHub , copyDesktopItems -, wrapQtAppsHook +, fetchFromGitHub , makeDesktopItem +, python3 +, wrapQtAppsHook }: python3.pkgs.buildPythonApplication rec { @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "casualsnek"; repo = "onthespot"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg="; }; @@ -54,11 +54,12 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - meta = { + meta = with lib; { description = " QT based Spotify music downloader written in Python"; homepage = "https://github.com/casualsnek/onthespot"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ onny ]; - platforms = lib.platforms.linux; + changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; }; }