From cae4798e8473145e8de9e9d333c9054a0a4b8764 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Fri, 24 Jul 2020 10:45:16 +0300 Subject: gnu: i3-gaps: Update to 4.18.1. * gnu/packages/wm.scm (i3-gaps): Update to 4.18.1. Signed-off-by: Brett Gilio --- 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 2849873329..a087457d30 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -340,7 +340,7 @@ many programming languages.") (define-public i3-gaps (package (inherit i3-wm) (name "i3-gaps") - (version "4.18") + (version "4.18.1") (source (origin (method url-fetch) (uri (string-append @@ -348,7 +348,7 @@ many programming languages.") version "/i3-" version ".tar.bz2")) (sha256 (base32 - "0id4qm9a7kc5yawff85blmph4zbizhb6ka88aqm10wrpfsknri3j")))) + "1cxwsrdzp18r5hj0ymg9fbzp1mhkj4m9h6i0b9cdg79cjbacba9k")))) (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 -- cgit v1.2.3 From ab751d5320b74e088f9e71d2ad3fd31fd73ae1bf Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 26 Jul 2020 14:48:51 +0300 Subject: gnu: Add xclickroot. * gnu/packages/wm.scm (xclickroot): New variable. --- 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 a087457d30..e6cb197e92 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1892,3 +1892,35 @@ bar entirely based on XCB. Provides full UTF-8 support, basic formatting, RandR and Xinerama support and EWMH compliance without wasting your precious memory.") (license license:x11)))) + +(define-public xclickroot + (let ((commit "309fd17174dba4149b5ea66654c6fd02cfcf7c9a") + (revision "1")) + (package + (name "xclickroot") + (version (git-version "0.0.1" revision commit)) ;no upstream release + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/phillbush/xclickroot") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fjqkg3wnyks0my1vrzhxfjicsfy8xwnijaazmpz6mhilcqkpvnd")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11))) + (arguments + `(#:tests? #f ;no test suite + #:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/phillbush/xclickroot") + (synopsis "Run a command when a mouse button is pressed on the root window") + (description "@code{xclickroot} runs a command every time a given mouse +button is pressed on the root window.") + (license license:public-domain)))) -- cgit v1.2.3 From 6bd6b12350e18611ade8bc79b80f633afcef86ec Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 26 Jul 2020 15:01:36 +0300 Subject: gnu: Add xmenu. * gnu/packages/wm.scm (xmenu): New variable. --- 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 e6cb197e92..081e059326 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1924,3 +1924,40 @@ wasting your precious memory.") (description "@code{xclickroot} runs a command every time a given mouse button is pressed on the root window.") (license license:public-domain)))) + +(define-public xmenu + (package + (name "xmenu") + (version "3.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/phillbush/xmenu") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1sw9l87fh03jp03a2v7rhgpyx29yg2x9blzfzp40jwad2whs7m7n")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("libxft" ,libxft) + ("freetype" ,freetype) + ("imlib2" ,imlib2))) + (arguments + `(#:tests? #f ;no test suite + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output) + (string-append "CFLAGS=" + "-I" (assoc-ref %build-inputs "freetype") + "/include/freetype2")) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/phillbush/xmenu") + (synopsis "Menu utility for X") + (description "@code{xmenu} receives a menu specification in stdin, shows +a menu for the user to select one of the options, and outputs the option +selected to stdout. It can be controlled both via mouse and via keyboard.") + (license license:public-domain))) -- cgit v1.2.3 From 79fed26e2cfe322ad97182e5a2d0bddd8fd7512a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Jul 2020 23:36:19 +0200 Subject: gnu: i3-wm: Update to 4.18.2. * gnu/packages/wm.scm (i3-wm): Update to 4.18.2. --- 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 081e059326..65c7b8bd28 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -270,14 +270,14 @@ commands would.") (define-public i3-wm (package (name "i3-wm") - (version "4.18.1") + (version "4.18.2") (source (origin (method url-fetch) (uri (string-append "https://i3wm.org/downloads/i3-" version ".tar.bz2")) (sha256 (base32 - "0z709cianlzw0x0qwq4361347354xd9ckj1v7vjvhb1zh3x91gws")))) + "030jym6b8b07yf4y6pb806hg8k77zsprv569gy0r72rh5zb1g1mj")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 6bf70cc8e7b8c592bb0feb67807e618d49920d8c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Jul 2020 23:36:23 +0200 Subject: gnu: i3-gaps: Update to 4.18.2. * gnu/packages/wm.scm (i3-gaps): Update to 4.18.2. --- 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 65c7b8bd28..bc3c152627 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -340,7 +340,7 @@ many programming languages.") (define-public i3-gaps (package (inherit i3-wm) (name "i3-gaps") - (version "4.18.1") + (version "4.18.2") (source (origin (method url-fetch) (uri (string-append @@ -348,7 +348,7 @@ many programming languages.") version "/i3-" version ".tar.bz2")) (sha256 (base32 - "1cxwsrdzp18r5hj0ymg9fbzp1mhkj4m9h6i0b9cdg79cjbacba9k")))) + "0lz08wf4b0yprzqsmymn94kiyg885dcwmh0p64v2rnf52s165g2g")))) (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 -- cgit v1.2.3 From 1db15d00cb2f5ee74568b88f3cc36e73e6653612 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 8 Aug 2020 10:54:14 +0300 Subject: gnu: Add idesk. * gnu/packages/wm.scm (idesk): New variable. --- 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 bc3c152627..2fab4cb0b2 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1961,3 +1961,55 @@ button is pressed on the root window.") a menu for the user to select one of the options, and outputs the option selected to stdout. It can be controlled both via mouse and via keyboard.") (license license:public-domain))) + +(define-public idesk + (package + (name "idesk") + (version "0.7.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/idesk/idesk/idesk-" version + "/idesk-" version ".tar.bz2")) + (sha256 + (base32 + "1lxk2yvgysxwl514zc82lwr1dwc8cd62slgr5lzdhjbdrxfymdyl")) + (modules '((guix build utils) + (ice-9 format))) + (snippet + '(let* ((file "src/DesktopConfig.cpp") + (template (string-append file ".XXXXXX")) + (out (mkstemp! template)) + (st (stat file)) + (mode (stat:mode st))) + (call-with-ascii-input-file file + (lambda (p) + (format out "~{~a~%~}" '("#include " + "#include " + "#include ")) + (dump-port p out) + (close out) + (chmod template mode) + (rename-file template file) + #t)))))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("libxft" ,libxft) + ("libxpm" ,libxpm) + ("libpng" ,libpng) + ("freetype" ,freetype) + ("imlib2" ,imlib2) + ("sed" ,sed))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (arguments + `(#:tests? #f)) ;no test suite + (home-page "https://sourceforge.net/projects/idesk/") + (synopsis "Add icons on X desktop and set background image for wallpaper") + (description "Idesk is program that draws desktop icons. Each icon will +execute a shell command on a configurable action. The icons can be moved on +the desktop by dragging them, and the icons will remember their positions on +start-up.") + (license license:bsd-3))) -- cgit v1.2.3 From 80817888a14f013c0aa8064296d59ebdf9a3acda Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Aug 2020 22:01:12 +0200 Subject: gnu: waybar: Update to 0.9.3. * gnu/packages/wm.scm (waybar): Update to 0.9.3. [native-inputs]: Compile with GCC 8. --- gnu/packages/wm.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2fab4cb0b2..2ffba9e5a2 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -77,6 +77,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) #:use-module (gnu packages gawk) + #:use-module (gnu packages gcc) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gperf) @@ -1488,7 +1489,7 @@ modules for building a Wayland compositor.") (define-public waybar (package (name "waybar") - (version "0.9.1") + (version "0.9.3") (source (origin (method git-fetch) @@ -1497,7 +1498,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s")))) + (base32 "0ks719khhg2zwpyiwa2079i6962qcxpapm28hmr4ckpsp2n659ck")))) (build-system meson-build-system) (arguments `(#:configure-flags @@ -1514,9 +1515,11 @@ modules for building a Wayland compositor.") ("pulseaudio" ,pulseaudio) ("spdlog" ,spdlog) ("wayland" ,wayland))) - (native-inputs `(("glib:bin" ,glib "bin") - ("pkg-config" ,pkg-config) - ("wayland-protocols" ,wayland-protocols))) + (native-inputs + `(("gcc" ,gcc-8) ; for #include + ("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/Alexays/Waybar") (synopsis "Wayland bar for Sway and Wlroots based compositors") (description "Waybar is a highly customisable Wayland bar for Sway and -- cgit v1.2.3 From 336b6d3cfb45a228dc9fc1a0c20b603c41960d8f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Aug 2020 23:24:04 +0200 Subject: gnu: bspwm: Update to 0.9.10. * gnu/packages/wm.scm (bspwm): Update to 0.9.10. --- 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 2ffba9e5a2..a1036654aa 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -117,7 +117,7 @@ (define-public bspwm (package (name "bspwm") - (version "0.9.9") + (version "0.9.10") (source (origin (method git-fetch) @@ -126,7 +126,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1i7crmljk1vra1r6alxvj6lqqailjjcv0llyg7a0gm23rbv4a42g")))) + (base32 "0qlv7b4c2mmjfd65y100d11x8iqyg5f6lfiws3cgmpjidhdygnxc")))) (build-system gnu-build-system) (inputs `(("libxcb" ,libxcb) -- cgit v1.2.3 From 9c814c337946f5e70b0dbe45fb54f451b06fe0b2 Mon Sep 17 00:00:00 2001 From: EuAndreh via Guix-patches via Date: Sat, 8 Aug 2020 06:24:21 -0300 Subject: gnu: Add yeganesh. * gnu/packages/wm.scm (yeganesh): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a1036654aa..28c3a3bac6 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Boris A. Dekshteyn ;;; Copyright © 2020 Marcin Karpezo +;;; Copyright © 2020 EuAndreh ;;; ;;; This file is part of GNU Guix. ;;; @@ -743,6 +744,29 @@ is also usable with any other window manager. While xmobar is written in Haskell, no knowledge of the language is required to install and use it.") (license license:bsd-3))) +(define-public yeganesh + (package + (name "yeganesh") + (version "2.4") + (source + (origin + + (method url-fetch) + (uri (string-append "http://dmwit.com/yeganesh/yeganesh-" version ".tar.gz")) + (sha256 + (base32 "04djfyjab3c5y9z9x8zd0xcx0jyy35zq7cl9ddr4ppf6k5ky6iky")))) + (build-system haskell-build-system) + (inputs + `(("ghc-strict" ,ghc-strict) + ("ghc-xdg-basedir" ,ghc-xdg-basedir))) + (home-page "http://dmwit.com/yeganesh/") + (synopsis "Small wrapper around dmenu") + (description "@code{yeganesh} is a small wrapper around demnu. Like +dmenu, it accepts input on stdin and writes the chosen result on stdout. +Unlike dmenu, it mangles the input before it presents its choices. In +particular, it displays commonly-chosen options before uncommon ones.") + (license license:bsd-3))) + (define-public ghc-xmonad-contrib (package (name "ghc-xmonad-contrib") -- cgit v1.2.3 From 56c39a07c8adb8130bb1293ccbe84cfe3e442a95 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 19 Aug 2020 12:33:17 +1000 Subject: gnu: waybar: Build documentation. * gnu/packages/wm.scm (waybar)native-inputs]: Add scdoc. Signed-off-by: Efraim Flashner --- 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 28c3a3bac6..53930d4580 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1543,6 +1543,7 @@ modules for building a Wayland compositor.") `(("gcc" ,gcc-8) ; for #include ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config) + ("scdoc" ,scdoc) ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/Alexays/Waybar") (synopsis "Wayland bar for Sway and Wlroots based compositors") -- cgit v1.2.3 From 2f3d23e12aa14b297ac0dc4c520da8a19eac3e53 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 19 Aug 2020 10:53:20 +0300 Subject: gnu: waybar: Remove unrecognized configure flag. * gnu/packages/wm.scm (waybar)[arguments]: Remove field. --- gnu/packages/wm.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 53930d4580..bb5a91a230 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1524,9 +1524,6 @@ modules for building a Wayland compositor.") (sha256 (base32 "0ks719khhg2zwpyiwa2079i6962qcxpapm28hmr4ckpsp2n659ck")))) (build-system meson-build-system) - (arguments - `(#:configure-flags - (list (string-append "-Dout=" (assoc-ref %outputs "out"))))) (inputs `(("date" ,date) ("fmt" ,fmt) ("gtk-layer-shell" ,gtk-layer-shell) -- cgit v1.2.3 From 57983029a9ad86dfad3ae5e352c24557ffae9829 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 2 Sep 2020 18:05:36 -0400 Subject: gnu: xmonad: Add patch to support dynamic linking. Fixes . * gnu/packages/patches/xmonad-dynamic-linking.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/wm.scm (xmonad)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/patches/xmonad-dynamic-linking.patch | 16 ++++++++++++++++ gnu/packages/wm.scm | 3 ++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/xmonad-dynamic-linking.patch (limited to 'gnu/packages/wm.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 6e47d74e0a..d2753f52ae 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1676,6 +1676,7 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ + %D%/packages/patches/xmonad-dynamic-linking.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ diff --git a/gnu/packages/patches/xmonad-dynamic-linking.patch b/gnu/packages/patches/xmonad-dynamic-linking.patch new file mode 100644 index 0000000000..4f3386e53a --- /dev/null +++ b/gnu/packages/patches/xmonad-dynamic-linking.patch @@ -0,0 +1,16 @@ +This patch is required for xmonad to make use of shared libraries. +Without it, xmonad will not work since we do not (by default) use +statically linked Haskell libraries. + +diff -ruN xmonad-0.15-a/src/XMonad/Core.hs xmonad-0.15-b/src/XMonad/Core.hs +--- xmonad-0.15-a/src/XMonad/Core.hs 1969-12-31 19:00:00.000000000 -0500 ++++ xmonad-0.15-b/src/XMonad/Core.hs 1969-12-31 19:00:00.000000000 -0500 +@@ -681,6 +681,8 @@ + compileGHC bin dir errHandle = + runProcess "ghc" ["--make" + , "xmonad.hs" ++ , "-dynamic" ++ , "-fPIC" + , "-i" + , "-ilib" + , "-fforce-recomp" diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index bb5a91a230..15fbf43ec7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -655,7 +655,8 @@ desktop environment.") "xmonad-" version ".tar.gz")) (sha256 (base32 - "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa")))) + "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa")) + (patches (search-patches "xmonad-dynamic-linking.patch")))) (build-system haskell-build-system) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) -- cgit v1.2.3