This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new a836089 gnu: waybar: Fix build.
a836089 is described below
commit a8360892d734b6c7418dd600b838faf2b2eda30c
Author: Efraim Flashner <[email protected]>
AuthorDate: Tue Sep 15 11:55:57 2020 +0300
gnu: waybar: Fix build.
Reported by bdju.
* gnu/packages/pretty-print.scm (fmt-6): New variable.
* gnu/packages/wm.scm (waybar)[inputs]: Replace fmt with fmt-6.
---
gnu/packages/pretty-print.scm | 15 ++++++++++++++-
gnu/packages/wm.scm | 4 ++--
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index eeae472..12ec1f7 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2019 Efraim Flashner <[email protected]>
+;;; Copyright © 2016, 2019, 2020 Efraim Flashner <[email protected]>
;;; Copyright © 2016 Ricardo Wurmus <[email protected]>
;;; Copyright © 2017 Marius Bakke <[email protected]>
;;; Copyright © 2017 Ludovic Courtès <[email protected]>
@@ -190,6 +190,19 @@ 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-6
+ (package
+ (inherit fmt)
+ (name "fmt")
+ (version "6.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/fmtlib/fmt/releases/download/";
+ version "/fmt-" version ".zip"))
+ (sha256
+ (base32 "06l8g59frbsbwj15kg6x2bbn6p8yidh6wzsigdhbdjncvm1agzll"))))))
+
(define-public source-highlight
(package
(name "source-highlight")
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 15fbf43..000ec8b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2015 xd1le <[email protected]>
;;; Copyright © 2015 Paul van der Walt <[email protected]>
;;; Copyright © 2016 Danny Milosavljevic <[email protected]>
-;;; Copyright © 2016, 2019 Efraim Flashner <[email protected]>
+;;; Copyright © 2016, 2019, 2020 Efraim Flashner <[email protected]>
;;; Copyright © 2016 Al McElrath <[email protected]>
;;; Copyright © 2016 Carlo Zancanaro <[email protected]>
;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <[email protected]>
@@ -1526,7 +1526,7 @@ modules for building a Wayland compositor.")
(base32 "0ks719khhg2zwpyiwa2079i6962qcxpapm28hmr4ckpsp2n659ck"))))
(build-system meson-build-system)
(inputs `(("date" ,date)
- ("fmt" ,fmt)
+ ("fmt" ,fmt-6)
("gtk-layer-shell" ,gtk-layer-shell)
("gtkmm" ,gtkmm)
("jsoncpp" ,jsoncpp)
