From b018ce24f54e3b8edac509ba0667113e16f5bd7d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 30 Jul 2024 01:17:27 +0200 Subject: [PATCH] python312Packages.samarium: 0.5.3 -> 0.6.2 --- .../samarium/crossandra-2-fix.patch | 18 ------------------ .../python-modules/samarium/default.nix | 5 ++--- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/python-modules/samarium/crossandra-2-fix.patch diff --git a/pkgs/development/python-modules/samarium/crossandra-2-fix.patch b/pkgs/development/python-modules/samarium/crossandra-2-fix.patch deleted file mode 100644 index 7861ce0611af..000000000000 --- a/pkgs/development/python-modules/samarium/crossandra-2-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/samarium/tokenizer.py 2024-06-07 13:07:38.731314161 +0200 -+++ b/src/samarium/tokenizer.py 2024-06-07 13:08:11.674488226 +0200 -@@ -26,12 +26,12 @@ - Token, - ignore_whitespace=True, - rules=[ -- Rule(r"==<.*>==", converter=False, flags=re.M | re.S), -- Rule(r"==[^\n]*", converter=False, flags=re.M | re.S), -+ Rule(r"==<.*>==", flags=re.M | re.S, ignore=True), -+ Rule(r"==[^\n]*", flags=re.M | re.S, ignore=True), - Rule( - common.DOUBLE_QUOTED_STRING.pattern, - lambda x: x.replace("\n", r"\n"), -- re.S, -+ flags=re.S, - ), - Rule(rf"{SM_BIT}+`?{SM_BIT}*|`{SM_BIT}*", to_number), - Rule(r"\w+"), diff --git a/pkgs/development/python-modules/samarium/default.nix b/pkgs/development/python-modules/samarium/default.nix index a2b637c620a5..89d5a700a7bc 100644 --- a/pkgs/development/python-modules/samarium/default.nix +++ b/pkgs/development/python-modules/samarium/default.nix @@ -10,20 +10,19 @@ buildPythonPackage rec { pname = "samarium"; - version = "0.5.3"; + version = "0.6.2"; pyproject = true; src = fetchFromGitHub { owner = "samarium-lang"; repo = "samarium"; rev = "refs/tags/${version}"; - hash = "sha256-4WVkTLE6OboNJE/f+6zS3xT1jEHUwV4HSLjl/PBP0FU="; + hash = "sha256-sOkJ67B8LaIA2cwCHaFnc16lMG8uaegBJCzF6Li77vk="; }; build-system = [ poetry-core pythonRelaxDepsHook ]; dependencies = [ crossandra dahlia ]; - patches = [ ./crossandra-2-fix.patch ]; pythonRelaxDeps = [ "crossandra" ]; meta = with lib; {