Merge branch 'tarsnap' into 'master'

nongnu: add tarsnap@1.0.40 See merge request nonguix/nonguix!435
nongnu: element-desktop: Update to 1.11.104.
2025-10-02 02:14:59 +00:00 · 2025-06-21 23:58:19 +00: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 81 additions and 17 deletions
--- 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/nongnu/packages/tarsnap.scm
+++ b/nongnu/packages/tarsnap.scm
@ -0,0 +1,59 @@
+;;; SPDX-License-Identifier: GPL-3.0-or-later
+;;; Copyright © 2024 Joshua Hunt <joshua.edward.hunt@gmail.com>
+
+(define-module (nongnu packages tarsnap)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (nonguix licenses)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages bash))
+
+(define-public tarsnap
+  (package
+    (name "tarsnap")
+    (version "1.0.40")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://www.tarsnap.com/download/tarsnap-autoconf-" version
+             ".tgz"))
+       (sha256
+        (base32 "1mbzq81l4my5wdhyxyma04sblr43m8p7ryycbpi6n78w1hwfbjmw"))))
+    (inputs (list e2fsprogs openssl zlib))
+    (native-inputs (list glibc bash))
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'fix-get-path
+                    (lambda _
+                      ;; Both configure and Makefile.in use `command -p` to find
+                      ;; commands using a "default" value of PATH that doesn't include
+                      ;; the guix store. Removing the `-p` flag allows the scripts to
+                      ;; find the commands they are trying to run.
+                      (substitute* "configure"
+                        (("command -p")
+                         "command"))
+                      (substitute* "Makefile.in"
+                        (("command -p")
+                         "command")))))
+       ;; POSIX_SH tells the configure script where to find the `sh`
+       ;; command. However, it doesn't actually seem to use the value of the
+       ;; variable. Not setting this environment variable causes the configure
+       ;; step to fail with an error that it can't find any POSIX-compatible
+       ;; shell.
+       #:configure-flags '("POSIX_SH=foo")))
+    (build-system gnu-build-system)
+    (synopsis
+     "Tarsnap is a secure, efficient online backup service: \"Online backups
+for the truly paranoid\".")
+    (description
+     "Tarsnap is a secure, efficient online backup service, offering
+encryption, de-duplicated backups, and a pre-paid pricing model based
+on actual usage.")
+    (home-page "https://www.tarsnap.com/")
+    (license (nonfree
+              "https://raw.githubusercontent.com/Tarsnap/tarsnap/master/COPYING"))))
--- 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
Joshua Hunt	50009afab5	Merge branch 'tarsnap' into 'master' nongnu: add tarsnap@1.0.40 See merge request nonguix/nonguix!435	2025-06-21 23:58:19 +00: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
Joshua Hunt	f6605f0784	Merge remote-tracking branch 'upstream/master' into tarsnap	2024-04-30 20:50:04 +02:00
Joshua Hunt	ad6c342054	nongnu: add tarsnap@1.0.40 * nongnu/packages/tarsnap.scm (tarsnap): new package	2024-03-15 18:47:53 +01:00