From 43f82eecf52c300698f19dee3927573dc8abbcb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:05:01 +0100 Subject: gnu: spdlog: Update to 1.8.3. * gnu/packages/logging.scm (spdlog): Update to 1.8.3. --- gnu/packages/logging.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/logging.scm') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index eafc23b2e6..09e9d59ed5 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Eric Bavier -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Marius Bakke @@ -190,7 +190,7 @@ output in multiple windows in a terminal.") (define-public spdlog (package (name "spdlog") - (version "1.8.2") + (version "1.8.3") (source (origin (method git-fetch) @@ -199,8 +199,7 @@ output in multiple windows in a terminal.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "03vmwbi9v7r3v8kzd0lj10fchp54kxbxwzfx7dp6qzkxjrvmx2dx")))) + (base32 "1qcabdc3yrm30vapn7g7lf3bwjissl15y66mpmx2w0gjjc6aqdd1")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle -- cgit v1.2.3 From da29d63a10409e7886bb825a6e03ea2af787009a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 18:28:46 +0200 Subject: gnu: spdlog: Update to 1.8.5. * gnu/packages/logging.scm (spdlog): Update to 1.8.5. --- gnu/packages/logging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/logging.scm') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 09e9d59ed5..b879fecebc 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.3") + (version "1.8.5") (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 "1qcabdc3yrm30vapn7g7lf3bwjissl15y66mpmx2w0gjjc6aqdd1")))) + (base32 "179krvg5sad6dviqpcjwg6czzknnilqszrg1d0fgp12h6sy66vqg")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle -- cgit v1.2.3 From 7e0e98aed6d9c9003d09ce156602a74b48b01d66 Mon Sep 17 00:00:00 2001 From: pricly_yellow Date: Tue, 30 Mar 2021 11:31:17 +0000 Subject: gnu: waybar: Update to 0.9.5. * gnu/packages/wm.scm (waybar): Update to 0.9.5. [inputs]: Replace fmt-6 with fmt, spdlog-1.7 with spdlog. * gnu/packages/logging.scm (spdlog-1.7): Remove variable. * gnu/packages/pretty-print.scm (fmt-6): Same. Signed-off-by: Efraim Flashner --- gnu/packages/logging.scm | 16 ---------------- gnu/packages/pretty-print.scm | 13 ------------- gnu/packages/wm.scm | 8 ++++---- 3 files changed, 4 insertions(+), 33 deletions(-) (limited to 'gnu/packages/logging.scm') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index b879fecebc..6a4975e435 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -214,19 +214,3 @@ library.") ;; spdlog is under Expat license, but the bundled fmt library in ;; "include/spdlog/fmt/bundled" is under BSD 2 clause license. (license (list license:expat license:bsd-2)))) - -(define-public spdlog-1.7 - (package - (inherit spdlog) - (name "spdlog") - (version "1.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gabime/spdlog") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j")))))) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index af02fd91a9..4662a1e717 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -189,19 +189,6 @@ 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 d3c76d7988..4df1af27cb 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1569,7 +1569,7 @@ modules for building a Wayland compositor.") (define-public waybar (package (name "waybar") - (version "0.9.4") + (version "0.9.5") (source (origin (method git-fetch) @@ -1578,10 +1578,10 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "038vnma7y7z81caywp45yr364bc1aq8d01j5vycyiyfv33nm76fy")))) + (base32 "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q")))) (build-system meson-build-system) (inputs `(("date" ,date) - ("fmt" ,fmt-6) + ("fmt" ,fmt) ("gtk-layer-shell" ,gtk-layer-shell) ("gtkmm" ,gtkmm) ("jsoncpp" ,jsoncpp) @@ -1590,7 +1590,7 @@ modules for building a Wayland compositor.") ("libmpdclent" ,libmpdclient) ("libnl" ,libnl) ("pulseaudio" ,pulseaudio) - ("spdlog" ,spdlog-1.7) + ("spdlog" ,spdlog) ("wayland" ,wayland))) (native-inputs `(("gcc" ,gcc-8) ; for #include -- cgit v1.2.3