From 65a2f158bbb3415abe83d454d2dc7235e65a77cc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 17 Jan 2024 00:03:18 +0000 Subject: gnu: go-github-com-minio-sha256-simd: Move to (gnu packages golang-crypto). * gnu/packages/golang.scm (go-github-com-minio-sha256-simd): Move from here ... * gnu/packages/golang-crypto.scm: ... to here. * gnu/packages/backup.scm: Add (gnu packages golang-crypto) to used modules. Change-Id: I4e57a1bee0c7e19a9bb60ce5ff72ccd5e42deea5 --- gnu/packages/backup.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 3126464347b..f160efd37d1 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) -- cgit v1.2.3 From 5f86eebd240958001ab4f178005f355d24d9b7f1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 25 Jan 2024 11:52:06 -0600 Subject: gnu: disarchive: Update to 0.6.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/backup.scm (disarchive): Update to 0.6.0; add 'guile-bzip2' as an input. * gnu/packages/package-management.scm (guix): Add 'guile-bzip2' as an input to enable bzip2 support when using Disarchive. * guix/self.scm (%packages): Add 'guile-bzip2'. (compiled-guix): Include 'guile-bzip2' as a dependency when building the 'guix' command. * etc/disarchive-manifest.scm (tarball-origin?): Include bzip2 tarballs. Co-authored-by: Ludovic Courtès Change-Id: I4da479054f6bef225f5ea979c091152f8a9e51d5 --- etc/disarchive-manifest.scm | 4 +++- gnu/packages/backup.scm | 7 ++++--- gnu/packages/package-management.scm | 4 +++- guix/self.scm | 5 +++++ 4 files changed, 15 insertions(+), 5 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/etc/disarchive-manifest.scm b/etc/disarchive-manifest.scm index 41f64eae4f7..3dbfa356dff 100644 --- a/etc/disarchive-manifest.scm +++ b/etc/disarchive-manifest.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021-2023 Ludovic Courtès +;;; Copyright © 2021-2024 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +35,8 @@ (and (origin-hash origin) (or (string-suffix? ".tar.gz" file) (string-suffix? ".tgz" file) + (string-suffix? ".tar.bz2" file) + (string-suffix? ".tbz2" file) (string-suffix? ".tar.xz" file) (string-suffix? ".tar" file)))))) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f160efd37d1..f89f1205fe3 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1271,27 +1271,28 @@ backup.") (define-public disarchive (package (name "disarchive") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "https://files.ngyro.com/disarchive/" "disarchive-" version ".tar.gz")) (sha256 (base32 - "16sjplkn9nr7zhfrqll7l1m2b2j4hg8k29p6bqjap9fkj6zpn2q2")))) + "1s4lyhhh1zsaxgn11hy2b1kdvnvpipii68wba0hwr471rd43m08k")))) (build-system gnu-build-system) (native-inputs (list autoconf automake pkg-config guile-3.0 ;for cross-compilation + guile-bzip2 guile-gcrypt guile-lzma guile-quickcheck)) (inputs (list guile-3.0 zlib)) (propagated-inputs - (list guile-gcrypt guile-lzma)) + (list guile-bzip2 guile-gcrypt guile-lzma)) (home-page "https://ngyro.com/software/disarchive.html") (synopsis "Software archive disassembler") (description "Disarchive can disassemble software archives into data diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 75c45aaa7df..e5c86da418e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -411,11 +411,12 @@ $(prefix)/etc/openrc\n"))) (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "guile-gnutls")) (disarchive (assoc-ref inputs "disarchive")) + (bzip2 (assoc-ref inputs "guile-bzip2")) (lzma (assoc-ref inputs "guile-lzma")) (locales (assoc-ref inputs "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git bs ssh zlib lzlib zstd guile-lib - disarchive lzma)) + disarchive bzip2 lzma)) (deps* (if avahi (cons avahi deps) deps)) (effective (read-line @@ -520,6 +521,7 @@ $(prefix)/etc/openrc\n"))) ("bootstrap/xz" ,(bootstrap-executable "xz" (%current-system))) ("disarchive" ,disarchive) ;for 'guix perform-download' + ("guile-bzip2" ,guile-bzip2) ;for Disarchive ("guile-lzma" ,guile-lzma) ;for Disarchive ("git-minimal" ,git-minimal) ;for 'guix perform-download' diff --git a/guix/self.scm b/guix/self.scm index f3785489590..19c6d08e01e 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -65,6 +65,7 @@ ("guile-gnutls" . ,(ref 'tls 'guile-gnutls)) ("guix-daemon" . ,(ref 'package-management 'guix-daemon)) ("disarchive" . ,(ref 'backup 'disarchive)) + ("guile-bzip2" . ,(ref 'guile 'guile-bzip2)) ("guile-lzma" . ,(ref 'guile 'guile-lzma)) ("gzip" . ,(ref 'compression 'gzip)) ("bzip2" . ,(ref 'compression 'bzip2)) @@ -827,6 +828,9 @@ itself." (define disarchive (specification->package "disarchive")) + (define guile-bzip2 + (specification->package "guile-bzip2")) + (define guile-lzma (specification->package "guile-lzma")) @@ -1058,6 +1062,7 @@ itself." #:source source #:dependencies (cons* disarchive + guile-bzip2 guile-lzma dependencies) #:guile guile-for-build -- cgit v1.2.3 From 19c8f9e0fe0f5489b1fdedab5190e4d0a4cddcb9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 10 Feb 2024 21:39:59 +0000 Subject: gnu: go-golang-org-x-crypto: Move to golang-build. * gnu/packages/golang.scm (go-golang-org-x-crypto): Move from here ... * gnu/packages/golang-build.scm: ... to here. * gnu/packages/backup.scm: Add (gnu packages golang-build) module. * gnu/packages/crypto.scm: As above. Change-Id: I5daad7fe90e1507958fe73c04fc043ebbc006395 --- gnu/packages/backup.scm | 1 + gnu/packages/crypto.scm | 1 + gnu/packages/golang-build.scm | 34 +++++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 31 ------------------------------- 4 files changed, 35 insertions(+), 32 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f89f1205fe3..0805e6f5b96 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages gperf) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index c7145bcb0c5..6857ea2075f 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -60,6 +60,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-build) #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages kerberos) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index b717c3ad27d..8b7dca46a6c 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -1,14 +1,15 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Brian Leung +;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 HiPhish -;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Vagrant Cascadian ;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 hackeryarn ;;; Copyright © 2023 Artyom V. Poptsov ;;; Copyright © 2023 Felix Lechner @@ -74,6 +75,37 @@ (description "This package provides a markdown parser.") (license license:expat))) +(define-public go-golang-org-x-crypto + (package + (name "go-golang-org-x-crypto") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/crypto") + (commit (string-append "v" version)))) + (file-name (string-append "go.googlesource.com-crypto-" + version "-checkout")) + (sha256 + (base32 "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/crypto" + ;; Source-only package + #:tests? #f + #:phases + (modify-phases %standard-phases + ;; Source-only package + (delete 'build)))) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://go.googlesource.com/crypto/") + (synopsis "Supplementary cryptographic libraries in Go") + (description "This package provides supplementary cryptographic libraries +for the Go language.") + (license license:bsd-3))) + (define-public go-golang-org-x-exp (package (name "go-golang-org-x-exp") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 98a3167aefd..a2073b5c5f5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3347,37 +3347,6 @@ expressing configuration which is easy for both humans and machines to read.") (home-page "https://github.com/hashicorp/hcl") (license license:mpl2.0))) -(define-public go-golang-org-x-crypto - (package - (name "go-golang-org-x-crypto") - (version "0.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/crypto") - (commit (string-append "v" version)))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) - (sha256 - (base32 - "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m")))) - (build-system go-build-system) - (arguments - '(#:import-path "golang.org/x/crypto" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (propagated-inputs - (list go-golang-org-x-sys)) - (synopsis "Supplementary cryptographic libraries in Go") - (description "This package provides supplementary cryptographic libraries -for the Go language.") - (home-page "https://go.googlesource.com/crypto/") - (license license:bsd-3))) - (define-public govulncheck (package (name "govulncheck") -- cgit v1.2.3 From 06014750338159a03a6374d7ebdd783c210b3715 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 15 Feb 2024 00:00:59 +0000 Subject: gnu: packages: backup: Add golang-xyz. * gnu/packages/backup.scm: Add (gnu packages golang-xyz) module. Change-Id: I848acb1dea36c59031bc60107179b3bc0d14636d --- gnu/packages/backup.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0805e6f5b96..0a0d901e672 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) -- cgit v1.2.3 From e5ae409276412927a7aca905bc49f1591b80a5e4 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 20 Oct 2023 16:40:22 +0100 Subject: gnu: python-ruamel-yaml: Update to 0.18.6. * gnu/package/serialization.scm (python-ruamel-yaml): Update to 0.18.6. (python-ruamel.yaml-0.16): New variable. * gnu/packages/package-management.scm (conda)[inputs]: Replace python-ruamel.yaml with python-ruamel.yaml-0.16. * gnu/packages/backup.scm (borgmatic)[inputs]: Replace python-ruamel.yaml with python-ruamel.yaml-0.16. * gnu/packages/python-xyz.scm (dynaconf)[inputs]: Replace python-ruamel.yaml with python-ruamel.yaml-0.16. Change-Id: Iff9eeeae043c9547d93a6c780f0c30bd760490d9 Change-Id: I43cad7e3936f62d209fbba7e86b93519cfc1c1ba Signed-off-by: Arun Isaac --- gnu/packages/backup.scm | 2 +- gnu/packages/package-management.scm | 3 ++- gnu/packages/python-xyz.scm | 2 +- gnu/packages/serialization.scm | 16 ++++++++++++++-- 4 files changed, 18 insertions(+), 5 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0a0d901e672..253ab74a19c 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1341,7 +1341,7 @@ compression parameters used by Gzip.") (invoke "pytest"))))))) (inputs (list borg python-colorama python-jsonschema python-requests - python-ruamel.yaml)) + python-ruamel.yaml-0.16)) (native-inputs (list python-flexmock python-pytest python-pytest-cov)) (home-page "https://torsion.org/borgmatic/") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c1ad613beef..5d6bc47b8b6 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2022, 2023 Zhu Zihao ;;; Copyright © 2023 jgart ;;; Copyright © 2023 Mădălin Ionel Patrașcu +;;; Copyright © 2024 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -1251,7 +1252,7 @@ extracting, creating, and converting between formats.") python-pyyaml python-requests python-responses - python-ruamel.yaml + python-ruamel.yaml-0.16 python-tqdm ;; XXX: This is dragged in by libarchive and is needed at runtime. zstd)) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c3dfb9603c3..a051f5a8db5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33347,7 +33347,7 @@ Python @code{set} interface.") "--maxfail=1" "tests/")))))))) (propagated-inputs (list python-click python-configobj python-dotenv-0.13.0 - python-ruamel.yaml python-toml python-tomli)) + python-ruamel.yaml-0.16 python-toml python-tomli)) (native-inputs (list python-django python-flask python-pytest python-pytest-cov python-pytest-mock)) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index cceef41a2a8..331fae80cfc 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -745,14 +745,14 @@ includes the following features: (define-public python-ruamel.yaml (package (name "python-ruamel.yaml") - (version "0.16.13") + (version "0.18.6") (source (origin (method url-fetch) (uri (pypi-uri "ruamel.yaml" version)) (sha256 (base32 - "0hm9yg785f46bkrgqknd6fdvmkby9dpzjnm0b63qf0i748acaj5v")))) + "06rimidc9nb3i3r90n3a1zwf0qxw24zqykb3wpxwd1p72yifc9wb")))) (build-system python-build-system) (native-inputs (list python-pytest)) @@ -771,6 +771,18 @@ and has round-trip loaders and dumpers. It supports comments. Block style and key ordering are kept, so you can diff the source.") (license license:expat))) +(define-public python-ruamel.yaml-0.16 + (package + (inherit python-ruamel.yaml) + (version "0.16.13") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ruamel.yaml" version)) + (sha256 + (base32 + "0hm9yg785f46bkrgqknd6fdvmkby9dpzjnm0b63qf0i748acaj5v")))))) + (define-public python-ruamel.yaml.clib (package (name "python-ruamel.yaml.clib") -- cgit v1.2.3