From 0c6b92d272f94fc035e020b63e818f6304658ffa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 Jul 2020 22:00:12 +0300 Subject: gnu: enlightenment: Update to 0.24.2. * gnu/packages/enlightenment.scm (enlightenment): Update to 0.24.2. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 02e1b0e220..9abaf7fc87 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -288,7 +288,7 @@ Libraries with some extra bells and whistles.") (define-public enlightenment (package (name "enlightenment") - (version "0.24.1") + (version "0.24.2") (source (origin (method url-fetch) (uri @@ -296,7 +296,7 @@ Libraries with some extra bells and whistles.") "enlightenment/enlightenment-" version ".tar.xz")) (sha256 (base32 - "02aadl5fqvpmpjnisrc4aw7ffwyp1109y4k1wvmp33ciihbvdqmf")) + "1wfz0rwwsx7c1mkswn4hc9xw1i6bsdirhxiycf7ha2vcipqy465y")) (patches (search-patches "enlightenment-fix-setuid-path.patch")))) (build-system meson-build-system) (arguments -- cgit 1.4.1 From 02dcd14f84eb01d2902e9e0b4de7af9a2260929c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Jul 2020 12:02:37 +0300 Subject: gnu: terminology: Update to 1.8.0. * gnu/packages/enlightenment.scm (terminology): Update to 1.8.0. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 9abaf7fc87..3018a12216 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -199,7 +199,7 @@ removable devices or support for multimedia.") (define-public terminology (package (name "terminology") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri @@ -207,7 +207,7 @@ removable devices or support for multimedia.") "terminology/terminology-" version ".tar.xz")) (sha256 (base32 - "11qan2k6w94cglysh95yxkbv6hw9x15ri927hkiy3k0hbmpbrxc8")) + "0pvn8mdzxlx7181xdha32fbr0w8xl7hsnb3hfxr5099g841v1xf6")) (modules '((guix build utils))) ;; Remove the bundled fonts. (snippet -- cgit 1.4.1 From 5f18f36dcf26f3a8819547b39b38185c6828834e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Jul 2020 12:05:00 +0300 Subject: gnu: evisum: Update to 0.5.1. * gnu/packages/enlightenment.scm (evisum): Update to 0.5.1. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 3018a12216..33f0753dbc 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -572,7 +572,7 @@ directories. (define-public evisum (package (name "evisum") - (version "0.4.1") + (version "0.5.1") (source (origin (method url-fetch) @@ -580,7 +580,7 @@ directories. "evisum/evisum-" version ".tar.xz")) (sha256 (base32 - "0c3sgz6g8agig1i6fwn1jv318zsm556l9f3f0dm1jll146dlk2iv")))) + "1gl0nfcsfnzl9vc2qcm5chj2nsavdgyy8szpamq2ggnn5p9llh16")))) (build-system meson-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit 1.4.1 From 554b13f35a799a8929a04ea9c2645c8dbad7cfa3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 10 Aug 2020 21:37:35 +0300 Subject: gnu: evisum: Update to 0.5.2. * gnu/packages/enlightenment.scm (evisum): Update to 0.5.2. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 33f0753dbc..ad7568d97a 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -572,7 +572,7 @@ directories. (define-public evisum (package (name "evisum") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) @@ -580,7 +580,7 @@ directories. "evisum/evisum-" version ".tar.xz")) (sha256 (base32 - "1gl0nfcsfnzl9vc2qcm5chj2nsavdgyy8szpamq2ggnn5p9llh16")))) + "1s2d61hjlyh212d9d7rpdlcv90lxsb8br89806wakgnadqygh9gc")))) (build-system meson-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit 1.4.1 From 31b1455c0b9b864512672e916d457be4c11d7770 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 12 Aug 2020 14:21:41 +0300 Subject: gnu: terminology: Update to 1.8.1. * gnu/packages/enlightenment.scm (terminology): UPdate to 1.8.1. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index ad7568d97a..06b5dd8719 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -199,7 +199,7 @@ removable devices or support for multimedia.") (define-public terminology (package (name "terminology") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri @@ -207,7 +207,7 @@ removable devices or support for multimedia.") "terminology/terminology-" version ".tar.xz")) (sha256 (base32 - "0pvn8mdzxlx7181xdha32fbr0w8xl7hsnb3hfxr5099g841v1xf6")) + "1fxqjf7g30ix4qxi6366rrax27s3maxq43z2vakwnhz4mp49m9h4")) (modules '((guix build utils))) ;; Remove the bundled fonts. (snippet -- cgit 1.4.1 From 747873e81ba1d70026f10cb35c336507a2ce1e9b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Aug 2020 02:03:17 +0200 Subject: gnu: evisum: Update to 0.5.3. * gnu/packages/enlightenment.scm (evisum): Update to 0.5.3. --- gnu/packages/enlightenment.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 06b5dd8719..60b42f69dc 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Daniel Pimentel ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Nikita -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Timo Eisenmann ;;; ;;; This file is part of GNU Guix. @@ -572,18 +572,17 @@ directories. (define-public evisum (package (name "evisum") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (string-append "https://download.enlightenment.org/rel/apps/" "evisum/evisum-" version ".tar.xz")) (sha256 - (base32 - "1s2d61hjlyh212d9d7rpdlcv90lxsb8br89806wakgnadqygh9gc")))) + (base32 "06ws75qfid0xizasw2aqpdhvxl4c31bn66fqa8aq4w0rykzs2r46")))) (build-system meson-build-system) (arguments - '(#:tests? #f)) ; no tests + '(#:tests? #f)) ; no tests (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit 1.4.1 From 3d25a35d407bb5bbf9111750db276c1cf52f7272 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 28 Aug 2020 06:51:47 +0200 Subject: gnu: evisum: Update to 0.5.4. * gnu/packages/enlightenment.scm (evisum): Update to 0.5.4. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 60b42f69dc..fc229f1264 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -572,14 +572,14 @@ directories. (define-public evisum (package (name "evisum") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) (uri (string-append "https://download.enlightenment.org/rel/apps/" "evisum/evisum-" version ".tar.xz")) (sha256 - (base32 "06ws75qfid0xizasw2aqpdhvxl4c31bn66fqa8aq4w0rykzs2r46")))) + (base32 "1ip3w2d476g45sivqvm1madfyqmkni9q2i99qqxk53859jgs91pa")))) (build-system meson-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit 1.4.1 From b27786d130a81a03f676320d67b303363190556c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Sep 2020 15:11:02 +0300 Subject: gnu: enlightenment.scm: Remove unneeded module import. * gnu/packages/enlightenment.scm: Remove unneeded module import. --- gnu/packages/enlightenment.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index fc229f1264..f447b02a6a 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -32,7 +32,6 @@ #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages avahi) - #:use-module (gnu packages bash) #:use-module (gnu packages bittorrent) #:use-module (gnu packages check) #:use-module (gnu packages code) -- cgit 1.4.1 From e8ae96ae61d125940d832df5c898bec307109f83 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Sep 2020 15:35:41 +0300 Subject: gnu: enlightenment: Use system eject. * gnu/packages/enlightenment.scm (enlightenment)[arguments]: Adjust 'set-system-actions phase to refer to eject in /run/current-system. [native-inputs]: Remove util-linux. --- gnu/packages/enlightenment.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index f447b02a6a..cb72f3bad0 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -314,7 +314,6 @@ Libraries with some extra bells and whistles.") (setenv "HOME" "/tmp") (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) (setxkbmap (assoc-ref inputs "setxkbmap")) - (utils (assoc-ref inputs "util-linux")) (libc (assoc-ref inputs "libc")) (bc (assoc-ref inputs "bc")) (efl (assoc-ref inputs "efl"))) @@ -345,14 +344,13 @@ Libraries with some extra bells and whistles.") (substitute* "data/etc/meson.build" (("/bin/mount") "/run/setuid-programs/mount") (("/bin/umount") "/run/setuid-programs/umount") - (("/usr/bin/eject") (string-append utils "/bin/eject"))) + (("/usr/bin/eject") "/run/current-system/profile/bin/eject")) (substitute* "src/bin/system/e_system_power.c" (("systemctl") "loginctl")) #t)))))) (native-inputs `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("util-linux" ,util-linux))) + ("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) ("bc" ,bc) -- cgit 1.4.1 From 04b5fb926289f6e234f26d3c24280f2f6aaaea75 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Sep 2020 15:40:03 +0300 Subject: gnu: python-efl: Use regex to delete cythonized files. * gnu/packages/enlightenment.scm (python-efl)[source]: Adjust snippet to delete cythonized files based on a regex pattern. --- gnu/packages/enlightenment.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index cb72f3bad0..16e9dcb807 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -402,13 +402,15 @@ embedded systems.") (modules '((guix build utils))) ;; Remove files generated by Cython (snippet - '(begin - (copy-file "efl/dbus_mainloop/e_dbus.c" "efl/dbus_mainloop/e_dbus.q") - (for-each delete-file (find-files "efl" ".*\\.c$")) - (delete-file "efl/eo/efl.eo_api.h") - (copy-file "efl/dbus_mainloop/e_dbus.q" "efl/dbus_mainloop/e_dbus.c") - (delete-file "efl/dbus_mainloop/e_dbus.q") - #t)))) + '(begin + (for-each (lambda (file) + (let ((generated-file + (string-append (string-drop-right file 3) "c"))) + (when (file-exists? generated-file) + (delete-file generated-file)))) + (find-files "efl" "\\.pyx$")) + (delete-file "efl/eo/efl.eo_api.h") + #t)))) (build-system python-build-system) (arguments '(#:phases -- cgit 1.4.1 From f911b27918271a3cb50b516d09e943f14b05e228 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Sep 2020 15:45:37 +0300 Subject: gnu: enlightenment: Build with wayland support. * gnu/packages/enlightenment.scm (enlightenment)[arguments]: Add configure-flag to build with wayland support. [inputs]: Add wayland-protocols, xorg-server-xwayland. --- gnu/packages/enlightenment.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 16e9dcb807..cb920c5ff6 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -303,6 +303,7 @@ Libraries with some extra bells and whistles.") (let ((efl (assoc-ref %build-inputs "efl"))) (list "-Dsystemd=false" "-Dpackagekit=false" + "-Dwl=true" (string-append "-Dedje-cc=" efl "/bin/edje_cc") (string-append "-Deldbus-codegen=" efl "/bin/eldbus-codegen") (string-append "-Deet=" efl "/bin/eet"))) @@ -363,8 +364,10 @@ Libraries with some extra bells and whistles.") ("linux-pam" ,linux-pam) ("puleseaudio" ,pulseaudio) ("setxkbmap" ,setxkbmap) + ("wayland-protocols" ,wayland-protocols) ("xcb-util-keysyms" ,xcb-util-keysyms) - ("xkeyboard-config" ,xkeyboard-config))) + ("xkeyboard-config" ,xkeyboard-config) + ("xorg-server-xwayland" ,xorg-server-xwayland))) (home-page "https://www.enlightenment.org/about-enlightenment") (synopsis "Lightweight desktop environment") (description -- cgit 1.4.1 From 92c83efc9485bb58472e968b08f3614efb5f8930 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Sep 2020 15:46:13 +0300 Subject: gnu: enlightenment-wayland: Deprecate package. * gnu/packages/enlightenment.scm (enlightenment-wayland): Deprecate package in favor of enlightenment. --- gnu/packages/enlightenment.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages/enlightenment.scm') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index cb920c5ff6..5821912599 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -378,17 +378,7 @@ embedded systems.") (license license:bsd-2))) (define-public enlightenment-wayland - (package - (inherit enlightenment) - (name "enlightenment-wayland") - (arguments - (substitute-keyword-arguments (package-arguments enlightenment) - ((#:configure-flags flags) - `(cons* "-Dwl=true" ,flags)))) - (inputs - `(("wayland-protocols" ,wayland-protocols) - ("xorg-server-xwayland" ,xorg-server-xwayland) - ,@(package-inputs enlightenment))))) + (deprecated-package "enlightenment-wayland" enlightenment)) (define-public python-efl (package -- cgit 1.4.1