From 1996575a7e30bc1c1bfd19840879f530869bec4e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 7 Feb 2024 17:08:13 +0000 Subject: gnu: Add (gnu packages golang-compression) module. * gnu/packages/golang-compression.scm: New file. * gnu/local.mk: Add to gnu/packages/golang-compression.scm scope. Change-Id: I1c68a3f6f9b3d6a316cba560b7fc81e707376417 --- gnu/packages/golang-compression.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 gnu/packages/golang-compression.scm (limited to 'gnu/packages/golang-compression.scm') diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm new file mode 100644 index 0000000000..268cd16e30 --- /dev/null +++ b/gnu/packages/golang-compression.scm @@ -0,0 +1,37 @@ +;;; GNU Guix --- Functional package management for GNU +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages golang-compression) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system go) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages)) + +;;; Commentary: +;;; +;;; Please: Try to add new module packages in alphabetic order. +;;; +;;; Code: + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; -- cgit v1.2.3 From 20c1bd6e9e318bfbe4ad6fe926b42a159ca4f9ae Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 7 Feb 2024 18:37:04 +0000 Subject: gnu: go-github-com-golang-snappy: Mmove to golang-compression. * gnu/packages/syncthing.scm (go-github-com-golang-snappy): Move from here ... * gnu/packages/golang-compression.scm: ... to here. * gnu/packages/golang.scm: Add (gnu packages golang-compression) module. * gnu/packages/high-availability.scm: As above. * gnu/packages/ipfs.scm: As above. * gnu/packages/syncthing.scm: As above. Change-Id: I936c82c127e1aa25dde20693bee70e5a871249fe --- gnu/packages/golang-compression.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 1 + gnu/packages/high-availability.scm | 4 ++-- gnu/packages/ipfs.scm | 1 + gnu/packages/syncthing.scm | 24 +----------------------- 5 files changed, 31 insertions(+), 25 deletions(-) (limited to 'gnu/packages/golang-compression.scm') diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index 268cd16e30..670572ea90 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -1,4 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2021 Arun Isaac +;;; Copyright © 2021 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +33,29 @@ (define-module (gnu packages golang-compression) ;;; ;;; Code: +(define-public go-github-com-golang-snappy + (package + (name "go-github-com-golang-snappy") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/snappy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j")) + (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/golang/snappy")) + (home-page "https://github.com/golang/snappy") + (synopsis "Snappy compression format in the Go programming language") + (description "This package provides a Go implementation of the Snappy +compression format.") + (license license:bsd-3))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cd15d7debc..9cac55bb12 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -83,6 +83,7 @@ (define-module (gnu packages golang) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index 9760084603..ad18a39738 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -36,6 +36,7 @@ (define-module (gnu packages high-availability) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) @@ -48,7 +49,6 @@ (define-module (gnu packages high-availability) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages rsync) - #:use-module (gnu packages syncthing) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages version-control) @@ -284,7 +284,7 @@ (define-public nsq go-github-com-bmizerany-perks-quantile go-github-com-burntsushi-toml go-github-com-davecgh-go-spew - go-github-com-golang-snappy ; Move to (gnu packages golang) + go-github-com-golang-snappy go-github-com-julienschmidt-httprouter go-github-com-mreiferson-go-options go-github-com-mreiferson-go-svc diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index c2d721dc0b..830e2ccd32 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -31,6 +31,7 @@ (define-module (gnu packages ipfs) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index f6e7f362c5..d26e8bc028 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -38,6 +38,7 @@ (define-module (gnu packages syncthing) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages gtk) #:use-module (gnu packages linux) #:use-module (gnu packages python-crypto) @@ -398,29 +399,6 @@ (define-public go-github-com-golang-groupcache-lru (home-page "https://github.com/golang/groupcache") (license asl2.0)))) -(define-public go-github-com-golang-snappy - (package - (name "go-github-com-golang-snappy") - (version "0.0.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/golang/snappy") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "004cw699yz3pdpawhjhpa0y94c4w479nw1rf39zj6h6027kpwv2j")) - (patches (search-patches "go-github-com-golang-snappy-32bit-test.patch")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/golang/snappy")) - (synopsis "Snappy compression format in the Go programming language") - (description "This package provides a Go implementation of the Snappy -compression format.") - (home-page "https://github.com/golang/snappy") - (license bsd-3))) - (define-public go-github-com-jackpal-gateway (package (name "go-github-com-jackpal-gateway") -- cgit v1.2.3 From d8f69addc2e6a3045e4ed9e91a6ac2b5829e6068 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 10 Feb 2024 22:06:15 +0000 Subject: gnu: go-github-com-klauspost-compress: Move to golang-compression. * gnu/packages/golang.scm (go-github-com-klauspost-compress): Move from here ... * gnu/packages/golang-compression.scm: ... to here. * gnu/packages/golang-compression.scm: Add (gnu packages golang-compression) module. * gnu/packages/golang-crypto.scm: As above. * gnu/packages/golang-web.scm: As above. * gnu/packages/uucp.scm: As above. Change-Id: Ia99f1e6aae7f75940fc150eb02862c0b3e9f3325 --- gnu/packages/golang-compression.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/golang-crypto.scm | 3 ++- gnu/packages/golang-web.scm | 1 + gnu/packages/golang.scm | 32 -------------------------------- gnu/packages/uucp.scm | 1 + 5 files changed, 35 insertions(+), 33 deletions(-) (limited to 'gnu/packages/golang-compression.scm') diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index 670572ea90..5aacc34a66 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -56,6 +56,37 @@ (define-public go-github-com-golang-snappy compression format.") (license license:bsd-3))) +(define-public go-github-com-klauspost-compress + (package + (name "go-github-com-klauspost-compress") + (version "1.13.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klauspost/compress") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/klauspost/compress" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'fix-permissions + (lambda* (#:key outputs #:allow-other-keys) + ;; Provide write permissions on gzip files so that + ;; reset-gzip-timestamps has sufficient permissions. + (for-each make-file-writable + (find-files (assoc-ref outputs "out") ".gz$"))))))) + (propagated-inputs + (list go-github-com-golang-snappy)) + (home-page "https://github.com/klauspost/compress") + (synopsis "Go compression library") + (description "@code{compress} provides various compression algorithms.") + (license license:bsd-3))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 39e7412558..58fd9cb250 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -45,7 +45,8 @@ (define-module (gnu packages golang-crypto) #:use-module (gnu packages) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) - #:use-module (gnu packages golang-check)) + #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression)) ;;; Commentary: ;;; diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index d7fb7dd366..28a9fad113 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -50,6 +50,7 @@ (define-module (gnu packages golang-web) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-xyz) #:use-module (gnu packages tls) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a2073b5c5f..69205badbe 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9498,38 +9498,6 @@ (define-public go-github-com-dustin-go-humanize back.") (license license:expat))) -(define-public go-github-com-klauspost-compress - (package - (name "go-github-com-klauspost-compress") - (version "1.13.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/klauspost/compress") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ydnf9rizlhm8rilh14674qqx272sbwbkjx06xn9pqvy6mmn2r3r")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/klauspost/compress" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'fix-permissions - (lambda* (#:key outputs #:allow-other-keys) - ;; Provide write permissions on gzip files so that - ;; reset-gzip-timestamps has sufficient permissions. - (for-each make-file-writable - (find-files (assoc-ref outputs "out") ".gz$"))))))) - (propagated-inputs - (list go-github-com-golang-snappy)) - (home-page "https://github.com/klauspost/compress") - (synopsis "Go compression library") - (description "@code{compress} provides various compression algorithms.") - (license license:bsd-3))) - (define-public go-github-com-oneofone-xxhash (package (name "go-github-com-oneofone-xxhash") diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index 8f1759556e..8e47834fef 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -20,6 +20,7 @@ (define-module (gnu packages uucp) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages texinfo) -- cgit v1.2.3 From 8af7c33818b241464f5968af3c1f06e42ae7290c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 10 Feb 2024 22:27:29 +0000 Subject: gnu: go-github-com-andybalholm-brotli: Move to golang-compression. * gnu/packages/golang.scm (go-github-com-andybalholm-brotli): Move from here ... * gnu/packages/golang-compression.scm: ... to here. Change-Id: I820b0211b1fe4d90643e82fc32a99d8e8b6a9b0f --- gnu/packages/golang-compression.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) (limited to 'gnu/packages/golang-compression.scm') diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index 5aacc34a66..6a556daa25 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2022 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,32 @@ (define-module (gnu packages golang-compression) ;;; ;;; Code: +(define-public go-github-com-andybalholm-brotli + (package + (name "go-github-com-andybalholm-brotli") + (version "1.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/andybalholm/brotli") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/andybalholm/brotli")) + (home-page "https://github.com/andybalholm/brotli") + (synopsis "Pure Go Brotli encoder and decoder") + (description + "This package is a brotli compressor and decompressor implemented in Go. +It was translated from the reference implementation +(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with +the @code{c2go} tool at +@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") + (license license:expat))) + (define-public go-github-com-golang-snappy (package (name "go-github-com-golang-snappy") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 69205badbe..184d658569 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3722,32 +3722,6 @@ (define-public go-github-com-google-cadvisor containers.") (license license:asl2.0)))) -(define-public go-github-com-andybalholm-brotli - (package - (name "go-github-com-andybalholm-brotli") - (version "1.0.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/andybalholm/brotli") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/andybalholm/brotli")) - (home-page "https://github.com/andybalholm/brotli") - (synopsis "Pure Go Brotli encoder and decoder") - (description - "This package is a brotli compressor and decompressor implemented in Go. -It was translated from the reference implementation -(@url{https://github.com/google/brotli,https://github.com/google/brotli}) with -the @code{c2go} tool at -@url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") - (license license:expat))) - (define-public go-github-com-jonboulle-clockwork (let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d") (revision "0")) -- cgit v1.2.3 From c185c51e1483af09df7010ea01a212968cbed9b4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 10 Feb 2024 22:32:10 +0000 Subject: gnu: go-github.com-ulikunitz-xz: Move to golang-compression. * gnu/packages/golang.scm (go-github.com-ulikunitz-xz): Move from here ... * gnu/packages/golang-compression.scm: ... to here. * gnu/packages/admin.scm: Add (gnu packages golang-compression) module. * gnu/packages/bioinformatics.scm: As above. Change-Id: I1901e67ac4336efd356085332572b3f09de90f7a --- gnu/packages/admin.scm | 1 + gnu/packages/bioinformatics.scm | 1 + gnu/packages/golang-compression.scm | 23 +++++++++++++++++++++++ gnu/packages/golang.scm | 22 ---------------------- 4 files changed, 25 insertions(+), 22 deletions(-) (limited to 'gnu/packages/golang-compression.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c595e1270f..11f69e57a4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -131,6 +131,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 08683bc8e9..bcfe3c2656 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -95,6 +95,7 @@ (define-module (gnu packages bioinformatics) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages glib) #:use-module (gnu packages graph) #:use-module (gnu packages graphics) diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index 6a556daa25..568fdd12b9 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2022 Sharlatan Hellseher @@ -114,6 +115,28 @@ (define-public go-github-com-klauspost-compress (description "@code{compress} provides various compression algorithms.") (license license:bsd-3))) +(define-public go-github.com-ulikunitz-xz + (package + (name "go-github.com-ulikunitz-xz") + (version "0.5.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ulikunitz/xz.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/ulikunitz/xz")) + (home-page "https://github.com/ulikunitz/xz") + (synopsis "Read and write xz compressed streams in Go") + (description "This package provides a library to read and write xz +compressed streams in Go.") + (license license:bsd-3))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 184d658569..68e0c8eb24 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8989,28 +8989,6 @@ (define-public go-github-com-tekwizely-go-parsing parsers, and related tools.") (license license:expat)))) -(define-public go-github.com-ulikunitz-xz - (package - (name "go-github.com-ulikunitz-xz") - (version "0.5.8") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ulikunitz/xz.git") - (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/ulikunitz/xz")) - (synopsis "Read and write xz compressed streams in Go") - (description "This package provides a library to read and write xz -compressed streams in Go.") - (home-page "https://github.com/ulikunitz/xz") - (license license:bsd-3))) - (define-public go-github-com-songmu-gitconfig (package (name "go-github-com-songmu-gitconfig") -- cgit v1.2.3