From f5adb28fc9170a17a95ea1ca17c44d73577413f7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 9 Jul 2026 22:33:07 +0100 Subject: gnu: oniguruma: Move to (gnu packages regex). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Authors were parsed from git history with the following command: git log --all --grep="gnu:.*oniguruma" \ --pretty=format:";;; Copyright © %as %aN <%aE>" * gnu/packages/textutils.scm (oniguruma): Move from here ... * gnu/packages/regex.scm: ... to here. * gnu/packages/admin.scm: Replace (gnu packages textutils) with (gnu packages regex). * gnu/packages/codex.scm: Likewise. * gnu/packages/php.scm: Likewise. * gnu/packages/rust-apps.scm: Likewise. * gnu/packages/rust-sources.scm: Likewise. * gnu/packages/machine-learning.scm: Remove (gnu packages textutils) to resolve import warning. * gnu/packages/web.scm: Adding (gnu packages regex) introduces import warning, selecting just utf8proc from (gnu packages textutils) breaks build. * gnu/packages/textutils.scm: Add (guix deprecation). Merges: guix/guix!9845 --- gnu/packages/admin.scm | 2 +- gnu/packages/codex.scm | 2 +- gnu/packages/machine-learning.scm | 1 - gnu/packages/php.scm | 2 +- gnu/packages/regex.scm | 30 +++++++++++++++++++++++++++++- gnu/packages/rust-apps.scm | 2 +- gnu/packages/rust-sources.scm | 2 +- gnu/packages/textutils.scm | 27 +++------------------------ 8 files changed, 37 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1af10fa1499..65867bca7fd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -203,6 +203,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages regex) #:use-module (gnu packages ruby) #:use-module (gnu packages ruby-check) #:use-module (gnu packages ruby-xyz) @@ -214,7 +215,6 @@ #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) - #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) diff --git a/gnu/packages/codex.scm b/gnu/packages/codex.scm index 9a02507add8..7cd2a7688fa 100644 --- a/gnu/packages/codex.scm +++ b/gnu/packages/codex.scm @@ -49,10 +49,10 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages regex) #:use-module (gnu packages rust) #:use-module (gnu packages rust-sources) #:use-module (gnu packages sqlite) - #:use-module (gnu packages textutils) #:use-module (gnu packages nss) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 4d69ff4e6e5..855bb42a5c9 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -126,7 +126,6 @@ #:use-module (gnu packages ssh) #:use-module (gnu packages statistics) #:use-module (gnu packages swig) - #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 8f413a38f8e..7fea0fb17f5 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -49,8 +49,8 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) + #:use-module (gnu packages regex) #:use-module (gnu packages sqlite) - #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index f0d965f45ea..8ad1fb3fa44 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -1,10 +1,12 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2016, 2020, 2022 Marius Bakke +;;; Copyright © 2016 Jelle Licht +;;; Copyright © 2016, 2018, 2019, 2020, 2022 Marius Bakke ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2025 Ashish SHUKLA ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +37,32 @@ #:use-module (gnu packages check) #:use-module (gnu packages cpp)) +(define-public oniguruma + (package + (name "oniguruma") + (version "6.9.10") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/kkos/" + "oniguruma/releases/download/v" + ;; If there is a "-" in the version, convert + ;; to underscore for this part of the URI. + (string-map (lambda (c) (if (char=? #\- c) #\_ c)) + version) + "/onig-" version ".tar.gz")) + (sha256 + (base32 "01gwd7bkhwl2rdqbfq109vlzznic2pygz3dnhrzykr2rw9dgqp1a")))) + (build-system gnu-build-system) + (arguments '(#:configure-flags '("--disable-static"))) + (home-page "https://github.com/kkos/oniguruma") + (synopsis "Regular expression library") + (description + "Oniguruma is a regular expressions library. The special characteristic +of this library is that different character encoding for every regular +expression object can be specified.") + (license license:bsd-2))) + (define-public re2 (package (name "re2") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 81e73173816..3bf75efb65d 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -128,11 +128,11 @@ #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ruby-xyz) + #:use-module (gnu packages regex) #:use-module (gnu packages rust) #:use-module (gnu packages security-token) #:use-module (gnu packages sqlite) #:use-module (gnu packages terminals) - #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages tree-sitter) #:use-module (gnu packages version-control) diff --git a/gnu/packages/rust-sources.scm b/gnu/packages/rust-sources.scm index 95cbde865f1..650fcb6e51c 100644 --- a/gnu/packages/rust-sources.scm +++ b/gnu/packages/rust-sources.scm @@ -37,9 +37,9 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages regex) #:use-module (gnu packages rust) #:use-module (gnu packages statistics) - #:use-module (gnu packages textutils) #:use-module (gnu packages virtualization)) ;;; diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 37c8f283ecc..a4b9fdca458 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -67,6 +67,7 @@ #:use-module (guix build-system go) #:use-module (guix build-system perl) #:use-module (guix build-system pyproject) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) @@ -848,30 +849,8 @@ as existing hashing techniques, with provably negligible risk of collisions.") focuses on supporting new expressions.") (license license:bsd-2))) -(define-public oniguruma - (package - (name "oniguruma") - (version "6.9.10") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/kkos/" - "oniguruma/releases/download/v" - ;; If there is a "-" in the version, convert - ;; to underscore for this part of the URI. - (string-map (lambda (c) (if (char=? #\- c) #\_ c)) - version) - "/onig-" version ".tar.gz")) - (sha256 - (base32 - "01gwd7bkhwl2rdqbfq109vlzznic2pygz3dnhrzykr2rw9dgqp1a")))) - (build-system gnu-build-system) - (arguments '(#:configure-flags '("--disable-static"))) - (home-page "https://github.com/kkos/oniguruma") - (synopsis "Regular expression library") - (description "Oniguruma is a regular expressions library. The special -characteristic of this library is that different character encoding for every -regular expression object can be specified.") - (license license:bsd-2))) +;; XXX: Deprecated on <2026-07-09>. +(define-deprecated/public-alias oniguruma (@ (gnu packages regex) oniguruma)) (define-public antiword (package -- cgit v1.2.3