From 89822cc130c8928490caa37e3ab547f41841cd7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 04:04:37 +0000 Subject: [PATCH 1/6] python311Packages.roadlib: 0.23.0 -> 0.24.0 --- pkgs/development/python-modules/roadlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 303024a90f52..81792fddd0e0 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "roadlib"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0hDiuF0dBRyR2B9dp4c7/jsC6li8uOduQBbhs6fFLfU="; + hash = "sha256-+5vR2iTFu50PJIsj4sW6McH1sg3yyEIwk15W8Jk0GKA="; }; nativeBuildInputs = [ From 541d458df41683faa25739d7fca4a0f54427b8f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:23:04 +0200 Subject: [PATCH 2/6] python311Packages.roadlib: refactor --- pkgs/development/python-modules/roadlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 81792fddd0e0..378ac50fa1b8 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { hash = "sha256-+5vR2iTFu50PJIsj4sW6McH1sg3yyEIwk15W8Jk0GKA="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ adal pyjwt sqlalchemy From dbb9bdf420f0ecfeb3238f853676bd22cf580cdb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:25:24 +0200 Subject: [PATCH 3/6] python312Packages.roadlib: format with nixfmt --- .../python-modules/roadlib/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 378ac50fa1b8..77c05f8dc597 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -1,11 +1,12 @@ -{ lib -, adal -, buildPythonPackage -, fetchPypi -, pyjwt -, pythonOlder -, setuptools -, sqlalchemy +{ + lib, + adal, + buildPythonPackage, + fetchPypi, + pyjwt, + pythonOlder, + setuptools, + sqlalchemy, }: buildPythonPackage rec { @@ -20,9 +21,7 @@ buildPythonPackage rec { hash = "sha256-+5vR2iTFu50PJIsj4sW6McH1sg3yyEIwk15W8Jk0GKA="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ adal @@ -33,9 +32,7 @@ buildPythonPackage rec { # Module has no test doCheck = false; - pythonImportsCheck = [ - "roadtools.roadlib" - ]; + pythonImportsCheck = [ "roadtools.roadlib" ]; meta = with lib; { description = "ROADtools common components library"; From ecd04dede8a8db56b5c8ed0e15882d7bf27f3180 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:36:48 +0200 Subject: [PATCH 4/6] python312Packages.roadtx: refactor --- pkgs/development/python-modules/roadtx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index 4ea50269cd76..6c67dc83fda5 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { hash = "sha256-qnumJbuBH+ajzfG+bLTrYPvB5uNnL8dJsTZoT2vo6g0="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pycryptodomex pyotp requests From 2313c67fcf0fa924652c73957240d2644abef9ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:37:18 +0200 Subject: [PATCH 5/6] python312Packages.roadtx: 1.7.0 -> 1.8.1 --- pkgs/development/python-modules/roadtx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index 6c67dc83fda5..1187e7e82340 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "roadtx"; - version = "1.7.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qnumJbuBH+ajzfG+bLTrYPvB5uNnL8dJsTZoT2vo6g0="; + hash = "sha256-hhxmwD1+mZtU/VmB8yXeQESh0AGtjhdpDXRG3+mYfEk="; }; build-system = [ From f9e7b448127ad8ebe962190f8527d2324c49ede0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:37:34 +0200 Subject: [PATCH 6/6] python312Packages.roadtx: format with nixfmt --- .../python-modules/roadtx/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index 1187e7e82340..eca756a0f033 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pycryptodomex -, pyotp -, pythonOlder -, requests -, roadlib -, selenium -, selenium-wire -, setuptools -, signxml +{ + lib, + buildPythonPackage, + fetchPypi, + pycryptodomex, + pyotp, + pythonOlder, + requests, + roadlib, + selenium, + selenium-wire, + setuptools, + signxml, }: buildPythonPackage rec { @@ -24,9 +25,7 @@ buildPythonPackage rec { hash = "sha256-hhxmwD1+mZtU/VmB8yXeQESh0AGtjhdpDXRG3+mYfEk="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ pycryptodomex @@ -38,9 +37,7 @@ buildPythonPackage rec { signxml ]; - pythonImportsCheck = [ - "roadtools.roadtx" - ]; + pythonImportsCheck = [ "roadtools.roadtx" ]; meta = with lib; { description = "ROADtools Token eXchange";