Merge branch 'master' into 'master'

WIP gnu: Add linux-surface.

See merge request nonguix/nonguix!51

nongnu/packages/linux.scm

@@ -349,6 +349,51 @@ stable, responsive and smooth desktop experience.")))
 ;;; Firmwares
 ;;;
 
+(define-public linux-surface-base
+  (hidden-package
+   (corrupt-linux linux-libre-5.8 "5.8.14"
+                  "1bzh82jpwcxsdzp6p1r8qlq9v5x79flhnzyimkcll8wdh28pjxpf")))
+
+(define-public linux-surface
+  (package
+    (inherit linux-surface-base)
+    (name "linux-surface")
+    (properties `((hidden? . #f)
+                  ,@(package-properties linux-surface-base)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments linux-surface-base)
+       ((#:modules modules)
+        `((ice-9 regex)
+          ,@modules))
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'apply-patches
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let* ((patch-dir
+                       (string-append (assoc-ref inputs "linux-surface-patches")
+                                      "/patches/5.8"))
+                      (patches (scandir patch-dir
+                                        (lambda (file) (string-match ".*.patch" file)))))
+                 (for-each
+                  (lambda (patch)
+                    (invoke "patch" "-p1" "-i"
+                            (string-append patch-dir "/" patch)))
+                  patches)
+                 #t)))))))
+    (native-inputs
+     `(,@(package-native-inputs linux-surface-base)
+       ("linux-surface-patches"
+        ;; Commit marked as release 5.8.14-1
+        ,(let ((commit "e230e9aeac4635aefccebf9d56b6c0ce838ceb7b"))
+           (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/linux-surface/linux-surface")
+                   (commit commit)))
+             (sha256
+              (base32 "07b7pf9yn2v7qqkqxg18jvmf9a4fkykv9ah6piam09rf64b2v7na"))
+             (file-name (git-file-name "linux-surface-patches" commit)))))))))
+
 (define-public linux-firmware
   (package
     (name "linux-firmware")

nongnu/packages/messaging.scm

@@ -37,7 +37,7 @@
 (define-public element-desktop
   (package
     (name "element-desktop")
-    (version "1.11.103")
+    (version "1.11.104")
     (source
      (origin
        (method url-fetch)
@@ -46,7 +46,7 @@
          "https://packages.riot.im/debian/pool/main/e/" name "/" name "_" version
          "_amd64.deb"))
        (sha256
-        (base32 "1apnj9n428lc9cw6jlmnqhcywqd6fnplkj3j5k731f2dzvzaifs6"))))
+        (base32 "1b1rzcsf0pdgccsl0cmrp9lnrcbhy50ygwkwik7hdnygr2721mbl"))))
     (supported-systems '("x86_64-linux"))
     (build-system chromium-binary-build-system)
     (arguments
@@ -83,7 +83,7 @@ its core.")
 (define-public signal-desktop
   (package
     (name "signal-desktop")
-    (version "7.57.0")
+    (version "7.58.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 "0xy4xfyx58v0869x0inypy9rgnbcxzrdnfh3r8qq00640wfj9j2c"))))
+        (base32 "1bhh9z7mclxlzq4pfs695pnkb5x36wm5ihniydvzqqi2g3xjbqam"))))
     (supported-systems '("x86_64-linux"))
     (build-system chromium-binary-build-system)
     (arguments

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.153.02")
+    (version "570.169")
     (source (nvidia-source
-             version "1dp1bpx4scx7lzqnajn75q5zjlbfvpjych3ils7zlxlmyvj8d20l"))
+             version "0r9phz9rv0n208f61lvv3m492387mjmqk4gph3ww7iawg53shcjz"))
     (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 "570.153.02")
+    (version "570.169")
     (source (nvidia-settings-source
-             name version "1qvvsrhlswpnv9aldqnynjch8y1x219ccsk3w4rfrw3swxm9qvp6"))
+             name version "15sxzczan9kq55hyiq73arls95lsdakpfbbzf4b6741fjfgd8kfh"))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f ;no test suite

nonguix/transformations.scm

@@ -2,6 +2,8 @@
 ;;; Copyright © 2025 Hilton Chain <hako@ultrarare.space>
 
 (define-module (nonguix transformations)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26)
   #:use-module (guix channels)
   #:use-module (guix diagnostics)
   #:use-module (guix gexp)
@@ -74,10 +76,11 @@ FIXME: GUIX-SOURCE? is disabled by default due to performance issue."
                       (cons %nonguix-signing-key
                             (guix-configuration-authorized-keys config)))
                      (substitute-urls
-                      `(,@(guix-configuration-substitute-urls config)
-                        ,@(if substitutes?
-                              '("https://substitutes.nonguix.org")
-                              '()))))))))))
+                      (delete-duplicates
+                       `(,@(guix-configuration-substitute-urls config)
+                         ,@(if substitutes?
+                               '("https://substitutes.nonguix.org")
+                               '())))))))))))
 
 (define* (nonguix-transformation-linux #:key (linux linux)
                                        (firmware (list linux-firmware))
@@ -128,11 +131,13 @@ TODO: Xorg configuration."
     (operating-system
       (inherit os)
       (kernel-arguments
-       `("modprobe.blacklist=nouveau"
-         ,@(if kernel-mode-setting?
-               '("nvidia_drm.modeset=1")
-               '())
-         ,@(operating-system-user-kernel-arguments os)))
+       (delete-duplicates
+        (cons* "modprobe.blacklist=nouveau"
+               (string-append
+                "nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0"))
+               (remove
+                (cut string-prefix? "nvidia_drm.modeset=" <>)
+                (operating-system-user-kernel-arguments os)))))
       (services
        `(,(or (assoc-ref %presets driver)
               (leave