From 9053a71c5acb6b61f02241d6771d3a0bb5afd628 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 02:53:06 +0000 Subject: [PATCH 1/2] python312Packages.socid-extractor: 0.0.26 -> 0.0.27 --- pkgs/development/python-modules/socid-extractor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/socid-extractor/default.nix b/pkgs/development/python-modules/socid-extractor/default.nix index 1fd9b67c5a5c..6ce0aecdacf9 100644 --- a/pkgs/development/python-modules/socid-extractor/default.nix +++ b/pkgs/development/python-modules/socid-extractor/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "socid-extractor"; - version = "0.0.26"; + version = "0.0.27"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "soxoj"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-3ht/wlxB40k4n0DTBGAvAl7yPiUIZqAe+ECbtkyMTzk="; + tag = "v${version}"; + hash = "sha256-oiXIxNvedEk+EufYzxhvRr8m+kuQRs0J62Yel5JLenQ="; }; propagatedBuildInputs = [ From 007af78414162e42c5dd4316f288ac6ec103342d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 10:09:42 +0100 Subject: [PATCH 2/2] python312Packages.socid-extractor: refactor --- .../socid-extractor/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/socid-extractor/default.nix b/pkgs/development/python-modules/socid-extractor/default.nix index 6ce0aecdacf9..27aca9ff9193 100644 --- a/pkgs/development/python-modules/socid-extractor/default.nix +++ b/pkgs/development/python-modules/socid-extractor/default.nix @@ -5,35 +5,32 @@ fetchFromGitHub, python-dateutil, pythonOlder, + setuptools, requests, }: buildPythonPackage rec { pname = "socid-extractor"; version = "0.0.27"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "soxoj"; - repo = pname; + repo = "socid-extractor"; tag = "v${version}"; hash = "sha256-oiXIxNvedEk+EufYzxhvRr8m+kuQRs0J62Yel5JLenQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ beautifulsoup4 python-dateutil requests ]; - postPatch = '' - # https://github.com/soxoj/socid-extractor/pull/150 - substituteInPlace requirements.txt \ - --replace "beautifulsoup4~=4.11.1" "beautifulsoup4>=4.10.0" - ''; - # Test require network access doCheck = false; @@ -41,10 +38,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract details from personal pages"; - mainProgram = "socid_extractor"; homepage = "https://github.com/soxoj/socid-extractor"; changelog = "https://github.com/soxoj/socid-extractor/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ gpl3Only ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "socid_extractor"; }; }