Merge branch 'qby-master-patch-12158' into 'master'

Draft: Brave

See merge request nonguix/nonguix!402

nongnu/packages/anonsurf-parrot.scm

@@ -0,0 +1,29 @@
+(define-module (my-packages anonsurf)
+  #:use-module (guix packages)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system gnu))
+
+(define-public anonsurf
+  (package
+    (name "anonsurf")
+    (version version) ;; Insert the appropriate version number
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/ParrotSec/anonsurf")
+                    (commit version)))
+              (file-name (string-append name "-" version))
+              (sha256
+               (base32
+                hash)))) ;; Update SHA256 hash
+    (build-system gnu-build-system)
+    (arguments `(#:phases
+                  (modify-phases %standard-phases
+                    (add-before 'configure 'pre-configure
+                      (lambda _
+                        (invoke "make")
+                        #t)))))
+    (home-page "https://github.com/ParrotSec/anonsurf")
+    (synopsis "Parrot AnonSurf Module")
+    (description "AnonSurf is a script designed to start TOR and set the iptables properly to prevent traffic from passing outside the TOR network.")
+    (license license:license))) ;; Update the license if different

nongnu/packages/brave.scm

@@ -0,0 +1,56 @@
+(use-modules (ice-9 popen)
+             (ice-9 rdelim))
+
+(define (get-hash path)
+  (let* ((hash-command (string-append "guix hash -rx '" path "'"))
+         (hash-pipe (open-input-pipe hash-command))
+         (hash (read-line hash-pipe)))
+    (close-pipe hash-pipe)
+    hash))
+
+(define version "1.61.120")
+(define url (string-append "https://github.com/brave/brave-browser/archive/refs/tags/v" version ".tar.gz"))
+(define file-path (string-append "/tmp/" version ".tar.gz"))
+
+;; Download file
+(system (string-append "wget -O " file-path " " url))
+
+(define-module (my-packages brave)
+  #:use-module (guix packages)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
+  #:use-module ((guix licenses) #:prefix license:))
+
+;; Calculate hash
+(define hash (get-hash file-path))
+
+(define-public brave
+  (package
+    (name "brave")
+    (version version) 
+    (source (origin
+              (method url-fetch)
+              (uri url)
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256 (base32 hash))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'pre-configure
+           (lambda _
+                        (mkdir "build") 
+             (invoke "npm" "install")
+             (invoke "npm" "run" "init")
+             (invoke "npm" "run" "build")
+             (invoke "npm" "start")
+                        (system* "cp" "-r" "build/*" "/gnu/store") 
+             #t)))))
+    (inputs 
+      `(("node" ,node)
+        ("git" ,git)
+        ("python3" ,python)))
+    (home-page "https://www.brave.com")
+    (synopsis "Fast, private and secure browser for PC, Mac and mobile")
+    (description "An open source browser derived from Chrome that focuses on privacy")
+    (license license:bsd-3))) ;; Update the license if different

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)
+                      (delete-duplicates
-                        ,@(if substitutes?
+                       `(,@(guix-configuration-substitute-urls config)
-                              '("https://substitutes.nonguix.org")
+                         ,@(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"
+       (delete-duplicates
-         ,@(if kernel-mode-setting?
+        (cons* "modprobe.blacklist=nouveau"
-               '("nvidia_drm.modeset=1")
+               (string-append
-               '())
+                "nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0"))
-         ,@(operating-system-user-kernel-arguments os)))
+               (remove
+                (cut string-prefix? "nvidia_drm.modeset=" <>)
+                (operating-system-user-kernel-arguments os)))))
       (services
        `(,(or (assoc-ref %presets driver)
               (leave