From 42a9eafab012c34225cc732423acb38265be4742 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:28:38 +0900 Subject: [PATCH 1/5] python312Packages.widlparser: 1.0.12 -> 1.1.5 Diff: https://github.com/plinss/widlparser/compare/v1.0.12...v1.1.5 --- pkgs/development/python-modules/widlparser/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/widlparser/default.nix b/pkgs/development/python-modules/widlparser/default.nix index 688c14a024dc..f9a0a3558f32 100644 --- a/pkgs/development/python-modules/widlparser/default.nix +++ b/pkgs/development/python-modules/widlparser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "widlparser"; - version = "1.0.12"; + version = "1.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,12 +18,9 @@ buildPythonPackage rec { owner = "plinss"; repo = pname; rev = "v${version}"; - hash = "sha256-T17fDWYd1naza/ao7kXWGcRIl2fzL1/Z9SaJiutZzqk="; + hash = "sha256-G5N29K0/ByfKwP1XfxZH9u/5x361JD/8qAD6eZaySnU="; }; - postPatch = '' - sed -i -e 's/0.0.0/${version}/' setup.py - ''; propagatedBuildInputs = [ typing-extensions ]; From 5c96771a91b74fcdfb5143f50c13b03bd1450d68 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 23:28:36 +0900 Subject: [PATCH 2/5] python312Packages.widlparser: refactor --- .../python-modules/widlparser/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/widlparser/default.nix b/pkgs/development/python-modules/widlparser/default.nix index f9a0a3558f32..9b961c89a9a9 100644 --- a/pkgs/development/python-modules/widlparser/default.nix +++ b/pkgs/development/python-modules/widlparser/default.nix @@ -4,28 +4,44 @@ fetchFromGitHub, pythonOlder, # build inputs + setuptools, + setuptools-scm, typing-extensions, }: buildPythonPackage rec { pname = "widlparser"; version = "1.1.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "plinss"; - repo = pname; + repo = "widlparser"; rev = "v${version}"; hash = "sha256-G5N29K0/ByfKwP1XfxZH9u/5x361JD/8qAD6eZaySnU="; }; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; pythonImportsCheck = [ "widlparser" ]; + # https://github.com/plinss/widlparser/blob/v1.1.5/.github/workflows/test.yml + checkPhase = '' + runHook preCheck + + python test.py > test-actual.txt + diff -u test-expected.txt test-actual.txt + + runHook postCheck + ''; + meta = with lib; { description = "Stand-alone WebIDL Parser in Python"; homepage = "https://github.com/plinss/widlparser"; From d76be85c4151cf7734d4f9e5231a165758adaf6d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 8 Nov 2024 00:05:30 +0900 Subject: [PATCH 3/5] python312Packages.kdl-py: init at 1.2.0 --- .../python-modules/kdl-py/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/kdl-py/default.nix diff --git a/pkgs/development/python-modules/kdl-py/default.nix b/pkgs/development/python-modules/kdl-py/default.nix new file mode 100644 index 000000000000..df409677cc92 --- /dev/null +++ b/pkgs/development/python-modules/kdl-py/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "kdl-py"; + version = "1.2.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Y/P0bGJ33trc5E3PyUZyv25r8zMLkBIuATTCKFfimXM="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "kdl" ]; + + checkPhase = '' + runHook preCheck + + python tests/run.py + + runHook postCheck + ''; + + meta = { + description = "Parser for the KDL language"; + homepage = "https://github.com/tabatkins/kdlpy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + mainProgram = "kdlreformat"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75ce887ee4f7..3dcc3b4b3c01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6765,6 +6765,8 @@ self: super: with self; { kde-material-you-colors = callPackage ../development/python-modules/kde-material-you-colors { }; + kdl-py = callPackage ../development/python-modules/kdl-py { }; + keba-kecontact = callPackage ../development/python-modules/keba-kecontact { }; keep = callPackage ../development/python-modules/keep { }; From 96a14dbad52ea895e31b053543530c4a2ed77237 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 7 Nov 2024 23:46:58 +0900 Subject: [PATCH 4/5] bikeshed: 3.7.0 -> 4.2.7 --- pkgs/applications/misc/bikeshed/default.nix | 34 +++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix index 244632521bac..64c5ca439829 100644 --- a/pkgs/applications/misc/bikeshed/default.nix +++ b/pkgs/applications/misc/bikeshed/default.nix @@ -2,31 +2,46 @@ , buildPythonApplication , fetchPypi # build inputs +, about-time , aiofiles , aiohttp +, aiosignal +, alive-progress +, async-timeout , attrs , certifi +, charset-normalizer , cssselect +, frozenlist , html5lib +, idna , isodate , json-home-client +, kdl-py , lxml +, multidict , pillow , pygments , requests , result , setuptools +, six , tenacity +, typing-extensions +, uri-template +, urllib3 +, webencodings , widlparser +, yarl }: buildPythonApplication rec { pname = "bikeshed"; - version = "3.7.0"; + version = "4.2.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3fVo+B71SsJs+XF4+FWH2nz0ouTnpC/02fXYr1C9Jrk="; + hash = "sha256-vtZ97brCk+fd/HsA2UHdS17o8rJ/VvSOdhg0MHzlCs8="; }; # Relax requirements from "==" to ">=" @@ -37,22 +52,37 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ + about-time aiofiles aiohttp + aiosignal + alive-progress + async-timeout attrs certifi + charset-normalizer cssselect + frozenlist html5lib + idna isodate json-home-client + kdl-py lxml + multidict pillow pygments requests result setuptools + six tenacity + typing-extensions + uri-template + urllib3 + webencodings widlparser + yarl ]; checkPhase = '' From da270d4934f0fe189723ef6450a0c15b48dbc365 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 8 Nov 2024 00:06:48 +0900 Subject: [PATCH 5/5] bikeshed: refactor --- pkgs/applications/misc/bikeshed/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix index 64c5ca439829..955da0699299 100644 --- a/pkgs/applications/misc/bikeshed/default.nix +++ b/pkgs/applications/misc/bikeshed/default.nix @@ -38,20 +38,18 @@ buildPythonApplication rec { pname = "bikeshed"; version = "4.2.7"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-vtZ97brCk+fd/HsA2UHdS17o8rJ/VvSOdhg0MHzlCs8="; }; - # Relax requirements from "==" to ">=" - # https://github.com/tabatkins/bikeshed/issues/2178 - postPatch = '' - substituteInPlace requirements.txt \ - --replace "==" ">=" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + pythonRelaxDeps = true; + + dependencies = [ about-time aiofiles aiohttp