From 1f6883b406b2e11c3cc41dc29d6178c951094d45 Mon Sep 17 00:00:00 2001 From: terramorpha Date: Tue, 14 May 2024 14:25:07 -0400 Subject: [PATCH 01/30] Add openmodelica. --- nongnu/packages/modelica.scm | 120 +++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 nongnu/packages/modelica.scm diff --git a/nongnu/packages/modelica.scm b/nongnu/packages/modelica.scm new file mode 100644 index 00000000..715cb209 --- /dev/null +++ b/nongnu/packages/modelica.scm @@ -0,0 +1,120 @@ +(define-module (nongnu packages modelica) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix build-system cmake) + #:use-module ((guix licenses) #:prefix license:) + + #:use-module (gnu packages autotools) + #:use-module (gnu packages boost) + #:use-module (gnu packages ccache) + #:use-module (gnu packages commencement) + #:use-module (gnu packages curl) + #:use-module (gnu packages documentation) + #:use-module (gnu packages graphics) + #:use-module (gnu packages graphviz) + #:use-module (gnu packages java) + #:use-module (gnu packages linux) + #:use-module (gnu packages maths) + #:use-module (gnu packages opencl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages qt) + #:use-module (gnu packages readline) + #:use-module (gnu packages xml)) + +(define ombootstrapping + (origin + (method url-fetch) + (uri "https://api.github.com/repos/OpenModelica/OMBootstrapping/tarball/c289e97c41d00939a4a69fe504961b47283a6d8e") + (sha256 + (base32 "1drz4hh9xfp2n9ilr0cmxm0jka24swdnglh8av06rdp0b2f9xszi")))) + +(define-public openmodelica + (package + (name "openmodelica") + (version "1.22.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenModelica/OpenModelica") + (commit (string-append "v" version)) + (recursive? #t))) + (sha256 + (base32 "02g5i2clcnn16gmi8v11sfn23r291jpsqi98qqq6al3lmc1xp556")) + (snippet + (with-imported-modules + '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (substitute* + "OMCompiler/Compiler/boot/CMakeLists.txt" + (("https://github.com/OpenModelica/OMBootstrapping/archive/refs/heads/master.tar.gz") + (string-append "file://" #$ombootstrapping))) + + + (substitute* + "OMPlot/OMPlot/OMPlotGUI/CMakeLists.txt" + (("target_link_libraries\\(OMPlotLib PUBLIC omc::simrt::runtime\\)") + "target_link_libraries(OMPlotLib PUBLIC omc::simrt::runtime) +find_package(Qt5Svg REQUIRED) +INCLUDE_DIRECTORIES(${Qt5Svg_INCLUDE_DIRS}) +target_link_libraries(OMPlotLib PUBLIC Qt5Svg) +"))))))) + + (build-system cmake-build-system) + (arguments + (list + #:validate-runpath? #f + ;; No tests + #:tests? #f + #:configure-flags + ''("-DOM_OMEDIT_ENABLE_QTWEBENGINE=ON") + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'create-home + (lambda _ + (mkdir-p (string-append (getcwd) "/home")) + (setenv "HOME" (string-append (getcwd) "/home"))))))) + (native-inputs + (list + ccache + doxygen + graphviz + autoconf + pkg-config)) + (inputs + (list + expat + openscenegraph + readline + qtdeclarative-5 + qtwebchannel-5 + qtwebengine-5 + qtxmlpatterns + qtsvg-5 + qtbase-5 + opencl-headers + opencl-icd-loader + boost + icedtea + (list util-linux "lib") + gfortran-toolchain + openblas + curl)) + (home-page "https://openmodelica.org/") + (synopsis + "Open-source Modelica-based modeling and simulation environment") + (description + "OPENMODELICA is an open-source Modelica-based1 modeling and simulation +environment intended for industrial and academic usage. + +The goal with the OpenModelica effort is to create a comprehensive Open Source +Modelica modeling, compilation and simulation environment based on free software +distributed in binary and source code form for research, teaching, and +industrial usage. We invite researchers and students, or any interested +developer to participate in the project and cooperate around OpenModelica, +tools, and applications.") + (license license:agpl3))) From f0132f2520d8c8d8619ca7a398508d233ba40499 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 30 Aug 2025 15:19:50 +0800 Subject: [PATCH 02/30] nongnu: replace-mesa: Group grafts together. * nongnu/packages/nvidia.scm (replace-mesa): Group grafts together. Fixes: #411 --- nongnu/packages/nvidia.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index fba5f08d..91ec1303 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -834,11 +834,10 @@ variables @code{__GLX_VENDOR_LIBRARY_NAME=nvidia} and (define* (replace-mesa obj #:key (driver nvda)) (with-transformation - (compose (package-input-grafting - `((,mesa . ,driver) - (,nvidia-driver . ,driver))) - (package-input-grafting - `((,ffmpeg . ,ffmpeg-nvenc)))) + (package-input-grafting + `((,mesa . ,driver) + (,nvidia-driver . ,driver) + (,ffmpeg . ,ffmpeg-nvenc))) obj)) From 1ad7bfcf34bb8886dc6b3bfb04cbbd60ba51c93b Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 30 Aug 2025 15:20:41 +0800 Subject: [PATCH 03/30] nongnu: Add obs-nvidia. * nongnu/packages/video.scm (obs-nvidia): New variable. --- nongnu/packages/video.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nongnu/packages/video.scm b/nongnu/packages/video.scm index e11a480a..5d4eaa41 100644 --- a/nongnu/packages/video.scm +++ b/nongnu/packages/video.scm @@ -242,6 +242,20 @@ specifically designed to be used by Firefox for accelerated decoding of web content.") (license license:expat))) +(define-public obs-nvidia + (package/inherit obs + (name "obs-nvidia") + (arguments + (substitute-keyword-arguments (package-arguments obs) + ((#:configure-flags flags #~'()) + #~(append #$flags '("-DENABLE_NVENC=ON"))))) + (inputs + (modify-inputs (package-inputs obs) + (prepend nv-codec-headers))) + (synopsis + "Live streaming software (with hardware acceleration for NVIDIA graphics +cards)"))) + (define-public obs-with-cef (package (inherit obs) From 3857caeccde0051fcf9b54c7fd3b94da2e27b5d5 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 30 Aug 2025 16:14:14 +0800 Subject: [PATCH 04/30] nongnu: nvidia-driver: Downgrade to 570.181. Due to various issues brought by the 580 driver. https://github.com/NixOS/nixpkgs/commit/582832167dfd913f3265fcec2ee288ae89527562 https://forums.developer.nvidia.com/t/580-release-feedback-discussion/341205/13 * nongnu/packages/nvidia.scm (nvidia-driver): Downgrade to 570.181. (nvidia-settings): Likewise. --- nongnu/packages/nvidia.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index 91ec1303..75589389 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -228,9 +228,9 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\ (define-public nvidia-driver (package (name "nvidia-driver") - (version "580.76.05") + (version "570.181") (source (nvidia-source - version "1zcpbp859h5whym0r54a3xrkqdl7z3py1hg8n8hv0c89nqvfd6r1")) + version "1yfwwfwbl5ph7s7zddixa0w8nb1wdg25sjysg98fl0hq7z72avgh")) (build-system copy-build-system) (arguments (list #:modules '((guix build copy-build-system) @@ -627,9 +627,9 @@ add @code{nvidia_drm.modeset=1} to @code{kernel-arguments} as well.") (define-public nvidia-settings (package (name "nvidia-settings") - (version "580.76.05") + (version "570.181") (source (nvidia-settings-source - name version "1156v82ligi89cpgrid923m1p81nvvrcwzlyraa74g2mnw7wfpln")) + name version "0fq72pj1b4iwlyivi9nmqr45iz6aqqdxgdbgk26x9m1yfxgpy748")) (build-system gnu-build-system) (arguments (list #:tests? #f ;no test suite From 65293a06a0360d980395ed7d708cb868979c289c Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 1 Sep 2025 15:31:41 +0800 Subject: [PATCH 05/30] services: nvidia: Load modules earlier. * nongnu/services/nvidia.scm (nvidia-service-type): Extend user-processes-service-type. --- nongnu/services/nvidia.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nongnu/services/nvidia.scm b/nongnu/services/nvidia.scm index adb9e9c7..ef8fd848 100644 --- a/nongnu/services/nvidia.scm +++ b/nongnu/services/nvidia.scm @@ -32,7 +32,7 @@ (list (shepherd-service (documentation "Prepare system environment for NVIDIA driver.") (provision '(nvidia)) - (requirement '(udev)) + (requirement '(kernel-module-loader)) (one-shot? #t) (modules '(((guix build utils) #:select (invoke/quiet)) ((rnrs io ports) #:select (get-line)))) @@ -59,6 +59,10 @@ (service-extension firmware-service-type (compose list nvidia-configuration-firmware)) (service-extension linux-loadable-module-service-type - (compose list nvidia-configuration-module)))) + (compose list nvidia-configuration-module)) + ;; Start before other user processes, necessary for some display + ;; managers. + (service-extension user-processes-service-type + (const '(nvidia))))) (default-value (nvidia-configuration)) (description "Prepare system environment for NVIDIA driver."))) From 6cea5f74bb27b1f6d55d85be7325c4764743f284 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 1 Sep 2025 23:37:47 +0800 Subject: [PATCH 06/30] nongnu: electron: Set supported-systems to x86_64-linux only. Since source hashes for other systems are not set. * nongnu/packages/electron.scm (electron-27) [supported-systems]: Set to x86_64-linux only. --- nongnu/packages/electron.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm index 9f16259e..55383c97 100644 --- a/nongnu/packages/electron.scm +++ b/nongnu/packages/electron.scm @@ -43,6 +43,8 @@ (version "27.3.11") (source (electron-source version "0qs5n6m0gj0rknjq5aqrbbpqwh2829a1cl51l6xj79p7aiggb9p3")) + ;; TODO: Better multi-arch source support for binary pacakges. + (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments (list From 665130f9e76d12fa9347b2f91d7ea272345bdec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Endsj=C3=B8?= Date: Mon, 25 Aug 2025 14:04:01 +0200 Subject: [PATCH 07/30] nongnu: electron-33: Update to 33.4.11. * nongnu/packages/electron.scm (electron-33): Update to 33.4.11. Signed-off-by: Hilton Chain --- nongnu/packages/electron.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm index 55383c97..ba66e3aa 100644 --- a/nongnu/packages/electron.scm +++ b/nongnu/packages/electron.scm @@ -129,9 +129,9 @@ Chromium and is used by the Atom editor and many other apps.") (define-public electron-33 (package (inherit electron-32) - (version "33.4.8") + (version "33.4.11") (source (electron-source version - "06v2v0pshya2d1kfwnxyhykf3yn9zz2dv7finv7llzv9sx4b6p5f")))) + "1ag8rrjgzvv2n4jcz0v9dsymlz26hhgxjz3r3hqr4qlighf46b91")))) (define-public electron-34 (package From c3912c319ee5a0d9bda464ae6d98129867b90a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Endsj=C3=B8?= Date: Mon, 25 Aug 2025 14:06:06 +0200 Subject: [PATCH 08/30] nongnu: electron-34: Update to 34.5.8. * nongnu/packages/electron.scm (electron-34): Update to 34.5.8. Signed-off-by: Hilton Chain --- nongnu/packages/electron.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm index ba66e3aa..d983c9a1 100644 --- a/nongnu/packages/electron.scm +++ b/nongnu/packages/electron.scm @@ -136,9 +136,9 @@ Chromium and is used by the Atom editor and many other apps.") (define-public electron-34 (package (inherit electron-33) - (version "34.5.0") + (version "34.5.8") (source (electron-source version - "1qkmg7ycp7529r1h36pxd867d8dpk1vdx6g5fgsakmqjlmyhvfhi")))) + "1ql0rxmw45p4vaxkxwl3pbgbqc0idz9fbifcnd0hsvwb0r0b0y6s")))) (define-public electron-35 (package From 11b61d926b92297685556513bf8afa375c9e89a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Endsj=C3=B8?= Date: Mon, 25 Aug 2025 14:07:31 +0200 Subject: [PATCH 09/30] nongnu: electron-35: Update to 35.7.5. * nongnu/packages/electron.scm (electron-35): Update to 35.7.5. Signed-off-by: Hilton Chain --- nongnu/packages/electron.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm index d983c9a1..2404030e 100644 --- a/nongnu/packages/electron.scm +++ b/nongnu/packages/electron.scm @@ -143,6 +143,6 @@ Chromium and is used by the Atom editor and many other apps.") (define-public electron-35 (package (inherit electron-34) - (version "35.1.3") + (version "35.7.5") (source (electron-source version - "076xi67bj11rr80k60ca8pv50lfzf3pi5z8glkybx2jr68f0vp7z")))) + "0ada9rafzi12bf9spxg1zik71rvr4xqlncqx25nhbqc945d1b39n")))) From de4cefa06412afaee8246e608b1543490a708c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Endsj=C3=B8?= Date: Mon, 25 Aug 2025 14:09:37 +0200 Subject: [PATCH 10/30] nongnu: Add electron-36. * nongnu/packages/electron.scm (electron-36): New variable. Signed-off-by: Hilton Chain --- nongnu/packages/electron.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm index 2404030e..1f399728 100644 --- a/nongnu/packages/electron.scm +++ b/nongnu/packages/electron.scm @@ -146,3 +146,10 @@ Chromium and is used by the Atom editor and many other apps.") (version "35.7.5") (source (electron-source version "0ada9rafzi12bf9spxg1zik71rvr4xqlncqx25nhbqc945d1b39n")))) + +(define-public electron-36 + (package + (inherit electron-35) + (version "36.8.1") + (source (electron-source version + "1qapdkchs2cpsksvmy1biglwx5h3cl2jg9jmdml7l185h5dfcw7y")))) From bca7b7f6edf28ca56846dab208f49ad1a479af5e Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 28 Aug 2025 00:13:44 +0200 Subject: [PATCH 11/30] nongnu: signal-desktop: Update to 7.68.0. * nongnu/packages/messaging.scm (signal-desktop): Update to 7.68.0. Signed-off-by: Hilton Chain --- 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 249f907c..7a0510bf 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -83,7 +83,7 @@ its core.") (define-public signal-desktop (package (name "signal-desktop") - (version "7.67.0") + (version "7.68.0") (source (origin (method url-fetch) @@ -92,7 +92,7 @@ its core.") "https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "1b8svlb6whlbl62wgia455wbdl847j4v93fvas3vyra2yi18jq2f")))) + (base32 "1ljs8n5kdscfpp2sjj9czl7j7fdviid0nj2h2vbs5939agy32h63")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments From e8b51099acf243adf6978ae5d661dfb3c5dcc5ac Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 1 Sep 2025 11:24:02 -0400 Subject: [PATCH 12/30] nongnu: corrupt-linux: Support modconfig option. This option was added in Guix in commit . * nongnu/packages/linux.scm (corrupt-linux): Add and use the modconfig keyword argument. --- nongnu/packages/linux.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index c0c59c9e..904a48b1 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -112,7 +112,8 @@ some freedo package or an output of package-version procedure." (name "linux") (configs "") (defconfig "nonguix_defconfig") - (get-extra-configs nonguix-extra-linux-options)) + (get-extra-configs nonguix-extra-linux-options) + modconfig) ;; TODO: This very directly depends on guix internals. ;; Throw it all out when we manage kernel hashes. @@ -168,7 +169,8 @@ some freedo package or an output of package-version procedure." (uri url) (hash hash)) #:configs configs - #:defconfig defconfig)) + #:defconfig defconfig + #:modconfig modconfig)) (home-page "https://www.kernel.org/") (synopsis "Linux kernel with nonfree binary blobs included") (description From 477f283914ca771a8622e16b73d845b87c63335d Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 2 Sep 2025 01:04:58 -0400 Subject: [PATCH 13/30] nongnu: Add linux-6.16. * nongnu/packages/linux.scm (linux-6.16): 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 904a48b1..43a62343 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -177,6 +177,9 @@ some freedo package or an output of package-version procedure." "The unmodified Linux kernel, including nonfree blobs, for running Guix System on hardware which requires nonfree software to function.")))) +(define-public linux-6.16 + (corrupt-linux linux-libre-6.16)) + (define-public linux-6.15 (corrupt-linux linux-libre-6.15)) From bf50e810a4d998902a9e53ac2d616e4dabbe074e Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sun, 7 Sep 2025 13:55:51 +0800 Subject: [PATCH 14/30] services: nvidia: Revert kernel-module-loader requirement. This is a follow-up to 65293a06a0360d980395ed7d708cb868979c289c, which made the service depending on kernel-module-loadel-service-type without actually extending it. Since the change is not necessary, I'm reverting it here. * nongnu/services/nvidia.scm (nvidia-shepherd-service) [requirement]: Revert to udev. --- nongnu/services/nvidia.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/services/nvidia.scm b/nongnu/services/nvidia.scm index ef8fd848..b57f5eb4 100644 --- a/nongnu/services/nvidia.scm +++ b/nongnu/services/nvidia.scm @@ -32,7 +32,7 @@ (list (shepherd-service (documentation "Prepare system environment for NVIDIA driver.") (provision '(nvidia)) - (requirement '(kernel-module-loader)) + (requirement '(udev)) (one-shot? #t) (modules '(((guix build utils) #:select (invoke/quiet)) ((rnrs io ports) #:select (get-line)))) From b95b52d9dddc83a587f201039370fcd2afee787b Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 4 Sep 2025 08:48:43 +0200 Subject: [PATCH 15/30] nongnu: signal-desktop: Update to 7.69.0. * nongnu/packages/messaging.scm (signal-desktop): Update to 7.69.0. Signed-off-by: Jelle Licht --- 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 7a0510bf..519c6c6c 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -83,7 +83,7 @@ its core.") (define-public signal-desktop (package (name "signal-desktop") - (version "7.68.0") + (version "7.69.0") (source (origin (method url-fetch) @@ -92,7 +92,7 @@ its core.") "https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "1ljs8n5kdscfpp2sjj9czl7j7fdviid0nj2h2vbs5939agy32h63")))) + (base32 "02hrsgx5jwhm16nvmz2pm8n11jp56g9mn404mymn1kfi2qsxy5mm")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments From d096df03564783372b315fe6c179655c2c337d5a Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 8 Sep 2025 08:22:15 +0200 Subject: [PATCH 16/30] nongnu: linux: Update to 6.16. * nongnu/packages/linux.scm (linux): Use linux-6.16. --- nongnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 43a62343..ebc9bab4 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -201,7 +201,7 @@ on hardware which requires nonfree software to function.")))) (define-public linux-5.4 (corrupt-linux linux-libre-5.4)) -(define-public linux linux-6.15) +(define-public linux linux-6.16) ;; linux-lts points to the *newest* released long-term support version. (define-public linux-lts linux-6.12) From df4e6ed9fe917f004357d931e210e328e348bb38 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 12 Sep 2025 17:31:49 -0400 Subject: [PATCH 17/30] nongnu: Remove linux-6.15. This version is slated to be removed from upstream Guix soon and is no longer supported upstream. The default has already been set to 6.16. * nongnu/packages/linux.scm (linux-6.15): Delete variable. --- nongnu/packages/linux.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index ebc9bab4..1c458be3 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -180,9 +180,6 @@ on hardware which requires nonfree software to function.")))) (define-public linux-6.16 (corrupt-linux linux-libre-6.16)) -(define-public linux-6.15 - (corrupt-linux linux-libre-6.15)) - (define-public linux-6.12 (corrupt-linux linux-libre-6.12)) From 52d202e8ecd9049d4c474dab56b67a1c50af1e34 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 16 Sep 2025 15:11:38 +0200 Subject: [PATCH 18/30] nongnu: firefox: Update to 143.0 [security fixes]. Fixes CVE-2025-10527, CVE-2025-10528, CVE-2025-10529, CVE-2025-10530, CVE-2025-10531, CVE-2025-10532, CVE-2025-10533, CVE-2025-10534, CVE-2025-10535, CVE-2025-10536, CVE-2025-10537. * nongnu/packages/mozilla.scm (firefox): Update to 143.0. Signed-off-by: John Kehayias --- 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 6d0fd849..2764ee6c 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -529,20 +529,20 @@ Release (ESR) version.") ;; 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 "20250818122500") +(define %firefox-build-id "20250915125927") (define-public firefox (package (inherit firefox-esr) (name "firefox") - (version "142.0") + (version "143.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 "03sblq1l5hjlwgqh1vyshrw1161cs5amlx7kjqzmjv1v1zqy2218")) + (base32 "10yz3rz2akf3b19hd2c5v77f038j0h6ci1asjb4w480q14wclibc")) (patches (map (lambda (patch) (search-path From adc55dec01c629efe39c4513e1ffe2b5fb7e7422 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 16 Sep 2025 15:14:55 +0200 Subject: [PATCH 19/30] nongnu: firefox-esr: Update to 140.3.0esr [security fixes]. Fixes CVE-2025-10527, CVE-2025-10528, CVE-2025-10529, CVE-2025-10532, CVE-2025-10533, CVE-2025-10536, CVE-2025-10537. * nongnu/packages/mozilla.scm (firefox-esr): Update to 140.3.0esr. Signed-off-by: John Kehayias --- 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 2764ee6c..88f88c3e 100644 --- a/nongnu/packages/mozilla.scm +++ b/nongnu/packages/mozilla.scm @@ -87,19 +87,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 "20250818124956") +(define %firefox-esr-build-id "20250915124517") (define-public firefox-esr (package (name "firefox-esr") - (version "140.2.0esr") + (version "140.3.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 "0mgglah7inji8gyhswdy62w2lqxgm4yfs1xg7ib6sw1vbikwwvcm")) + (base32 "05i3czn3v2qnhir8apcphbqy7rmy1dn7kcwx5yyi2qvmjcyfpipg")) (patches (map (lambda (patch) (search-path From de297a2a28577651cbe27ba58f8b9ea8912392b0 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 11 Sep 2025 12:31:26 +0200 Subject: [PATCH 20/30] nongnu: signal-desktop: Update to 7.70.0 * nongnu/packages/messaging.scm (signal-desktop): Update to 7.70.0 Signed-off-by: John Kehayias --- 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 519c6c6c..d8d2f4d0 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -83,7 +83,7 @@ its core.") (define-public signal-desktop (package (name "signal-desktop") - (version "7.69.0") + (version "7.70.0") (source (origin (method url-fetch) @@ -92,7 +92,7 @@ its core.") "https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "02hrsgx5jwhm16nvmz2pm8n11jp56g9mn404mymn1kfi2qsxy5mm")))) + (base32 "1f3vgfyb53c1qbvcmhmmbwz4iychdvbiyrpa2rgnzr3jp5ax8dhp")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments From bc2a73d7a8252b14a2a3705f8df791ab314f5a5c Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Fri, 19 Sep 2025 13:26:35 +0200 Subject: [PATCH 21/30] nongnu: linux-firmware: Update to 20250917. * nongnu/packages/linux.scm (linux-firmware): Update to 20250917. (select-firmware): Handle the Link keyword correctly. (iwlwifi-firmware)[arguments]{phases}: In the select-firmware phase, use new location of firmware. --- nongnu/packages/linux.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 1c458be3..a12c0563 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm @@ -361,14 +361,14 @@ stable, responsive and smooth desktop experience."))) (define-public linux-firmware (package (name "linux-firmware") - (version "20250808") + (version "20250917") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/firmware/" "linux-firmware-" version ".tar.xz")) (sha256 (base32 - "0zw3vsmd07yr27y5fz0m357hci00ah5impx5sz4jcnd18ldmaaf0")))) + "0xgvb0fb4s48423asdb1dnkjjskbfmm336gm6vki2nliasvpa18j")))) (build-system gnu-build-system) (arguments (list #:tests? #f @@ -415,8 +415,11 @@ if your hardware is supported by one of the smaller firmware packages.") #~(lambda _ (use-modules (ice-9 regex)) (substitute* "WHENCE" - (("^(File|RawFile|Link): *([^ ]*)(.*)" _ type file rest) - (string-append (if (string-match #$keep file) type "Skip") ": " file rest))))) + (("^(File|RawFile): *([^ ]*)(.*)" _ type file rest) + (string-append (if (string-match #$keep file) type "Skip") ": " file rest)) + (("^Link: *(.*) *-> *(.*)" _ file target) + (string-append (if (string-match #$keep target) "Link" "Skip") + ": " file " -> " target))))) (define-public amdgpu-firmware (package @@ -705,7 +708,7 @@ laptops).") ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'select-firmware - #$(select-firmware "^iwlwifi-"))))))) + #$(select-firmware "^intel/iwlwifi/"))))))) (home-page "https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi") (synopsis "Nonfree firmware for Intel wifi chips") (description "The proprietary iwlwifi kernel module is required by many From 0531ba5050d893013864c779ae4c7dd1d16bfb1f Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 17 Sep 2025 00:28:00 +0800 Subject: [PATCH 22/30] nongnu: heroic-client: Set supported-systems. * nongnu/packages/game-client.scm (heroic-client) [supported-systems]: Limit to x86_64-linux only. --- nongnu/packages/game-client.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index 817c97b3..7f4518ed 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -105,7 +105,8 @@ (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))) + (license license:gpl3) + (supported-systems '("x86_64-linux")))) (define steam-client (package From 0864aa6ba5ff1544222a133cd7cab030b5490250 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 17 Sep 2025 00:28:27 +0800 Subject: [PATCH 23/30] nongnu: steam-client: Set supported-systems. * nongnu/packages/game-client.scm (steam-client) [supported-systems]: Limit to x86_64-linux only. --- nongnu/packages/game-client.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index 7f4518ed..f33d8036 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -161,7 +161,8 @@ implementation with gogdl and Amazon Games using Nile.") (home-page "https://store.steampowered.com") (synopsis "Digital distribution platform for managing and playing games") (description "Steam is a digital software distribution platform created by Valve.") - (license (license:nonfree "file:///share/doc/steam/steam_subscriber_agreement.txt")))) + (license (license:nonfree "file:///share/doc/steam/steam_subscriber_agreement.txt")) + (supported-systems '("x86_64-linux")))) (define steam-client-libs `(("at-spi2-core" ,at-spi2-core) ; Required (often) for SteamVR interface. From 017e4bf8642dd8bc5de576ed57eec30c0ff833f0 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 19 Sep 2025 08:47:07 +0200 Subject: [PATCH 24/30] nongnu: signal-desktop: Update to 7.71.0. * nongnu/packages/messaging.scm (signal-desktop): Update to 7.71.0. Signed-off-by: Hilton Chain --- 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 d8d2f4d0..54acf433 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -83,7 +83,7 @@ its core.") (define-public signal-desktop (package (name "signal-desktop") - (version "7.70.0") + (version "7.71.0") (source (origin (method url-fetch) @@ -92,7 +92,7 @@ its core.") "https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "1f3vgfyb53c1qbvcmhmmbwz4iychdvbiyrpa2rgnzr3jp5ax8dhp")))) + (base32 "14lk8s040alj2lxqw30hh54l4p3kpq1mxq64l8sqlph2y9c3hig3")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments From 7a67115e0daafb276574a283ce0d474936cfc3e0 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Mon, 8 Sep 2025 10:21:39 +0200 Subject: [PATCH 25/30] import: Add firefox updater. * guix/import/firefox.scm: Implement basic firefox updater. Signed-off-by: Hilton Chain Modified-by: Hilton Chain --- guix/import/firefox.scm | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 guix/import/firefox.scm diff --git a/guix/import/firefox.scm b/guix/import/firefox.scm new file mode 100644 index 00000000..7bcaf07e --- /dev/null +++ b/guix/import/firefox.scm @@ -0,0 +1,47 @@ +;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; Copyright © 2025 Nicolas Graves + +;;; This file is not part of GNU Guix but requires this naming scheme +;;; so that the %firefox-updater is properly read when using +;;; `guix refresh -L$(pwd) firefox' in nonguix root. + +(define-module (guix import firefox) + #:use-module (guix import json) + #:use-module (guix memoization) + #:use-module (guix packages) + #:use-module (guix upstream) + #:export (%firefox-updater)) + +(define firefox-json-url "https://product-details.mozilla.org/1.0/firefox_versions.json") + +(define firefox-versions + (memoize + (lambda _ + (let ((alist (json-fetch firefox-json-url))) + (list (cons "firefox" (assoc-ref alist "LATEST_FIREFOX_VERSION")) + (cons "firefox-esr" (assoc-ref alist "FIREFOX_ESR"))))))) + +(define* (latest-release package #:key (version #f) partial-version?) + "Return an for the latest-release of PACKAGE." + (let* ((name (package-name package)) + (version (or version (assoc-ref (firefox-versions) name)))) + (upstream-source + (package name) + (version version) + (urls + (list (string-append "https://archive.mozilla.org/pub/firefox/releases/" + version "/source/firefox-" + version ".source.tar.xz")))))) + +(define (firefox-package? package) + "Return true if PACKAGE is Firefox." + (member (package-name package) (list "firefox" "firefox-esr"))) + +(define %firefox-updater + (upstream-updater + (name 'firefox) + (description "Updater for Firefox packages") + (pred firefox-package?) + (import latest-release))) + +;;; firefox.scm ends here. From 63c7e043869abc244999636bff053f6adcbb0704 Mon Sep 17 00:00:00 2001 From: Murilo Date: Mon, 1 Sep 2025 16:43:06 -0300 Subject: [PATCH 26/30] nongnu: egl-gbm: Update to 1.1.2.1. * nongnu/packages/nvidia.scm (egl-gbm): Update to 1.1.2.1. Signed-off-by: Hilton Chain --- nongnu/packages/nvidia.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index 75589389..ea7d7d87 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -849,7 +849,7 @@ variables @code{__GLX_VENDOR_LIBRARY_NAME=nvidia} and (define-public egl-gbm (package (name "egl-gbm") - (version "1.1.2") + (version "1.1.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -858,7 +858,7 @@ variables @code{__GLX_VENDOR_LIBRARY_NAME=nvidia} and (file-name (git-file-name name version)) (sha256 (base32 - "1rfgfi06ry7c7hnzdm4b0dc8r3hmbfn2rd37z3mc4wn38sgz5l3a")))) + "1zcr1jksnh0431marzvgg301aybli29r1xw5vs4wnxgcp9bigvn6")))) (build-system meson-build-system) (native-inputs (list pkg-config)) (inputs (list eglexternalplatform mesa-for-nvda)) From 9302c6319b9d4530359f310e45e37e911915b0ce Mon Sep 17 00:00:00 2001 From: Murilo Date: Mon, 1 Sep 2025 16:45:08 -0300 Subject: [PATCH 27/30] nongnu: egl-x11: Update to 1.0.3. * nongnu/packages/nvidia.scm (egl-x11): Update to 1.0.3. Signed-off-by: Hilton Chain --- nongnu/packages/nvidia.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index ea7d7d87..9dfc4cd3 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -872,7 +872,7 @@ GBM EGL support.") (define-public egl-x11 (package (name "egl-x11") - (version "1.0.2") + (version "1.0.3") (source (origin (method git-fetch) (uri (git-reference @@ -881,7 +881,7 @@ GBM EGL support.") (file-name (git-file-name name version)) (sha256 (base32 - "0s18xpylz16ry51xp1bs2s4hmvwsq49hcfc0gnmmvnymdzm041aq")))) + "1hh1wkdijjhsmym5ab5nw8wyi0w9x7aznnmyg8sczhwdfb5rdnrj")))) (build-system meson-build-system) (native-inputs (list pkg-config)) (inputs (list eglexternalplatform mesa-for-nvda)) From 2fe28d2a1bbeadd52b0c74c4c04cb7983d9f16b3 Mon Sep 17 00:00:00 2001 From: Murilo Date: Mon, 1 Sep 2025 16:32:49 -0300 Subject: [PATCH 28/30] nongnu: nvidia-driver: Install additional components. * nongnu/packages/nvidia.scm (nvidia-driver)[arguments] <#:install-plan>: Install 'nvngx_dlssg.dll' and 'nvoptix.bin'. <#:phases>{create-misc-files}: Set 'nvidia_layers.json' library_path to the store absolute path of 'libnvidia-present.so'. Signed-off-by: Hilton Chain --- nongnu/packages/nvidia.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index 9dfc4cd3..17b10813 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -245,8 +245,8 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\ ("x86_64-linux" ".") (_ ".")) "lib/" #:include-regexp ("^./[^/]+\\.so")) - ("." "lib/nvidia/wine/" #:include-regexp ("_?nvngx\\.dll$")) - ("." "share/nvidia/" #:include-regexp ("nvidia-application-profiles")) + ("." "lib/nvidia/wine/" #:include-regexp ("_?nvngx.*?\\.dll$")) + ("." "share/nvidia/" #:include-regexp ("nvidia-application-profiles|nvoptix.bin")) ("." "share/egl/egl_external_platform.d/" #:include-regexp ("(gbm|wayland|xcb|xlib)\\.json")) ("10_nvidia.json" "share/glvnd/egl_vendor.d/") ("90-nvidia.rules" "lib/udev/rules.d/") @@ -287,6 +287,8 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\ (substitute* '("nvidia_icd.json" "nvidia_layers.json") (("libGLX_nvidia\\.so\\.." all) + (string-append #$output "/lib/" all)) + (("libnvidia-present\\.so\\.[0-9.]*" all) (string-append #$output "/lib/" all))) ;; VulkanSC ICD configuration From c33db8571ae46feb457917327db8f6f91599e997 Mon Sep 17 00:00:00 2001 From: Murilo Date: Mon, 1 Sep 2025 16:31:31 -0300 Subject: [PATCH 29/30] nongnu: nvidia-driver: Update to 580.82.09. * nongnu/packages/nvidia.scm (nvidia-driver): Update to 580.82.09. (nvidia-settings): Likewise. Signed-off-by: Hilton Chain --- nongnu/packages/nvidia.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index 17b10813..1a5031bc 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -228,9 +228,9 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\ (define-public nvidia-driver (package (name "nvidia-driver") - (version "570.181") + (version "580.82.09") (source (nvidia-source - version "1yfwwfwbl5ph7s7zddixa0w8nb1wdg25sjysg98fl0hq7z72avgh")) + version "1dwmardvxb2w6mx7hich5wc06f50qz92jk63kbhf059fv8rgiv1y")) (build-system copy-build-system) (arguments (list #:modules '((guix build copy-build-system) @@ -629,9 +629,9 @@ add @code{nvidia_drm.modeset=1} to @code{kernel-arguments} as well.") (define-public nvidia-settings (package (name "nvidia-settings") - (version "570.181") + (version "580.82.09") (source (nvidia-settings-source - name version "0fq72pj1b4iwlyivi9nmqr45iz6aqqdxgdbgk26x9m1yfxgpy748")) + name version "0sy3mrg3vmyba6m87nanzmpvv2hzhb6nqdckhlaxv8wppmr7fvms")) (build-system gnu-build-system) (arguments (list #:tests? #f ;no test suite From 25d7a8091c2c9678a8694f073d846a7001165169 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 23 Sep 2025 22:45:08 +0200 Subject: [PATCH 30/30] nongnu: steam-client: Update to 1.0.0.84. * nongnu/packages/game-client.scm (steam-client): Update to 1.0.0.84. --- 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 f33d8036..d520821c 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -111,7 +111,7 @@ implementation with gogdl and Amazon Games using Nile.") (define steam-client (package (name "steam-client") - (version "1.0.0.83") + (version "1.0.0.84") (source (origin (method url-fetch) @@ -119,7 +119,7 @@ implementation with gogdl and Amazon Games using Nile.") version ".tar.gz")) (sha256 (base32 - "10lgmjsada0n2a4h1vgrnwcjcka7vp4igy82f1n99zbyrjq845kr")) + "0i3v0zz36x7v81qslvfbiby57hk96hn15w4xxal1lgvrb0npdyii")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (arguments