From 2e9cdb6a65aa0260f01110d26e83080e898ea0a5 Mon Sep 17 00:00:00 2001 From: qblade Date: Fri, 26 Mar 2021 01:33:42 +0000 Subject: gnu: Add hikari. * gnu/packages/wm.scm (hikari): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/wm.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3d85392394..a637bce602 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2400,3 +2400,55 @@ for wayland conceptually based on the X11 window manager (description "libucl implements a configuration language that is easy to read and write, and compatible with JSON.") (license license:bsd-2))) + +(define-public hikari + (package + (name "hikari") + (version "2.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hikari.acmelabs.space/releases/hikari-" + version ".tar.gz")) + (sha256 + (base32 + "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) + (build-system gnu-build-system) + (native-inputs + `(("bmake" ,bmake) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) + (inputs + `(("wayland" ,wayland) + ("wlroots" ,wlroots) + ("libinput" ,libinput) + ("cairo" ,cairo) + ("pango" ,pango) + ("libxkbcommon" ,libxkbcommon) + ("libucl" ,libucl) + ("pam" ,linux-pam))) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "CC=" ,(cc-for-target)) + "WITH_XWAYLAND=YES" + "WITH_SCREENCOPY=YES" + "WITH_LAYERSHELL=YES" + "WITH_VIRTUAL_INPUT=YES") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs outputs make-flags #:allow-other-keys) + (apply invoke "bmake" make-flags))) + (replace 'install + (lambda* (#:key inputs outputs make-flags #:allow-other-keys) + (apply invoke "bmake" "install" make-flags)))))) + (home-page "https://hikari.acmelabs.space/") + (synopsis "Stacking Wayland compositor with additional tiling capabilities") + (description "Stacking Wayland compositor with additional tiling +capabilities, it is heavily inspired by the Calm Window manager(cwm)") + (license license:bsd-2))) -- cgit v1.2.3 From 636caba168bf06a17c10ca583e374793e7c7b1cb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Mar 2021 14:47:55 +0100 Subject: gnu: hikari: Improve package. * gnu/packages/wm.scm (hikari)[inputs]: Sort alphabetically. [synopsis]: Shorten a bit. [description]: Use full sentences. --- gnu/packages/wm.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a637bce602..6105a98f14 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2408,28 +2408,26 @@ read and write, and compatible with JSON.") (source (origin (method url-fetch) - (uri (string-append - "https://hikari.acmelabs.space/releases/hikari-" - version ".tar.gz")) + (uri (string-append "https://hikari.acmelabs.space/releases/" + "hikari-" version ".tar.gz")) (sha256 - (base32 - "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) + (base32 "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) (build-system gnu-build-system) (native-inputs `(("bmake" ,bmake) ("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols))) (inputs - `(("wayland" ,wayland) - ("wlroots" ,wlroots) + `(("cairo" ,cairo) ("libinput" ,libinput) - ("cairo" ,cairo) - ("pango" ,pango) - ("libxkbcommon" ,libxkbcommon) ("libucl" ,libucl) - ("pam" ,linux-pam))) + ("libxkbcommon" ,libxkbcommon) + ("pam" ,linux-pam) + ("pango" ,pango) + ("wayland" ,wayland) + ("wlroots" ,wlroots))) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) @@ -2448,7 +2446,8 @@ read and write, and compatible with JSON.") (lambda* (#:key inputs outputs make-flags #:allow-other-keys) (apply invoke "bmake" "install" make-flags)))))) (home-page "https://hikari.acmelabs.space/") - (synopsis "Stacking Wayland compositor with additional tiling capabilities") - (description "Stacking Wayland compositor with additional tiling -capabilities, it is heavily inspired by the Calm Window manager(cwm)") + (synopsis "Stacking Wayland compositor with tiling capabilities") + (description + "Hikari is a stacking Wayland compositor with additional tiling +capabilities. It is heavily inspired by the Calm Window manager(cwm).") (license license:bsd-2))) -- cgit v1.2.3 From 5cf90c43cab457ca789862e456556af7f092063a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 12:03:31 +0200 Subject: gnu: hikari: Update to 2.2.3. * gnu/packages/wm.scm (hikari): Update to 2.2.3. --- 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 6105a98f14..d3c76d7988 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2404,14 +2404,14 @@ read and write, and compatible with JSON.") (define-public hikari (package (name "hikari") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) (uri (string-append "https://hikari.acmelabs.space/releases/" "hikari-" version ".tar.gz")) (sha256 - (base32 "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) + (base32 "1d023cphzi15k434n60l1rp5awxmdijvsxfrm59fmsvd5rjxh9q7")))) (build-system gnu-build-system) (native-inputs `(("bmake" ,bmake) -- 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/wm.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/wm.scm') 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 From 96026bdb8fc3ebcdb4b4144246a1ae8105eefb7c Mon Sep 17 00:00:00 2001 From: la snesne Date: Thu, 1 Apr 2021 01:12:15 +0900 Subject: gnu: Add wlogout. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (wlogout): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4df1af27cb..90896c2b89 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 qblade +;;; Copyright © 2021 lasnesne ;;; ;;; This file is part of GNU Guix. ;;; @@ -2451,3 +2452,39 @@ read and write, and compatible with JSON.") "Hikari is a stacking Wayland compositor with additional tiling capabilities. It is heavily inspired by the Calm Window manager(cwm).") (license license:bsd-2))) + +(define-public wlogout + (package + (name "wlogout") + (version "1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ArtsyMacaw/wlogout") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1swhzkqkzli59c89pvrakfvicd00x7ga860c3x2pbb4y3xziqfvi")))) + (build-system meson-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) + (inputs + `(("gtk-layer-shell" ,gtk-layer-shell) + ("gtk+" ,gtk+))) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source-paths + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "main.c" + (("/usr/share") (string-append out "/share")) + (("/etc") (string-append out "/etc")))) + #t))))) + (home-page "https://github.com/ArtsyMacaw/wlogout") + (synopsis "Logout menu for Wayland") + (description "wlogout is a logout menu for Wayland environments.") + (license license:expat))) -- cgit v1.2.3 From 280cfe63bdd6eb4dd5460385e7918e0808ffe511 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Apr 2021 06:16:17 +0300 Subject: gnu: xclickroot: Update to 1.3. * gnu/packages/wm.scm (xclickroot): Update to 1.3. --- 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 90896c2b89..6695186c3e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2192,7 +2192,7 @@ support, for easier unicode usage."))))) (define-public xclickroot (package (name "xclickroot") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) (uri (git-reference @@ -2201,7 +2201,7 @@ support, for easier unicode usage."))))) (file-name (git-file-name name version)) (sha256 (base32 - "1nd5qz0qz5j7gx2jsbcp234giwaa0xmg42vrcjrcf587q9ivakfl")))) + "0wnsfxvh4v02r2jjyh2n6jfkbj2dna2hlm6anl4b36lwji749k2k")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11))) -- cgit v1.2.3 From 69b91b80cfd28b45fac74f0573347e6e63152c4d Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Apr 2021 06:20:28 +0300 Subject: gnu: xnotify: Update to 0.8.1. * gnu/packages/wm.scm (xnotify): Update to 0.8.1. --- gnu/packages/wm.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6695186c3e..f92b8f4d85 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016 Ivan Vilata i Balaguer ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017, 2019, 2020 Marius Bakke -;;; Copyright © 2017, 2020 Oleg Pykhalov +;;; Copyright © 2017, 2020, 2021 Oleg Pykhalov ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018, 2019 Meiyo Peng @@ -2312,16 +2312,16 @@ start-up.") (define-public xnotify (package (name "xnotify") - (version "0.7.3") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/phillbush/xnotify") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "09s29m8z4x3mc3wja2587ik3f6zg16b40adr3nllnpyy1mqnprq5")))) + "1jxms4md2mwfjgm2pgg3vakpp33800jbn9hnl0j4jyfc9f1ckbsv")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) -- cgit v1.2.3