* [bug#51079] [PATCH] gnu: fmt: Update to 8.0.1.
2021-10-07 21:52 ` Marius Bakke
@ 2021-10-12 17:31 ` Greg Hogan
2021-11-13 23:12 ` bug#51079: " Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: Greg Hogan @ 2021-10-12 17:31 UTC (permalink / raw)
To: Marius Bakke; +Cc: 51079
[-- Attachment #1.1: Type: text/plain, Size: 887 bytes --]
Hi Marius,
Thank you for reviewing these patches. Attached is a replacement patchset
updating the 'fmt' dependent packages which are buildable with fmt 8.0.1,
and adds a fmt-7 package then used by the packages which could not be
updated. The only dependent package failing to build is hyperledger-iroha,
which is currently failing to build on master.
Greg
On Thu, Oct 7, 2021 at 5:52 PM Marius Bakke <marius@gnu.org> wrote:
> Greg Hogan <code@greghogan.com> skriver:
>
> >>From aa10e9e487397b95e0345f07c91911858962fda0 Mon Sep 17 00:00:00 2001
> > From: Greg Hogan <code@greghogan.com>
> > Date: Thu, 24 Jun 2021 13:23:21 +0000
> > Subject: [PATCH] gnu: fmt: Update to 8.0.1.
> >
> > * gnu/packages/pretty-print.scm (fmt): Update to 8.0.1.
>
> This causes build failures in 'bear', 'celestia' and possibly others
> (see './pre-inst-env guix refresh -l fmt'). Can you take a look?
>
[-- Attachment #1.2: Type: text/html, Size: 1462 bytes --]
[-- Attachment #2: 0004-gnu-fmt-Update-to-8.0.1.patch --]
[-- Type: application/octet-stream, Size: 4521 bytes --]
From a96a8074a91676e6d927a28920b167e38522d4b9 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Thu, 24 Jun 2021 13:23:21 +0000
Subject: [PATCH 4/5] gnu: fmt: Update to 8.0.1.
* gnu/packages/pretty-print.scm (fmt): Update to 8.0.1,
(fmt-7): New variable.
* gnu/packages/astronomy.scm (celestia)[inputs],
gnu/packages/kodi.scm (kodi)[inputs],
gnu/packages/lua.scm (emilua)[inputs]: Change to fmt-7.
---
gnu/packages/astronomy.scm | 3 ++-
gnu/packages/kodi.scm | 3 ++-
gnu/packages/lua.scm | 3 ++-
gnu/packages/pretty-print.scm | 15 +++++++++++++--
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 8d3953ede8..1d559ba544 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -580,7 +581,7 @@ any arbitrary astrometric projection defined in the WCS standard.")
;; maybe required?
("mesa" ,mesa)
;; optional: fmtlib, Eigen3;
- ("fmt" ,fmt)
+ ("fmt" ,fmt-7)
("eigen" ,eigen)
;; glut: for glut interface
("freeglut" ,freeglut)))
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index b3dc96f925..1e50624696 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -404,7 +405,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
("ffmpeg" ,ffmpeg)
("flac" ,flac)
("flatbuffers" ,flatbuffers)
- ("fmt" ,fmt)
+ ("fmt" ,fmt-7)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("fribidi" ,fribidi)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 0ecc91294f..e40d28a473 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2020 Simon South <simon@simonsouth.net>
;;; Copyright © 2020 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2021 Vinícius dos Santos Oliveira <vini.ipsmaker@gmail.com>
+;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1141,7 +1142,7 @@ shell command executions.")
(inputs
`(("boost" ,boost)
("boost-static" ,boost-static)
- ("fmt" ,fmt)
+ ("fmt" ,fmt-7)
;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty
;; fork. Emilua is severely affected by this limit, so the upstream package
;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 1fc1441052..728f00f16e 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -168,14 +168,14 @@ different programming languages.")
(define-public fmt
(package
(name "fmt")
- (version "7.1.3")
+ (version "8.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/fmtlib/fmt/releases/download/"
version "/fmt-" version ".zip"))
(sha256
- (base32 "17sc10hfg087z0s774lnn05wwy3bfzmcv7j448p92pr0s02cb62x"))))
+ (base32 "1gqmsk4r93x65cqs8w7zhfiv70w5fv8279nrblggqm4mmdpaa9x6"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
@@ -190,6 +190,17 @@ to @code{IOStreams}.")
;; The library is bsd-2, but documentation and tests include other licenses.
(license (list bsd-2 bsd-3 psfl))))
+(define-public fmt-7
+ (package (inherit fmt)
+ (version "7.1.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/fmtlib/fmt/releases/download/"
+ version "/fmt-" version ".zip"))
+ (sha256
+ (base32 "17sc10hfg087z0s774lnn05wwy3bfzmcv7j448p92pr0s02cb62x"))))))
+
(define-public fmt-for-irods
(package
(inherit fmt)
--
2.33.0
[-- Attachment #3: 0003-gnu-fcitx5-gtk-Update-to-5.0.8.patch --]
[-- Type: application/octet-stream, Size: 1119 bytes --]
From 32de6aea3b408d00306e8b93f61e35d3c5ebdc15 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Fri, 8 Oct 2021 19:07:14 +0000
Subject: [PATCH 3/5] gnu: fcitx5-gtk: Update to 5.0.8.
* gnu/packages/fcitx5.scm (fcitx5-gtk): Update to 5.0.8.
---
gnu/packages/fcitx5.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 737f47f20f..3b5fe47638 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -198,7 +198,7 @@ editors.")
(define-public fcitx5-gtk
(package
(name "fcitx5-gtk")
- (version "5.0.7")
+ (version "5.0.8")
(source
(origin
(method url-fetch)
@@ -206,7 +206,7 @@ editors.")
"/fcitx5-gtk/fcitx5-gtk-"
version ".tar.xz"))
(sha256
- (base32 "0x9xwyb3hnb2xl47jkj8zs34fhyf7gshy3bv3jxd66sfkjrscr5v"))))
+ (base32 "13j2gf4rmkjc74skhc52ashrk3n08503d74wlzqfp5ds8fkgfcy1"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;No test
--
2.33.0
[-- Attachment #4: 0002-gnu-waybar-Update-to-0.9.8.patch --]
[-- Type: application/octet-stream, Size: 1587 bytes --]
From 016c0df391c0fc2d22bd1cc3b66a5197c106f53b Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Fri, 8 Oct 2021 19:06:42 +0000
Subject: [PATCH 2/5] gnu: waybar: Update to 0.9.8.
* gnu/packages/wm.scm (waybar): Update to 0.9.8.
[inputs]: Add libxml2.
---
gnu/packages/wm.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 39d83336fd..a0af487f49 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1684,7 +1684,7 @@ display a clock or apply image manipulation techniques to the background image."
(define-public waybar
(package
(name "waybar")
- (version "0.9.7")
+ (version "0.9.8")
(source
(origin
(method git-fetch)
@@ -1693,7 +1693,7 @@ display a clock or apply image manipulation techniques to the background image."
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "17cn4d3dx92v40jd9vl41smp8hh3gf5chd1j2f7l1lrpfpnllg5x"))))
+ (base32 "109a49f064ma5js2d7maribmfalswbmmhq2fraa7hfz5pf2jxs2w"))))
(build-system meson-build-system)
(inputs `(("date" ,date)
("fmt" ,fmt)
@@ -1704,6 +1704,7 @@ display a clock or apply image manipulation techniques to the background image."
("libinput" ,libinput)
("libmpdclent" ,libmpdclient)
("libnl" ,libnl)
+ ("libxml2" ,libxml2)
("pulseaudio" ,pulseaudio)
("spdlog" ,spdlog)
("wayland" ,wayland)))
--
2.33.0
[-- Attachment #5: 0005-gnu-bear-Update-to-3.0.16.patch --]
[-- Type: application/octet-stream, Size: 3152 bytes --]
From ca5f66284f71fda3a6721916343764ae8cc70df0 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Fri, 8 Oct 2021 19:06:02 +0000
Subject: [PATCH 5/5] gnu: bear: Update to 3.0.16.
* gnu/packages/build-tools.scm (bear): Update to 3.0.16.
* gnu/packages/patches/bear-disable-preinstall-tests.patch: Update.
---
gnu/packages/build-tools.scm | 4 ++--
.../bear-disable-preinstall-tests.patch | 24 ++++---------------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 7c44d2b80f..f8303a331b 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -103,7 +103,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
(define-public bear
(package
(name "bear")
- (version "3.0.4")
+ (version "3.0.16")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -114,7 +114,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
"bear-disable-preinstall-tests.patch"))
(sha256
(base32
- "15r22sbk5bibrhf54lf0shiqw1gnsik24fr5as96w3hnj6iahgwn"))))
+ "01giv11nhjp4pvw8ssf8bxf503pabwnwnvfzmrxyxixnairwmykg"))))
(build-system cmake-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/patches/bear-disable-preinstall-tests.patch b/gnu/packages/patches/bear-disable-preinstall-tests.patch
index c65095405f..ffb31c28f1 100644
--- a/gnu/packages/patches/bear-disable-preinstall-tests.patch
+++ b/gnu/packages/patches/bear-disable-preinstall-tests.patch
@@ -1,20 +1,9 @@
-From d7d0cdd48017679e8529f8475d1b9902944cf243 Mon Sep 17 00:00:00 2001
-From: Brett Gilio <brettg@gnu.org>
-Date: Sun, 20 Dec 2020 14:43:30 -0600
-Subject: [PATCH] Disallow Pre-install Checks
-
----
- CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 45c6d27..73b4ace 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -58,10 +58,6 @@ ExternalProject_Add(BearSource
- -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+@@ -60,10 +60,6 @@ ExternalProject_Add(BearSource
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}
+ -DENABLE_FUNC_TESTS:BOOL=${ENABLE_FUNC_TESTS}
- TEST_BEFORE_INSTALL
- 1
- TEST_COMMAND
@@ -22,9 +11,9 @@ index 45c6d27..73b4ace 100644
)
# Run the functional tests
-@@ -73,12 +69,8 @@ if (ENABLE_FUNC_TESTS)
- BearSource
- CMAKE_CACHE_ARGS
+@@ -77,12 +73,8 @@ if (ENABLE_FUNC_TESTS)
+ -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR}
+ -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR}
-DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}
- TEST_BEFORE_INSTALL
- 1
@@ -35,6 +24,3 @@ index 45c6d27..73b4ace 100644
)
endif ()
---
-2.29.2
-
--
2.33.0
[-- Attachment #6: 0001-gnu-spdlog-Update-to-1.9.2.patch --]
[-- Type: application/octet-stream, Size: 1229 bytes --]
From 8a7dbec431360a794ac3a1b9a7d94aede6dbaec0 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Fri, 8 Oct 2021 19:06:56 +0000
Subject: [PATCH 1/5] gnu: spdlog: Update to 1.9.2.
* gnu/packages/logging.scm (spdlog): Update to 1.9.2.
---
gnu/packages/logging.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index 6a4975e435..06a1905479 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -190,7 +190,7 @@ output in multiple windows in a terminal.")
(define-public spdlog
(package
(name "spdlog")
- (version "1.8.5")
+ (version "1.9.2")
(source
(origin
(method git-fetch)
@@ -199,7 +199,7 @@ output in multiple windows in a terminal.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "179krvg5sad6dviqpcjwg6czzknnilqszrg1d0fgp12h6sy66vqg"))))
+ (base32 "1img03ka63hf3sb62v5f02ax5jc9mlpz5cijr38xxzymvcg1s98r"))))
(build-system cmake-build-system)
;; TODO run benchmark. Currently not possible, as adding
;; (gnu packages benchmark) forms a dependency cycle
--
2.33.0
^ permalink raw reply related [flat|nested] 4+ messages in thread