From 36ebf117dd48623360adf9aecd19d677ad22af95 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 11 Dec 2023 20:30:03 -0500 Subject: [PATCH 01/94] nongnu: Remove linux-6.5. linux-libre-6.5 was removed upstream in 4bf4e340b74b66a0fc319aeb100fb1f948a67211. * nongnu/packages/linux.scm (linux-6.5): Remove variable. --- nongnu/packages/linux.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 7853ac4..3300609 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -106,9 +106,6 @@ on hardware which requires nonfree software to function.")))) (define-public linux-6.6 (corrupt-linux linux-libre-6.6)) -(define-public linux-6.5 - (corrupt-linux linux-libre-6.5)) - (define-public linux-6.1 (corrupt-linux linux-libre-6.1)) From e3694f827b96b523dc9dd980790ccd29c7a038a5 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sun, 10 Dec 2023 16:04:23 +0100 Subject: [PATCH 02/94] nongnu: vscodium: Update to 1.85.0.23343. * nongnu/packages/editors (vscodium): Update to 1.85.0.23343. Signed-off-by: John Kehayias --- nongnu/packages/editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/editors.scm b/nongnu/packages/editors.scm index 7c4fe60..d9a5c0a 100644 --- a/nongnu/packages/editors.scm +++ b/nongnu/packages/editors.scm @@ -13,7 +13,7 @@ (define-public vscodium (package (name "vscodium") - (version "1.81.1.23222") + (version "1.85.0.23343") (source (origin (method url-fetch) @@ -22,7 +22,7 @@ "https://github.com/VSCodium/vscodium/releases/download/" version "/VSCodium-linux-x64-" version ".tar.gz")) (sha256 - (base32 "0wx53ajjwil82s3nl6wvpdf01mh33yqasf1ia54s1rfzz10fa1m6")))) + (base32 "16m7a2j9rmnp9pqpyyy2dx09paj1qh0h4gb1dhhwakw7w0zjlxn5")))) (build-system chromium-binary-build-system) (arguments (list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files From 3aa291a94a77f2f2d03b0cb2aff235db36a800c0 Mon Sep 17 00:00:00 2001 From: Remco van 't Veer Date: Mon, 4 Dec 2023 15:58:34 +0100 Subject: [PATCH 03/94] nongnu: clj-kondo: Update to 2023.10.20. * nongnu/packages/clojure.scm (clj-kondo): Update to 2023.10.20. Signed-off-by: John Kehayias --- nongnu/packages/clojure.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/clojure.scm b/nongnu/packages/clojure.scm index 3ef3ff4..6b94616 100644 --- a/nongnu/packages/clojure.scm +++ b/nongnu/packages/clojure.scm @@ -85,7 +85,7 @@ lets you focus on your code.") (define-public clj-kondo (package (name "clj-kondo") - (version "2023.01.20") + (version "2023.10.20") (source (origin (method url-fetch/zipbomb) (uri (string-append @@ -93,7 +93,7 @@ lets you focus on your code.") version "/clj-kondo-" version "-linux-amd64.zip")) (sha256 (base32 - "0i91qaqjnrg7ad0rs1r4rjwi77pr16dhck9bflb4kiyggcbs4dds")))) + "1zb4bkmhv5mh18z8h82qa1a0m95pd5dwdxg31pqgs6lnlca3vsph")))) (build-system binary-build-system) (arguments `(#:patchelf-plan From 0dce1e6b6d108625bce709759231085caafa2655 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 11 Dec 2023 21:01:53 -0500 Subject: [PATCH 04/94] nongnu: element-desktop: Update to 1.11.51 [security fixes]. Previous versions include fixes for CVE-2023-5217 and CVE-2023-4863. * nongnu/packages/messaging.scm (element-desktop): Update to 1.11.51. --- nongnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 0bddb98..bc04d8e 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -36,7 +36,7 @@ (define-public element-desktop (package (name "element-desktop") - (version "1.11.41") + (version "1.11.51") (source (origin (method url-fetch) @@ -45,7 +45,7 @@ "https://packages.riot.im/debian/pool/main/e/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "1m07b1ykmxly16irca171z4f718as7hqsccp1q7qrqj9b5lkmv64")))) + (base32 "018i2ba66g4lr7cm9psnrkjhw6y5jpfa5imdfa34xlpbf0pglp6r")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments From f9327439b8d3507933c6b70514a9e2f239f350ee Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 11 Dec 2023 21:05:24 -0500 Subject: [PATCH 05/94] nongnu: signal-desktop: Update to 6.41.0. * nongnu/packages/messaging.scm (signal-desktop): Update to 6.41.0 --- nongnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index bc04d8e..a6ffee9 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -98,7 +98,7 @@ its core.") (define-public signal-desktop (package (name "signal-desktop") - (version "6.39.1") + (version "6.41.0") (source (origin (method url-fetch) @@ -107,7 +107,7 @@ its core.") "https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "0rlcn3fyzc69x52g634nd7wryfkkrmykp62wl590shp92nkx8dkl")))) + (base32 "0y69dap2arsnmm193f731n1mavcq2cjrbdd26cr5fl934fgp428g")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments From e721ad7dfd050aaca55c839dbf5ca1ba3345567c Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 11 Dec 2023 21:10:48 -0500 Subject: [PATCH 06/94] nongnu: zoom: Update to 5.16.10.668. * nongnu/packages/messaging.scm (zoom): Update to 5.16.10.668. --- nongnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index a6ffee9..d2d13ab 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -160,14 +160,14 @@ or iOS.") (define-public zoom (package (name "zoom") - (version "5.15.12.7665") + (version "5.16.10.668") (source (origin (method url-fetch) (uri (string-append "https://cdn.zoom.us/prod/" version "/zoom_x86_64.tar.xz")) (file-name (string-append name "-" version "-x86_64.tar.xz")) (sha256 - (base32 "1pmxgfafwlxnrcw1fay91krjqbf1kaf5ng4f3na0p6liyd5c6fhq")))) + (base32 "01h16n235jr3fzvx6kzl1kv38k74n6418m2wjprlxa3hydqmcm7d")))) (supported-systems '("x86_64-linux")) (build-system binary-build-system) (arguments From 25b3a7b6f6ed6aa78c30ea3ea51828c15b729bcb Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 13 Dec 2023 17:55:24 +0100 Subject: [PATCH 07/94] nongnu: hplip-plugin: Update source hash. Inherited hplip package was updated to 3.23.12 in commit 392de3262ef388ec282d4311a7c2954e86e5aac9 of guix. * nongnu/packages/printers.scm (hplip-plugin)[native-inputs]: Update sha256 hash for hplip-plugin. --- nongnu/packages/printers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/printers.scm b/nongnu/packages/printers.scm index 9e1cdac..77d5f98 100644 --- a/nongnu/packages/printers.scm +++ b/nongnu/packages/printers.scm @@ -1,7 +1,7 @@ ;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Kahka F -;;; Copyright © 2021 Jonathan Brielmaier +;;; Copyright © 2021, 2023 Jonathan Brielmaier (define-module (nongnu packages printers) #:use-module (gnu packages) @@ -40,7 +40,7 @@ ;; hplip is updated in Guix. (sha256 (base32 - "09kixd9pb0p94bw3xyqy9h62gwqnbwcjjsvb2g3wvl6zxp4j1fvy"))))) + "0zq66hm7ni6w1c3cxy1gxrxzvyvfn0lhjnia8p4azvz2r309j9s0"))))) (package-native-inputs hplip))) (arguments (substitute-keyword-arguments (package-arguments hplip) From 5d308347ca094d045dcc932540262f5f60c63eed Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 19 Dec 2023 17:25:43 +0100 Subject: [PATCH 08/94] nongnu: firefox-esr: Update to 115.6.0esr [security fixes]. Fixes CVE-2023-6856, CVE-2023-6857, CVE-2023-6858, CVE-2023-6859, CVE-2023-6860, CVE-2023-6861, CVE-2023-6862, CVE-2023-6863, CVE-2023-6864, CVE-2023-6865, CVE-2023-6867. * nongnu/packages/mozilla.scm (firefox-esr): Update to 115.6.0esr. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/mozilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index 734a74c..63d87e9 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -97,19 +97,19 @@ ;; Update this id with every firefox update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. -(define %firefox-esr-build-id "20231120132923") +(define %firefox-esr-build-id "20231218150756") (define-public firefox-esr (package (name "firefox-esr") - (version "115.5.0esr") + (version "115.6.0esr") (source (origin (method url-fetch) (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" version "/source/firefox-" version ".source.tar.xz")) (sha256 - (base32 "0a578r4kri7jdw8pkkzp7f1mm9idlk7sjxjghcb08k5p14172gyv")))) + (base32 "0rmw486yhkb1is1j2fy51djl5p5qggf2fhp2hgzfdj4s2bjydmv6")))) (build-system gnu-build-system) (arguments (list From 75541ecc299ad884e1e9dc04e8d4a347bfe40cbf Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 19 Dec 2023 17:25:47 +0100 Subject: [PATCH 09/94] nongnu: firefox: Update to 121.0 [security fixes]. Fixes CVE-2023-6135, CVE-2023-6856, CVE-2023-6857, CVE-2023-6858, CVE-2023-6859, CVE-2023-6860, CVE-2023-6861, CVE-2023-6863, CVE-2023-6864, CVE-2023-6865, CVE-2023-6866, CVE-2023-6867, CVE-2023-6868, CVE-2023-6869, CVE-2023-6870, CVE-2023-6871, CVE-2023-6872, CVE-2023-6873. Firefox 121.0 uses Wayland now by default when available on Linux: https://www.mozilla.org/en-US/firefox/121.0/releasenotes/ * nongnu/packages/mozilla.scm (firefox): Update to 121.0. (firefox/wayland): Remove variable and deprecate the package. Co-authored-by: Ada Stevenson Signed-off-by: Jonathan Brielmaier --- nongnu/packages/mozilla.scm | 44 +++++-------------------------------- 1 file changed, 6 insertions(+), 38 deletions(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index 63d87e9..a207db2 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -532,20 +532,20 @@ MOZ_ENABLE_WAYLAND=1 exec ~a $@\n" ;; Update this id with every firefox update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. -(define %firefox-build-id "20231129224408") +(define %firefox-build-id "20231218153158") (define-public firefox (package (inherit firefox-esr) (name "firefox") - (version "120.0.1") + (version "121.0") (source (origin (method url-fetch) (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" version "/source/firefox-" version ".source.tar.xz")) (sha256 - (base32 "1qlsjpiwgr17bd0dphshs6dj23889m7h3sfq8j21b0282hmbprvn")))) + (base32 "193al259awzfi5c3pf8257p8qr9i4biapx9bw8ijmzr3klasbizd")))) (arguments (substitute-keyword-arguments (package-arguments firefox-esr) ((#:phases phases) @@ -562,38 +562,6 @@ MOZ_ENABLE_WAYLAND=1 exec ~a $@\n" "Full-featured browser client built from Firefox source tree, without the official icon and the name \"firefox\"."))) -(define-public firefox/wayland - (package - (inherit firefox) - (name "firefox-wayland") - (native-inputs '()) - (inputs - `(("bash" ,bash-minimal) - ("firefox" ,firefox))) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((bash (assoc-ref %build-inputs "bash")) - (firefox (assoc-ref %build-inputs "firefox")) - (out (assoc-ref %outputs "out")) - (exe (string-append out "/bin/firefox"))) - (mkdir-p (dirname exe)) - - (call-with-output-file exe - (lambda (port) - (format port "#!~a -MOZ_ENABLE_WAYLAND=1 exec ~a $@\n" - (string-append bash "/bin/bash") - (string-append firefox "/bin/firefox")))) - (chmod exe #o555) - - ;; Provide the manual and .desktop file. - (copy-recursively (string-append firefox "/share") - (string-append out "/share")) - (substitute* (string-append - out "/share/applications/firefox.desktop") - ((firefox) out)) - #t)))))) +;; As of Firefox 121.0, Firefox uses Wayland by default. This means we no longer need a seperate package +;; for Firefox on Wayland. +(deprecated-package "firefox-wayland" firefox) From f0c8465ed2a0eff5e2411e0f22b0146a386fee69 Mon Sep 17 00:00:00 2001 From: Ada Stevenson Date: Wed, 20 Dec 2023 14:33:37 +0800 Subject: [PATCH 10/94] nongnu: linux-firmware: Update to 20231211. * nongnu/packages/linux.scm (linux-firmware): Update to 20231211. [source]: Remove no longer needed patch. [arguments]: Replace 'install phase to not call rdfind. * nongnu/packages/patches/copy-firmware-rdfind.patch: Remove file. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 9 +++--- .../patches/copy-firmware-rdfind.patch | 31 ------------------- 2 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 nongnu/packages/patches/copy-firmware-rdfind.patch diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 3300609..0094b1c 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -245,22 +245,23 @@ stable, responsive and smooth desktop experience.")))) (define-public linux-firmware (package (name "linux-firmware") - (version "20231111") + (version "20231211") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/firmware/" "linux-firmware-" version ".tar.xz")) (sha256 (base32 - "165hrdwfvkqngmdf5s759wzfk8wpa8h6bln31bjady1z570mjjcd")) - (patches - (search-patches "nongnu/packages/patches/copy-firmware-rdfind.patch")))) + "1fz8vflidayal6gpjvmp75ni04b9ndxbpp5krmlpilxbbr5pxbwn")))) (build-system gnu-build-system) (arguments `(#:tests? #f #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" "install-nodedup" make-flags))) (delete 'validate-runpath)))) (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git") diff --git a/nongnu/packages/patches/copy-firmware-rdfind.patch b/nongnu/packages/patches/copy-firmware-rdfind.patch deleted file mode 100644 index 08ccfad..0000000 --- a/nongnu/packages/patches/copy-firmware-rdfind.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/copy-firmware.sh b/copy-firmware.sh -index f9b1f0ff..de28e882 100755 ---- a/copy-firmware.sh -+++ b/copy-firmware.sh -@@ -69,11 +69,6 @@ if [ -z "$destdir" ]; then - exit 1 - fi - --if ! which rdfind 2>/dev/null >/dev/null; then -- echo "ERROR: rdfind is not installed" -- exit 1 --fi -- - # shellcheck disable=SC2162 # file/folder name can include escaped symbols - grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do - test -f "$f" || continue -@@ -87,14 +82,6 @@ grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' - fi - done - --$verbose "Finding duplicate files" --rdfind -makesymlinks true -makeresultsfile false "$destdir" >/dev/null --find "$destdir" -type l | while read -r l; do -- target="$(realpath "$l")" -- $verbose "Correcting path for $l" -- ln -fs "$(realpath --relative-to="$(dirname "$(realpath -s "$l")")" "$target")" "$l" --done -- - # shellcheck disable=SC2162 # file/folder name can include escaped symbols - grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do - if test -L "$f$compext"; then From 71a53faf2e1925a309b480f17e5b836740ce54bc Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 21 Dec 2023 15:01:35 +0100 Subject: [PATCH 11/94] nongnu: firefox-wayland: Make deprecation public. * nongnu/packages/mozilla.scm (firefox-wayland): Make the deprecation public. Follow-up: 75541ecc299ad884e1e9dc04e8d4a347bfe40cbf Fixes: https://gitlab.com/nonguix/nonguix/-/merge_requests/386#note_1704258921 Reported-by: Ada Stevenson --- nongnu/packages/mozilla.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index a207db2..fdc2ca7 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -564,4 +564,5 @@ the official icon and the name \"firefox\"."))) ;; As of Firefox 121.0, Firefox uses Wayland by default. This means we no longer need a seperate package ;; for Firefox on Wayland. -(deprecated-package "firefox-wayland" firefox) +(define-public firefox-wayland + (deprecated-package "firefox-wayland" firefox)) From 181e3acdf6d619d79945ec7d66ac65ad1d4a8f1a Mon Sep 17 00:00:00 2001 From: Dariqq <6424921-Dariqq@users.noreply.gitlab.com> Date: Wed, 27 Dec 2023 16:44:06 +0000 Subject: [PATCH 12/94] nongnu: linux-4.14: Disable gcc plugins. * nongnu/packages/linux.scm (linux-4.14): Add additonal config options. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 0094b1c..baf3760 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -122,7 +122,12 @@ on hardware which requires nonfree software to function.")))) (corrupt-linux linux-libre-4.19)) (define-public linux-4.14 - (corrupt-linux linux-libre-4.14)) + (corrupt-linux linux-libre-4.14 + #:configs + '("# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set" + "# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set" + "# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set" + "# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set"))) (define-public linux linux-6.6) ;; linux-lts points to the *newest* released long-term support version. From 801c09a60c8efe4a1e0a08ebcbf7442f11465335 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sun, 10 Dec 2023 15:30:29 +0100 Subject: [PATCH 13/94] nongnu: Update google-chrome-stable to 120.0.6099.71. * nongnu/packages/chrome.scm (make-google-chrome)[arguments]: Add some bundled libraries and add nacl_helper only on stable channel; (google-chrome-stable): update to 120.0.6099.71. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/chrome.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/chrome.scm b/nongnu/packages/chrome.scm index ec281e9..ff3a0de 100644 --- a/nongnu/packages/chrome.scm +++ b/nongnu/packages/chrome.scm @@ -15,6 +15,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages pciutils) #:use-module (gnu packages photo) + #:use-module (gnu packages qt) #:use-module (gnu packages video) #:use-module (gnu packages wget) #:use-module (gnu packages xiph) @@ -55,9 +56,17 @@ '("chrome" "chrome-sandbox" "chrome_crashpad_handler" - "nacl_helper" "libEGL.so" - "libGLESv2.so"))) + "libGLESv2.so" + "liboptimization_guide_internal.so" + "libqt5_shim.so" + "libqt6_shim.so" + "libvk_swiftshader.so" + "libvulkan.so.1" + "WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" + #$@(if (string=? repo "stable") + '("nacl_helper") + '())))) #:install-plan #~'(("opt/" "/share") ("usr/share/" "/share")) @@ -135,6 +144,8 @@ opus pciutils pipewire + qtbase-5 + qtbase snappy util-linux xdg-utils @@ -146,7 +157,7 @@ (license (nonfree "https://www.google.com/intl/en/chrome/terms/"))))) (define-public google-chrome-stable - (make-google-chrome "stable" "118.0.5993.70" "1bq170l0g9yq17x6xlg6fjar6gv3hdi0zijwmx4s02pmw6727484")) + (make-google-chrome "stable" "120.0.6099.71" "15r1kx4jnbrcw7kfma528ks5ic17s4ydh1ncsb680himhln02z64")) (define-public google-chrome-beta (make-google-chrome "beta" "117.0.5938.22" "11w1di146mjb9ql30df9yk9x4b9amc6514jzyfbf09mqsrw88dvr")) From 9970630a037776c198eec5ef0aa10760315c23fe Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sun, 10 Dec 2023 15:30:56 +0100 Subject: [PATCH 14/94] nongnu: Update google-chrome-beta to 121.0.6167.8. * nongnu/packages/chrome.scm google-chrome-beta: Update to 121.0.6167.8. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/chrome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/chrome.scm b/nongnu/packages/chrome.scm index ff3a0de..6a40ba1 100644 --- a/nongnu/packages/chrome.scm +++ b/nongnu/packages/chrome.scm @@ -160,7 +160,7 @@ (make-google-chrome "stable" "120.0.6099.71" "15r1kx4jnbrcw7kfma528ks5ic17s4ydh1ncsb680himhln02z64")) (define-public google-chrome-beta - (make-google-chrome "beta" "117.0.5938.22" "11w1di146mjb9ql30df9yk9x4b9amc6514jzyfbf09mqsrw88dvr")) + (make-google-chrome "beta" "121.0.6167.8" "0q5gdsczhqyk4irhqwfw4qcspk3bi8knj83lx5hx000lil5nqc46")) (define-public google-chrome-unstable (make-google-chrome "unstable" "119.0.6034.6" "156rsklyi1z014pyximwyjsnc2rhdky1kck9g63738vnhcv398b0")) From 76e8ca00db99250210dac3db8ab55ccb783f9088 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sun, 10 Dec 2023 15:31:36 +0100 Subject: [PATCH 15/94] nongnu: Update google-chrome-unstable to 122.0.6170.3. * nongnu/packages/chrome.scm google-chrome-unstable: Update to 122.0.6170.3. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/chrome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/chrome.scm b/nongnu/packages/chrome.scm index 6a40ba1..388b02c 100644 --- a/nongnu/packages/chrome.scm +++ b/nongnu/packages/chrome.scm @@ -163,4 +163,4 @@ (make-google-chrome "beta" "121.0.6167.8" "0q5gdsczhqyk4irhqwfw4qcspk3bi8knj83lx5hx000lil5nqc46")) (define-public google-chrome-unstable - (make-google-chrome "unstable" "119.0.6034.6" "156rsklyi1z014pyximwyjsnc2rhdky1kck9g63738vnhcv398b0")) + (make-google-chrome "unstable" "122.0.6170.3" "04plb14z3wlagg2b2p9plr91if1r84mnmb46cxs08x3m6dapqcj6")) From 6e4db2848afdedc65fa1304ffeb7028d37fa9f29 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 28 Dec 2023 16:33:04 +0100 Subject: [PATCH 16/94] nongnu: r8168-linux-module: Update to 8.052.01. Fixes build with newer kernel version. * nongnu/packages/linux.scm (r8168-linux-module): Update to 8.052.01. [arguments]: Remove phases to fix build as proper fix is now in upstream. --- nongnu/packages/linux.scm | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index baf3760..583d19f 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Timotej Lazar ;;; Copyright © 2020, 2021 James Smith -;;; Copyright © 2020, 2021, 2022 Jonathan Brielmaier +;;; Copyright © 2020-2023 Jonathan Brielmaier ;;; Copyright © 2020, 2022 Michael Rohleder ;;; Copyright © 2020, 2021, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021, 2022 Zhu Zihao @@ -824,7 +824,7 @@ RTL8812AU, RTL8821AU, and RTL8814AU chips.") (define-public r8168-linux-module (package (name "r8168-linux-module") - (version "8.051.02") + (version "8.052.01") (source (origin (method git-fetch) (uri (git-reference @@ -833,19 +833,9 @@ RTL8812AU, RTL8821AU, and RTL8814AU chips.") (file-name (git-file-name name version)) (sha256 (base32 - "16mpr0np6xbmzdnwg4p3q6yli2gh032k98g4vplya33hrn50vh52")))) + "01mi7hh92nc7jaxkfrpz7j0ci78djrhgmq0im4k1270mwmvr0yzj")))) (arguments - (list #:tests? #f - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'enter-src-directory - (lambda _ - (chdir "src"))) - ;; Needed to compile module for linux >= 6.1 - (add-before 'build 'fix-build - (lambda _ - (substitute* "r8168.h" - (("netif_napi_add\\(ndev, &priv->napi, function, weight\\)") - "netif_napi_add(ndev, &priv->napi, function)"))))))) + (list #:tests? #f)) (build-system linux-module-build-system) (home-page "https://github.com/mtorromeo/r8168") (synopsis "Linux driver for Realtek PCIe network adapters") From d9260c9eeb8608a44d525cfbca41ae983dae5341 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 28 Dec 2023 16:40:38 +0100 Subject: [PATCH 17/94] nongnu: rtl8192eu-linux-module: Update to 0.0.0-6.a928f08. * nongnu/packages/linux.scm (rtl8192eu-linux-module): Update to 0.0.0-6.a928f08. --- nongnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 583d19f..52d9e98 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -706,8 +706,8 @@ package contains nonfree firmware for the following chips: (deprecated-package "rtl-bt-firmware" realtek-firmware)) (define-public rtl8192eu-linux-module - (let ((commit "865656c3a1d1aee8c4ba459ce7608756d17c712f") - (revision "5")) + (let ((commit "a928f08c1dd4f9a1e84d85811a543e974551bc4f") + (revision "6")) (package (name "rtl8192eu-linux-module") (version (git-version "0.0.0" revision commit)) @@ -720,7 +720,7 @@ package contains nonfree firmware for the following chips: (file-name (git-file-name name version)) (sha256 (base32 - "08nq0wlrpzm8n2g14c4jlxs0crr6s5ls1n14bc17zmpy9vlarhfx")))) + "1q26kyic4glmgy0hbaq46r067m6cqf7d41chgivyxn8y32rf1fgc")))) (build-system linux-module-build-system) (arguments `(#:make-flags From 768f182776e9fb3e839883cf219bf4da6899de26 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 28 Dec 2023 17:06:16 +0100 Subject: [PATCH 18/94] nongnu: helix-core: Update to r23.1. * nongnu/packages/version-control.scm (helix-core): Update to r23.1. --- nongnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/version-control.scm b/nongnu/packages/version-control.scm index 1948f7d..675bf88 100644 --- a/nongnu/packages/version-control.scm +++ b/nongnu/packages/version-control.scm @@ -13,7 +13,7 @@ (define-public helix-core (package (name "helix-core") - (version "r22.1") + (version "r23.1") (source (origin (method url-fetch) (uri (string-append "https://ftp.perforce.com/perforce/" version @@ -28,7 +28,7 @@ ("i686-linux" "0f5qs55rspw86axnmml3nxx551lwbxwz1cgi9kmy2f9g5rrplnkn") (_ - "077rfbjgyhdgv76i2727s3yk3p52y75nml8n9wv8g7mvhfs9ypa9")))))) + "1vqfkhgbx6ch7710w8mmm7hydl6jmd9qgzs0gfjg8gvd5gnh1csr")))))) (build-system binary-build-system) (arguments `(#:strip-binaries? #f From 00e0b5f319d660298f9650f8e225e755fdf79e6d Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Thu, 21 Sep 2023 02:19:27 +0200 Subject: [PATCH 19/94] nonguix: binary: Automatically detect and unpack .deb files. A new binary-unpack phase is added to the binary-build-system. When a supported binary file is detected as the only file after the unpack phase it is then decompressed in a specific directory. * nonguix/build/binary-build-system.scm (deb-file?): new variable; (unpack-deb): new variable; (binary-unpack): new variable; (%standard-phases): use the new phase. Signed-off-by: Jonathan Brielmaier --- nonguix/build/binary-build-system.scm | 29 +++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/nonguix/build/binary-build-system.scm b/nonguix/build/binary-build-system.scm index 087ef89..147aa18 100644 --- a/nonguix/build/binary-build-system.scm +++ b/nonguix/build/binary-build-system.scm @@ -1,6 +1,7 @@ ;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2022 Attila Lendvai +;;; Copyright © 2023 Giacomo Leidi (define-module (nonguix build binary-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) @@ -133,10 +134,34 @@ The inputs are optional when the file is an executable." patchelf-plan))) #t) +(define (deb-file? binary-file) + (string-suffix? ".deb" binary-file)) + +(define (unpack-deb deb-file) + (invoke "ar" "x" deb-file) + (invoke "tar" "xvf" "data.tar.xz") + (invoke "rm" "-rfv" "control.tar.gz" + "data.tar.xz" + deb-file + "debian-binary")) + +(define* (binary-unpack #:key source #:allow-other-keys) + (let* ((files (filter (lambda (f) + (not (string=? (basename f) "environment-variables"))) + (find-files (getcwd)))) + (binary-file (car files))) + (when (= 1 (length files)) + (mkdir "binary") + (chdir "binary") + (match binary-file + ((? deb-file?) (unpack-deb binary-file)) + (_ (format #t "Unknown file type: ~a~%" (basename binary-file))))))) + (define %standard-phases - ;; Everything is as with the GNU Build System except for the `configure' - ;; , `build', `check' and `install' phases. + ;; Everything is as with the GNU Build System except for the `binary-unpack', + ;; `configure', `build', `check' and `install' phases. (modify-phases gnu:%standard-phases + (add-after 'unpack 'binary-unpack binary-unpack) (delete 'bootstrap) (delete 'configure) (delete 'build) From a33d57ee74638b675d3951279e731839d50ddc78 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Thu, 21 Sep 2023 02:29:00 +0200 Subject: [PATCH 20/94] nongnu: chrome: Avoid manually unpacking .deb file. * nongnu/packages/chrome.scm (make-google-chrome)[phases] Drop 'unpack-deb phase; [native-inputs]: drop tar. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/chrome.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/nongnu/packages/chrome.scm b/nongnu/packages/chrome.scm index 388b02c..16d7f89 100644 --- a/nongnu/packages/chrome.scm +++ b/nongnu/packages/chrome.scm @@ -72,16 +72,6 @@ ("usr/share/" "/share")) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'unpack-deb - (lambda* (#:key inputs #:allow-other-keys) - (invoke "ar" "x" #$source) - (invoke "rm" "-v" "control.tar.xz" - "debian-binary" - (string-append "google-chrome-" #$repo "_" - #$version - "-1_amd64.deb")) - (invoke "tar" "xf" "data.tar.xz") - (invoke "rm" "-vrf" "data.tar.xz" "etc"))) (add-before 'install 'patch-assets ;; Many thanks to ;; https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -128,7 +118,6 @@ (symlink chrome-target exe) (wrap-program exe '("CHROME_WRAPPER" = (#$appname))))))))) - (native-inputs (list tar)) (inputs (list bzip2 curl From a6c27f4d2f8a93e0027e38f4d31eb60ed8ed813e Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Thu, 21 Sep 2023 02:34:15 +0200 Subject: [PATCH 21/94] nongnu: signal-desktop: Avoid manually unpacking .deb file. * nongnu/packages/messaging.scm (signal-desktop)[phases]: Replace with 'setup-cwd; : there's no need anymore to care about the environment-variables file; [native-inputs]: drop tar. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/messaging.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index d2d13ab..35ebb49 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -116,26 +116,19 @@ its core.") #~'("lib/Signal/signal-desktop") #:phases #~(modify-phases %standard-phases - (replace 'unpack + (add-after 'binary-unpack 'setup-cwd (lambda _ - (invoke "ar" "x" #$source) - (invoke "tar" "xvf" "data.tar.xz") (copy-recursively "usr/" ".") ;; Use the more standard lib directory for everything. (rename-file "opt/" "lib") ;; Remove unneeded files. (delete-file-recursively "usr") - (delete-file "control.tar.gz") - (delete-file "data.tar.xz") - (delete-file "debian-binary") - (delete-file "environment-variables") ;; Fix the .desktop file binary location. (substitute* '("share/applications/signal-desktop.desktop") (("/opt/Signal/") (string-append #$output "/bin/"))))) - (add-after 'install 'symlink-binary-file-and-cleanup + (add-after 'install 'symlink-binary-file (lambda _ - (delete-file (string-append #$output "/environment-variables")) (mkdir-p (string-append #$output "/bin")) (symlink (string-append #$output "/lib/Signal/signal-desktop") (string-append #$output "/bin/signal-desktop")))) @@ -147,7 +140,6 @@ its core.") (list (string-append #$output "/lib/Signal")) ":"))))))))) - (native-inputs (list tar)) (home-page "https://signal.org/") (synopsis "Private messenger using the Signal protocol") (description "Signal Desktop is an Electron application that links with Signal on Android From 9a0253ae893aca6d3363bd5ad9158b4dc2fbfa98 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Thu, 21 Sep 2023 02:37:54 +0200 Subject: [PATCH 22/94] nongnu: element-desktop: Avoid manually unpacking .deb file. * nongnu/packages/messaging.scm (element-desktop)[phases]: Replace with 'setup-cwd; : there's no need anymore to care about the environment-variables file; [native-inputs]: drop tar. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/messaging.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 35ebb49..2fe5f15 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -54,25 +54,19 @@ #~'("lib/Element/element-desktop") #:phases #~(modify-phases %standard-phases - (replace 'unpack + (add-after 'binary-unpack 'setup-cwd (lambda _ - (invoke "ar" "x" #$source) - (invoke "tar" "xvf" "data.tar.xz") (copy-recursively "usr/" ".") ;; Use the more standard lib directory for everything. (rename-file "opt/" "lib") ;; Remove unneeded files. (delete-file-recursively "usr") - (delete-file "control.tar.gz") - (delete-file "data.tar.xz") - (delete-file "debian-binary") ;; Fix the .desktop file binary location. (substitute* '("share/applications/element-desktop.desktop") (("/opt/Element/") (string-append #$output "/bin/"))))) - (add-after 'install 'symlink-binary-file-and-cleanup + (add-after 'install 'symlink-binary-file (lambda _ - (delete-file (string-append #$output "/environment-variables")) (mkdir-p (string-append #$output "/bin")) (symlink (string-append #$output "/lib/Element/element-desktop") (string-append #$output "/bin/element-desktop")))) @@ -84,8 +78,6 @@ (list (string-append #$output "/lib/Element")) ":"))))))))) - - (native-inputs (list tar)) (home-page "https://github.com/vector-im/element-desktop") (synopsis "Matrix collaboration client for desktop") (description "Element Desktop is a Matrix client for desktop with Element Web at From 62d1c7ab6b2bda4d301e0f10d290d9250ac92d10 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Thu, 21 Sep 2023 02:42:33 +0200 Subject: [PATCH 23/94] nongnu: lycheeslicer: Avoid manually unpacking .deb file. * nongnu/packages/engineering.scm (lycheeslicer)[phases]: Replace with 'setup-cwd; : there's no need anymore to care about the environment-variables file; [native-inputs]: drop tar. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/engineering.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/nongnu/packages/engineering.scm b/nongnu/packages/engineering.scm index e4ddd5b..b05f6c0 100644 --- a/nongnu/packages/engineering.scm +++ b/nongnu/packages/engineering.scm @@ -35,28 +35,22 @@ #~'("lib/LycheeSlicer/lycheeslicer") #:phases #~(modify-phases %standard-phases - (replace 'unpack + (add-after 'binary-unpack 'setup-cwd (lambda _ - (invoke "ar" "x" #$source) - (invoke "tar" "xvf" "data.tar.xz") ;; Use the more standard lib directory for everything. (rename-file "opt/" "lib") (mkdir-p "share") (copy-recursively "usr/share" "share") ;; Remove unneeded files. - (delete-file-recursively "usr") - (delete-file "control.tar.gz") - (delete-file "data.tar.xz") - (delete-file "debian-binary"))) - (add-after 'unpack 'fix-desktop-file + (delete-file-recursively "usr"))) + (add-after 'setup-cwd 'fix-desktop-file (lambda _ ;; Fix the .desktop file binary location. (substitute* '("share/applications/lycheeslicer.desktop") (("/opt/LycheeSlicer") (string-append #$output "/lib/LycheeSlicer"))))) - (add-before 'install-wrapper 'symlink-binary-file-and-cleanup + (add-before 'install-wrapper 'symlink-binary-file (lambda _ - (delete-file (string-append #$output "/environment-variables")) (mkdir-p (string-append #$output "/bin")) (symlink (string-append #$output "/lib/LycheeSlicer/lycheeslicer") (string-append #$output "/bin/lycheeslicer")))) @@ -68,7 +62,6 @@ (list (string-append #$output "/lib/LycheeSlicer")) ":"))))))))) - (native-inputs (list tar)) (inputs (list libxscrnsaver)) (home-page "https://mango3d.io") From 13114fa36da9cac4d14b7fc559ec6731d98cb443 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sat, 7 Oct 2023 11:21:28 +0200 Subject: [PATCH 24/94] nongnu: anytype: Avoid manually unpacking .deb file. * nongnu/packages/productivity.scm (anytype)[phases] Drop 'unpack-deb phase; [native-inputs]: drop tar. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/productivity.scm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/nongnu/packages/productivity.scm b/nongnu/packages/productivity.scm index d063288..89ab0bc 100644 --- a/nongnu/packages/productivity.scm +++ b/nongnu/packages/productivity.scm @@ -58,14 +58,6 @@ ("usr/share/" "/share")) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'unpack-deb - (lambda* (#:key inputs #:allow-other-keys) - (invoke "ar" "x" #$source) - (invoke "rm" "-v" "control.tar.gz" - "debian-binary" - (string-append "anytype-" #$version ".deb")) - (invoke "tar" "xvf" "data.tar.xz") - (invoke "rm" "-vrf" "data.tar.xz"))) (add-before 'install 'patch-assets (lambda _ (let* ((bin (string-append #$output "/bin")) @@ -86,7 +78,6 @@ (symlink target exe) (wrap-program exe `("LD_LIBRARY_PATH" = (,share))))))))) - (native-inputs (list tar)) (inputs (list bzip2 flac From 0f355661044affec8532380fff6d5f027fbd899a Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 29 Dec 2023 00:34:06 +0100 Subject: [PATCH 25/94] nongnu: clj-kondo: Fix build. The new unpack-binary phase seems to not harmonize with patchelf always: https://gitlab.com/nonguix/nonguix/-/merge_requests/336#note_1709385147 * nongnu/packages/clojure.scm (clj-kondo)[arguments]: Delete 'binary-unpack phase for now and change style to gexp. [native-inputs]: change style to gexp. [inputs]: dito. --- nongnu/packages/clojure.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nongnu/packages/clojure.scm b/nongnu/packages/clojure.scm index 6b94616..25170ed 100644 --- a/nongnu/packages/clojure.scm +++ b/nongnu/packages/clojure.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Jelle Licht ;;; Copyright © 2020 Alex Griffin +;;; Copyright © 2023 Jonathan Brielmaier (define-module (nongnu packages clojure) #:use-module (gnu packages compression) @@ -11,6 +12,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (nonguix build-system binary) @@ -96,20 +98,18 @@ lets you focus on your code.") "1zb4bkmhv5mh18z8h82qa1a0m95pd5dwdxg31pqgs6lnlca3vsph")))) (build-system binary-build-system) (arguments - `(#:patchelf-plan - '(("clj-kondo" ("gcc:lib" "zlib"))) - #:install-plan - '(("clj-kondo" "/bin/")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'chmod - (lambda _ - (chmod "clj-kondo" #o755)))))) + (list #:patchelf-plan `'(("clj-kondo" ("gcc" "zlib"))) + #:install-plan `'(("clj-kondo" "/bin/")) + #:phases #~(modify-phases %standard-phases + (delete 'binary-unpack) + (add-after 'unpack 'chmod + (lambda _ + (chmod "clj-kondo" #o755)))))) (native-inputs - `(("unzip" ,unzip))) + (list unzip)) (inputs - `(("gcc:lib" ,gcc "lib") - ("zlib" ,zlib))) + (list `(,gcc "lib") + zlib)) (supported-systems '("x86_64-linux")) (home-page "https://github.com/clj-kondo/clj-kondo") (synopsis "Linter for Clojure code") From 8956906f6bed6709e71f0c26ed6a3620f40dc487 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 29 Dec 2023 00:47:13 +0100 Subject: [PATCH 26/94] nongnu: libsteam: Fix build. The new unpack-binary phase seems to not harmonize with patchelf always: https://gitlab.com/nonguix/nonguix/-/merge_requests/336#note_1709385147 * nongnu/packages/game-development.scm (libsteam)[arguments]: Delete 'binary-unpack for now. --- nongnu/packages/game-development.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/nongnu/packages/game-development.scm b/nongnu/packages/game-development.scm index 566cea2..0e28127 100644 --- a/nongnu/packages/game-development.scm +++ b/nongnu/packages/game-development.scm @@ -144,6 +144,7 @@ development should opt for GLSL rather than Cg.") (copy-file (assoc-ref inputs "source") "libsteam_api.so") (chmod "libsteam_api.so" #o644) #t)) + (delete 'binary-unpack) (add-after 'install 'symlink (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) From 07b884a7b1f019f427e4d17e0094326069152f40 Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Fri, 15 Dec 2023 21:04:24 +0100 Subject: [PATCH 27/94] nongnu: steam-nvidia: Fix launching .desktop files. Steam installs .desktop files that refer to an executable called `steam'. Installing steam-nvidia as the `steam-nvidia' executable breaks this, which means Steam cannot be launched from its desktop icon. This also applies to .desktop files for individual games generated by Steam, when they are copied from `/.local/share/applications/'. Fix this by always installing Steam's wrapper executable as `steam'. We add a new field using "binary" to keep things shorter. This has the downside that the `steam' and `steam-nvidia' packages cannot be installed in the same profile, but likely people wouldn't want to do this anyway. Fixes #294. * nongnu/packages/steam-client.scm (steam-nvidia-container)[binary-name]: Specify for compatibility with .desktop files. * nonguix/multiarch-container.scm ()[binary-name, ngc-binary-name]: New field and accessor. (nonguix-container->package): Use it to set correct executable name. (make-internal-script): Use it in message. Co-authored-by: John Kehayias Signed-off-by: John Kehayias --- nongnu/packages/steam-client.scm | 3 +++ nonguix/multiarch-container.scm | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/steam-client.scm b/nongnu/packages/steam-client.scm index 2f313c7..c8ff950 100644 --- a/nongnu/packages/steam-client.scm +++ b/nongnu/packages/steam-client.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021, 2022 John Kehayias ;;; Copyright © 2023 Giacomo Leidi ;;; Copyright © 2023 Elijah Malaby +;;; Copyright © 2023 Timo Wilken (define-module (nongnu packages steam-client) #:use-module ((guix licenses) #:prefix license:) @@ -200,6 +201,8 @@ all games will be installed."))) (nonguix-container (inherit steam-container) (name "steam-nvidia") + ;; Steam's .desktop files expect a "steam" executable, so provide that. + (binary-name "steam") (union64 (replace-mesa (ngc-union64 steam-container))) (union32 (replace-mesa (ngc-union32 steam-container))))) diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index b333b71..8d3bf70 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2023 Giacomo Leidi ;;; Copyright © 2023 Attila Lendvai ;;; Copyright © 2023 Elijah Malaby +;;; Copyright © 2023 Timo Wilken ;;; The script provided by this package may optionally be started as ;;; a shell instead of automatically launching the wrapped entrypoint by setting @@ -50,6 +51,7 @@ #:export (nonguix-container nonguix-container? ngc-name + ngc-binary-name ngc-version ngc-wrap-package ngc-run @@ -82,6 +84,7 @@ nonguix-container make-nonguix-container nonguix-container? this-nonguix-container (name ngc-name) + (binary-name ngc-binary-name (default (ngc-name this-nonguix-container)) (thunked)) (version ngc-version (default #f)) (wrap-package ngc-wrap-package) (run ngc-run) @@ -207,7 +210,7 @@ in a sandboxed FHS environment." (manifest-target (assoc-ref %build-inputs "fhs-manifest")) (manifest-dest (string-append out "/etc/" ,(ngc-manifest-name container))) (wrapper-target (assoc-ref %build-inputs "fhs-wrapper")) - (wrapper-dest (string-append out "/bin/" ,(ngc-name container))) + (wrapper-dest (string-append out "/bin/" ,(ngc-binary-name container))) (link-files ',(ngc-link-files container))) (mkdir-p (string-append out "/sbin")) (mkdir-p (string-append out "/etc")) @@ -528,7 +531,7 @@ application." (if asound32-opt (display "\n\n/etc/asound.conf configured for 32-bit.\n\n\n") (display (string-append "\n\n/etc/asound.conf configured for 64-bit.\nLaunch " - #$(ngc-name container) + #$(ngc-binary-name container) " with \"" (basename #$(ngc-run container)) " -- --asound32\" to use 32-bit instead.\n\n\n"))) From 1591c3d1d10b2884da29ab7d1252304f2ce1514b Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 3 Jan 2024 19:59:33 -0500 Subject: [PATCH 28/94] nongnu: Rename (nongnu packages steam-client) module. * nongnu/packages/steam-client.scm: Rename to ... * nongnu/packages/game-client.scm: ... this. --- nongnu/packages/{steam-client.scm => game-client.scm} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename nongnu/packages/{steam-client.scm => game-client.scm} (99%) diff --git a/nongnu/packages/steam-client.scm b/nongnu/packages/game-client.scm similarity index 99% rename from nongnu/packages/steam-client.scm rename to nongnu/packages/game-client.scm index c8ff950..18bc21d 100644 --- a/nongnu/packages/steam-client.scm +++ b/nongnu/packages/game-client.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2023 Elijah Malaby ;;; Copyright © 2023 Timo Wilken -(define-module (nongnu packages steam-client) +(define-module (nongnu packages game-client) #:use-module ((guix licenses) #:prefix license:) #:use-module ((nonguix licenses) #:prefix license:) #:use-module (guix git-download) From c6771b89c36f4e1bf3eb4e66232ef3b9ae5cd435 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 3 Jan 2024 20:07:12 -0500 Subject: [PATCH 29/94] news: Add entry for steam-client module renaming. * news.txt: Add entry. --- news.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/news.txt b/news.txt index b4ebd48..1ce2ed9 100644 --- a/news.txt +++ b/news.txt @@ -9,6 +9,14 @@ (channel-news (version 0) + (entry (commit "efc2678cbcd85c9cdb759500dcd8ab53c05095ff") + (title + (en "(nongnu packages steam-client) module renamed")) + (body + (en "The (nongnu packages steam-client) module has been renamed to (nongnu packages +game-client). This is to better reflect the contents with the addition of the +Heroic client in a following commit."))) + (entry (commit "9456c59cfa580399ab450ca0057321e2d81f3319") (title (en "Linux LTS kernel updated to 6.1") From e823034e401a94e4fdffd81d4d9e926b05f1c856 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 3 Jan 2024 20:08:28 -0500 Subject: [PATCH 30/94] nongnu: Add heroic. * nongnu/packages/game-client.scm (heroic-client, heroic-extra-client-libs, heroic-container, heroic-nvidia-container, heroic, heroic-nvidia): New variables. * nonguix/multi-arch-container.scm (make-container-wrapper): Preserve "^SSL_" for heroic to use curl. (make-internal-script): Add symlink for "/usr/share/glib-2.0". --- nongnu/packages/game-client.scm | 112 +++++++++++++++++++++++++++++++- nonguix/multiarch-container.scm | 2 + 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index 18bc21d..fa935b6 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2021 pineapples ;;; Copyright © 2021 Jean-Baptiste Volatier ;;; Copyright © 2021 Kozo -;;; Copyright © 2021, 2022 John Kehayias +;;; Copyright © 2021, 2022, 2023, 2024 John Kehayias ;;; Copyright © 2023 Giacomo Leidi ;;; Copyright © 2023 Elijah Malaby ;;; Copyright © 2023 Timo Wilken @@ -15,6 +15,7 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages audio) @@ -22,6 +23,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages certs) #:use-module (gnu packages compression) + #:use-module (gnu packages curl) #:use-module (gnu packages elf) #:use-module (gnu packages file) #:use-module (gnu packages fonts) @@ -49,9 +51,68 @@ #:use-module (gnu packages toolkits) #:use-module (gnu packages video) #:use-module (gnu packages xorg) + #:use-module (nonguix build-system chromium-binary) #:use-module (nonguix multiarch-container) #:use-module (nonguix utils)) +(define heroic-client + (package + (name "heroic-client") + (version "2.11.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/Heroic-Games-Launcher/" + "HeroicGamesLauncher/releases/download/v" + version "/heroic_" version "_amd64.deb")) + (sha256 + (base32 + "1g54rzhgbqqd7nsbd08p3jkdyy01gz0q8yvhpcd698jpi2ks87q0")))) + (build-system chromium-binary-build-system) + (arguments + (list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files + #:wrapper-plan + #~'("lib/Heroic/heroic" + "lib/Heroic/libEGL.so" + "lib/Heroic/libGLESv2.so" + "lib/Heroic/libvk_swiftshader.so" + "lib/Heroic/libvulkan.so.1" + "lib/Heroic/chrome-sandbox" + "lib/Heroic/chrome_crashpad_handler" + "lib/Heroic/libffmpeg.so") + #:phases + #~(modify-phases %standard-phases + (add-after 'binary-unpack 'setup-cwd + (lambda _ + (copy-recursively "usr/" ".") + ;; Use the more standard lib directory for everything. + (rename-file "opt/" "lib") + ;; Remove unneeded files. + (delete-file-recursively "usr") + ;; Fix the .desktop file binary location. + (substitute* '("share/applications/heroic.desktop") + (("/opt/Heroic/") + (string-append #$output "/bin/"))))) + (add-after 'install 'symlink-binary-file + (lambda _ + (mkdir-p (string-append #$output "/bin")) + (symlink (string-append #$output "/lib/Heroic/heroic") + (string-append #$output "/bin/heroic")))) + (add-after 'install-wrapper 'wrap-where-patchelf-does-not-work + (lambda _ + (wrap-program (string-append #$output "/lib/Heroic/heroic") + `("LD_LIBRARY_PATH" ":" prefix + (,(string-join + (list + (string-append #$output "/lib/Heroic")) + ":"))))))))) + (home-page "https://heroicgameslauncher.com") + (synopsis "A Native GOG, Amazon and Epic Games Launcher") + (description "Heroic is an Open Source Game Launcher. Right now it supports launching +games from the Epic Games Store using Legendary, GOG Games using our custom +implementation with gogdl and Amazon Games using Nile.") + (license license:gpl3))) + (define steam-client (package (name "steam-client") @@ -157,6 +218,11 @@ ("python" ,python) ; Required for KillingFloor2 and Wreckfest. ("spdlog" ,spdlog))) ; Required for MangoHud. +(define heroic-extra-client-libs + `(("curl" ,curl) ; Required for Heroic to download e.g. Wine. + ("which" ,which) ; Heroic complains about trying to use which (though works). + ("gtk+" ,gtk+))) ; Required for Heroic interface (gtk filechooser schema). + (define steam-ld.so.conf (packages->ld.so.conf (list (fhs-union `(,@steam-client-libs @@ -209,6 +275,50 @@ all games will be installed."))) (define-public steam (nonguix-container->package steam-container)) (define-public steam-nvidia (nonguix-container->package steam-nvidia-container)) +(define-public heroic-container + (nonguix-container + (name "heroic") + (wrap-package heroic-client) + (run "/bin/heroic") + (ld.so.conf steam-ld.so.conf) + (ld.so.cache steam-ld.so.cache) + ;; TODO: Probably can remove some of the packages from these lists, at + ;; least changing the client libraries as Heroic is rather different from + ;; Steam. However, a good number will be needed to run games anyway. A + ;; better separation and testing in Steam as well would be helpful to + ;; differentiate what packages are needed for what in general. For now, + ;; this is easier and works. + (union64 + (fhs-union `(,@heroic-extra-client-libs + ,@steam-client-libs + ,@steam-gameruntime-libs + ,@fhs-min-libs) + #:name "fhs-union-64")) + ;; Don't include heroic-client-libs as they are not needed in 32-bit. + (union32 + (fhs-union `(,@steam-client-libs + ,@steam-gameruntime-libs + ,@fhs-min-libs) + #:name "fhs-union-32" + #:system "i686-linux")) + (link-files '("share/applications/heroic.desktop")) + (description "Heroic is an Open Source Game Launcher. Right now it supports launching +games from the Epic Games Store using Legendary, GOG Games using our custom +implementation with gogdl and Amazon Games using Nile. This package provides +a script for launching Heroic in a Guix container which will use the directory +@file{$HOME/.local/share/guix-sandbox-home} where all games will be +installed."))) + +(define-public heroic-nvidia-container + (nonguix-container + (inherit heroic-container) + (name "heroic-nvidia") + (union64 (replace-mesa (ngc-union64 heroic-container))) + (union32 (replace-mesa (ngc-union32 heroic-container))))) + +(define-public heroic (nonguix-container->package heroic-container)) +(define-public heroic-nvidia (nonguix-container->package heroic-nvidia-container)) + (define-public protonup-ng (package (name "protonup-ng") diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index 8d3bf70..135a72c 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -287,6 +287,7 @@ in a sandboxed FHS environment." "^QT_X11_NO_MITSHM$" "^SDL_" "^STEAM_" + "^SSL_" ; SSL certificate environment, needed by curl for Heroic. "^VDPAU_DRIVER_PATH$" ; For VDPAU drivers. "^XAUTHORITY$" ;; Matching all ^XDG_ vars causes issues @@ -506,6 +507,7 @@ application." ((,union64 "lib/locale") . "/usr/lib/locale") ((,union64 "sbin/ldconfig") . "/sbin/ldconfig") ((,union64 "share/mime") . "/usr/share/mime") ; Steam tray icon. + ((,union64 "share/glib-2.0") . "/usr/share/glib-2.0") ; Heroic interface. ((,union64 "share/drirc.d") . "/usr/share/drirc.d") ((,union64 "share/fonts") . "/run/current-system/profile/share/fonts") ((,union64 "etc/fonts") . "/etc/fonts") From 4f2dca39151066eb752a37b0bf583a33c4092341 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 3 Jan 2024 23:34:01 -0500 Subject: [PATCH 31/94] news: Fix entry for steam-client module renaming. * news.txt: Use correct commit in steam-client module entry. --- news.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news.txt b/news.txt index 1ce2ed9..4f8973f 100644 --- a/news.txt +++ b/news.txt @@ -9,7 +9,7 @@ (channel-news (version 0) - (entry (commit "efc2678cbcd85c9cdb759500dcd8ab53c05095ff") + (entry (commit "1591c3d1d10b2884da29ab7d1252304f2ce1514b") (title (en "(nongnu packages steam-client) module renamed")) (body From a328f6c91f3d24508ff37338e6a68ba82aaa0141 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Fri, 29 Dec 2023 22:23:03 +0100 Subject: [PATCH 32/94] nonguix: binary: Cleanup when an unknown binary extension is detected. The binary-unpack phase suffered from a problem for unknown binary file extensions, see: !336 (comment 1709385147) . This patch fixes the incorrect behavior by effectively restoring the state of the directory tree before the phase. * nonguix/build/binary-build-system.scm (binary-unpack): Restore the environment as it was before this phase. * nongnu/packages/clojure.scm (clj-kondo)[arguments]: No longer delete 'binary-unpack phase. * nongnu/packages/game-development.scm (libsteam)[arguments]: dito. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/clojure.scm | 1 - nongnu/packages/game-development.scm | 1 - nonguix/build/binary-build-system.scm | 7 ++++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/clojure.scm b/nongnu/packages/clojure.scm index 25170ed..234fafd 100644 --- a/nongnu/packages/clojure.scm +++ b/nongnu/packages/clojure.scm @@ -101,7 +101,6 @@ lets you focus on your code.") (list #:patchelf-plan `'(("clj-kondo" ("gcc" "zlib"))) #:install-plan `'(("clj-kondo" "/bin/")) #:phases #~(modify-phases %standard-phases - (delete 'binary-unpack) (add-after 'unpack 'chmod (lambda _ (chmod "clj-kondo" #o755)))))) diff --git a/nongnu/packages/game-development.scm b/nongnu/packages/game-development.scm index 0e28127..566cea2 100644 --- a/nongnu/packages/game-development.scm +++ b/nongnu/packages/game-development.scm @@ -144,7 +144,6 @@ development should opt for GLSL rather than Cg.") (copy-file (assoc-ref inputs "source") "libsteam_api.so") (chmod "libsteam_api.so" #o644) #t)) - (delete 'binary-unpack) (add-after 'install 'symlink (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) diff --git a/nonguix/build/binary-build-system.scm b/nonguix/build/binary-build-system.scm index 147aa18..e5bbc48 100644 --- a/nonguix/build/binary-build-system.scm +++ b/nonguix/build/binary-build-system.scm @@ -155,7 +155,12 @@ The inputs are optional when the file is an executable." (chdir "binary") (match binary-file ((? deb-file?) (unpack-deb binary-file)) - (_ (format #t "Unknown file type: ~a~%" (basename binary-file))))))) + (_ + (begin + (format #t "Unknown file type: ~a~%" (basename binary-file)) + ;; Cleanup after ourselves + (chdir "..") + (rmdir "binary"))))))) (define %standard-phases ;; Everything is as with the GNU Build System except for the `binary-unpack', From 7dd68696a2e7052e76b11355bccfe148c1800169 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Thu, 4 Jan 2024 20:44:21 -0500 Subject: [PATCH 33/94] nongnu: multiarch-container: Fix missing module on foreign distros. Fixes #277. See discussion in above issue for details and some education on what went wrong here. In short, we didn't capture the needed (guix build utils) module in the container script. On a Guix System this didn't cause any problems as guix modules are found through set Guile environment variables. But on a foreign distro these weren't set without hacky workarounds. This prevented Steam from launching with a "no code for module" error. * nonguix/multiarch-container.scm (make-container-wrapper)[make-container-wrapper]: Use 'with-imported-modules' for (guix build utils). --- nonguix/multiarch-container.scm | 261 ++++++++++++++++---------------- 1 file changed, 131 insertions(+), 130 deletions(-) diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index 135a72c..1462881 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -239,136 +239,137 @@ in a sandboxed FHS environment." in a sandboxed FHS environment." (program-file (ngc-wrapper-name container) - #~(begin - (use-modules (guix build utils)) - (define (preserve-var var) - (string-append "--preserve=" var)) - (define* (add-path path #:key writable?) - (let ((opt (if writable? - "--share=" - "--expose="))) - (if (pair? path) - (string-append opt (car path) "=" (cdr path)) - (string-append opt path)))) - (define (exists-> file) - (if (and file (file-exists? file)) - `(,file) '())) - (let* ((run #$(file-append fhs-internal "/bin/" (ngc-internal-name container))) - (manifest-file #$(file-append fhs-manifest)) - (xdg-runtime (getenv "XDG_RUNTIME_DIR")) - (home (getenv "HOME")) - (sandbox-home (or (getenv "GUIX_SANDBOX_HOME") - (string-append home "/" #$(ngc-sandbox-home container)))) - (preserved-env '("^DBUS_" - "^DISPLAY$" - "^DRI_PRIME$" - "^GDK_SCALE$" ; For UI scaling. - "^GUIX_LOCPATH$" ; For pressure-vessel locales. - ;; For startup of added non-Steam games as it - ;; seems they start in an early environment - ;; before our additional settings. (Likely - ;; this can be removed when rewritten to use - ;; --emulate-fhs from upstream.) Note that - ;; this is explicitly set below. We could - ;; preserve what is set before launching the - ;; container, but any such directories would - ;; need to be shared with the container as - ;; well; this is not needed currently. - "^LD_LIBRARY_PATH$" - "^MANGOHUD" ; For MangoHud configuration. - "^PRESSURE_VESSEL_" ; For pressure vessel options. - "_PROXY$" - "_proxy$" - ;; To allow workaround for upstream bug - ;; - ;; and tracked on our end as - ;; . - ;; TODO: Remove once upstream fixes this bug. - "^QT_X11_NO_MITSHM$" - "^SDL_" - "^STEAM_" - "^SSL_" ; SSL certificate environment, needed by curl for Heroic. - "^VDPAU_DRIVER_PATH$" ; For VDPAU drivers. - "^XAUTHORITY$" - ;; Matching all ^XDG_ vars causes issues - ;; discussed in 80decf05. - "^XDG_DATA_HOME$" - "^XDG_RUNTIME_DIR$" - ;; The following are useful for debugging. - "^CAPSULE_DEBUG$" - "^G_MESSAGES_DEBUG$" - "^LD_DEBUG$" - "^LIBGL_DEBUG$")) - (expose `("/dev/bus/usb" ; Needed for libusb. - "/dev/dri" - "/dev/input" ; Needed for controller input. - "/dev/uinput" ; Needed for Steam Input. - ,@(exists-> "/dev/nvidia0") ; needed for nvidia proprietary driver - ,@(exists-> "/dev/nvidiactl") - ,@(exists-> "/dev/nvidia-modeset") - ,@(exists-> "/etc/machine-id") - "/etc/localtime" ; Needed for correct time zone. - "/sys/class/drm" ; Needed for hw monitoring like MangoHud. - "/sys/class/hwmon" ; Needed for hw monitoring like MangoHud. - "/sys/class/hidraw" ; Needed for devices like the Valve Index. - "/sys/class/input" ; Needed for controller input. - ,@(exists-> "/sys/class/power_supply") ; Needed for power monitoring like MangoHud. - ,@(exists-> "/sys/class/powercap") ; Needed for power monitoring like MangoHud. - "/sys/dev" - "/sys/devices" - ,@(exists-> "/var/run/dbus") - #$@(ngc-exposed container))) - ;; /dev/hidraw is needed for SteamVR to access the HMD, although here we - ;; share all hidraw devices. Instead we could filter to only share specific - ;; device. See, for example, this script: - ;; https://arvchristos.github.io/post/matching-dev-hidraw-devices-with-physical-devices/ - (share `(,@(find-files "/dev" "hidraw") - "/dev/shm" - ;; "/tmp/.X11-unix" is needed for bwrap, and "/tmp" more generally - ;; for writing things like crash dumps and "steam_chrome_shm". - "/tmp" - ,(string-append sandbox-home "=" home) - ,@(exists-> (string-append home "/.config/pulse")) - ,@(exists-> (string-append xdg-runtime "/pulse")) - ,@(exists-> (string-append xdg-runtime "/bus")) - ,@(exists-> (getenv "XAUTHORITY")) - #$@(ngc-shared container))) - (DEBUG (equal? (getenv "DEBUG") "1")) - (args (cdr (command-line))) - (command (if DEBUG '() - `("--" ,run ,@args)))) - ;; Set this so that e.g. non-Steam games added to Steam will launch - ;; properly. It seems otherwise they don't make it to launching - ;; Steam's pressure-vessel container (for Proton games). - (setenv "LD_LIBRARY_PATH" "/lib64:/lib") - ;; Set this so Steam's pressure-vessel container does not need to - ;; generate locales, improving startup time. This needs to be set to - ;; the "usual" path, probably so they are included in the - ;; pressure-vessel container. - (setenv "GUIX_LOCPATH" "/usr/lib/locale") - ;; By default VDPAU drivers are searched for in libvdpau's store - ;; path, so set this path to where the drivers will actually be - ;; located in the container. - (setenv "VDPAU_DRIVER_PATH" "/lib64/vdpau") - (format #t "\n* Launching ~a in sandbox: ~a.\n\n" - #$(package-name (ngc-wrap-package container)) sandbox-home) - (when DEBUG - (format #t "* DEBUG set to 1: Starting shell. Launch application manually with: ~a.\n\n" - #$(ngc-internal-name container))) - (mkdir-p sandbox-home) - (invoke #$(file-append pulseaudio "/bin/pulseaudio") - "--start" - "--exit-idle-time=60") - (apply invoke - `("guix" "shell" - "--container" "--no-cwd" "--network" - ,@(map preserve-var preserved-env) - ,@(map add-path expose) - ,@(map (lambda (item) - (add-path item #:writable? #t)) - share) - "-m" ,manifest-file - ,@command)))))) + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (define (preserve-var var) + (string-append "--preserve=" var)) + (define* (add-path path #:key writable?) + (let ((opt (if writable? + "--share=" + "--expose="))) + (if (pair? path) + (string-append opt (car path) "=" (cdr path)) + (string-append opt path)))) + (define (exists-> file) + (if (and file (file-exists? file)) + `(,file) '())) + (let* ((run #$(file-append fhs-internal "/bin/" (ngc-internal-name container))) + (manifest-file #$(file-append fhs-manifest)) + (xdg-runtime (getenv "XDG_RUNTIME_DIR")) + (home (getenv "HOME")) + (sandbox-home (or (getenv "GUIX_SANDBOX_HOME") + (string-append home "/" #$(ngc-sandbox-home container)))) + (preserved-env '("^DBUS_" + "^DISPLAY$" + "^DRI_PRIME$" + "^GDK_SCALE$" ; For UI scaling. + "^GUIX_LOCPATH$" ; For pressure-vessel locales. + ;; For startup of added non-Steam games as it + ;; seems they start in an early environment + ;; before our additional settings. (Likely + ;; this can be removed when rewritten to use + ;; --emulate-fhs from upstream.) Note that + ;; this is explicitly set below. We could + ;; preserve what is set before launching the + ;; container, but any such directories would + ;; need to be shared with the container as + ;; well; this is not needed currently. + "^LD_LIBRARY_PATH$" + "^MANGOHUD" ; For MangoHud configuration. + "^PRESSURE_VESSEL_" ; For pressure vessel options. + "_PROXY$" + "_proxy$" + ;; To allow workaround for upstream bug + ;; + ;; and tracked on our end as + ;; . + ;; TODO: Remove once upstream fixes this bug. + "^QT_X11_NO_MITSHM$" + "^SDL_" + "^STEAM_" + "^SSL_" ; SSL certificate environment, needed by curl for Heroic. + "^VDPAU_DRIVER_PATH$" ; For VDPAU drivers. + "^XAUTHORITY$" + ;; Matching all ^XDG_ vars causes issues + ;; discussed in 80decf05. + "^XDG_DATA_HOME$" + "^XDG_RUNTIME_DIR$" + ;; The following are useful for debugging. + "^CAPSULE_DEBUG$" + "^G_MESSAGES_DEBUG$" + "^LD_DEBUG$" + "^LIBGL_DEBUG$")) + (expose `("/dev/bus/usb" ; Needed for libusb. + "/dev/dri" + "/dev/input" ; Needed for controller input. + "/dev/uinput" ; Needed for Steam Input. + ,@(exists-> "/dev/nvidia0") ; needed for nvidia proprietary driver + ,@(exists-> "/dev/nvidiactl") + ,@(exists-> "/dev/nvidia-modeset") + ,@(exists-> "/etc/machine-id") + "/etc/localtime" ; Needed for correct time zone. + "/sys/class/drm" ; Needed for hw monitoring like MangoHud. + "/sys/class/hwmon" ; Needed for hw monitoring like MangoHud. + "/sys/class/hidraw" ; Needed for devices like the Valve Index. + "/sys/class/input" ; Needed for controller input. + ,@(exists-> "/sys/class/power_supply") ; Needed for power monitoring like MangoHud. + ,@(exists-> "/sys/class/powercap") ; Needed for power monitoring like MangoHud. + "/sys/dev" + "/sys/devices" + ,@(exists-> "/var/run/dbus") + #$@(ngc-exposed container))) + ;; /dev/hidraw is needed for SteamVR to access the HMD, although here we + ;; share all hidraw devices. Instead we could filter to only share specific + ;; device. See, for example, this script: + ;; https://arvchristos.github.io/post/matching-dev-hidraw-devices-with-physical-devices/ + (share `(,@(find-files "/dev" "hidraw") + "/dev/shm" + ;; "/tmp/.X11-unix" is needed for bwrap, and "/tmp" more generally + ;; for writing things like crash dumps and "steam_chrome_shm". + "/tmp" + ,(string-append sandbox-home "=" home) + ,@(exists-> (string-append home "/.config/pulse")) + ,@(exists-> (string-append xdg-runtime "/pulse")) + ,@(exists-> (string-append xdg-runtime "/bus")) + ,@(exists-> (getenv "XAUTHORITY")) + #$@(ngc-shared container))) + (DEBUG (equal? (getenv "DEBUG") "1")) + (args (cdr (command-line))) + (command (if DEBUG '() + `("--" ,run ,@args)))) + ;; Set this so that e.g. non-Steam games added to Steam will launch + ;; properly. It seems otherwise they don't make it to launching + ;; Steam's pressure-vessel container (for Proton games). + (setenv "LD_LIBRARY_PATH" "/lib64:/lib") + ;; Set this so Steam's pressure-vessel container does not need to + ;; generate locales, improving startup time. This needs to be set to + ;; the "usual" path, probably so they are included in the + ;; pressure-vessel container. + (setenv "GUIX_LOCPATH" "/usr/lib/locale") + ;; By default VDPAU drivers are searched for in libvdpau's store + ;; path, so set this path to where the drivers will actually be + ;; located in the container. + (setenv "VDPAU_DRIVER_PATH" "/lib64/vdpau") + (format #t "\n* Launching ~a in sandbox: ~a.\n\n" + #$(package-name (ngc-wrap-package container)) sandbox-home) + (when DEBUG + (format #t "* DEBUG set to 1: Starting shell. Launch application manually with: ~a.\n\n" + #$(ngc-internal-name container))) + (mkdir-p sandbox-home) + (invoke #$(file-append pulseaudio "/bin/pulseaudio") + "--start" + "--exit-idle-time=60") + (apply invoke + `("guix" "shell" + "--container" "--no-cwd" "--network" + ,@(map preserve-var preserved-env) + ,@(map add-path expose) + ,@(map (lambda (item) + (add-path item #:writable? #t)) + share) + "-m" ,manifest-file + ,@command))))))) (define (make-container-manifest container fhs-internal) "Return a scheme file-like object to be used as package manifest for FHS From 1f91ecd3c06ac3275490311ec79bb8f361e9d963 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sat, 6 Jan 2024 17:01:18 -0500 Subject: [PATCH 34/94] nonguix: multiarch-container: Set LD_LIBRARY_PATH inside container. Fixes #303. Previously LD_LIBRARY_PATH was being set before the container was launched, which could cause issues on some foreign distros where this alters what is loaded from an FHS structure. This was only meant to be set inside the container, though this didn't cause any issues on a Guix System. * nonguix/multiarch-container.scm (make-container-wrapper): Move setting LD_LIBRARY_PATH from here ... (make-internal-script): ... to here. --- nonguix/multiarch-container.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index 1462881..6cbd14a 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -338,10 +338,6 @@ in a sandboxed FHS environment." (args (cdr (command-line))) (command (if DEBUG '() `("--" ,run ,@args)))) - ;; Set this so that e.g. non-Steam games added to Steam will launch - ;; properly. It seems otherwise they don't make it to launching - ;; Steam's pressure-vessel container (for Proton games). - (setenv "LD_LIBRARY_PATH" "/lib64:/lib") ;; Set this so Steam's pressure-vessel container does not need to ;; generate locales, improving startup time. This needs to be set to ;; the "usual" path, probably so they are included in the @@ -526,6 +522,16 @@ application." ;; (previous would output this error but continue). (if (file-exists? ".steam/root/bootstrap.tar.xz") (chmod ".steam/root/bootstrap.tar.xz" #o644)) + ;; TODO: Should other environment setup also happen inside the + ;; container rather than before container is launched? + ;; + ;; Set this so that e.g. non-Steam games added to Steam will + ;; launch properly. It seems otherwise they don't make it to + ;; launching Steam's pressure-vessel container (for Proton + ;; games). Wait to set this inside the container to not cause + ;; issues on foreign distros, see + ;; + (setenv "LD_LIBRARY_PATH" "/lib64:/lib") ;; Process FHS-specific command line options. (let* ((options (getopt-long (or fhs-args '("")) fhs-option-spec)) From f325d88cb6b47aea4d5bccb868bb411c98906486 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sat, 6 Jan 2024 15:09:03 +0100 Subject: [PATCH 35/94] nongnu: anytype: Update to 0.37.3. * nongnu/packages/productivity.scm (anytype): Update to 0.37.3; [arguments]: avoid hardcoding the icon path in anytype.desktop. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/productivity.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nongnu/packages/productivity.scm b/nongnu/packages/productivity.scm index 89ab0bc..d0b7f37 100644 --- a/nongnu/packages/productivity.scm +++ b/nongnu/packages/productivity.scm @@ -24,17 +24,17 @@ (define-public anytype (package (name "anytype") - (version "0.36.0") + (version "0.37.3") (source (origin (method url-fetch) (uri (string-append "https://download.anytype.io?action=download" - "&key=desktop&id=136705969")) + "&key=desktop&id=142685264")) (file-name (string-append "anytype-" version ".deb")) (sha256 (base32 - "17cs4w3k7nmjav873wwzpxb2dz4mp2zgkpz1karp3x2mxan0x2i3")))) + "197v4dsn21yfi9dhcrqdznz3vfzicd79fc4abbpifacgb4fxcxq8")))) (build-system chromium-binary-build-system) (arguments (list @@ -61,12 +61,10 @@ (add-before 'install 'patch-assets (lambda _ (let* ((bin (string-append #$output "/bin")) - (icon (string-append #$output "/share/icons/hicolor/0x0/apps/anytype.png")) (usr/share "./usr/share") (old-exe "/opt/Anytype/anytype") (exe (string-append bin "/anytype"))) (substitute* (string-append usr/share "/applications/anytype.desktop") - (("^Icon=anytype") (string-append "Icon=" icon)) (((string-append "^Exec=" old-exe)) (string-append "Exec=" exe)))))) (add-before 'install-wrapper 'symlink-entrypoint (lambda _ From 1eaa24df40ee65ce33a964639f3174b71466320b Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 9 Dec 2023 15:28:41 +0800 Subject: [PATCH 36/94] nongnu: make-linux-xanmod-source: Patch upstream kernel source instead. * nongnu/packages/linux.scm (make-linux-xanmod-source): Patch upstream linux source instead of downloading the auto-generated tarball from GitLab. (make-linux-xanmod)[arguments]<#:phases>: Delete 'remove-localversion, moved to snippet. (linux-xanmod-source,linux-xanmod-lts-source): Adjust accordingly. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 54 ++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 52d9e98..be6fb8e 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -147,12 +147,43 @@ on hardware which requires nonfree software to function.")))) ;;; Linux-XanMod ;;; -(define (make-linux-xanmod-source version xanmod-revision hash-string) +(define* (make-linux-xanmod-source version xanmod-revision + #:key xanmod-branch kernel-hash xanmod-hash) + + (define %upstream-linux-source + (@@ (gnu packages linux) %upstream-linux-source)) + + (define kernel-source + (%upstream-linux-source (version-major+minor version) kernel-hash)) + + (define xanmod-patch + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/xanmod/releases/" xanmod-branch "/" + version "-" xanmod-revision "/patch-" + version "-" xanmod-revision ".xz")) + (sha256 xanmod-hash))) + (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/xanmod/linux/-/archive/" - version "-" xanmod-revision ".tar.bz2")) - (sha256 hash-string))) + (inherit kernel-source) + (modules '((guix build utils))) + (snippet + #~(begin + (let* ((xz-name (basename #+xanmod-patch)) + (patch-xz-name (string-append (string-drop-right xz-name 3) + ".patch.xz")) + (patch-name (string-drop-right patch-xz-name 3))) + (copy-file #+xanmod-patch patch-xz-name) + (invoke #+(file-append xz "/bin/unxz") patch-xz-name) + (invoke #+(file-append patch "/bin/patch") + "--force" "--no-backup-if-mismatch" + #+@(origin-patch-flags kernel-source) + "--input" patch-name) + (for-each delete-file + (list patch-name + ;; EXTRAVERSION is used instead. + "localversion"))))))) (define* (make-linux-xanmod version xanmod-revision source #:key @@ -173,11 +204,6 @@ on hardware which requires nonfree software to function.")))) (substitute-keyword-arguments (package-arguments base) ((#:phases phases) #~(modify-phases #$phases - ;; EXTRAVERSION is used instead. - (add-after 'unpack 'remove-localversion - (lambda _ - (when (file-exists? "localversion") - (delete-file "localversion")))) (add-before 'configure 'add-xanmod-defconfig (lambda _ (rename-file @@ -221,7 +247,9 @@ stable, responsive and smooth desktop experience.")))) (make-linux-xanmod-source linux-xanmod-version linux-xanmod-revision - (base32 "020f97pd45lg9nw38j4hz4kqd2ch81fqdp3qkpnzpxf8kihzn2li"))) + #:xanmod-branch "main" + #:kernel-hash (base32 "117qmckqrabja9f9260vhrg08wkz4q3syzyaa9msfbl042y4nmvs") + #:xanmod-hash (base32 "1n10yl5wgqk0n6ijnnzlmidk61hazhhwzgjf7kkg9cgk7nsjs626"))) (define-public linux-xanmod-lts-version "6.1.61") (define-public linux-xanmod-lts-revision "xanmod1") @@ -229,7 +257,9 @@ stable, responsive and smooth desktop experience.")))) (make-linux-xanmod-source linux-xanmod-lts-version linux-xanmod-lts-revision - (base32 "1rp9g9qdrr2l0wwxx4myz6kr3agznama2r6q8an505l8mwdgwll8"))) + #:xanmod-branch "lts" + #:kernel-hash (base32 "1ssxn81jfl0jf9brczfrrwd1f1vmf594jvhrs7zgcc54a5qg389c") + #:xanmod-hash (base32 "036yl7a8x2y8mjwyb061vaw9zwabdddpvs7sii9ip27i34k0cl11"))) ;; Linux-XanMod packages (define-public linux-xanmod From 0b4f1c3affb1faf1aae2afb07bdd4e8697f87f2c Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 9 Dec 2023 15:58:47 +0800 Subject: [PATCH 37/94] nongnu: make-linux-xanmod: Adjust style. * nongnu/packages/linux.scm (%default-extra-linux-options,config->string): Move into make-linux-xanmod. (make-linux-xanmod): Adjust comments. Move the base kernel produced by customize-linux out of let form. [native-inputs]: Use prepend instead of append. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 112 ++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index be6fb8e..222862a 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -46,12 +46,6 @@ #:use-module (srfi srfi-1) #:export (corrupt-linux)) -(define %default-extra-linux-options - (@@ (gnu packages linux) %default-extra-linux-options)) - -(define config->string - (@@ (gnu packages linux) config->string)) - (define (linux-url version) "Return a URL for Linux VERSION." (string-append "mirror://kernel.org" @@ -189,56 +183,68 @@ on hardware which requires nonfree software to function.")))) #:key (name "linux-xanmod") (xanmod-defconfig "config_x86-64-v1")) - (let ((defconfig xanmod-defconfig) ;to be used in phases. - (base (customize-linux #:name name - #:source source - #:defconfig xanmod-defconfig - ;; EXTRAVERSION is used instead. - #:configs (config->string - '(("CONFIG_LOCALVERSION" . ""))) - #:extra-version xanmod-revision))) - (package - (inherit base) - (version version) - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases) - #~(modify-phases #$phases - (add-before 'configure 'add-xanmod-defconfig - (lambda _ - (rename-file - (string-append "CONFIGS/xanmod/gcc/" #$defconfig) - ".config") - ;; Adapted from `make-linux-libre*'. - (chmod ".config" #o666) - (let ((port (open-file ".config" "a")) - (extra-configuration - #$(config->string - ;; FIXME: There might be other support missing. - (append '(("CONFIG_BLK_DEV_NVME" . #t) - ("CONFIG_CRYPTO_XTS" . m) - ("CONFIG_VIRTIO_CONSOLE" . m)) - %default-extra-linux-options)))) - (display extra-configuration port) - (close-port port)) - (invoke "make" "oldconfig") + (define %default-extra-linux-options + (@@ (gnu packages linux) %default-extra-linux-options)) - (rename-file - ".config" - (string-append "arch/x86/configs/" #$defconfig)))))))) - (native-inputs - (modify-inputs (package-native-inputs base) - ;; cpio is needed for CONFIG_IKHEADERS. - (append cpio zstd))) - (home-page "https://xanmod.org/") - (supported-systems '("x86_64-linux")) - (synopsis - "Linux kernel distribution with custom settings and new features") - (description - "This package provides XanMod kernel, a general-purpose Linux kernel + (define config->string + (@@ (gnu packages linux) config->string)) + + (define base-kernel + (customize-linux + #:name name + #:source source + #:defconfig xanmod-defconfig + ;; EXTRAVERSION is used instead. + #:configs (config->string + '(("CONFIG_LOCALVERSION" . ""))) + #:extra-version xanmod-revision)) + + (package + (inherit base-kernel) + (version version) + (arguments + (substitute-keyword-arguments (package-arguments base-kernel) + ((#:phases phases) + #~(modify-phases #$phases + ;; Since `customize-linux' replaces the configure phase, we add + ;; XanMod defconfig beforehand to ensure compatibility of the + ;; resulting package with `customize-linux'. + (add-before 'configure 'add-xanmod-defconfig + (lambda _ + (rename-file + (string-append "CONFIGS/xanmod/gcc/" #$xanmod-defconfig) + ".config") + + ;; Adapted from `make-linux-libre*'. + (chmod ".config" #o666) + (let ((port (open-file ".config" "a")) + (extra-configuration + #$(config->string + (append %default-extra-linux-options + ;; NOTE: These are configs expected by Guix + ;; but missing from XanMod defconfig. + '(("CONFIG_BLK_DEV_NVME" . #t) + ("CONFIG_CRYPTO_XTS" . m) + ("CONFIG_VIRTIO_CONSOLE" . m)))))) + (display extra-configuration port) + (close-port port)) + (invoke "make" "oldconfig") + + (rename-file + ".config" + (string-append "arch/x86/configs/" #$xanmod-defconfig)))))))) + (native-inputs + (modify-inputs (package-native-inputs base-kernel) + ;; cpio is needed for CONFIG_IKHEADERS. + (prepend cpio zstd))) + (home-page "https://xanmod.org/") + (supported-systems '("x86_64-linux")) + (synopsis "Linux kernel distribution with custom settings and new features") + (description + "This package provides XanMod kernel, a general-purpose Linux kernel distribution with custom settings and new features. It's built to provide a -stable, responsive and smooth desktop experience.")))) +stable, responsive and smooth desktop experience."))) ;; Linux-XanMod sources (define-public linux-xanmod-version "6.5.10") From 999f7386b7f6f3e78223fcc872c40a4bd52389ba Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 21 Dec 2023 20:37:20 +0800 Subject: [PATCH 38/94] nongnu: linux-xanmod-lts: Update to 6.1.71. * nongnu/packages/linux.scm (linux-xanmod-lts-version): Update to 6.1.71. (linux-xanmod-lts-source): Update hash. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 222862a..29ea4fb 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -257,7 +257,7 @@ stable, responsive and smooth desktop experience."))) #:kernel-hash (base32 "117qmckqrabja9f9260vhrg08wkz4q3syzyaa9msfbl042y4nmvs") #:xanmod-hash (base32 "1n10yl5wgqk0n6ijnnzlmidk61hazhhwzgjf7kkg9cgk7nsjs626"))) -(define-public linux-xanmod-lts-version "6.1.61") +(define-public linux-xanmod-lts-version "6.1.71") (define-public linux-xanmod-lts-revision "xanmod1") (define-public linux-xanmod-lts-source (make-linux-xanmod-source @@ -265,7 +265,7 @@ stable, responsive and smooth desktop experience."))) linux-xanmod-lts-revision #:xanmod-branch "lts" #:kernel-hash (base32 "1ssxn81jfl0jf9brczfrrwd1f1vmf594jvhrs7zgcc54a5qg389c") - #:xanmod-hash (base32 "036yl7a8x2y8mjwyb061vaw9zwabdddpvs7sii9ip27i34k0cl11"))) + #:xanmod-hash (base32 "1jnvwh9kblyiwccp0r6i2g10d8hpfpkm1n95agp2b7j1g4rvc8qp"))) ;; Linux-XanMod packages (define-public linux-xanmod From 9080e44271c715685b770d1f58337ca9de34dc0a Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 21 Dec 2023 20:38:05 +0800 Subject: [PATCH 39/94] nongnu: linux-xanmod: Update to 6.6.10. * nongnu/packages/linux.scm (linux-xanmod-version): Update to 6.6.10. (linux-xanmod-source): Update hash. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 29ea4fb..8d1e170 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -247,15 +247,15 @@ distribution with custom settings and new features. It's built to provide a stable, responsive and smooth desktop experience."))) ;; Linux-XanMod sources -(define-public linux-xanmod-version "6.5.10") +(define-public linux-xanmod-version "6.6.10") (define-public linux-xanmod-revision "xanmod1") (define-public linux-xanmod-source (make-linux-xanmod-source linux-xanmod-version linux-xanmod-revision #:xanmod-branch "main" - #:kernel-hash (base32 "117qmckqrabja9f9260vhrg08wkz4q3syzyaa9msfbl042y4nmvs") - #:xanmod-hash (base32 "1n10yl5wgqk0n6ijnnzlmidk61hazhhwzgjf7kkg9cgk7nsjs626"))) + #:kernel-hash (base32 "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr") + #:xanmod-hash (base32 "0ld8gfigld5g39nrx3f6j58nlfv5d076haba7zj9x24qhgnj7x19"))) (define-public linux-xanmod-lts-version "6.1.71") (define-public linux-xanmod-lts-revision "xanmod1") From 5b8b13c956874430bb5d578ef46c77dd6c87cf21 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 8 Jan 2024 14:37:21 -0500 Subject: [PATCH 40/94] nongnu: heroic-client: Update to 2.12.0. * nongnu/packages/game-client.scm (heroic-client): Update to 2.12.0. --- nongnu/packages/game-client.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index fa935b6..4cdc4ff 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -58,7 +58,7 @@ (define heroic-client (package (name "heroic-client") - (version "2.11.0") + (version "2.12.0") (source (origin (method url-fetch) @@ -67,7 +67,7 @@ version "/heroic_" version "_amd64.deb")) (sha256 (base32 - "1g54rzhgbqqd7nsbd08p3jkdyy01gz0q8yvhpcd698jpi2ks87q0")))) + "0ikb9r72n7xknns81mibipfwqh0r9hqnm5a3k4xsk8my1gajc60c")))) (build-system chromium-binary-build-system) (arguments (list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files From 9a502ae1b0c97b3fa007b5ea059403268cf8981c Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 9 Jan 2024 17:56:21 +0100 Subject: [PATCH 41/94] nongnu: firefox: Update to 121.0.1. * nongnu/packages/mozilla.scm (firefox): Update to 121.0.1. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/mozilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index fdc2ca7..72886bd 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -532,20 +532,20 @@ MOZ_ENABLE_WAYLAND=1 exec ~a $@\n" ;; Update this id with every firefox update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. -(define %firefox-build-id "20231218153158") +(define %firefox-build-id "20240109024134") (define-public firefox (package (inherit firefox-esr) (name "firefox") - (version "121.0") + (version "121.0.1") (source (origin (method url-fetch) (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" version "/source/firefox-" version ".source.tar.xz")) (sha256 - (base32 "193al259awzfi5c3pf8257p8qr9i4biapx9bw8ijmzr3klasbizd")))) + (base32 "1kj97vk8322r7bp7k0laly8bsvwmrn6rsrgldry9msza05p2395k")))) (arguments (substitute-keyword-arguments (package-arguments firefox-esr) ((#:phases phases) From 8078757b887a7691644b119913c3f7b41661775d Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sun, 22 Oct 2023 15:54:54 -0400 Subject: [PATCH 42/94] nonguix: multiarch-container: Allow extra shared directories. Basic fix for #237. This allows exposing other directories or drives to the nonguix container, for example to add additional library locations to Steam, by setting $GUIX_SANDBOX_EXTRA_SHARES. * nonguix/multiarch-container.scm (make-container-wrapper): Use environment variable $GUIX_SANDBOX_EXTRA_SHARES to pass extra directories to share with the container. --- nonguix/multiarch-container.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index 6cbd14a..8b54d40 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -335,6 +335,9 @@ in a sandboxed FHS environment." ,@(exists-> (getenv "XAUTHORITY")) #$@(ngc-shared container))) (DEBUG (equal? (getenv "DEBUG") "1")) + (extra-shares (if (getenv "GUIX_SANDBOX_EXTRA_SHARES") + (string-split (getenv "GUIX_SANDBOX_EXTRA_SHARES") #\:) + #f)) (args (cdr (command-line))) (command (if DEBUG '() `("--" ,run ,@args)))) @@ -363,7 +366,9 @@ in a sandboxed FHS environment." ,@(map add-path expose) ,@(map (lambda (item) (add-path item #:writable? #t)) - share) + (if extra-shares + (append share extra-shares) + share)) "-m" ,manifest-file ,@command))))))) From 8c03b980b69c1749acd106d022ba748a9e87c931 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 10 Jan 2024 11:55:31 -0500 Subject: [PATCH 43/94] news: Add entry for GUIX_SANDBOX_EXTRA_SHARES variable. * news.txt: Add entry. --- news.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/news.txt b/news.txt index 4f8973f..2f043c5 100644 --- a/news.txt +++ b/news.txt @@ -9,6 +9,26 @@ (channel-news (version 0) + (entry (commit "8078757b887a7691644b119913c3f7b41661775d") + (title + (en "New @code{GUIX_SANDBOX_EXTRA_SHARES} variable for nonguix containers (Steam)") + (body + (en "The nonguix container has a new environment variable +@code{GUIX_SANDBOX_EXTRA_SHARES} which is a @code{:} delimited list of +directories to share with the container. These directories will be available +at the same path as the host. For instance, you can set this to another drive +you want to have a Steam library in by either setting this variable in your +environment or launching Steam with: + +@example +GUIX_SANDBOX_EXTRA_SHARES=/some/other/drive steam +@end example + +This should allow you to select @code{/some/other/drive} in Steam for a game +library. This is an experimental feature and just provides a basic way to add +shares to the container, so please test and report any difficulties or +suggestions to improve.")))) + (entry (commit "1591c3d1d10b2884da29ab7d1252304f2ce1514b") (title (en "(nongnu packages steam-client) module renamed")) From 01f18977c278ce09fc1f4912185aa898b212c95c Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 10 Jan 2024 12:56:32 -0500 Subject: [PATCH 44/94] news: Fix entry for GUIX_SANDBOX_EXTRA_SHARES. * news.txt: Incorrect paren placement. How embarrassing! --- news.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/news.txt b/news.txt index 2f043c5..d294861 100644 --- a/news.txt +++ b/news.txt @@ -11,9 +11,9 @@ (entry (commit "8078757b887a7691644b119913c3f7b41661775d") (title - (en "New @code{GUIX_SANDBOX_EXTRA_SHARES} variable for nonguix containers (Steam)") - (body - (en "The nonguix container has a new environment variable + (en "New @code{GUIX_SANDBOX_EXTRA_SHARES} variable for nonguix containers (Steam)")) + (body + (en "The nonguix container has a new environment variable @code{GUIX_SANDBOX_EXTRA_SHARES} which is a @code{:} delimited list of directories to share with the container. These directories will be available at the same path as the host. For instance, you can set this to another drive @@ -27,7 +27,7 @@ GUIX_SANDBOX_EXTRA_SHARES=/some/other/drive steam This should allow you to select @code{/some/other/drive} in Steam for a game library. This is an experimental feature and just provides a basic way to add shares to the container, so please test and report any difficulties or -suggestions to improve.")))) +suggestions to improve."))) (entry (commit "1591c3d1d10b2884da29ab7d1252304f2ce1514b") (title From 02903cebbffe96132128e56f8504f9a69f12410a Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 16 Jan 2024 16:43:18 +0100 Subject: [PATCH 45/94] .dir-locals.el: Add geiser-insert-actual-lambda. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guix project seems to prefer using lambda over λ. Express that preference for Geiser users by setting the geiser-insert-actual-lambda variable to nil. In the 0.31 version it will affect how geiser-insert-lambda works, making it insert lambda string (instead of the current λ. * .dir-locals.el (nil): Add geiser-insert-actual-lambda set to nil. Signed-off-by: Jonathan Brielmaier --- .dir-locals.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.dir-locals.el b/.dir-locals.el index b54f600..4ab3cc8 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,4 +1,5 @@ ;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;; Per-directory local variables for GNU Emacs 23 and later. ((nil @@ -9,7 +10,9 @@ ;; For use with 'bug-reference-prog-mode'. (bug-reference-url-format . "https://gitlab.com/nonguix/nonguix/issues/%s") (bug-reference-bug-regexp - . "\\(#\\([0-9]+\\)\\)"))) + . "\\(#\\([0-9]+\\)\\)") + + (geiser-insert-actual-lambda . nil))) (c-mode . ((c-file-style . "gnu"))) (scheme-mode . From fcdda9283a29fb8c79c718308f353cfa6a650499 Mon Sep 17 00:00:00 2001 From: Christopher League Date: Thu, 4 Jan 2024 13:55:36 -0500 Subject: [PATCH 46/94] nongnu: zoom: Ignore some QML/QT environment variables. Fixes https://gitlab.com/nonguix/nonguix/-/issues/301 * nongnu/packages/messaging.scm (zoom)[arguments]: Reset some QML/QT environment variables. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/messaging.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 2fe5f15..22d3757 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -227,6 +227,9 @@ or iOS.") "libxrender" "zlib"))))) (wrap-program (string-append #$output "/lib/zoom/zoom") + '("QML2_IMPORT_PATH" = ()) + '("QT_PLUGIN_PATH" = ()) + '("QT_SCREEN_SCALE_FACTORS" = ()) `("FONTCONFIG_PATH" ":" prefix (,(string-join (list From 53df88e36f8df4905903abfe935c5768b24fa8c3 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sat, 20 Jan 2024 16:44:32 -0500 Subject: [PATCH 47/94] nongnu: Add linux@6.7. Upstream added linux-libre@6.7 in 95a3aaf7ad37bb0717f2c9e3faf6f636b586d133 but it is not yet the default. * nongnu/packages/linux.scm (linux-6.7): New variable. --- nongnu/packages/linux.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 8d1e170..71709fd 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -97,6 +97,9 @@ "The unmodified Linux kernel, including nonfree blobs, for running Guix System on hardware which requires nonfree software to function.")))) +(define-public linux-6.7 + (corrupt-linux linux-libre-6.7)) + (define-public linux-6.6 (corrupt-linux linux-libre-6.6)) From 45c3dca80d3370f161b3fba3ce7a12655728c698 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Thu, 18 Jan 2024 15:05:07 +0100 Subject: [PATCH 48/94] =?UTF-8?q?nongnu:=20firefox-esr:=20Use=20lambda=20i?= =?UTF-8?q?nstead=20of=20=CE=BB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Following the project's conventions, replace the λ symbol with the lambda keyword. * nongnu/packages/mozilla.scm (firefox-esr) [arguments]<#:phases>['patch-SpeechDispatcherService.cpp]: Use lambda. Signed-off-by: John Kehayias --- nongnu/packages/mozilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index 72886bd..2b9a1c0 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -241,7 +241,7 @@ (substitute file `((,(format #f "~s" lib) - . ,(λ (line _) + . ,(lambda (line _) (string-replace-substring line lib From da242a7ba1d3b751e177852385b7dd079e41bede Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Mon, 22 Jan 2024 20:01:59 +0100 Subject: [PATCH 49/94] nongnu: linux@4.14: Remove it. `linux-libre-4.14` got removed in upstream Guix commit: 497780ad25faf71d3ace39efe7451ef01e353d5b. * nongnu/packages/linux.scm (linux-4.14): Remove variable. --- nongnu/packages/linux.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 71709fd..c1efb40 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -118,14 +118,6 @@ on hardware which requires nonfree software to function.")))) (define-public linux-4.19 (corrupt-linux linux-libre-4.19)) -(define-public linux-4.14 - (corrupt-linux linux-libre-4.14 - #:configs - '("# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set" - "# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set" - "# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set" - "# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set"))) - (define-public linux linux-6.6) ;; linux-lts points to the *newest* released long-term support version. (define-public linux-lts linux-6.1) From 47d7caa2316f2e24f19e5341aeb259872fe7b21a Mon Sep 17 00:00:00 2001 From: Ada Stevenson Date: Mon, 22 Jan 2024 15:09:25 +0800 Subject: [PATCH 50/94] nongnu: linux-firmware: Update to 20240115. * nongnu/packages/linux.scm (linux-firmware): Update to 20240115. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index c1efb40..652f258 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -281,14 +281,14 @@ stable, responsive and smooth desktop experience."))) (define-public linux-firmware (package (name "linux-firmware") - (version "20231211") + (version "20240115") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/firmware/" "linux-firmware-" version ".tar.xz")) (sha256 (base32 - "1fz8vflidayal6gpjvmp75ni04b9ndxbpp5krmlpilxbbr5pxbwn")))) + "13b75kd075famc58pvx4r9268pxn69nyihx7p3i6i7mvkgqayz5b")))) (build-system gnu-build-system) (arguments `(#:tests? #f From 94f27641b1ff3a9816d7812ad0e52a77105198d0 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 23 Jan 2024 16:25:39 +0100 Subject: [PATCH 51/94] nongnu: firefox-esr: Update to 115.7.0esr [security fixes]. Fixes CVE-2024-0741, CVE-2024-0742, CVE-2024-0746, CVE-2024-0747, CVE-2024-0749, CVE-2024-0750, CVE-2024-0751, CVE-2024-0753, CVE-2024-0755. * nongnu/packages/mozilla.scm (firefox-esr): Update to 115.7.0esr. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/mozilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index 2b9a1c0..e0a8ca3 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -97,19 +97,19 @@ ;; Update this id with every firefox update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. -(define %firefox-esr-build-id "20231218150756") +(define %firefox-esr-build-id "20240122143752") (define-public firefox-esr (package (name "firefox-esr") - (version "115.6.0esr") + (version "115.7.0esr") (source (origin (method url-fetch) (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" version "/source/firefox-" version ".source.tar.xz")) (sha256 - (base32 "0rmw486yhkb1is1j2fy51djl5p5qggf2fhp2hgzfdj4s2bjydmv6")))) + (base32 "0ad4az0hiq7q9pnya1pyj75a732ag5bd4jp8mxg4izz97k6zzv8k")))) (build-system gnu-build-system) (arguments (list From d0a8b135d3c75dca774e55e15b4671dcf5965cd1 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 23 Jan 2024 16:25:52 +0100 Subject: [PATCH 52/94] nongnu: firefox: Update to 122.0 [security fixes]. Fixes CVE-2024-0741, CVE-2024-0742, CVE-2024-0743, CVE-2024-0744, CVE-2024-0745, CVE-2024-0746, CVE-2024-0747, CVE-2024-0748, CVE-2024-0749, CVE-2024-0750, CVE-2024-0751, CVE-2024-0752, CVE-2024-0753, CVE-2024-0754, CVE-2024-0755. * nongnu/packages/mozilla.scm (firefox): Update to 122.0. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/mozilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index e0a8ca3..c40c604 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -532,20 +532,20 @@ MOZ_ENABLE_WAYLAND=1 exec ~a $@\n" ;; Update this id with every firefox update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. -(define %firefox-build-id "20240109024134") +(define %firefox-build-id "20240122142651") (define-public firefox (package (inherit firefox-esr) (name "firefox") - (version "121.0.1") + (version "122.0") (source (origin (method url-fetch) (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" version "/source/firefox-" version ".source.tar.xz")) (sha256 - (base32 "1kj97vk8322r7bp7k0laly8bsvwmrn6rsrgldry9msza05p2395k")))) + (base32 "1hyylp60sqswyig5w422rq7sn8hhbg49j1dmq3j6ay8l1sliaj5q")))) (arguments (substitute-keyword-arguments (package-arguments firefox-esr) ((#:phases phases) From 3857d86267284000dc48660a5dfd56cb2a8cf004 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Thu, 11 Jan 2024 13:30:38 +0100 Subject: [PATCH 53/94] nongnu: linux: Enable mt7921e driver. In order to be able to use WiFi chip in P14s ThinkPad, the mt7921e module is required. This commit enables it in kernels that do have it. I originally implemented this using a list of additional option, same way %default-extra-linux-options is done. However I quickly realized that approach is not suitable for hardware enablement. The older versions do not support the same drivers as the newer ones. Solution is to create a new procedure that generates the list for a specific kernel version and use it as a default value for #:configs. * nongnu/packages/linux.scm (nonguix-extra-linux-options): New procedure. (corrupt-linux): Use it as default value for #:configs. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 652f258..365590c 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2023 Adam Kandur ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Ada Stevenson +;;; Copyright © 2023 Tomas Volf <~@wolfsden.cz> (define-module (nongnu packages linux) #:use-module (gnu packages) @@ -52,10 +53,42 @@ "/linux/kernel/v" (version-major version) ".x" "/linux-" version ".tar.xz")) +;;; If you are corrupting the kernel on your own, consider using output of +;;; this procedure as a base for your options: +;;; (corrupt-linux linux-libre-lts +;;; #:configs (cons* "CONFIG_FOO=y" +;;; (nonguix-extra-linux-options linux-libre-lts) +(define-public (nonguix-extra-linux-options linux-or-version) + "Return a list containing additional options that nonguix sets by default +for a corrupted linux package of specified version. linux-or-version can be +some freedo package or an output of package-version procedure." + (define linux-version + (if (package? linux-or-version) + (package-version linux-or-version) + linux-or-version)) + + (reverse (fold (lambda (opt opts) + (if (version>=? linux-version (car opt)) + (cons* (cdr opt) opts) + opts)) + '() + ;; List of additional options for nonguix corrupted linux. + ;; Each member is a pair of a minimal version (>=) and the + ;; option itself. Option has to be in a format suitable for + ;; (@ (guix build kconfig) modify-defconfig) procedure. + ;; + ;; Do note that this list is intended for enabling use of + ;; hardware requiring non-free firmware. If a configuration + ;; option does work under linux-libre, it should go into Guix + ;; actual. + '( + ;; Driver for MediaTek mt7921e wireless chipset + ("5.15" . "CONFIG_MT7921E=m"))))) + (define* (corrupt-linux freedo #:key (name "linux") - (configs '()) + (configs (nonguix-extra-linux-options freedo)) (defconfig #f)) ;; TODO: This very directly depends on guix internals. From e261e9ea586be3ef406b9546d73fffdd222b38de Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 24 Jan 2024 16:43:53 +0800 Subject: [PATCH 54/94] nongnu: linux-xanmod-lts: Update to 6.1.75. * nongnu/packages/linux.scm (linux-xanmod-lts-version): Update to 6.1.75. (linux-xanmod-lts-source): Update hash. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 365590c..5b1d6fc 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -285,7 +285,7 @@ stable, responsive and smooth desktop experience."))) #:kernel-hash (base32 "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr") #:xanmod-hash (base32 "0ld8gfigld5g39nrx3f6j58nlfv5d076haba7zj9x24qhgnj7x19"))) -(define-public linux-xanmod-lts-version "6.1.71") +(define-public linux-xanmod-lts-version "6.1.75") (define-public linux-xanmod-lts-revision "xanmod1") (define-public linux-xanmod-lts-source (make-linux-xanmod-source @@ -293,7 +293,7 @@ stable, responsive and smooth desktop experience."))) linux-xanmod-lts-revision #:xanmod-branch "lts" #:kernel-hash (base32 "1ssxn81jfl0jf9brczfrrwd1f1vmf594jvhrs7zgcc54a5qg389c") - #:xanmod-hash (base32 "1jnvwh9kblyiwccp0r6i2g10d8hpfpkm1n95agp2b7j1g4rvc8qp"))) + #:xanmod-hash (base32 "0mqyc2cpwb2fss70802p2m093xdh9b80vq5gh2h2ka5axckbiymr"))) ;; Linux-XanMod packages (define-public linux-xanmod From 90105e527292211b9d9dde00cc988e8bb5031da6 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 24 Jan 2024 16:44:48 +0800 Subject: [PATCH 55/94] nongnu: linux-xanmod: Update to 6.6.14. * nongnu/packages/linux.scm (linux-xanmod-version): Update to 6.6.14. (linux-xanmod-source): Update hash. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 5b1d6fc..9d28d2f 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -275,7 +275,7 @@ distribution with custom settings and new features. It's built to provide a stable, responsive and smooth desktop experience."))) ;; Linux-XanMod sources -(define-public linux-xanmod-version "6.6.10") +(define-public linux-xanmod-version "6.6.14") (define-public linux-xanmod-revision "xanmod1") (define-public linux-xanmod-source (make-linux-xanmod-source @@ -283,7 +283,7 @@ stable, responsive and smooth desktop experience."))) linux-xanmod-revision #:xanmod-branch "main" #:kernel-hash (base32 "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr") - #:xanmod-hash (base32 "0ld8gfigld5g39nrx3f6j58nlfv5d076haba7zj9x24qhgnj7x19"))) + #:xanmod-hash (base32 "0zzmajdzyicj8grwg9gkx710bndrgdq392xqnx8q9287jaag43g1"))) (define-public linux-xanmod-lts-version "6.1.75") (define-public linux-xanmod-lts-revision "xanmod1") From 9acfbadebf64add37fa31546ac7272adfba389ff Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 24 Jan 2024 16:39:49 +0800 Subject: [PATCH 56/94] nongnu: steam-client: Update to 1.0.0.78. * nongnu/packages/game-client.scm (steam-client): Update to 1.0.0.78. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/game-client.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index 4cdc4ff..4273568 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -116,7 +116,7 @@ implementation with gogdl and Amazon Games using Nile.") (define steam-client (package (name "steam-client") - (version "1.0.0.75") + (version "1.0.0.78") (source (origin (method url-fetch) @@ -124,7 +124,7 @@ implementation with gogdl and Amazon Games using Nile.") version ".tar.gz")) (sha256 (base32 - "19rn29slsxv7b5fisr1jzn79bskzifbj5hmxqn2436ivwfjna9g5")) + "0390qy8vy7sx35hxl51yrbk6mvdz1vvpy96v07qva4bjbmsmjhhh")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (arguments From b2e769487eba7f699a90f32e6bf802eb9d18f0a3 Mon Sep 17 00:00:00 2001 From: PRESFIL Date: Mon, 29 Jan 2024 20:27:29 +0100 Subject: [PATCH 57/94] nongnu: Add rtl8821cu-linux-module. * nongnu/packages/linux.scm: (rtl8821cu-linux-module): New variable. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 57 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 9d28d2f..ce4b0bf 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Timotej Lazar ;;; Copyright © 2020, 2021 James Smith -;;; Copyright © 2020-2023 Jonathan Brielmaier +;;; Copyright © 2020-2024 Jonathan Brielmaier ;;; Copyright © 2020, 2022 Michael Rohleder ;;; Copyright © 2020, 2021, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021, 2022 Zhu Zihao @@ -25,6 +25,7 @@ ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Ada Stevenson ;;; Copyright © 2023 Tomas Volf <~@wolfsden.cz> +;;; Copyright © 2023 PRESFIL (define-module (nongnu packages linux) #:use-module (gnu packages) @@ -849,6 +850,60 @@ network adapters.") ;; hal/rtl8821c/hal8821c_fw.c (license gpl2)))) +(define-public rtl8821cu-linux-module + (let ((commit "a41ef7cabd1aa36fa2b4eb63a71cf719bff11b72") + (revision "1")) + (package + (name "rtl8821cu-linux-module") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/morrownr/8821cu-20210916") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fnv4gm4adnf8gbjzc2lljh2a3i111159qira3w0qm1zhyqadaq0")))) + (build-system linux-module-build-system) + (arguments + (list + #:make-flags #~(list (string-append "CC=" + #$(cc-for-target)) + (string-append "KSRC=" + (assoc-ref %build-inputs + "linux-module-builder") + "/lib/modules/build")) + #:phases #~(modify-phases %standard-phases + (replace 'build + (lambda* (#:key (make-flags '()) + (parallel-build? #t) #:allow-other-keys) + (apply invoke "make" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) ,@make-flags))))) + #:tests? #f)) + (home-page "https://github.com/morrownr/8821cu-20210916") + (synopsis "Linux driver for Realtek USB WiFi adapters") + (description + "Linux driver for USB WiFi adapters that are based on the +Realtek RTL8811CU, RTL8821CU, RTL8821CUH and RTL8731AU chipsets. + +To work, in addition to installing the driver, you need +to disable the conflicting rtw88 driver: + +@example +(operating-system + ;; ... + ;; Blacklist conflicting kernel modules. + (kernel-arguments '(\"modprobe.blacklist=rtw88_8821cu\")) + (kernel-loadable-modules (list rtl8821cu-linux-module))) +@end example") + ;; Rejected by Guix beause it contains a binary blob in: + ;; hal/rtl8821c/hal8821c_fw.c + (license (nonfree + "https://github.com/morrownr/8821cu-20210916/blob/main/LICENSE"))))) + (define-public rtl8812au-aircrack-ng-linux-module (let ((commit "35308f4dd73e77fa572c48867cce737449dd8548") (revision "11")) From 79c8cc2b66ebc3d70dfd48b32e206e4d33b86fa7 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 31 Jan 2024 15:25:15 -0500 Subject: [PATCH 58/94] nongnu: element-desktop: Update to 1.11.57. * nongnu/packages/messaging.scm (element-desktop): Update to 1.11.57. --- nongnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 22d3757..67e8647 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -1,6 +1,6 @@ ;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; Copyright © 2021, 2022 PantherX OS Team -;;; Copyright © 2022, 2023 John Kehayias +;;; Copyright © 2022, 2023, 2024 John Kehayias ;;; Copyright © 2022 Evgenii Lepikhin ;;; Copyright © 2023 Giacomo Leidi ;;; Copyright © 2023 Raven Hallsby @@ -36,7 +36,7 @@ (define-public element-desktop (package (name "element-desktop") - (version "1.11.51") + (version "1.11.57") (source (origin (method url-fetch) @@ -45,7 +45,7 @@ "https://packages.riot.im/debian/pool/main/e/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "018i2ba66g4lr7cm9psnrkjhw6y5jpfa5imdfa34xlpbf0pglp6r")))) + (base32 "05318i6z5kkzi01ygr77g5ij0hs4xmy0j23hznkqc4zia02q1vgx")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments From 9e3098848274437c3fd425d487760516f95eab92 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 31 Jan 2024 15:27:49 -0500 Subject: [PATCH 59/94] nongnu: signal-desktop: Update to 6.46.0. * nongnu/packages/messaging.scm (signal-desktop): Update to 6.46.0. --- nongnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 67e8647..d74da89 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -90,7 +90,7 @@ its core.") (define-public signal-desktop (package (name "signal-desktop") - (version "6.41.0") + (version "6.46.0") (source (origin (method url-fetch) @@ -99,7 +99,7 @@ its core.") "https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "0y69dap2arsnmm193f731n1mavcq2cjrbdd26cr5fl934fgp428g")))) + (base32 "1pjv8v1hhycwbvqvih83axv41jkyksq6d9152fqic9d61lbb1kpa")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments From 729ee6b62a9f02363ee75d7f956f39f99bce00ba Mon Sep 17 00:00:00 2001 From: Michal Atlas Date: Tue, 23 Jan 2024 00:11:42 +0100 Subject: [PATCH 60/94] nongnu: multiarch-container: Fix preserved-env not being used. * nonguix/multiarch-container.scm (make-container-wrapper): Use ngc-preserved-env. Signed-off-by: John Kehayias Co-authored-by: John Kehayias --- nonguix/multiarch-container.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index 8b54d40..3d040c2 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -295,6 +295,7 @@ in a sandboxed FHS environment." ;; discussed in 80decf05. "^XDG_DATA_HOME$" "^XDG_RUNTIME_DIR$" + #$@(ngc-preserved-env container) ; Environment from container. ;; The following are useful for debugging. "^CAPSULE_DEBUG$" "^G_MESSAGES_DEBUG$" From 7082201ca023c5cc122426e6d9a2f714be43c600 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 31 Jan 2024 18:12:22 +0100 Subject: [PATCH 61/94] nongnu: google-chrome-stable: Update to 121.0.6167.139. * nongnu/packages/chrome.scm (google-chrome-stable): Update to 121.0.6167.139. Signed-off-by: John Kehayias --- nongnu/packages/chrome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/chrome.scm b/nongnu/packages/chrome.scm index 16d7f89..e79af99 100644 --- a/nongnu/packages/chrome.scm +++ b/nongnu/packages/chrome.scm @@ -146,7 +146,7 @@ (license (nonfree "https://www.google.com/intl/en/chrome/terms/"))))) (define-public google-chrome-stable - (make-google-chrome "stable" "120.0.6099.71" "15r1kx4jnbrcw7kfma528ks5ic17s4ydh1ncsb680himhln02z64")) + (make-google-chrome "stable" "121.0.6167.139" "1b08wqflp1j5yqpw2g9z2s239gs8bzqbxigcxk93aqwf5c21ijkh")) (define-public google-chrome-beta (make-google-chrome "beta" "121.0.6167.8" "0q5gdsczhqyk4irhqwfw4qcspk3bi8knj83lx5hx000lil5nqc46")) From 02f9ea0b8510ada53be87b4c3d9528c7cedf9343 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 31 Jan 2024 18:12:35 +0100 Subject: [PATCH 62/94] nongnu: google-chrome-beta: Update to 122.0.6261.6. * nongnu/packages/chrome.scm (google-chrome-beta): Update to 122.0.6261.6. Signed-off-by: John Kehayias --- nongnu/packages/chrome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/chrome.scm b/nongnu/packages/chrome.scm index e79af99..f49dcc8 100644 --- a/nongnu/packages/chrome.scm +++ b/nongnu/packages/chrome.scm @@ -149,7 +149,7 @@ (make-google-chrome "stable" "121.0.6167.139" "1b08wqflp1j5yqpw2g9z2s239gs8bzqbxigcxk93aqwf5c21ijkh")) (define-public google-chrome-beta - (make-google-chrome "beta" "121.0.6167.8" "0q5gdsczhqyk4irhqwfw4qcspk3bi8knj83lx5hx000lil5nqc46")) + (make-google-chrome "beta" "122.0.6261.6" "1b12bjcg99f6bjfhm311hdx9s1a4i13mcgxbvf1gpzq8989c1g96")) (define-public google-chrome-unstable (make-google-chrome "unstable" "122.0.6170.3" "04plb14z3wlagg2b2p9plr91if1r84mnmb46cxs08x3m6dapqcj6")) From 6b779b8179a08ef0545cb69f3fc0459149b4d52c Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 31 Jan 2024 18:12:54 +0100 Subject: [PATCH 63/94] nongnu: google-chrome-unstable: Update to 123.0.6262.5. * nongnu/packages/chrome.scm (google-chrome-unstable): Update to 123.0.6262.5. Signed-off-by: John Kehayias --- nongnu/packages/chrome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/chrome.scm b/nongnu/packages/chrome.scm index f49dcc8..709b96b 100644 --- a/nongnu/packages/chrome.scm +++ b/nongnu/packages/chrome.scm @@ -152,4 +152,4 @@ (make-google-chrome "beta" "122.0.6261.6" "1b12bjcg99f6bjfhm311hdx9s1a4i13mcgxbvf1gpzq8989c1g96")) (define-public google-chrome-unstable - (make-google-chrome "unstable" "122.0.6170.3" "04plb14z3wlagg2b2p9plr91if1r84mnmb46cxs08x3m6dapqcj6")) + (make-google-chrome "unstable" "123.0.6262.5" "04mf9nysdn77371fxa3z0wbvy2k09vw49s3lrcynlwgiwrz89a3m")) From f9ed62f37d237fbb854554bd1d643fd3e1d05a2a Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 31 Jan 2024 18:23:14 +0100 Subject: [PATCH 64/94] nongnu: vscodium: Update to 1.85.2.24019. * nongnu/packages/editors (vscodium): Update to 1.85.2.24019. [origin]: Download correct binary for different architectures. [supported-systems]: List all supported architectures. Signed-off-by: John Kehayias --- nongnu/packages/editors.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/nongnu/packages/editors.scm b/nongnu/packages/editors.scm index d9a5c0a..6b35962 100644 --- a/nongnu/packages/editors.scm +++ b/nongnu/packages/editors.scm @@ -8,21 +8,26 @@ #:use-module (guix gexp) #:use-module (guix packages) #:use-module ((guix licenses) :prefix license:) - #:use-module (nonguix build-system chromium-binary)) + #:use-module (nonguix build-system chromium-binary) + #:use-module (ice-9 match)) (define-public vscodium (package (name "vscodium") - (version "1.85.0.23343") + (version "1.85.2.24019") (source (origin (method url-fetch) (uri - (string-append - "https://github.com/VSCodium/vscodium/releases/download/" version - "/VSCodium-linux-x64-" version ".tar.gz")) + (let ((arch (match (or (%current-target-system) (%current-system)) + ("aarch64-linux" "arm64") + ("armhf-linux" "armhf") + (_ "x64")))) + (string-append + "https://github.com/VSCodium/vscodium/releases/download/" version + "/VSCodium-linux-" arch "-" version ".tar.gz"))) (sha256 - (base32 "16m7a2j9rmnp9pqpyyy2dx09paj1qh0h4gb1dhhwakw7w0zjlxn5")))) + (base32 "0nd9hipz1jhjdv6hrm6q2jpppanh8nmkpy9zpayymy4dwif8a49q")))) (build-system chromium-binary-build-system) (arguments (list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files @@ -80,6 +85,7 @@ (,(string-join (list (string-append #$output "/opt/vscodium")) ":"))))))))) + (supported-systems '("armhf-linux" "aarch64-linux" "x86_64-linux")) (native-inputs (list tar)) (inputs From ae314a6eaa8c07e728083eec066f1685decd2a91 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 31 Jan 2024 17:55:06 +0100 Subject: [PATCH 65/94] nongnu: anytype: Update to 0.38. * nongnu/packages/productivity.scm (anytype): Update to 0.38. [arguments]: Add strip-python phase. Signed-off-by: John Kehayias Co-authored-by: John Kehayias --- nongnu/packages/productivity.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/productivity.scm b/nongnu/packages/productivity.scm index d0b7f37..5ccabb7 100644 --- a/nongnu/packages/productivity.scm +++ b/nongnu/packages/productivity.scm @@ -24,17 +24,17 @@ (define-public anytype (package (name "anytype") - (version "0.37.3") + (version "0.38") (source (origin (method url-fetch) (uri (string-append "https://download.anytype.io?action=download" - "&key=desktop&id=142685264")) + "&key=desktop&id=148487107")) (file-name (string-append "anytype-" version ".deb")) (sha256 (base32 - "197v4dsn21yfi9dhcrqdznz3vfzicd79fc4abbpifacgb4fxcxq8")))) + "1xc57ppk3l16mq2a53scf79m8hx43x21kac96ws66awlkz14swc7")))) (build-system chromium-binary-build-system) (arguments (list @@ -58,6 +58,11 @@ ("usr/share/" "/share")) #:phases #~(modify-phases %standard-phases + (add-after 'binary-unpack 'strip-python + (lambda _ + (delete-file + (string-append "opt/Anytype/resources/app.asar.unpacked/" + "node_modules/keytar/build/node_gyp_bins/python3")))) (add-before 'install 'patch-assets (lambda _ (let* ((bin (string-append #$output "/bin")) From 8e6e045a9dcfa0ae6e0b9f006c617d8fd871a76f Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 30 Jan 2024 10:25:50 +0100 Subject: [PATCH 66/94] nongnu: lgogdownloader: Update to 3.12. * nongnu/packages/gog.scm (lgogdownloader): Update to 3.12. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/gog.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/gog.scm b/nongnu/packages/gog.scm index e3b6dc8..f6deffb 100644 --- a/nongnu/packages/gog.scm +++ b/nongnu/packages/gog.scm @@ -22,7 +22,7 @@ (define-public lgogdownloader (package (name "lgogdownloader") - (version "3.11") + (version "3.12") (source (origin (method git-fetch) @@ -31,7 +31,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mcwl6vfyy91sq1816j4v3lhf06dz1rr58hsq8hqx217z102s86d")))) + (base32 "0kmz5zsbci7iilbqdvql9c1vk2b1q2flsdr6psnkln07xp664di2")))) (build-system qt-build-system) (arguments `(#:configure-flags '("-DUSE_QT_GUI=ON") From fe2fcf125cfc5f7284b24cfac50f37feaf74f7b5 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 31 Jan 2024 22:29:30 +0100 Subject: [PATCH 67/94] nongnu: google-chrome-stable: Fix wrapper-plan. * nongnu/packages/chrome.scm (make-google-chrome [patchelf-plan]: Avoid patching nacl_helper for google-chrome-stable. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/chrome.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nongnu/packages/chrome.scm b/nongnu/packages/chrome.scm index 709b96b..67a061b 100644 --- a/nongnu/packages/chrome.scm +++ b/nongnu/packages/chrome.scm @@ -63,10 +63,7 @@ "libqt6_shim.so" "libvk_swiftshader.so" "libvulkan.so.1" - "WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" - #$@(if (string=? repo "stable") - '("nacl_helper") - '())))) + "WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"))) #:install-plan #~'(("opt/" "/share") ("usr/share/" "/share")) From 6e646d2c16958df57687d609f1904e404ae4d8c3 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 6 Feb 2024 17:17:34 +0100 Subject: [PATCH 68/94] nongnu: firefox: Update to 122.0.1. * nongnu/packages/mozilla.scm (firefox): Update to 122.0.1. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/mozilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index c40c604..81db25a 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -532,20 +532,20 @@ MOZ_ENABLE_WAYLAND=1 exec ~a $@\n" ;; Update this id with every firefox update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. -(define %firefox-build-id "20240122142651") +(define %firefox-build-id "20240205214308") (define-public firefox (package (inherit firefox-esr) (name "firefox") - (version "122.0") + (version "122.0.1") (source (origin (method url-fetch) (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" version "/source/firefox-" version ".source.tar.xz")) (sha256 - (base32 "1hyylp60sqswyig5w422rq7sn8hhbg49j1dmq3j6ay8l1sliaj5q")))) + (base32 "1minry6lgf4xvbpdgmly3nm5wwbv3l7lsnd1sgb2zv4ffjd9rw9n")))) (arguments (substitute-keyword-arguments (package-arguments firefox-esr) ((#:phases phases) From e4fe4809f88d91eda5a7dc29e44ee649ded7e830 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 6 Jan 2024 03:46:01 +0300 Subject: [PATCH 69/94] nongnu: chromium-embedded-framework: Update to 117.2.4. * nongnu/packages/chromium.scm (chromium-embedded-framework): Update to 117.2.4. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/chromium.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nongnu/packages/chromium.scm b/nongnu/packages/chromium.scm index 9580b8a..4467714 100644 --- a/nongnu/packages/chromium.scm +++ b/nongnu/packages/chromium.scm @@ -26,15 +26,15 @@ #:use-module (srfi srfi-1)) (define-public chromium-embedded-framework - (let ((git-revision "d0bbcbb") - (chromium-version "103.0.5060.114") + (let ((git-revision "5053a95") + (chromium-version "117.0.5938.150") (arch (match (or (%current-target-system) (%current-system)) ("aarch64-linux" "linuxarm64") ("armhf-linux" "linuxarm") (_ "linux64")))) (package (name "chromium-embedded-framework") - (version "103.0.9") + (version "117.2.4") (source (origin (method url-fetch) (uri (string-append @@ -45,7 +45,7 @@ "_" arch "_minimal.tar.bz2")) (sha256 (base32 - "143x0jmasl4z16bkxlrbz874chd9x9xpc5qylb9h7j80gfcrzlsi")))) + "0vzzwq1k6bv9d209yg3samvfnfwj7s58y9r3p3pd98wxa9iyzf4j")))) (build-system binary-build-system) (arguments `(#:patchelf-plan From abefc82fab49ccd7202fc66565e5fedcea53538e Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 7 Feb 2024 13:17:35 +0800 Subject: [PATCH 70/94] nongnu: linux-xanmod-lts: Update to 6.1.77. * nongnu/packages/linux.scm (linux-xanmod-lts-version): Update to 6.1.77. (linux-xanmod-lts-source): Update hash. --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index ce4b0bf..7c55254 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -286,7 +286,7 @@ stable, responsive and smooth desktop experience."))) #:kernel-hash (base32 "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr") #:xanmod-hash (base32 "0zzmajdzyicj8grwg9gkx710bndrgdq392xqnx8q9287jaag43g1"))) -(define-public linux-xanmod-lts-version "6.1.75") +(define-public linux-xanmod-lts-version "6.1.77") (define-public linux-xanmod-lts-revision "xanmod1") (define-public linux-xanmod-lts-source (make-linux-xanmod-source @@ -294,7 +294,7 @@ stable, responsive and smooth desktop experience."))) linux-xanmod-lts-revision #:xanmod-branch "lts" #:kernel-hash (base32 "1ssxn81jfl0jf9brczfrrwd1f1vmf594jvhrs7zgcc54a5qg389c") - #:xanmod-hash (base32 "0mqyc2cpwb2fss70802p2m093xdh9b80vq5gh2h2ka5axckbiymr"))) + #:xanmod-hash (base32 "0drc6p2rc2jwc6abq1cbdy0z6hmzv1hc9vl1s1gi9zdw9ldal8j4"))) ;; Linux-XanMod packages (define-public linux-xanmod From 80682cbadd24eaa5840ceb68c3e19a6c027c0243 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 7 Feb 2024 13:18:16 +0800 Subject: [PATCH 71/94] nongnu: linux-xanmod: Update to 6.6.16. * nongnu/packages/linux.scm (linux-xanmod-version): Update to 6.6.16. (linux-xanmod-source): Update hash. Signed-off-by: John Kehayias --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 7c55254..ccdaf5b 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -276,7 +276,7 @@ distribution with custom settings and new features. It's built to provide a stable, responsive and smooth desktop experience."))) ;; Linux-XanMod sources -(define-public linux-xanmod-version "6.6.14") +(define-public linux-xanmod-version "6.6.16") (define-public linux-xanmod-revision "xanmod1") (define-public linux-xanmod-source (make-linux-xanmod-source @@ -284,7 +284,7 @@ stable, responsive and smooth desktop experience."))) linux-xanmod-revision #:xanmod-branch "main" #:kernel-hash (base32 "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr") - #:xanmod-hash (base32 "0zzmajdzyicj8grwg9gkx710bndrgdq392xqnx8q9287jaag43g1"))) + #:xanmod-hash (base32 "0s0wbqd79jwkna8c8k1v4qiv51q1nwcqwz625ybahlm1qwha19bm"))) (define-public linux-xanmod-lts-version "6.1.77") (define-public linux-xanmod-lts-revision "xanmod1") From 1e7af45b5ffd99d1625fca2a03c430eca736d7b7 Mon Sep 17 00:00:00 2001 From: Krzysztof Baranowski Date: Sun, 11 Feb 2024 04:19:55 -0800 Subject: [PATCH 72/94] nongnu: facetimehd: Update to 0.6.8. * nongnu/packages/linux.scm (facetimehd): Update to 0.6.8. Signed-off-by: John Kehayias --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index ccdaf5b..d172a19 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -1153,7 +1153,7 @@ chipsets from Broadcom: (define-public facetimehd (package (name "facetimehd") - (version "0.5.18") + (version "0.6.8") (source (origin (method git-fetch) @@ -1163,7 +1163,7 @@ chipsets from Broadcom: (file-name (git-file-name "facetimehd" version)) (sha256 (base32 - "1598pzjnbij3knvqmk2yslj26wmqiqjqgqgcw9p9jx6z7bdjvvsh")))) + "1g0ky9w5klkjndf30mjymq78r6yls9gri9x702nn8qkmgkjbqdsg")))) (build-system linux-module-build-system) (arguments '(#:tests? #f)) From 10318ef7dd53c946bae9ed63f7e0e8bb8941b6b1 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 14 Feb 2024 16:36:06 -0500 Subject: [PATCH 73/94] nongnu: zoom: Update to 5.17.5.2543. * nongnu/packages/messaging.scm (zoom): Update to 5.17.5.2543. --- nongnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index d74da89..74e65ed 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -144,14 +144,14 @@ or iOS.") (define-public zoom (package (name "zoom") - (version "5.16.10.668") + (version "5.17.5.2543") (source (origin (method url-fetch) (uri (string-append "https://cdn.zoom.us/prod/" version "/zoom_x86_64.tar.xz")) (file-name (string-append name "-" version "-x86_64.tar.xz")) (sha256 - (base32 "01h16n235jr3fzvx6kzl1kv38k74n6418m2wjprlxa3hydqmcm7d")))) + (base32 "06m53d3jrpiq1z5wd7m61lb3w8m8g72iaqx5sixnzn290gyyzgim")))) (supported-systems '("x86_64-linux")) (build-system binary-build-system) (arguments From 86525cdb21527b77617eef74a2f4a3b371db5030 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Wed, 21 Feb 2024 15:14:22 +0100 Subject: [PATCH 74/94] nongnu: firefox-esr: Update to 115.8.0esr [security fixes]. Fixes CVE-2024-1546, CVE-2024-1547, CVE-2024-1548, CVE-2024-1549, CVE-2024-1550, CVE-2024-1551, CVE-2024-1552, CVE-2024-1553. * nongnu/packages/mozilla.scm (firefox-esr): Update to 115.8.0esr. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/mozilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index 81db25a..c4ce6d0 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -97,19 +97,19 @@ ;; Update this id with every firefox update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. -(define %firefox-esr-build-id "20240122143752") +(define %firefox-esr-build-id "20240219101823") (define-public firefox-esr (package (name "firefox-esr") - (version "115.7.0esr") + (version "115.8.0esr") (source (origin (method url-fetch) (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" version "/source/firefox-" version ".source.tar.xz")) (sha256 - (base32 "0ad4az0hiq7q9pnya1pyj75a732ag5bd4jp8mxg4izz97k6zzv8k")))) + (base32 "1slmp2v1q3my81z8kiym9rpxw5d9n4sn07v7hv99517w7vr8d05g")))) (build-system gnu-build-system) (arguments (list From c620b749a0a959b2f6a3f20211dbdbf42c53a34a Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 20 Feb 2024 16:40:42 +0100 Subject: [PATCH 75/94] nongnu: firefox: Update to 123.0 [security fixes]. Fixes CVE-2024-1546, CVE-2024-1547, CVE-2024-1548, CVE-2024-1549, CVE-2024-1550, CVE-2024-1551, CVE-2024-1552, CVE-2024-1553, CVE-2024-1554, CVE-2024-1555, CVE-2024-1556, CVE-2024-1557. * nongnu/packages/mozilla.scm (firefox): Update to 123.0. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/mozilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index c4ce6d0..f159446 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -532,20 +532,20 @@ MOZ_ENABLE_WAYLAND=1 exec ~a $@\n" ;; Update this id with every firefox update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. -(define %firefox-build-id "20240205214308") +(define %firefox-build-id "20240219104035") (define-public firefox (package (inherit firefox-esr) (name "firefox") - (version "122.0.1") + (version "123.0") (source (origin (method url-fetch) (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" version "/source/firefox-" version ".source.tar.xz")) (sha256 - (base32 "1minry6lgf4xvbpdgmly3nm5wwbv3l7lsnd1sgb2zv4ffjd9rw9n")))) + (base32 "1dscgn1ymqi4zr29fpj43y8gaspc5wl7a59w657ws56vmnymm24y")))) (arguments (substitute-keyword-arguments (package-arguments firefox-esr) ((#:phases phases) From 66b129c9c2cff760992cace703fbf7f833ea08ae Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 17 Feb 2024 20:13:29 +0800 Subject: [PATCH 76/94] nongnu: linux-xanmod-lts: Update to 6.6.17. * nongnu/packages/linux.scm (linux-xanmod-lts-version): Update to 6.6.17. (linux-xanmod-lts-source): Update hash. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index d172a19..498f016 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -286,15 +286,15 @@ stable, responsive and smooth desktop experience."))) #:kernel-hash (base32 "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr") #:xanmod-hash (base32 "0s0wbqd79jwkna8c8k1v4qiv51q1nwcqwz625ybahlm1qwha19bm"))) -(define-public linux-xanmod-lts-version "6.1.77") +(define-public linux-xanmod-lts-version "6.6.17") (define-public linux-xanmod-lts-revision "xanmod1") (define-public linux-xanmod-lts-source (make-linux-xanmod-source linux-xanmod-lts-version linux-xanmod-lts-revision #:xanmod-branch "lts" - #:kernel-hash (base32 "1ssxn81jfl0jf9brczfrrwd1f1vmf594jvhrs7zgcc54a5qg389c") - #:xanmod-hash (base32 "0drc6p2rc2jwc6abq1cbdy0z6hmzv1hc9vl1s1gi9zdw9ldal8j4"))) + #:kernel-hash (base32 "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr") + #:xanmod-hash (base32 "0cbr487nmk8q0dfbf288h4fg0vb8b3qmjjl5zvlk00d4fgd10p4i"))) ;; Linux-XanMod packages (define-public linux-xanmod From a664b6da35513fe007c1d48936e74541074e01fc Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 17 Feb 2024 20:19:08 +0800 Subject: [PATCH 77/94] nongnu: linux-xanmod: Update to 6.7.5. * nongnu/packages/linux.scm (linux-xanmod-version): Update to 6.7.5. (linux-xanmod-source): Update hash. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 498f016..1d6e6c5 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -276,15 +276,15 @@ distribution with custom settings and new features. It's built to provide a stable, responsive and smooth desktop experience."))) ;; Linux-XanMod sources -(define-public linux-xanmod-version "6.6.16") +(define-public linux-xanmod-version "6.7.5") (define-public linux-xanmod-revision "xanmod1") (define-public linux-xanmod-source (make-linux-xanmod-source linux-xanmod-version linux-xanmod-revision #:xanmod-branch "main" - #:kernel-hash (base32 "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr") - #:xanmod-hash (base32 "0s0wbqd79jwkna8c8k1v4qiv51q1nwcqwz625ybahlm1qwha19bm"))) + #:kernel-hash (base32 "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg") + #:xanmod-hash (base32 "1k8ll65hiad6asq9rzdwfadmylgksfpvnp11hd04jz5kmwd25kp0"))) (define-public linux-xanmod-lts-version "6.6.17") (define-public linux-xanmod-lts-revision "xanmod1") From 5d5d496e57d7014226d4d972d9cc7554c96a5b68 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 23 Feb 2024 23:12:58 -0500 Subject: [PATCH 78/94] nongnu: steam-container: Link all of 'share' from steam-client. Previously, only the .desktop files from steam-client were shared with steam-container, and thus only those were available directly when installing the steam package. This would miss things like the icons (needed in some cases for tray support, for example, in waybar). Update to share all of 'share' to provide a more complete package for the user. * nongnu/packages/game-client.scm (steam-container)[link-files]: Link all of 'share' from steam-client. --- nongnu/packages/game-client.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index 4273568..e9fcfc7 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -256,8 +256,7 @@ implementation with gogdl and Amazon Games using Nile.") ,@fhs-min-libs) #:name "fhs-union-32" #:system "i686-linux")) - (link-files '("share/applications/steam.desktop" - "share/applications/steam-asound32.desktop")) + (link-files '("share")) (description "Steam is a digital software distribution platform created by Valve. This package provides a script for launching Steam in a Guix container which will use the directory @file{$HOME/.local/share/guix-sandbox-home} where From a78155eaeeb10a66b306634f46b98a39ae0ac2a3 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 23 Feb 2024 23:21:05 -0500 Subject: [PATCH 79/94] nongnu: heroic-container: Link all of 'share' from heroic-client. Followup to 5d5d496 to do the same for heroic. * nongnu/packages/game-client.scm (heroic-container)[link-files]: Link all of 'share' from heroic-client. --- nongnu/packages/game-client.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index e9fcfc7..03fd21a 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -300,7 +300,7 @@ all games will be installed."))) ,@fhs-min-libs) #:name "fhs-union-32" #:system "i686-linux")) - (link-files '("share/applications/heroic.desktop")) + (link-files '("share")) (description "Heroic is an Open Source Game Launcher. Right now it supports launching games from the Epic Games Store using Legendary, GOG Games using our custom implementation with gogdl and Amazon Games using Nile. This package provides From b6d05dbefd2664aa6706d13ec4f46526a814369f Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sun, 25 Feb 2024 15:06:43 -0500 Subject: [PATCH 80/94] nongnu: corrupt-linux: Pass 'linux' argument to customize-linux. This fixes an issue where corrupt-linux would use the kernel config from the wrong version. The reason is that the package phases in customize-linux come from inheriting the package in the 'linux' keyword argument, defaulting to linux-libre. The kernel configuration comes in the configure phase. Since we did not use this in the customize-linux in corrupt-linux, we would be using the wrong configuration. For example, linux-6.7 would be built with the linux-libre-6.6 kernel config rather than linux-libre-6.7, missing the new CONFIG_BCACHEFS_FS option. Presumably all of our kernels were trying to use the default linux-libre version kernel config rather than the correct one to match their version. This should fix that. * nongnu/packages/linux.scm (corrupt-linux): Use the 'linux' keyword argument in customize-linux. Reported-by: reedm and yelninei on the #nonguix IRC channel. --- nongnu/packages/linux.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 1d6e6c5..e221bc4 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -118,6 +118,7 @@ some freedo package or an output of package-version procedure." (inherit (customize-linux #:name name + #:linux freedo #:source (origin (method url-fetch) (uri url) From 1b3a863979582ec136f49a7ff3178344a724b1fe Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 26 Feb 2024 08:40:14 +0800 Subject: [PATCH 81/94] nongnu: linux-xanmod-lts: Update to 6.6.18. * nongnu/packages/linux.scm (linux-xanmod-lts-version): Update to 6.6.18. (linux-xanmod-lts-source): Update hash. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index e221bc4..54e63e1 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -287,7 +287,7 @@ stable, responsive and smooth desktop experience."))) #:kernel-hash (base32 "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg") #:xanmod-hash (base32 "1k8ll65hiad6asq9rzdwfadmylgksfpvnp11hd04jz5kmwd25kp0"))) -(define-public linux-xanmod-lts-version "6.6.17") +(define-public linux-xanmod-lts-version "6.6.18") (define-public linux-xanmod-lts-revision "xanmod1") (define-public linux-xanmod-lts-source (make-linux-xanmod-source @@ -295,7 +295,7 @@ stable, responsive and smooth desktop experience."))) linux-xanmod-lts-revision #:xanmod-branch "lts" #:kernel-hash (base32 "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr") - #:xanmod-hash (base32 "0cbr487nmk8q0dfbf288h4fg0vb8b3qmjjl5zvlk00d4fgd10p4i"))) + #:xanmod-hash (base32 "1q33bd4a65l46333l2m7vjn46b0xhdbz508bq7q0bphbmy0bf35m"))) ;; Linux-XanMod packages (define-public linux-xanmod From 937598e1f23ea59306fdae9763afeff837c13f0f Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 26 Feb 2024 08:40:42 +0800 Subject: [PATCH 82/94] nongnu: linux-xanmod: Update to 6.7.6. * nongnu/packages/linux.scm (linux-xanmod-version): Update to 6.7.6. (linux-xanmod-source): Update hash. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 54e63e1..51bbfb0 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -277,7 +277,7 @@ distribution with custom settings and new features. It's built to provide a stable, responsive and smooth desktop experience."))) ;; Linux-XanMod sources -(define-public linux-xanmod-version "6.7.5") +(define-public linux-xanmod-version "6.7.6") (define-public linux-xanmod-revision "xanmod1") (define-public linux-xanmod-source (make-linux-xanmod-source @@ -285,7 +285,7 @@ stable, responsive and smooth desktop experience."))) linux-xanmod-revision #:xanmod-branch "main" #:kernel-hash (base32 "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg") - #:xanmod-hash (base32 "1k8ll65hiad6asq9rzdwfadmylgksfpvnp11hd04jz5kmwd25kp0"))) + #:xanmod-hash (base32 "0hv76dj9z17w6zcy25v1ndlmdw593wlbmnw5x903vidb3c6a1dfi"))) (define-public linux-xanmod-lts-version "6.6.18") (define-public linux-xanmod-lts-revision "xanmod1") From 25bcda2b9107b948a1c858e41aba1b7f95b76228 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 3 Mar 2024 13:33:11 +0100 Subject: [PATCH 83/94] nongnu: Update vscodium to 1.87.0.24060. * nongnu/packages/editors.scm (vscodium): Update to 1.87.0.24060. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/editors.scm b/nongnu/packages/editors.scm index 6b35962..d07bf1d 100644 --- a/nongnu/packages/editors.scm +++ b/nongnu/packages/editors.scm @@ -14,7 +14,7 @@ (define-public vscodium (package (name "vscodium") - (version "1.85.2.24019") + (version "1.87.0.24060") (source (origin (method url-fetch) @@ -27,7 +27,7 @@ "https://github.com/VSCodium/vscodium/releases/download/" version "/VSCodium-linux-" arch "-" version ".tar.gz"))) (sha256 - (base32 "0nd9hipz1jhjdv6hrm6q2jpppanh8nmkpy9zpayymy4dwif8a49q")))) + (base32 "1lw7j8h0i96mg8si8dmi55ldbz5j63zb93qf1g59siavx84f1zpd")))) (build-system chromium-binary-build-system) (arguments (list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files From f6121e161d3c5414e3829560b4517c7ba6af89bc Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 12 Mar 2024 00:12:02 -0400 Subject: [PATCH 84/94] nongnu: Set linux to linux@6.7 Upstream Guix defaulted to linux-libre@6.7 in commit 001dfb89579856b8695b33b59f484f36e313347f. Do likewise here. Also, update my copyright header from previous year as well. * nongnu/packages/linux.scm (linux): Set to linux-6.7. --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 51bbfb0..285c594 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2021 Risto Stevcev ;;; Copyright © 2021 aerique ;;; Copyright © 2022 Josselin Poiret -;;; Copyright © 2022 John Kehayias +;;; Copyright © 2022, 2023, 2024 John Kehayias ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 Remco van 't Veer ;;; Copyright © 2022 Simen Endsjø @@ -153,7 +153,7 @@ on hardware which requires nonfree software to function.")))) (define-public linux-4.19 (corrupt-linux linux-libre-4.19)) -(define-public linux linux-6.6) +(define-public linux linux-6.7) ;; linux-lts points to the *newest* released long-term support version. (define-public linux-lts linux-6.1) From 2d648f10abe534143f5328149d6eb2e7f3456532 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 5 Mar 2024 16:52:47 +0100 Subject: [PATCH 85/94] nongnu: firefox: Update to 123.0.1. * nongnu/packages/mozilla.scm (firefox): Update to 123.0.1. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/mozilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index f159446..c9a4e6a 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -532,20 +532,20 @@ MOZ_ENABLE_WAYLAND=1 exec ~a $@\n" ;; Update this id with every firefox update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. -(define %firefox-build-id "20240219104035") +(define %firefox-build-id "20240304165820") (define-public firefox (package (inherit firefox-esr) (name "firefox") - (version "123.0") + (version "123.0.1") (source (origin (method url-fetch) (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" version "/source/firefox-" version ".source.tar.xz")) (sha256 - (base32 "1dscgn1ymqi4zr29fpj43y8gaspc5wl7a59w657ws56vmnymm24y")))) + (base32 "073lbl2gs7c08kr9h6r2jvl3cvj84h3pdh6aj151c3synravkp6m")))) (arguments (substitute-keyword-arguments (package-arguments firefox-esr) ((#:phases phases) From db2293400d29583efb9154ccc0e9cde4a33963ab Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Thu, 14 Mar 2024 12:56:38 +0100 Subject: [PATCH 86/94] nongnu: anytype: Update to 0.39.0. * nongnu/packages/productivity.scm (anytype): Update to 0.39.0; [origin]: update to match the new distribution URI scheme; [arguments]: include additional binary. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/productivity.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nongnu/packages/productivity.scm b/nongnu/packages/productivity.scm index 5ccabb7..1065399 100644 --- a/nongnu/packages/productivity.scm +++ b/nongnu/packages/productivity.scm @@ -24,17 +24,17 @@ (define-public anytype (package (name "anytype") - (version "0.38") + (version "0.39.0") (source (origin (method url-fetch) (uri - (string-append "https://download.anytype.io?action=download" - "&key=desktop&id=148487107")) + (string-append "https://anytype-release.fra1.cdn.digitaloceanspaces.com/" + name "_" version "_amd64.deb")) (file-name (string-append "anytype-" version ".deb")) (sha256 (base32 - "1xc57ppk3l16mq2a53scf79m8hx43x21kac96ws66awlkz14swc7")))) + "10y037qwm6k28min2sgpshrlpirc1p0zn3b4syxrrz494x5g2ivi")))) (build-system chromium-binary-build-system) (arguments (list @@ -52,6 +52,7 @@ "libGLESv2.so" "libvk_swiftshader.so" "libvulkan.so.1" + "resources/app.asar.unpacked/dist/nativeMessagingHost" "resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node")) #:install-plan #~'(("opt/" "/share") From 2b8a066fa11b4b7cfd33d85e7df08e5f8ddd2c0b Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Wed, 13 Mar 2024 16:41:50 +0200 Subject: [PATCH 87/94] nongnu: electron: Update to 27.3.6. * nongnu/packages/electron.scm (electron): Rename to `electron-27` and default to it. (electron-source): New procedure. (electron-27): Update to 27.3.6. [source]: Use `electron-source`. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/electron.scm | 38 ++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm index 4a3ac0d..7df6c75 100644 --- a/nongnu/packages/electron.scm +++ b/nongnu/packages/electron.scm @@ -1,6 +1,8 @@ ;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; Copyright © 2023 Pierre Neidhardt ;;; Copyright © 2023 Giacomo Leidi +;;; Copyright © 2024 Andre A. Gomes +;;; Copyright © 2024 Jonathan Brielmaier (define-module (nongnu packages electron) #:use-module (nonguix build-system chromium-binary) @@ -13,23 +15,27 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages video)) -(define-public electron +(define (electron-source version hash) + (origin + (method url-fetch/zipbomb) + (uri + (string-append + "https://github.com/electron/electron/releases/download/v" + version "/electron-v" version "-" + (match (or (%current-system) (%current-target-system)) + ("x86_64-linux" "linux-x64") + ("i686-linux" "linux-ia32") + ("aarch64-linux" "linux-arm64") + ("armhf-linux" "linux-armv7l")) + ".zip")) + (sha256 (base32 hash)))) + +(define-public electron-27 (package (name "electron") - (version "27.1.0") - (source (origin - (method url-fetch/zipbomb) - (uri - (string-append - "https://github.com/electron/electron/releases/download/v" - version "/electron-v" version "-" - (match (or (%current-system) (%current-target-system)) - ("x86_64-linux" "linux-x64") - ("i686-linux" "linux-ia32") - ("aarch64-linux" "linux-arm64") - ("armhf-linux" "linux-armv7l")) - ".zip")) - (sha256 (base32 "08illknzcikzzsb6i7z1p2xgb20jjc5cx9hynll25f44q9pg48b6")))) + (version "27.3.6") + (source (electron-source version + "12hjn1bfk8c25f54kk561mkjl7hsk8b16rj7a7gczswjdpx6fpi0")) (build-system chromium-binary-build-system) (arguments `(#:wrapper-plan @@ -81,3 +87,5 @@ Chromium and is used by the Atom editor and many other apps.") (license (license:nonfree (string-append "https://github.com/electron/electron/blob/v" version "/LICENSE"))))) + +(define-public electron electron-27) From e9e954a6f00f68527bd4e5a2a8f64c001000e691 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 14 Mar 2024 23:07:47 +0100 Subject: [PATCH 88/94] nongnu: Add electron@28. * nongnu/packages/electron.scm (electron-28): New variable. Co-authored-by: Andre A. Gomes --- nongnu/packages/electron.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm index 7df6c75..21a5079 100644 --- a/nongnu/packages/electron.scm +++ b/nongnu/packages/electron.scm @@ -89,3 +89,10 @@ Chromium and is used by the Atom editor and many other apps.") version "/LICENSE"))))) (define-public electron electron-27) + +(define-public electron-28 + (package + (inherit electron-27) + (version "28.2.7") + (source (electron-source version + "0sw8nn1jr9x0p4s2g5yp5lrpy8mzq0sjd099x7axbg6cm1c80iff")))) From 587cf0a13518c506cd550cdfbf47b3792004cf73 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 14 Mar 2024 23:08:58 +0100 Subject: [PATCH 89/94] nongnu: Add electron@29. * nongnu/packages/electron.scm (electron-29): New variable. Co-authored-by: Andre A. Gomes --- nongnu/packages/electron.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm index 21a5079..a4a7b67 100644 --- a/nongnu/packages/electron.scm +++ b/nongnu/packages/electron.scm @@ -96,3 +96,9 @@ Chromium and is used by the Atom editor and many other apps.") (version "28.2.7") (source (electron-source version "0sw8nn1jr9x0p4s2g5yp5lrpy8mzq0sjd099x7axbg6cm1c80iff")))) +(define-public electron-29 + (package + (inherit electron-27) + (version "29.1.4") + (source (electron-source version + "1d96nhx9j9mzc3q3ald1imqdxdgq9by1qm4q703sjy3knq1p38w3")))) From f8b956664cd6eff67304be330dec1e4c1ab0ebd3 Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Wed, 13 Mar 2024 10:01:29 +0200 Subject: [PATCH 90/94] nongnu: sbcl-cl-electron: Update to 0.0.0-3.f2245dc. * nongnu/packages/lisp.scm (sbcl-cl-electron): Update to 0.0.0-3.f2245dc. [native-inputs]: Remove `sbcl` and commented out `sbcl-lisp-unit2`. [inputs]: Add `sbcl-cl-ppcre`, `sbcl-lparallel` and `sbcl-spinneret`. [arguments]: Disable test and use asd-systems. Add phase to fix paths. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/lisp.scm | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/nongnu/packages/lisp.scm b/nongnu/packages/lisp.scm index 527dd9f..d868a5f 100644 --- a/nongnu/packages/lisp.scm +++ b/nongnu/packages/lisp.scm @@ -1,16 +1,14 @@ ;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; Copyright © 2022 Pierre Neidhardt -;;; Copyright © 2023 André A. Gomes +;;; Copyright © 2023, 2024 André A. Gomes (define-module (nongnu packages lisp) #:use-module (ice-9 match) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages tls) - #:use-module (gnu packages node) #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) - ;; #:use-module (gnu packages lisp-check) #:use-module (nongnu packages electron) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -125,8 +123,8 @@ then open a browser at http://localhost:PORT, where PORT is the indicated port." "https://franz.com/ftp/pub/legal/ACL-Express-20170301.pdf")))) (define-public sbcl-cl-electron - (let ((commit "458a60d8c9baae71906294ffae891c3d0686c672") - (revision "2")) + (let ((commit "f2245dc1450a6ad416984cf932be50e00957390a") + (revision "3")) (package (name "sbcl-cl-electron") (version (git-version "0.0.0" revision commit)) @@ -138,13 +136,22 @@ then open a browser at http://localhost:PORT, where PORT is the indicated port." (commit commit))) (file-name (git-file-name "cl-electron" version)) (sha256 - (base32 "1ya6y55kv0g3h19ifnmwbc752p00s9mj1b1n4ljw4n7ycxmdpb24")))) + (base32 "0c18xbwwnjaiwzd01dprdrwzp27nwihaf7pmkql1f5yk43x3ajs0")))) (build-system asdf-build-system/sbcl) - (native-inputs (list ;; sbcl-lisp-unit2 - sbcl)) - (inputs (list electron node + (inputs (list electron sbcl-cl-json sbcl-iolib sbcl-cl-str sbcl-nclasses - sbcl-parenscript sbcl-bordeaux-threads)) + sbcl-cl-ppcre sbcl-bordeaux-threads sbcl-lparallel + sbcl-parenscript sbcl-spinneret)) + (arguments + '(#:tests? #f + #:asd-systems '("cl-electron" "cl-electron/demos") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "source/core.lisp" + (("\"electron\"") + (string-append "\"" (assoc-ref inputs "electron") "/bin/electron\"")))))))) (synopsis "Common Lisp interface to Electron") (home-page "https://github.com/atlas-engineer/cl-electron") (description "@command{cl-electron} is a binding to Electron for From 87357a2bec344f59635ddcde1472ff54b1c9c6cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Mar 2024 09:02:10 +0200 Subject: [PATCH 91/94] nongnu: ap6256-firmware: Update installed firmware. * nongnu/packages/firmware.scm (ap6256-firmware)[arguments]: Update install-plan to install to the correct destination. Sent to me directly via e-mail. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/firmware.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/nongnu/packages/firmware.scm b/nongnu/packages/firmware.scm index 218d375..22fd072 100644 --- a/nongnu/packages/firmware.scm +++ b/nongnu/packages/firmware.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2022-2023 Jonathan Brielmaier ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Krzysztof Baranowski +;;; Copyright © 2024 Efraim Flashner (define-module (nongnu packages firmware) #:use-module (gnu packages compression) @@ -134,16 +135,18 @@ HDMI to USB Type-C Bridge in the PinePhone.") (build-system copy-build-system) (arguments `(#:substitutable? #f - #:install-plan '( ;Bluetooth firmware - ("BCM4345C5.hcd" "usr/lib/firmware/brcm/") + #:install-plan '(;;Bluetooth firmware + ("BCM4345C5.hcd" "/lib/firmware/brcm/") ;; WiFi firmware - ("fw_bcm43456c5_ag.bin" "usr/lib/firmware/brcm/") + ("fw_bcm43456c5_ag.bin" "/lib/firmware/brcm/") + ("fw_bcm43456c5_ag.bin" + "/lib/firmware/brcm/brcmfmac43456-sdio.bin") ("brcmfmac43456-sdio.clm_blob" - "usr/lib/firmware/brcm/") + "/lib/firmware/brcm/") ("brcmfmac43456-sdio.AP6256.txt" - "usr/lib/firmware/brcm/") + "/lib/firmware/brcm/") ("brcmfmac43456-sdio.AP6256.txt" - "usr/lib/firmware/brcm/brcmfmac43456-sdio.pine64,pinebook-pro.txt")))) + "/lib/firmware/brcm/brcmfmac43456-sdio.pine64,pinebook-pro.txt")))) (synopsis "Firmware for the wifi/bt module AP6256") (description "This package provides Firmware for the wifi/bt module AP6256, From 8ecb4e5b327326b847fb63b48152544b399d4ec2 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 15 Mar 2024 13:28:17 +0100 Subject: [PATCH 92/94] nongnu: rtl8812au-aircrack-ng-linux-module: Update to 5.6.4.2-12.a3e0c0b. * nongnu/packages/linux.scm (rtl8812au-aircrack-ng-linux-module): Update to 5.6.4.2-12.a3e0c0b. --- nongnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 285c594..ba1d444 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -906,8 +906,8 @@ to disable the conflicting rtw88 driver: "https://github.com/morrownr/8821cu-20210916/blob/main/LICENSE"))))) (define-public rtl8812au-aircrack-ng-linux-module - (let ((commit "35308f4dd73e77fa572c48867cce737449dd8548") - (revision "11")) + (let ((commit "a3e0c0b6d54546418f046db0dbf1d20e454c9ec2") + (revision "12")) (package (inherit rtl8821ce-linux-module) (name "rtl8812au-aircrack-ng-linux-module") @@ -920,7 +920,7 @@ to disable the conflicting rtw88 driver: (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1clqrgmq5fhzybbiapmdbhg5qfx9k21r0hqa9pqmyinaqhvfnhfj")) + (base32 "1hwzsy62h7ik5s54paikcj5ips7mrnfacprciiq412mz5ag28cdn")) (modules '((guix build utils))) (snippet #~(begin From 8b130114d6998ef4ad1c54ad17ee2d783af51c2f Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 15 Mar 2024 13:31:19 +0100 Subject: [PATCH 93/94] nongnu: rtl8821ce-linux-module: Update to 0.0.0-11.66983b6. * nongnu/packages/linux.scm (rtl8821ce-linux-module): Update to 0.0.0-11.66983b6. --- nongnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index ba1d444..1221b0f 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -809,8 +809,8 @@ network adapters.") (license gpl2)))) (define-public rtl8821ce-linux-module - (let ((commit "a478095a45d8aa957b45be4f9173c414efcacc6f") - (revision "10")) + (let ((commit "66983b69120a13699acf40a12979317f29012111") + (revision "11")) (package (name "rtl8821ce-linux-module") (version (git-version "0.0.0" revision commit)) @@ -823,7 +823,7 @@ network adapters.") (file-name (git-file-name name version)) (sha256 (base32 - "00cn87jjrcxjqr3n8jv4w3n64zksmzz05fdr1gdvnbx1ab5739f6")))) + "0kj12jll0df1h4z6kzv3vylh22xlniki5kg414fv9sqgx1qgs5k7")))) (build-system linux-module-build-system) (arguments (list #:make-flags From 5baccd1d72594b4c85e958c2f34cac923345acb3 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 Mar 2024 09:05:12 +0100 Subject: [PATCH 94/94] nongnu: intel-microcode: Update to 20240312 [security fixes]. Fixes CVE-2023-43490, CVE-2023-39368, CVE-2023-38575, CVE-2023-28746, CVE-2023-22655. * nongnu/packages/linux.scm (intel-microcode): Update to 20240312. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 1221b0f..61e7f0a 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -1188,7 +1188,7 @@ driver: (define-public intel-microcode (package (name "intel-microcode") - (version "20231114") + (version "20240312") (source (origin (method git-fetch) @@ -1199,7 +1199,7 @@ driver: (commit (string-append "microcode-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07c7hkwpvb9056s73s55sg04cxr1d9n1sd9r1g7sm3gh70yc17ki")))) + (base32 "1j1krkmp9kxmpq8bbbld8bm3y9rqhmlj5qfm43czikawnpw81571")))) (build-system copy-build-system) (arguments (list #:install-plan