diff options
| author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2026-07-09 22:33:07 +0100 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2026-07-23 09:59:56 +0100 |
| commit | f5adb28fc9170a17a95ea1ca17c44d73577413f7 (patch) | |
| tree | 396c026b476d66c6644618a066788f187efa4c44 /gnu | |
| parent | b0aefab8a743b9890accc069408aaae460c5a964 (diff) | |
gnu: oniguruma: Move to (gnu packages regex).
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
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/admin.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/codex.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/machine-learning.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/php.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/regex.scm | 30 | ||||
| -rw-r--r-- | gnu/packages/rust-apps.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/rust-sources.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/textutils.scm | 27 |
8 files changed, 37 insertions, 31 deletions
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 @@ | |||
| 203 | #:use-module (gnu packages python-xyz) | 203 | #:use-module (gnu packages python-xyz) |
| 204 | #:use-module (gnu packages qt) | 204 | #:use-module (gnu packages qt) |
| 205 | #:use-module (gnu packages readline) | 205 | #:use-module (gnu packages readline) |
| 206 | #:use-module (gnu packages regex) | ||
| 206 | #:use-module (gnu packages ruby) | 207 | #:use-module (gnu packages ruby) |
| 207 | #:use-module (gnu packages ruby-check) | 208 | #:use-module (gnu packages ruby-check) |
| 208 | #:use-module (gnu packages ruby-xyz) | 209 | #:use-module (gnu packages ruby-xyz) |
| @@ -214,7 +215,6 @@ | |||
| 214 | #:use-module (gnu packages tcl) | 215 | #:use-module (gnu packages tcl) |
| 215 | #:use-module (gnu packages terminals) | 216 | #:use-module (gnu packages terminals) |
| 216 | #:use-module (gnu packages texinfo) | 217 | #:use-module (gnu packages texinfo) |
| 217 | #:use-module (gnu packages textutils) | ||
| 218 | #:use-module (gnu packages time) | 218 | #:use-module (gnu packages time) |
| 219 | #:use-module (gnu packages tls) | 219 | #:use-module (gnu packages tls) |
| 220 | #:use-module (gnu packages version-control) | 220 | #: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 @@ | |||
| 49 | #:use-module (gnu packages perl) | 49 | #:use-module (gnu packages perl) |
| 50 | #:use-module (gnu packages pkg-config) | 50 | #:use-module (gnu packages pkg-config) |
| 51 | #:use-module (gnu packages python) | 51 | #:use-module (gnu packages python) |
| 52 | #:use-module (gnu packages regex) | ||
| 52 | #:use-module (gnu packages rust) | 53 | #:use-module (gnu packages rust) |
| 53 | #:use-module (gnu packages rust-sources) | 54 | #:use-module (gnu packages rust-sources) |
| 54 | #:use-module (gnu packages sqlite) | 55 | #:use-module (gnu packages sqlite) |
| 55 | #:use-module (gnu packages textutils) | ||
| 56 | #:use-module (gnu packages nss) | 56 | #:use-module (gnu packages nss) |
| 57 | #:use-module (gnu packages tls) | 57 | #:use-module (gnu packages tls) |
| 58 | #:use-module (gnu packages version-control) | 58 | #: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 @@ | |||
| 126 | #:use-module (gnu packages ssh) | 126 | #:use-module (gnu packages ssh) |
| 127 | #:use-module (gnu packages statistics) | 127 | #:use-module (gnu packages statistics) |
| 128 | #:use-module (gnu packages swig) | 128 | #:use-module (gnu packages swig) |
| 129 | #:use-module (gnu packages textutils) | ||
| 130 | #:use-module (gnu packages time) | 129 | #:use-module (gnu packages time) |
| 131 | #:use-module (gnu packages tls) | 130 | #:use-module (gnu packages tls) |
| 132 | #:use-module (gnu packages valgrind) | 131 | #: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 @@ | |||
| 49 | #:use-module (gnu packages pcre) | 49 | #:use-module (gnu packages pcre) |
| 50 | #:use-module (gnu packages pkg-config) | 50 | #:use-module (gnu packages pkg-config) |
| 51 | #:use-module (gnu packages readline) | 51 | #:use-module (gnu packages readline) |
| 52 | #:use-module (gnu packages regex) | ||
| 52 | #:use-module (gnu packages sqlite) | 53 | #:use-module (gnu packages sqlite) |
| 53 | #:use-module (gnu packages textutils) | ||
| 54 | #:use-module (gnu packages tls) | 54 | #:use-module (gnu packages tls) |
| 55 | #:use-module (gnu packages web) | 55 | #:use-module (gnu packages web) |
| 56 | #:use-module (gnu packages xml) | 56 | #: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 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2014 John Darrington | 2 | ;;; Copyright © 2014 John Darrington |
| 3 | ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> | 3 | ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> |
| 4 | ;;; Copyright © 2016, 2020, 2022 Marius Bakke <marius@gnu.org> | 4 | ;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org> |
| 5 | ;;; Copyright © 2016, 2018, 2019, 2020, 2022 Marius Bakke <marius@gnu.org> | ||
| 5 | ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> | 6 | ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> |
| 6 | ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> | 7 | ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> |
| 7 | ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> | 8 | ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> |
| 9 | ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se> | ||
| 8 | ;;; | 10 | ;;; |
| 9 | ;;; This file is part of GNU Guix. | 11 | ;;; This file is part of GNU Guix. |
| 10 | ;;; | 12 | ;;; |
| @@ -35,6 +37,32 @@ | |||
| 35 | #:use-module (gnu packages check) | 37 | #:use-module (gnu packages check) |
| 36 | #:use-module (gnu packages cpp)) | 38 | #:use-module (gnu packages cpp)) |
| 37 | 39 | ||
| 40 | (define-public oniguruma | ||
| 41 | (package | ||
| 42 | (name "oniguruma") | ||
| 43 | (version "6.9.10") | ||
| 44 | (source | ||
| 45 | (origin | ||
| 46 | (method url-fetch) | ||
| 47 | (uri (string-append "https://github.com/kkos/" | ||
| 48 | "oniguruma/releases/download/v" | ||
| 49 | ;; If there is a "-" in the version, convert | ||
| 50 | ;; to underscore for this part of the URI. | ||
| 51 | (string-map (lambda (c) (if (char=? #\- c) #\_ c)) | ||
| 52 | version) | ||
| 53 | "/onig-" version ".tar.gz")) | ||
| 54 | (sha256 | ||
| 55 | (base32 "01gwd7bkhwl2rdqbfq109vlzznic2pygz3dnhrzykr2rw9dgqp1a")))) | ||
| 56 | (build-system gnu-build-system) | ||
| 57 | (arguments '(#:configure-flags '("--disable-static"))) | ||
| 58 | (home-page "https://github.com/kkos/oniguruma") | ||
| 59 | (synopsis "Regular expression library") | ||
| 60 | (description | ||
| 61 | "Oniguruma is a regular expressions library. The special characteristic | ||
| 62 | of this library is that different character encoding for every regular | ||
| 63 | expression object can be specified.") | ||
| 64 | (license license:bsd-2))) | ||
| 65 | |||
| 38 | (define-public re2 | 66 | (define-public re2 |
| 39 | (package | 67 | (package |
| 40 | (name "re2") | 68 | (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 @@ | |||
| 128 | #:use-module (gnu packages python-build) | 128 | #:use-module (gnu packages python-build) |
| 129 | #:use-module (gnu packages python-xyz) | 129 | #:use-module (gnu packages python-xyz) |
| 130 | #:use-module (gnu packages ruby-xyz) | 130 | #:use-module (gnu packages ruby-xyz) |
| 131 | #:use-module (gnu packages regex) | ||
| 131 | #:use-module (gnu packages rust) | 132 | #:use-module (gnu packages rust) |
| 132 | #:use-module (gnu packages security-token) | 133 | #:use-module (gnu packages security-token) |
| 133 | #:use-module (gnu packages sqlite) | 134 | #:use-module (gnu packages sqlite) |
| 134 | #:use-module (gnu packages terminals) | 135 | #:use-module (gnu packages terminals) |
| 135 | #:use-module (gnu packages textutils) | ||
| 136 | #:use-module (gnu packages tls) | 136 | #:use-module (gnu packages tls) |
| 137 | #:use-module (gnu packages tree-sitter) | 137 | #:use-module (gnu packages tree-sitter) |
| 138 | #:use-module (gnu packages version-control) | 138 | #: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 @@ | |||
| 37 | #:use-module (gnu packages perl) | 37 | #:use-module (gnu packages perl) |
| 38 | #:use-module (gnu packages pkg-config) | 38 | #:use-module (gnu packages pkg-config) |
| 39 | #:use-module (gnu packages python) | 39 | #:use-module (gnu packages python) |
| 40 | #:use-module (gnu packages regex) | ||
| 40 | #:use-module (gnu packages rust) | 41 | #:use-module (gnu packages rust) |
| 41 | #:use-module (gnu packages statistics) | 42 | #:use-module (gnu packages statistics) |
| 42 | #:use-module (gnu packages textutils) | ||
| 43 | #:use-module (gnu packages virtualization)) | 43 | #:use-module (gnu packages virtualization)) |
| 44 | 44 | ||
| 45 | ;;; | 45 | ;;; |
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 @@ | |||
| 67 | #:use-module (guix build-system go) | 67 | #:use-module (guix build-system go) |
| 68 | #:use-module (guix build-system perl) | 68 | #:use-module (guix build-system perl) |
| 69 | #:use-module (guix build-system pyproject) | 69 | #:use-module (guix build-system pyproject) |
| 70 | #:use-module (guix deprecation) | ||
| 70 | #:use-module (guix download) | 71 | #:use-module (guix download) |
| 71 | #:use-module (guix gexp) | 72 | #:use-module (guix gexp) |
| 72 | #:use-module (guix git-download) | 73 | #:use-module (guix git-download) |
| @@ -848,30 +849,8 @@ as existing hashing techniques, with provably negligible risk of collisions.") | |||
| 848 | focuses on supporting new expressions.") | 849 | focuses on supporting new expressions.") |
| 849 | (license license:bsd-2))) | 850 | (license license:bsd-2))) |
| 850 | 851 | ||
| 851 | (define-public oniguruma | 852 | ;; XXX: Deprecated on <2026-07-09>. |
| 852 | (package | 853 | (define-deprecated/public-alias oniguruma (@ (gnu packages regex) oniguruma)) |
| 853 | (name "oniguruma") | ||
| 854 | (version "6.9.10") | ||
| 855 | (source (origin | ||
| 856 | (method url-fetch) | ||
| 857 | (uri (string-append "https://github.com/kkos/" | ||
| 858 | "oniguruma/releases/download/v" | ||
| 859 | ;; If there is a "-" in the version, convert | ||
| 860 | ;; to underscore for this part of the URI. | ||
| 861 | (string-map (lambda (c) (if (char=? #\- c) #\_ c)) | ||
| 862 | version) | ||
| 863 | "/onig-" version ".tar.gz")) | ||
| 864 | (sha256 | ||
| 865 | (base32 | ||
| 866 | "01gwd7bkhwl2rdqbfq109vlzznic2pygz3dnhrzykr2rw9dgqp1a")))) | ||
| 867 | (build-system gnu-build-system) | ||
| 868 | (arguments '(#:configure-flags '("--disable-static"))) | ||
| 869 | (home-page "https://github.com/kkos/oniguruma") | ||
| 870 | (synopsis "Regular expression library") | ||
| 871 | (description "Oniguruma is a regular expressions library. The special | ||
| 872 | characteristic of this library is that different character encoding for every | ||
| 873 | regular expression object can be specified.") | ||
| 874 | (license license:bsd-2))) | ||
| 875 | 854 | ||
| 876 | (define-public antiword | 855 | (define-public antiword |
| 877 | (package | 856 | (package |
