From a5ae3d781bc67000b09bd1a17be7d7110bd29eb2 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Tue, 27 Sep 2022 02:06:30 -0400 Subject: gnu: swaylock-effects: Update to 1.6.10, use G-expressions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (swaylock-effects): Update to 1.6.10. [source]: Switch from commit to release tag. [arguments]: Use G-expressions. [home-page]: Switch to maintained fork. Signed-off-by: 宋文武 --- gnu/packages/wm.scm | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 310e62a00d..5699e42540 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1675,36 +1675,27 @@ modules for building a Wayland compositor.") (license license:expat))) ; MIT license (define-public swaylock-effects - ;; Latest release is from November 2020, but doesn't support disabling SSE. - (let ((commit "5cb9579faaf5662b111f5722311b701eff1c1d00") - (revision "1")) - (package - (inherit swaylock) - (name "swaylock-effects") - (version (git-version "1.6-3" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mortie/swaylock-effects") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "036dkhfqgk7g9vbr5pxgrs66h5fz0rwdsc67i1w51aa9v01r35ca")))) - (arguments - `(#:configure-flags '("-Dsse=false") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-meson - (lambda _ - (substitute* "meson.build" - (("'-mtune=native',") ""))))))) - (synopsis "Screen locking utility for Wayland compositors with effects") - (description "@code{Swaylock-effects} is a fork of swaylock with additional + (package + (inherit swaylock) + (name "swaylock-effects") + (version "1.6.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jirutka/swaylock-effects") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1d8ri7bzwfr53ybgf23acz57wyhcl2f1nqprcda1v9bzfgsqfk2n")))) + (arguments + (list #:configure-flags #~'("-Dsse=false"))) + (synopsis "Screen locking utility for Wayland compositors with effects") + (description "@code{Swaylock-effects} is a fork of swaylock with additional features, such as the ability to take a screenshot as the background image, display a clock or apply image manipulation techniques to the background image.") - (home-page "https://github.com/mortie/swaylock-effects")))) + (home-page "https://github.com/jirutka/swaylock-effects"))) (define-public swaybg (package -- cgit v1.2.3 From 53e086c5c6ec9988f08bf7072c26030237dbd890 Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Sun, 18 Sep 2022 00:04:17 +0000 Subject: gnu: Add waybar-cpu-histogram. * gnu/packages/wm.scm (waybar-cpu-histogram): New variable. Signed-off-by: Christopher Baines --- gnu/packages/wm.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 5699e42540..af406ed2ed 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Elais Player ;;; Copyright © 2022 Trevor Richards +;;; Copyright © 2022 Fredrik Salomonsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -1753,6 +1754,34 @@ display a clock or apply image manipulation techniques to the background image." Wlroots based compositors.") (license license:expat))) ; MIT license +(define-public waybar-cpu-histogram + (package + (name "waybar-cpu-histogram") + (version "0.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~plattfot/waybar-cpu-histogram") + (commit (string-append version)))) + (sha256 + (base32 + "001pyf1jdmf2478plnggd7dkfi688qwi89db2jwfp4zza3640na6")) + (file-name (git-file-name name version)))) + (build-system meson-build-system) + (native-inputs + (list pkg-config)) + (inputs + (list jsoncpp + fmt)) + (synopsis "CPU histogram for waybar") + (description + "Custom module for waybar to show CPU usage as a histogram. A compact way +to see how many cores are active, compared to having a bar for each +core/thread.") + (home-page "https://github.com/plattfot/cpu-histogram/") + (license license:expat))) + (define-public wlr-randr (package (name "wlr-randr") -- cgit v1.2.3 From 39816716c3a59ace1dde062d3524bedbf7817ef3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 31 Oct 2022 14:55:17 +0100 Subject: gnu: stumpwm: Update to 22.05-1.ff6cb73. * gnu/packages/wm.scm (stumpwm): Update to 22.05-1.ff6cb73. --- gnu/packages/wm.scm | 143 +++++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 69 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index af406ed2ed..eedd339c6c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1849,79 +1849,84 @@ Wayland compositors supporting the wlr-output-management protocol.") (license license:expat))) ; MIT license (define-public stumpwm - (package - (name "stumpwm") - (version "22.05") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stumpwm/stumpwm") - (commit version))) - (file-name (git-file-name "stumpwm" version)) - (sha256 - (base32 "12hf70mpwy0ixiyvv8sf8pkwrzz8nb12a8ybvsdpibsxfjxgxnan")))) - (build-system asdf-build-system/sbcl) - (native-inputs - (list sbcl-fiasco - texinfo + ;; Some fixes to make stumpwm work with sbcl>=2.2.7 are not in a release + ;; yet, so we use a commit directly. + (let ((commit "ff6cb73f48f0df4285948f1009ef3b285c78b351") + (revision "1")) + (package + (name "stumpwm") + (version (git-version "22.05" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stumpwm/stumpwm") + (commit commit))) + (file-name (git-file-name "stumpwm" version)) + (sha256 + (base32 "0gvr136fv5zs61017gns3kbkz00837n0b52fif9vany5fslx3aj2")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-fiasco + texinfo - ;; To build the manual. - autoconf - automake)) - (inputs - (list sbcl-alexandria - sbcl-cl-ppcre - sbcl-clx)) - (outputs '("out" "lib")) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "stumpwm-tests.asd" - (("\"ALL-TESTS\"") - "\"RUN-PACKAGE-TESTS\" :package")))) - (add-after 'create-asdf-configuration 'build-program - (lambda* (#:key outputs #:allow-other-keys) - (build-program - (string-append (assoc-ref outputs "out") "/bin/stumpwm") - outputs - #:entry-program '((stumpwm:stumpwm) 0)))) - (add-after 'build-program 'create-desktop-file - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (xsessions (string-append out "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file - (string-append xsessions "/stumpwm.desktop") - (lambda (file) - (format file - "[Desktop Entry]~@ - Name=stumpwm~@ - Comment=The Stump Window Manager~@ - Exec=~a/bin/stumpwm~@ - TryExec=~@*~a/bin/stumpwm~@ - Icon=~@ - Type=Application~%" - out)))))) - (add-after 'install 'install-manual - (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info"))) - (invoke "./autogen.sh") - (invoke "sh" "./configure" "SHELL=sh") - (apply invoke "make" "stumpwm.info" make-flags) - (install-file "stumpwm.info" info))))))) - (synopsis "Window manager written in Common Lisp") - (description "Stumpwm is a window manager written entirely in Common Lisp. + ;; To build the manual. + autoconf + automake)) + (inputs + (list sbcl-alexandria + sbcl-cl-ppcre + sbcl-clx)) + (outputs '("out" "lib")) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "stumpwm-tests.asd" + (("\"ALL-TESTS\"") + "\"RUN-PACKAGE-TESTS\" :package")))) + (add-after 'create-asdf-configuration 'build-program + (lambda* (#:key outputs #:allow-other-keys) + (build-program + (string-append (assoc-ref outputs "out") "/bin/stumpwm") + outputs + #:entry-program '((stumpwm:stumpwm) 0)))) + (add-after 'build-program 'create-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xsessions (string-append out "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file + (string-append xsessions "/stumpwm.desktop") + (lambda (file) + (format file + "[Desktop Entry]~@ + Name=stumpwm~@ + Comment=The Stump Window Manager~@ + Exec=~a/bin/stumpwm~@ + TryExec=~@*~a/bin/stumpwm~@ + Icon=~@ + Type=Application~%" + out)))))) + (add-after 'install 'install-manual + (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (info (string-append out "/share/info"))) + (invoke "./autogen.sh") + (invoke "sh" "./configure" "SHELL=sh") + (apply invoke "make" "stumpwm.info" make-flags) + (install-file "stumpwm.info" info))))))) + (synopsis "Window manager written in Common Lisp") + (description + "Stumpwm is a window manager written entirely in Common Lisp. It attempts to be highly customizable while relying entirely on the keyboard for input. These design decisions reflect the growing popularity of productive, customizable lisp based systems.") - (home-page "https://github.com/stumpwm/stumpwm") - (license license:gpl2+) - (properties `((cl-source-variant . ,(delay cl-stumpwm)))))) + (home-page "https://github.com/stumpwm/stumpwm") + (license license:gpl2+) + (properties `((cl-source-variant . ,(delay cl-stumpwm))))))) (define-public sbcl-stumpwm (deprecated-package "sbcl-stumpwm" stumpwm)) -- cgit v1.2.3 From 451d2802f6471d1a5f2eea08ae7ce2ad8747f797 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 3 Nov 2022 15:06:55 -0400 Subject: gnu: fmt: Update to 9.1.0. * gnu/packages/pretty-print.scm (fmt): Update to 9.1.0. (fmt-8): New variable. * gnu/packages/hyperledger.scm (hyperledger-iroha) [snippet]: Delete trailing #t. [native-inputs]: Re-indent. Replace fmt with fmt-8. * gnu/packages/networking.scm (opendht) [inputs]: Replace fmt with fmt-8. * gnu/packages/storage.scm (ceph): Likewise. * gnu/packages/video.scm (mkvtoolnix): Likewise. * gnu/packages/aidc.scm (zxing-cpp): Likewise. * gnu/packages/wm.scm (waybar): Likewise. * gnu/packages/geo.scm (osm2pgsql): Likewise. * gnu/packages/graphics.scm (openimageio): Likewise. * gnu/packages/build-tools.scm (bear): Likewise. * gnu/packages/networking.scm (restinio): Likewise. --- gnu/packages/aidc.scm | 3 +-- gnu/packages/build-tools.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/hyperledger.scm | 9 ++++++--- gnu/packages/networking.scm | 4 ++-- gnu/packages/pretty-print.scm | 30 ++++++++++++++++++++---------- gnu/packages/storage.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/wm.scm | 2 +- 10 files changed, 35 insertions(+), 23 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 5e77ae3c5a..b0fc1b30d9 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -64,8 +64,7 @@ (base32 "1yl2cpaqiv1g4nq9v0xfj1vd5faz55k4541vz6hsffvcxgn9nmc5")))) (build-system cmake-build-system) - (native-inputs - (list fmt googletest)) + (native-inputs (list fmt-8 googletest)) (synopsis "C++ port of ZXing") (description "ZXing-CPP is a barcode scanning library.") (home-page "https://github.com/nu-book/zxing-cpp") diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 376c4d3486..9cd11f08ea 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -135,7 +135,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (invoke "ctest"))))))) (inputs `(("c-ares" ,c-ares) - ("fmt" ,fmt) + ("fmt" ,fmt-8) ("grpc" ,grpc) ("json-modern-cxx" ,json-modern-cxx) ("protobuf" ,protobuf) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index dc5a77e820..9895756864 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1384,7 +1384,7 @@ based on the Osmium library.") (list boost bzip2 expat - fmt + fmt-8 libosmium lua postgresql diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8ac4a8dc6e..e15a533f5b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1251,7 +1251,7 @@ with strong support for multi-part, multi-channel use cases.") (list pkg-config)) (inputs `(("boost" ,boost) - ("fmt" ,fmt) + ("fmt" ,fmt-8) ("libheif" ,libheif) ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo) diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index 2a4b87e927..45436da7db 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -166,8 +166,7 @@ link-time. New implementations can be added as well.") ;; https://github.com/hyperledger/iroha/commit/4dc710d2e9a067af866771318f673c7392797e48 ;; Backport unversioned fmt dependency, remove next update: (substitute* "libs/logger/logger.hpp" - (("fmt::v5") "fmt")) - #t)))) + (("fmt::v5") "fmt")))))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -179,7 +178,11 @@ link-time. New implementations can be added as well.") #:test-target ".")) ;; https://github.com/hyperledger/iroha/blob/master/vcpkg/VCPKG_DEPS_LIST (native-inputs - (list fmt googletest rapidjson rxcpp spdlog)) + (list fmt-8 + googletest + rapidjson + rxcpp + spdlog)) (inputs (list boost gflags diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index cd095a0ed8..b0393a7e69 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3649,7 +3649,7 @@ communication over HTTP.") pcre2 sobjectizer)) (propagated-inputs - (list asio fmt http-parser)) + (list asio fmt-8 http-parser)) (arguments `(#:configure-flags '("-DRESTINIO_INSTALL=on") #:tests? #f ; TODO: The tests are called from the root CMakelist, need RESTINIO_TEST=on. @@ -3737,7 +3737,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (chmod dhtcluster #o555) (wrap-program dhtcluster `("GUIX_PYTHONPATH" prefix (,site-packages))))))))) - (inputs (list bash-minimal fmt readline)) + (inputs (list bash-minimal fmt-8 readline)) (propagated-inputs (list msgpack ;included in several installed headers restinio ;included in opendht/http.h diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 6dcf1675c4..7bc54c4a0b 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -166,28 +167,37 @@ different programming languages.") (define-public fmt (package (name "fmt") - (version "8.1.1") + (version "9.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" version "/fmt-" version ".zip")) (sha256 - (base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3")))) + (base32 "15n9yi6xzzs7g9rm87kg8y5yhl2zrqj3bjr845saa63f6swlrsyc")))) (build-system cmake-build-system) - (arguments - '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) - (native-inputs - (list unzip)) + (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + (native-inputs (list unzip)) (home-page "https://fmt.dev") (synopsis "Small and fast C++ formatting library") - (description - "@code{fmt} (formerly @code{cppformat}) is a formatting library for C++. -It can be used as a safe alternative to @code{printf} or as a fast alternative -to @code{IOStreams}.") + (description "@code{fmt} (formerly @code{cppformat}) is a formatting +library for C++. It can be used as a safe alternative to @code{printf} or as +a fast alternative 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-8 + (package + (inherit fmt) + (version "8.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" + version "/fmt-" version ".zip")) + (sha256 + (base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3")))))) + (define-public fmt-8.0 (package (inherit fmt) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 86ae1c883f..9d360e8eb3 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -201,7 +201,7 @@ ("cryptsetup" ,cryptsetup) ("expat" ,expat) ("fcgi" ,fcgi) - ("fmt" ,fmt) + ("fmt" ,fmt-8) ("fuse" ,fuse) ("icu4c" ,icu4c) ("jemalloc" ,jemalloc) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c95bb02507..c8f3c6f8a5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1029,7 +1029,7 @@ H.264 (MPEG-4 AVC) video streams.") libebml file flac - fmt + fmt-8 libdvdread libmatroska libogg diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index eedd339c6c..54e1c9c016 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1734,7 +1734,7 @@ display a clock or apply image manipulation techniques to the background image." (base32 "15fy21cipih80amv78g7g4k2gylf107phbv0fjacn3w3n0i3cf2k")))) (build-system meson-build-system) (inputs (list date - fmt + fmt-8 gtk-layer-shell gtkmm-3 jsoncpp -- cgit v1.2.3 From 2c9b4c573b6fd24ed350f19e1b0ea0b1c0fbe932 Mon Sep 17 00:00:00 2001 From: "( via Guix-patches via" Date: Mon, 17 Oct 2022 17:47:02 +0100 Subject: gnu: mako: Patch makoctl to refer directly to binaries. * gnu/packages/wm.scm (mako)[arguments]<#:phases>{'patch-makoctl}: New phase. [inputs]: Add jq. Signed-off-by: Andrew Tropin --- gnu/packages/wm.scm | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 54e1c9c016..e765d28f53 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2022 Elais Player ;;; Copyright © 2022 Trevor Richards ;;; Copyright © 2022 Fredrik Salomonsson +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -1807,17 +1808,32 @@ core/thread.") (package (name "mako") (version "1.7.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/mako") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/mako") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz")))) (build-system meson-build-system) - (inputs (list basu cairo gdk-pixbuf pango wayland)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-makoctl + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "makoctl" + (("^BUSCTL=.*$") + (string-append + "BUSCTL=" + (search-input-file inputs "bin/basuctl") + "\n")) + (("jq ") + (string-append + (search-input-file inputs "bin/jq") + " ")))))))) + (inputs (list basu cairo gdk-pixbuf jq pango wayland)) (native-inputs (list pkg-config scdoc wayland-protocols)) (home-page "https://wayland.emersion.fr/mako") (synopsis "Lightweight Wayland notification daemon") -- cgit v1.2.3 From da0f50274203d91bc777bf20ff8170e797019733 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 7 Nov 2022 19:47:45 +0000 Subject: gnu: waybar: Update to 0.9.15. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (waybar): Update to 0.9.15. [inputs]: Replace fmt-8 with fmt. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index e765d28f53..116071b5c7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1723,7 +1723,7 @@ display a clock or apply image manipulation techniques to the background image." (define-public waybar (package (name "waybar") - (version "0.9.13") + (version "0.9.15") (source (origin (method git-fetch) @@ -1732,10 +1732,10 @@ display a clock or apply image manipulation techniques to the background image." (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15fy21cipih80amv78g7g4k2gylf107phbv0fjacn3w3n0i3cf2k")))) + (base32 "0mvwsd3krrlniga0fq13b0qvsf1fj22mk9nzsfgz49r55lqw8sdv")))) (build-system meson-build-system) (inputs (list date - fmt-8 + fmt gtk-layer-shell gtkmm-3 jsoncpp -- cgit v1.2.3 From d5fff6885ba713f336f5c30940b873cdc213c1fc Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Fri, 4 Nov 2022 22:34:13 -0400 Subject: gnu: swayidle: Update to 1.7.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (swayidle): Update to 1.7.1. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 116071b5c7..52ef61ee34 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1633,7 +1633,7 @@ modules for building a Wayland compositor.") (define-public swayidle (package (name "swayidle") - (version "1.7") + (version "1.7.1") (source (origin (method git-fetch) @@ -1642,7 +1642,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0ziya8d5pvvxg16jhy4i04pvq11bdvj68gz5q654ar4dldil17nn")))) + (base32 "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dlogind-provider=elogind"))) -- cgit v1.2.3 From 4ba780aeb8dec8e813f0cdfb53c386164b1364cd Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Fri, 4 Nov 2022 23:50:28 -0400 Subject: gnu: kanshi: Update to 1.3.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (kanshi): Update to 1.3.0. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 52ef61ee34..70e5fc359a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1844,7 +1844,7 @@ compositors that support the layer-shell protocol.") (define-public kanshi (package (name "kanshi") - (version "1.2.0") + (version "1.3.0") (source (origin (method git-fetch) @@ -1853,7 +1853,7 @@ compositors that support the layer-shell protocol.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10lxagwc2pkq86g2sxkwljjd39sahp3w1j5yx853d3c4d95iwls5")))) + (base32 "0sa8k74d24ijw6ml1yyy75dk763r2sbm7fgk033g5xnx28kd394j")))) (build-system meson-build-system) (inputs (list wayland)) (native-inputs (list pkg-config scdoc)) -- cgit v1.2.3 From b13f00f0e1dea914f94538e13c5c392278426673 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 14 Nov 2022 15:23:49 +0200 Subject: gnu: i3-gaps: Add source file-name. * gnu/packages/wm.scm (i3-gaps)[source]: Add file-name field. --- gnu/packages/wm.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 70e5fc359a..6bca36f432 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -383,6 +383,7 @@ many programming languages.") (uri (git-reference (url "https://github.com/Airblader/i3") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "0g0qmv2gpv9qbhj9h5f4c4vfs6ndzq2rblgx9md85iharwp5sbb9")))) -- cgit v1.2.3 From fc2b9522057681330d3b507aa69c9aa3b3b8f3e6 Mon Sep 17 00:00:00 2001 From: zamfofex Date: Thu, 20 Oct 2022 09:25:11 -0300 Subject: gnu: Add wld. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (wld): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/wm.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6bca36f432..cf0dc63a38 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -59,6 +59,7 @@ ;;; Copyright © 2022 Trevor Richards ;;; Copyright © 2022 Fredrik Salomonsson ;;; Copyright © 2022 ( +;;; Copyright © 2022 zamfofex ;;; ;;; This file is part of GNU Guix. ;;; @@ -2953,3 +2954,36 @@ used for multimedia keys.") an interface over @code{grim}, @code{slurp} and @code{jq}, and supports storing the screenshot either directly to the clipboard using @code{wl-copy} or to a file."))) + +(define-public wld + (let ((commit "6586736176ef50a88025abae835e29a7ca980126") + (revision "1")) + (package + (name "wld") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/michaelforney/wld") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qkd3q8p1s72x688g83fkcarrz2h20904rpd8z44ql6ksgrj9bp3")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (inputs (list fontconfig + libdrm + pixman + wayland)) + (propagated-inputs (list fontconfig pixman)) + (native-inputs (list pkg-config)) + (home-page "https://github.com/michaelforney/wld") + (synopsis "Primitive drawing library for Wayland") + (description "wld is a drawing library that targets Wayland.") + (license license:expat)))) -- cgit v1.2.3 From e6dd58cfb511c23beb4d2732f898bb5479bd52d5 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Mon, 28 Nov 2022 12:40:20 +0400 Subject: gnu: waybar: Update to 0.9.16. * gnu/packages/wm.scm (waybar): Update to 0.9.16. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index cf0dc63a38..178a5d95ba 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1725,7 +1725,7 @@ display a clock or apply image manipulation techniques to the background image." (define-public waybar (package (name "waybar") - (version "0.9.15") + (version "0.9.16") (source (origin (method git-fetch) @@ -1734,7 +1734,7 @@ display a clock or apply image manipulation techniques to the background image." (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0mvwsd3krrlniga0fq13b0qvsf1fj22mk9nzsfgz49r55lqw8sdv")))) + (base32 "06vwsax8z6vvvav4c1d40nfiljc7h1cla57r43nv8dw86n539ic5")))) (build-system meson-build-system) (inputs (list date fmt -- cgit v1.2.3 From 27b04fcdd4073d9e8ded620ffbc7d0ed7cad1c15 Mon Sep 17 00:00:00 2001 From: zamfofex Date: Thu, 20 Oct 2022 09:25:12 -0300 Subject: gnu: Add swc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (swc): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 178a5d95ba..149ea1bb69 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2987,3 +2987,49 @@ file."))) (synopsis "Primitive drawing library for Wayland") (description "wld is a drawing library that targets Wayland.") (license license:expat)))) + +(define-public swc + (let ((commit "a7b615567f83d9e48d585251015048c441ca0239") + (revision "1")) + (package + (name "swc") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/michaelforney/swc") + (commit commit))) + (sha256 + (base32 + "19rpbwpi81pm92fkhsmbx7pzagpah5m9ih5h5k3m8dy6r8ihdh35")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:make-flags (list (string-append "CC=" + ,(cc-for-target)) + (string-append "PREFIX=" %output)) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (inputs (list libdrm + libinput + libxcb + libxkbcommon + wayland + wayland-protocols + wld + xcb-util-wm)) + (native-inputs (list pkg-config)) + (home-page "https://github.com/michaelforney/swc") + (synopsis "Library for making a simple Wayland compositor") + (description + "swc is a small Wayland compositor implemented as a library. + +It has been designed primarily with tiling window managers in mind. Additionally, +notable features include: +@itemize +@item Easy to follow code base +@item XWayland support +@item Can place borders around windows +@end itemize") + (license license:expat)))) -- cgit v1.2.3 From 8eb0abf32f506195f45eeb49f91516705c39ad13 Mon Sep 17 00:00:00 2001 From: zamfofex Date: Thu, 20 Oct 2022 09:25:13 -0300 Subject: gnu: Add velox. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (velox): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 149ea1bb69..04a44b4c15 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -3033,3 +3033,35 @@ notable features include: @item Can place borders around windows @end itemize") (license license:expat)))) + +(define-public velox + (let ((commit "fcc041265539befd907a64ee3a536cb2489ffb99") + (revision "1")) + (package + (name "velox") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/michaelforney/velox") + (commit commit))) + (sha256 + (base32 + "0d11bmag5zwmas3rf1b7x5hjla7wpxq70nr86dz3x9r7cal04mym")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:make-flags (list (string-append "CC=" + ,(cc-for-target)) + (string-append "PREFIX=" %output)) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (inputs (list libinput libxkbcommon wayland wld)) + (propagated-inputs (list swc)) + (native-inputs (list pkg-config)) + (home-page "https://github.com/michaelforney/velox") + (synopsis "Simple window manager based on swc") + (description "velox is a simple window manager for Wayland based on swc. +It is inspired by dwm and xmonad.") + (license license:expat)))) -- cgit v1.2.3 From 1b6172d5f6ca22f0fa02cd1335b1b90e9501b731 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 8 Dec 2022 12:15:11 +0100 Subject: gnu: fnott: Update to 1.3.0. * gnu/packages/wm.scm (fnott): Update to 1.3.0. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 04a44b4c15..d3a7716c23 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1055,7 +1055,7 @@ experience.") (define-public fnott (package (name "fnott") - (version "1.2.1") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -1064,7 +1064,7 @@ experience.") (file-name (git-file-name name version)) (sha256 (base32 - "1770p5hfswbaa15zmjh10n7fskch00d3y03ij3gfb1v4q314nb9n")))) + "00zg03nz79kqcsnwmm22friawhvl05f93yxpvqmy5wvggx9hrlz8")))) (build-system meson-build-system) (arguments `(#:build-type "release")) (native-inputs -- cgit v1.2.3 From 8fe6d3e8446944294856950ef192cac83e03e58b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Dec 2022 01:00:52 +0100 Subject: gnu: yajl: Drop custom ‘lib-’ prefix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (yajl): New variable, renamed from… (libyajl): …this one, which is now a DEPRECATED-PACKAGE alias of yajl. Adjust all users. --- gnu/packages/containers.scm | 2 +- gnu/packages/monitoring.scm | 2 +- gnu/packages/mpd.scm | 2 +- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/virtualization.scm | 6 +++--- gnu/packages/web.scm | 7 +++++-- gnu/packages/wm.scm | 4 ++-- 7 files changed, 15 insertions(+), 12 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 59eea423a1..e2d698dcc2 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -91,7 +91,7 @@ (inputs (list libcap libseccomp - libyajl)) + yajl)) (native-inputs (list automake autoconf diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 37b9335ac8..74ec7b6cdf 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -636,7 +636,7 @@ devices.") ;; Required because of patched sources. (invoke "autoreconf" "-vfi")))))) (inputs - (list rrdtool curl libyajl)) + (list rrdtool curl yajl)) (native-inputs (list autoconf automake libtool pkg-config)) (home-page "https://collectd.org/") diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index e0bd7633bc..5439d89f4a 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -170,7 +170,7 @@ interfacing MPD in the C, C++ & Objective C languages.") zlib)) (native-inputs (list cmake pkg-config python-sphinx)) ;; Missing optional inputs: - ;; libyajl + ;; yajl ;; libcdio_paranoia ;; libmms ;; libadplug diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8591423116..9629012a80 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29784,9 +29784,9 @@ simple mock/record and a complete capture/replay framework.") (when tests? (invoke "pytest" "-vv"))))))) (inputs - ;; libyajl is optional, but compiling with it makes faster + ;; yajl is optional, but compiling with it makes faster ;; backends available to ijson: - (list libyajl)) + (list yajl)) (native-inputs (list python-pytest)) (build-system python-build-system) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c0334f1760..1218112a20 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1363,7 +1363,7 @@ pretty simple, REST API.") openssl readline cyrus-sasl - libyajl + yajl audit dmidecode dnsmasq @@ -1403,7 +1403,7 @@ to integrate other virtualization mechanisms if needed.") (build-system meson-build-system) (inputs (list openssl cyrus-sasl lvm2 ; for libdevmapper - libyajl)) + yajl)) (native-inputs (list pkg-config intltool `(,glib "bin") vala)) @@ -2269,7 +2269,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) ("iproute" ,iproute) ; TODO: patch invocations. ("libaio" ,libaio) ("libx11" ,libx11) - ("libyajl" ,libyajl) + ("yajl" ,yajl) ("ncurses" ,ncurses) ("openssl" ,openssl) ("ovmf" ,ovmf) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c1e9e943c0..efb0313f05 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1395,9 +1395,9 @@ current version of any major web browser.") style API.") (license license:expat))) -(define-public libyajl +(define-public yajl (package - (name "libyajl") + (name "yajl") (version "2.1.0") (source (origin (method git-fetch) @@ -1424,6 +1424,9 @@ style API.") parser written in ANSI C and a small validating JSON generator.") (license license:isc))) +(define-public libyajl + (deprecated-package "libyajl" yajl)) + (define-public libwebsockets (package (name "libwebsockets") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index d3a7716c23..18fe606c7b 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -287,7 +287,7 @@ or musca). (list alsa-lib libconfuse libnl - libyajl + yajl pulseaudio)) (native-inputs (list asciidoc @@ -342,7 +342,7 @@ commands would.") xcb-util-xrm libxkbcommon libev - libyajl + yajl xmlto perl-pod-simple libx11 -- cgit v1.2.3 From 8aa104752cb6a61f2ac689c31ac627ccab32f7fe Mon Sep 17 00:00:00 2001 From: Trevor Richards Date: Fri, 23 Dec 2022 20:54:36 -0800 Subject: gnu: Add sbcl-stumpwm-battery-portable. * gnu/packages/wm.scm (sbcl-stumpwm-battery-portable): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/wm.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 18fe606c7b..a13467663e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -56,7 +56,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Elais Player -;;; Copyright © 2022 Trevor Richards +;;; Copyright © 2022, 2023 Trevor Richards ;;; Copyright © 2022 Fredrik Salomonsson ;;; Copyright © 2022 ( ;;; Copyright © 2022 zamfofex @@ -2358,6 +2358,25 @@ interface[fn:dbus-spec]. It shows notifications using stumpwm:message by default.") (license license:gpl3+))) +(define-public sbcl-stumpwm-battery-portable + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-battery-portable") + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-cl-ppcre + (list stumpwm "lib"))) + (arguments + '(#:asd-systems '("battery-portable") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "modeline/battery-portable")))))) + (synopsis "Battery level indicator for StumpWM") + (description "This module provides a battery level indicator for the +modeline. It can be displayed in the modeline with %B.") + (license (list license:expat license:gpl3+)))) + (define-public lemonbar (package (name "lemonbar") -- cgit v1.2.3 From f2deb6c18a023caa4b023627a156e331003d416f Mon Sep 17 00:00:00 2001 From: florhizome Date: Mon, 12 Dec 2022 12:56:43 +0000 Subject: gnu: Add swaynotificationcenter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (swaynotificationcenter): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a13467663e..9a18580753 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1722,6 +1722,57 @@ display a clock or apply image manipulation techniques to the background image." (description "Swaybg is a wallpaper utility for Wayland compositors.") (license license:expat))) ; MIT license + +(define-public swaynotificationcenter + (package + (name "swaynotificationcenter") + (version "0.7.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ErikReider/SwayNotificationCenter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xvr5m5sqznr3dd512i5pk0d56v7n0ywdcy6rnz85vbf2k7b6kj5")))) + (build-system meson-build-system) + (arguments (list #:configure-flags #~(list "-Dsystemd-service=false"))) + (native-inputs + (list `(,glib "bin") + gobject-introspection + pkg-config + python-minimal + scdoc + vala-next)) + (inputs + (list json-glib + glib + gtk+ + gtk-layer-shell + libhandy + wayland-protocols)) + (synopsis "Notification daemon with a graphical interface") + (description + "This package provides a notification daemon for the Sway Wayland +compository, supporting the following featuers: + +@itemize +@item Keyboard shortcuts +@item Notification body markup with image support +@item A panel to view previous notifications +@item Show album art for notifications like Spotify +@item Do not disturb +@item Click notification to execute default action +@item Show alternative notification actions +@item Customization through a CSS file +@item Trackpad/mouse gesture to close notification +@item The same features as any other basic notification daemon +@item Basic configuration through a JSON config file +@item Hot-reload config through swaync-client +@end itemize") + (home-page "https://github.com/ErikReider/SwayNotificationCenter") + (license license:expat))) + (define-public waybar (package (name "waybar") -- cgit v1.2.3 From 9a15bcd94910351ce0189d79c2821f4fbbd45ffb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Jan 2023 01:00:03 +0100 Subject: gnu: berry: Update to 0.1.12. * gnu/packages/wm.scm (berry): Update to 0.1.12. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 9a18580753..f7c93c13fc 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2900,7 +2900,7 @@ which do not support it.") (define-public berry (package (name "berry") - (version "0.1.11") + (version "0.1.12") (source (origin (method git-fetch) @@ -2909,7 +2909,7 @@ which do not support it.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qyq3g0m7rb9gpk1i5kfy9nr8sqivjiilbi4g0nw4d400rblvkbj")))) + (base32 "0ygqzgi7ncc6whvwdifds2cq9cllq9fhiqnigx859hbdnf453hn4")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There are no tests. -- cgit v1.2.3 From d2d38add078f15fcc5beb4ec6ae11b8572b01167 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Jan 2023 01:00:01 +0100 Subject: gnu: libucl: Update to 0.8.2. * gnu/packages/wm.scm (libucl): Update to 0.8.2. --- gnu/packages/wm.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f7c93c13fc..a860ed1f93 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2723,7 +2723,7 @@ for wayland conceptually based on the X11 window manager (define-public libucl (package (name "libucl") - (version "0.8.1") + (version "0.8.2") (source (origin (method git-fetch) @@ -2732,8 +2732,7 @@ for wayland conceptually based on the X11 window manager (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1h52ldxankyhbbm1qbqz1f2q0j03c1b4mig7343bs3mc6fpm18gf")))) + (base32 "1j8npymjhcnzbwhx1wggr88148cga921438flf1sn7mw1b9dr55f")))) (native-inputs (list autoconf automake pkg-config libtool)) (build-system gnu-build-system) -- cgit v1.2.3 From 388beed0783fd0e166c88ef4cccb0278ec575f16 Mon Sep 17 00:00:00 2001 From: Marcel van der Boom Date: Thu, 12 Jan 2023 15:58:36 +0100 Subject: gnu: i3-wm: Update to 4.22. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (i3-wm): Update to 4.22. Signed-off-by: 宋文武 --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a860ed1f93..3deba066f5 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -309,14 +309,14 @@ commands would.") (define-public i3-wm (package (name "i3-wm") - (version "4.20.1") + (version "4.22") (source (origin (method url-fetch) (uri (string-append "https://i3wm.org/downloads/i3-" version ".tar.xz")) (sha256 (base32 - "1rpwdgykcvmrmdz244f0wm7446ih1dcw8rlc1hm1c7cc42pyrq93")))) + "0jrya4rhh46sivlmqaqc4n9abpp1yn1ajhi616gn75cxwl8rjqr8")))) (build-system meson-build-system) (arguments `(;; The test suite requires the unpackaged Xephyr X server. @@ -346,7 +346,7 @@ commands would.") xmlto perl-pod-simple libx11 - pcre + pcre2 startup-notification pango cairo)) -- cgit v1.2.3 From 3411d36ddd027ef83b304558b1d331210df9dd46 Mon Sep 17 00:00:00 2001 From: Marcel van der Boom Date: Sat, 14 Jan 2023 11:06:13 +0100 Subject: gnu: Deprecate i3-gaps. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (i3-gaps): Deprecated by i3-wm. Signed-off-by: 宋文武 --- gnu/packages/wm.scm | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3deba066f5..2fd70af07f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -375,36 +375,7 @@ many programming languages.") (license license:bsd-3))) (define-public i3-gaps - (package - (inherit i3-wm) - (name "i3-gaps") - (version "4.20.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Airblader/i3") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0g0qmv2gpv9qbhj9h5f4c4vfs6ndzq2rblgx9md85iharwp5sbb9")))) - (home-page "https://github.com/Airblader/i3") - (synopsis "Tiling window manager with gaps") - (description - "i3-gaps is a fork of i3wm, a tiling window manager -for X11. It is kept up to date with upstream, adding a few additional -features such as gaps between windows. - -i3 is a tiling X11 window manager that dynamically manages tiled, stacked, -and tabbed window layouts. - -i3 primarily targets advanced users. Windows are managed manually and -organised inside containers, which can be split vertically or horizontally, -and optionally resized. - -i3 uses a plain-text configuration file, and can be extended and controlled -from many programming languages.") - (license license:bsd-3))) + (deprecated-package "i3-gaps" i3-wm)) (define-public i3lock (package -- cgit v1.2.3