From 56c97d665b565d54dab794456cd1744055963678 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 Sep 2025 23:16:49 +0100 Subject: [PATCH] gnu: python-murmurhash: Move to pyhton-crypto. * gnu/packages/python-xyz.scm (python-murmurhash): Move from here ... * gnu/packages/python-crypto.scm: ... to here. * gnu/packages/machine-learning.scm: Add python-crypto module. Change-Id: I59a26e82622112736b5a331dd948d9aa91255207 --- gnu/packages/machine-learning.scm | 1 + gnu/packages/python-crypto.scm | 48 +++++++++++++++++++++++++++++++ gnu/packages/python-xyz.scm | 47 ------------------------------ 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 933ede23ac9f0b4f58550b135e0a442e983f2a6f..01b7c49de5bf178d063da3421b94dcc9230370ee 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -121,6 +121,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 938fe82480f6e6b095cbb483aaa565678fa936ff..79e3a934896461c68d85e76fa9c4f8286a981e43 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2022 Artyom V. Poptsov ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023, 2025 Zheng Junjie @@ -132,6 +133,53 @@ on the Blowfish password hashing algorithm, as described in Password Scheme\"} by Niels Provos and David Mazieres.") (license license:asl2.0))) +(define-public python-murmurhash + (package + (name "python-murmurhash") + (version "1.0.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/explosion/murmurhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02ny4391kbrssq9bf7kq75615ragvbjhsqi9hgv7wiaiz6yai1k8")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'fix-installation + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion + (string-append (site-packages inputs outputs) "/murmurhash") + (delete-file-recursively "tests") + (delete-file "mrmr.pyx") + (for-each + (lambda (file) + (chmod file #o555)) + (find-files "." "\\.so$"))))) + ;; XXX: Otherwise ModuleNotFoundError, and --pyargs doesn't seem + ;; to fix the issue. + (replace 'check + (lambda args + (copy-recursively "murmurhash/tests" "tests") + (delete-file-recursively "murmurhash") + (with-directory-excursion "tests" + (apply (assoc-ref %standard-phases 'check) args))))))) + (native-inputs + (list python-cython + python-murmurhash3 + python-pytest + python-setuptools)) + (home-page "https://github.com/explosion/murmurhash") + (synopsis "Cython bindings for MurmurHash2") + (description + "This package provides Cython bindings for MurmurHash2.") + (license license:expat))) + (define-public python-passlib (package (name "python-passlib") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 389947e5a8c4bdeffa1eba47560bdeedfbd8c474..01fac10a044d462cb4ee0a7f3610b618e9118700 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -39112,53 +39112,6 @@ of fast and robust hash functions. This library is a Python extension module written in C.") (license license:public-domain)))) -(define-public python-murmurhash - (package - (name "python-murmurhash") - (version "1.0.10") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/explosion/murmurhash") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "02ny4391kbrssq9bf7kq75615ragvbjhsqi9hgv7wiaiz6yai1k8")))) - (build-system pyproject-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'fix-installation - (lambda* (#:key inputs outputs #:allow-other-keys) - (with-directory-excursion - (string-append (site-packages inputs outputs) "/murmurhash") - (delete-file-recursively "tests") - (delete-file "mrmr.pyx") - (for-each - (lambda (file) - (chmod file #o555)) - (find-files "." "\\.so$"))))) - ;; XXX: Otherwise ModuleNotFoundError, and --pyargs doesn't seem - ;; to fix the issue. - (replace 'check - (lambda args - (copy-recursively "murmurhash/tests" "tests") - (delete-file-recursively "murmurhash") - (with-directory-excursion "tests" - (apply (assoc-ref %standard-phases 'check) args))))))) - (native-inputs - (list python-cython - python-murmurhash3 - python-pytest - python-setuptools)) - (home-page "https://github.com/explosion/murmurhash") - (synopsis "Cython bindings for MurmurHash2") - (description - "This package provides Cython bindings for MurmurHash2.") - (license license:expat))) - ;; Scooby requires for its test suite a ‘pyvips’ package that is missing its ;; VIPS dependency. (define python-pyvips-for-python-scooby