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. diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm index 9f16259e..1f399728 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 @@ -127,20 +129,27 @@ 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 (inherit electron-33) - (version "34.5.0") + (version "34.5.8") (source (electron-source version - "1qkmg7ycp7529r1h36pxd867d8dpk1vdx6g5fgsakmqjlmyhvfhi")))) + "1ql0rxmw45p4vaxkxwl3pbgbqc0idz9fbifcnd0hsvwb0r0b0y6s")))) (define-public electron-35 (package (inherit electron-34) - (version "35.1.3") + (version "35.7.5") (source (electron-source version - "076xi67bj11rr80k60ca8pv50lfzf3pi5z8glkybx2jr68f0vp7z")))) + "0ada9rafzi12bf9spxg1zik71rvr4xqlncqx25nhbqc945d1b39n")))) + +(define-public electron-36 + (package + (inherit electron-35) + (version "36.8.1") + (source (electron-source version + "1qapdkchs2cpsksvmy1biglwx5h3cl2jg9jmdml7l185h5dfcw7y")))) diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index 817c97b3..d520821c 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -105,12 +105,13 @@ (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 (name "steam-client") - (version "1.0.0.83") + (version "1.0.0.84") (source (origin (method url-fetch) @@ -118,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 @@ -160,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. diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index c0c59c9e..a12c0563 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,15 +169,16 @@ 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 "The unmodified Linux kernel, including nonfree blobs, for running Guix System on hardware which requires nonfree software to function.")))) -(define-public linux-6.15 - (corrupt-linux linux-libre-6.15)) +(define-public linux-6.16 + (corrupt-linux linux-libre-6.16)) (define-public linux-6.12 (corrupt-linux linux-libre-6.12)) @@ -196,7 +198,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) @@ -359,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 @@ -413,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 @@ -703,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 diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 249f907c..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.67.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 "1b8svlb6whlbl62wgia455wbdl847j4v93fvas3vyra2yi18jq2f")))) + (base32 "14lk8s040alj2lxqw30hh54l4p3kpq1mxq64l8sqlph2y9c3hig3")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm index 6d0fd849..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 @@ -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 diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index fba5f08d..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 "580.76.05") + (version "580.82.09") (source (nvidia-source - version "1zcpbp859h5whym0r54a3xrkqdl7z3py1hg8n8hv0c89nqvfd6r1")) + version "1dwmardvxb2w6mx7hich5wc06f50qz92jk63kbhf059fv8rgiv1y")) (build-system copy-build-system) (arguments (list #:modules '((guix build copy-build-system) @@ -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 @@ -627,9 +629,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 "580.82.09") (source (nvidia-settings-source - name version "1156v82ligi89cpgrid923m1p81nvvrcwzlyraa74g2mnw7wfpln")) + name version "0sy3mrg3vmyba6m87nanzmpvv2hzhb6nqdckhlaxv8wppmr7fvms")) (build-system gnu-build-system) (arguments (list #:tests? #f ;no test suite @@ -834,11 +836,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)) @@ -850,7 +851,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 @@ -859,7 +860,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)) @@ -873,7 +874,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 @@ -882,7 +883,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)) 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) diff --git a/nongnu/services/nvidia.scm b/nongnu/services/nvidia.scm index adb9e9c7..b57f5eb4 100644 --- a/nongnu/services/nvidia.scm +++ b/nongnu/services/nvidia.scm @@ -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.")))