From ec9fb25517ba5fb98074585e177db3d17e0f7dec Mon Sep 17 00:00:00 2001
From: Saku Laesvuori <saku@laesvuori.fi>
Date: Thu, 28 Nov 2024 14:26:43 +0200
Subject: [PATCH] Fix build with newer dependencies
---
.guix/modules/datarekisteri-package.scm | 113 +++++++-----------------
channels.scm | 2 +-
2 files changed, 35 insertions(+), 80 deletions(-)
diff --git a/.guix/modules/datarekisteri-package.scm b/.guix/modules/datarekisteri-package.scm
index 53c2460..02abc57 100644
--- a/.guix/modules/datarekisteri-package.scm
+++ b/.guix/modules/datarekisteri-package.scm
@@ -7,6 +7,8 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages golang-xyz)
+ #:use-module (gnu packages golang-compression)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages syncthing)
#:use-module (gnu packages haskell)
@@ -759,7 +761,7 @@ README for more information.")
(define-public go-github-com-jmoiron-sqlx
(package
(name "go-github-com-jmoiron-sqlx")
- (version "1.3.5")
+ (version "1.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -768,7 +770,7 @@ README for more information.")
(file-name (git-file-name name version))
(sha256
(base32
- "09snd3gfi3sm3gib7jdc6p8zxpn2ah0isqnibbag6f63k473yj14"))))
+ "10rg9b6cl1j7jjr6z95xa1k45016mhicii3cmz0pkwrxw3dpfzfh"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/jmoiron/sqlx"))
@@ -782,29 +784,29 @@ README for more information.")
"Package sqlx provides general purpose extensions to database/sql.")
(license license:expat)))
-(define-public go-github-com-pierrec-lz4
+(define-public go-github-com-bkaradzic-go-lz4
(package
- (name "go-github-com-pierrec-lz4")
- (version "v2.0.5+incompatible")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/pierrec/lz4")
- (commit (go-version->git-ref version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p"))))
+ (name "go-github-com-bkaradzic-go-lz4")
+ (version "1.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bkaradzic/go-lz4")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/pierrec/lz4"))
- (home-page "https://github.com/pierrec/lz4")
- (synopsis "lz4 : LZ4 compression in pure Go")
+ (list
+ #:import-path "github.com/bkaradzic/go-lz4"))
+ (home-page "https://github.com/bkaradzic/go-lz4")
+ (synopsis "go-lz4")
(description
- "Package lz4 implements reading and writing lz4 compressed data (a frame), as
-specified in
-@url{http://fastcompression.blogspot.fr/2013/04/lz4-streaming-format-final.html,http://fastcompression.blogspot.fr/2013/04/lz4-streaming-format-final.html}.")
- (license license:bsd-3)))
+ "go-lz4 is port of LZ4 lossless compression algorithm to Go. The original C code
+is located at:.")
+ (license license:bsd-2)))
(define-public go-github-com-clickhouse-clickhouse-go
(package
@@ -839,7 +841,7 @@ ClickHouse}")
(define-public go-github-com-joho-godotenv
(package
(name "go-github-com-joho-godotenv")
- (version "1.4.0")
+ (version "1.5.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -848,7 +850,7 @@ ClickHouse}")
(file-name (git-file-name name version))
(sha256
(base32
- "1036h59vyhb58n817az6yg0zw5wa87yb86i7fnbdq8cw46mnjgw8"))))
+ "03vijs05k31jdf24pzj3vlk6b5jxf894v1kvzals4wzclyq2h3ch"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/joho/godotenv"))
@@ -859,9 +861,9 @@ ClickHouse}")
(@url{https://github.com/bkeepers/dotenv,https://github.com/bkeepers/dotenv})")
(license license:expat)))
-(define-public go-github-com-kami-zh-go-capturer
+(define-public go-github-com-zenizh-go-capturer
(package
- (name "go-github-com-kami-zh-go-capturer")
+ (name "go-github-com-zenizh-go-capturer")
(version "0.0.0-20211219060012-52ea6c8fed04")
(source (origin
(method git-fetch)
@@ -874,8 +876,8 @@ ClickHouse}")
"0zwz9gr1863z32gz9nyysg66mg124w6nql4m99g2dg6fbq2klda4"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/kami-zh/go-capturer"))
- (home-page "https://github.com/kami-zh/go-capturer")
+ '(#:import-path "github.com/zenizh/go-capturer"))
+ (home-page "https://github.com/zenizh/go-capturer")
(synopsis "go-capturer")
(description
"Capture @code{os.Stdout} and/or @code{os.Stderr} in Go. This package is useful
@@ -885,7 +887,7 @@ for writing tests which print some outputs using @code{fmt} package.")
(define-public go-github-com-cloudflare-golz4
(package
(name "go-github-com-cloudflare-golz4")
- (version "0.0.0-20150217214814-ef862a3cdc58")
+ (version "0.0.0-20240916140612-caecf3c00c06")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -894,7 +896,7 @@ for writing tests which print some outputs using @code{fmt} package.")
(file-name (git-file-name name version))
(sha256
(base32
- "0ckiwp3aa010sdnki6vd32f0n08768ppnggc8d7syzh3kkn9zvn1"))))
+ "15nppvbav7kj3hh9qv9qbn15pd0c9lpljs5syl004cz6mif43as3"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/cloudflare/golz4"
@@ -904,53 +906,12 @@ for writing tests which print some outputs using @code{fmt} package.")
(description "Package lz4 implements compression using lz4.c and lz4hc.c")
(license license:bsd-3)))
-(define-public go-github-com-cpuguy83-go-md2man-v2
- (package
- (name "go-github-com-cpuguy83-go-md2man-v2")
- (version "2.0.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cpuguy83/go-md2man")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "19qri18cinpzxblkid6ngz2vcxslv73s1aid900q0gfzvc71mqqb"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/cpuguy83/go-md2man/v2"))
- (propagated-inputs (list go-github-com-russross-blackfriday-v2))
- (home-page "https://github.com/cpuguy83/go-md2man")
- (synopsis "go-md2man")
- (description "Converts markdown into roff (man pages).")
- (license license:expat)))
-(define-public go-github-com-russross-blackfriday-v2
- (package
- (name "go-github-com-russross-blackfriday-v2")
- (version "2.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/russross/blackfriday")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0d1rg1drrfmabilqjjayklsz5d0n3hkf979sr3wsrw92bfbkivs7"))))
- (build-system go-build-system)
- (arguments
- '(#:import-path "github.com/russross/blackfriday/v2"))
- (home-page "https://github.com/russross/blackfriday")
- (synopsis "Blackfriday")
- (description "Package blackfriday is a markdown processor.")
- (license license:bsd-2)))
(define-public dbmate
(package
(name "dbmate")
- (version "1.15.0")
+ (version "1.16.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -959,22 +920,16 @@ for writing tests which print some outputs using @code{fmt} package.")
(file-name (git-file-name name version))
(sha256
(base32
- "1dbhm2aqppn4m55xnx18017shsy109hqv2nhksxb4ix83bjaq5vq"))))
+ "0mp06dg8x19pkbl51k0b5xj7bamaj6f61fyi0cfbd1dldwzw0676"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/amacneil/dbmate"))
(propagated-inputs
- (list go-gopkg-in-yaml-v3
- go-github-com-russross-blackfriday-v2
- go-github-com-pmezard-go-difflib
- go-github-com-davecgh-go-spew
- go-github-com-cpuguy83-go-md2man-v2
- go-github-com-cloudflare-golz4
+ (list go-github-com-zenizh-go-capturer
go-github-com-urfave-cli-v2
go-github-com-stretchr-testify
go-github-com-mattn-go-sqlite3
go-github-com-lib-pq
- go-github-com-kami-zh-go-capturer
go-github-com-joho-godotenv
go-github-com-go-sql-driver-mysql
go-github-com-clickhouse-clickhouse-go))
diff --git a/channels.scm b/channels.scm
index 281a35d..4394a92 100644
--- a/channels.scm
+++ b/channels.scm
@@ -3,7 +3,7 @@
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
- "a96f1c1bc0fa186414359890025e8acacbb1de02")
+ "faf8ba9b43323dc61988a368690b20008611fc87")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"