Merge branch 'hugo-extended' into 'master'

nongnu: hugo: Update to extended version See merge request nonguix/nonguix!643
nongnu: element-desktop: Update to 1.11.104.
2025-10-02 02:14:59 +00:00 · 2025-06-22 04:04:55 +02:00 · 2025-06-21 15:57:27 -04:00 · 2025-06-20 20:46:08 +08:00 · 2025-06-20 20:46:08 +08:00 · 2025-06-20 20:40:06 +08:00
4 changed files with 54 additions and 38 deletions
--- a/nongnu/packages/hugo.scm
+++ b/nongnu/packages/hugo.scm
@ -7,39 +7,50 @@
  #:use-module ((guix licenses)
                #:prefix license:)
  #:use-module (guix packages)
-  #:use-module (guix utils))
+  #:use-module (guix utils)
+  #:use-module (guix gexp)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages base))

 (define-public hugo
  (package
    (name "hugo")
-    (version "0.140.2")
+    (version "0.145.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append
-             "https://github.com/gohugoio/hugo/releases/download/v" version
-             "/" name "_" version "_linux-" (cond ((target-aarch64?)
-                                                   "arm64")
-                                                  ((target-arm32?)
-                                                   "arm")
-                                                  ((target-x86-64?)
-                                                   "amd64")
-                                                  (else "")) ".tar.gz"))
+             "https://github.com/gohugoio/hugo/releases/download/v"
+             version
+             "/"
+             name
+             "_extended_"
+             version
+             "_linux-"
+             (cond
+               ((target-aarch64?)
+                "arm64")
+               ((target-x86-64?)
+                "amd64")
+               (else ""))
+             ".tar.gz"))
       (sha256
-        (base32 (cond ((target-aarch64?)
-                       "1dv2k9j3i3294bl94jhwi645pf5r2143hizxd3xpc3fz8w8cfyy8")
-                      ((target-arm32?)
-                       "0f3mirqn3x2lrj7gzjyqklj081y7jfyxww2zkccg9f6jq0vcfcxd")
-                      ((target-x86-64?)
-                       "0hs4b3nrr1qajrh7f64ibwjrfipqllvifp526kf2gfxnhpkr67l8")
-                      (else ""))))))
+        (base32 (cond
+                  ((target-aarch64?)
+                   "0vl66diz0a35zznlk3c9x2ik419xpc9q8mybm90dv5pw7vj46rgc")
+                  ((target-x86-64?)
+                   "1r2alw2a3acs99dx89p886p3qbwpds6kpgz510jjiym8dna6hx3w")
+                  (else ""))))))
    (build-system binary-build-system)
    (arguments
     (list
-      #:install-plan ''(("hugo" "/bin/hugo"))))
-    (supported-systems (list "aarch64-linux"
-                             "armhf-linux"
-                             "x86_64-linux"))
+      #:install-plan ''(("hugo" "/bin/hugo"))
+      #:strip-binaries? #f
+      #:patchelf-plan
+      #~(list (list "hugo"
+                    '("gcc:lib")))))
+    (inputs `(("gcc:lib" ,gcc "lib")))
+    (supported-systems (list "aarch64-linux" "x86_64-linux"))
    (home-page "https://gohugo.io/")
    (synopsis "Static site generator written in Go")
    (description
--- a/nongnu/packages/messaging.scm
+++ b/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
--- 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.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
--- a/nonguix/transformations.scm
+++ b/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
Author	SHA1	Message	Date
Fernando Ayats	e0a028699c	Merge branch 'hugo-extended' into 'master' nongnu: hugo: Update to extended version See merge request nonguix/nonguix!643	2025-06-22 04:04:55 +02:00
John Kehayias	94c750ad59	nongnu: element-desktop: Update to 1.11.104. * nongnu/packages/messaging.scm (element-desktop): Update to 1.11.104.	2025-06-21 15:57:27 -04:00
Hilton Chain	382df31152	nongnu: nvidia-driver: Update to 570.169. * nongnu/packages/nvidia.scm (nvidia-driver): Update to 570.169. (nvidia-settings): Likewise.	2025-06-20 20:46:08 +08:00
Ashish SHUKLA	bfe682b9ab	nongnu: signal-desktop: Update to 7.58.0. * nongnu/packages/messaging.scm (signal-desktop): Update to 7.58.0. Signed-off-by: Hilton Chain <hako@ultrarare.space>	2025-06-20 20:46:08 +08:00
Hilton Chain	70a0de71d0	transformations: Deduplicate transformed field values. * nonguix/transformations.scm (nonguix-transformation-guix)[substitute-urls]: Delete duplicates. (nonguix-transformation-nvidia)[kernel-arguments]: Likewise.	2025-06-20 20:40:06 +08:00
Hilton Chain	5c13dbf132	transformations: nvidia: Set nvidia_drm.modeset explicitly. * nonguix/transformations.scm (nonguix-transformation-nvidia): Set nvidia_drm.modeset to 0 when kernel-mode-setting? is #f.	2025-06-20 20:40:06 +08:00
Fernando Ayats	011f702a5f	nongnu: hugo: Update to extended version	2025-03-27 08:28:39 +01:00