From 06d8a479d697cfc327ba30feb056e06ff56a4ad1 Mon Sep 17 00:00:00 2001 From: qby <5731587-qby@users.noreply.gitlab.com> Date: Sun, 24 Mar 2024 14:14:49 +0000 Subject: [PATCH 1/7] Adding SamSung's Odin 4 --- nongnu/packages/odin4.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 nongnu/packages/odin4.scm diff --git a/nongnu/packages/odin4.scm b/nongnu/packages/odin4.scm new file mode 100644 index 00000000..e9f642da --- /dev/null +++ b/nongnu/packages/odin4.scm @@ -0,0 +1,31 @@ +(define-module (my-channel odin4-downloader-menu) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system gnu)) + +(define-public odin4-downloader-menu + (package + (name "odin4-downloader-menu") + (version "0.1.0") ;; Adjust this to match the actual version + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/afaneh92/Odin4-downloader-menu") + (commit "master"))) ;; Replace with specific commit if needed + (file-name (git-file-name name version)) + (sha256 (base32 "")))) ;; Replace with actual hash + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;; No tests in the repository + #:phases + (modify-phases %standard-phases + (delete 'configure) ;; No configure script in the repository + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "menu" (string-append out "/bin/menu")) + #t)))))) + (home-page "https://github.com/afaneh92/Odin4-downloader-menu") + (synopsis "Odin4 downloader menu") + (description "This package provides a menu for Odin4 downloader.") + (license license:expat))) ;; Replace with actual license \ No newline at end of file From 0a94bd4009bd5d6847eec740d2246d69a3580a86 Mon Sep 17 00:00:00 2001 From: qby <5731587-qby@users.noreply.gitlab.com> Date: Sun, 24 Mar 2024 16:02:03 +0000 Subject: [PATCH 2/7] Adding empty hash --- nongnu/packages/odin4.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/odin4.scm b/nongnu/packages/odin4.scm index e9f642da..39e897bd 100644 --- a/nongnu/packages/odin4.scm +++ b/nongnu/packages/odin4.scm @@ -13,7 +13,7 @@ (url "https://github.com/afaneh92/Odin4-downloader-menu") (commit "master"))) ;; Replace with specific commit if needed (file-name (git-file-name name version)) - (sha256 (base32 "")))) ;; Replace with actual hash + (sha256 (base32 "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73")))) ;; Replace with actual hash (build-system gnu-build-system) (arguments `(#:tests? #f ;; No tests in the repository From 8419e8b17d3311fbc2a5dce275f8ce1fb53867df Mon Sep 17 00:00:00 2001 From: qby <5731587-qby@users.noreply.gitlab.com> Date: Sun, 24 Mar 2024 16:26:14 +0000 Subject: [PATCH 3/7] nongnuify --- nongnu/packages/odin4.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/odin4.scm b/nongnu/packages/odin4.scm index 39e897bd..93dec6d8 100644 --- a/nongnu/packages/odin4.scm +++ b/nongnu/packages/odin4.scm @@ -1,4 +1,4 @@ -(define-module (my-channel odin4-downloader-menu) +(define-module (nongnu odin4-downloader-menu) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system gnu)) From 5c13dbf132cb2a542ff2899da51b0ad2dba2714a Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 16 Jun 2025 22:17:31 +0800 Subject: [PATCH 4/7] 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. --- nonguix/transformations.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nonguix/transformations.scm b/nonguix/transformations.scm index 90dab066..1647c5bd 100644 --- a/nonguix/transformations.scm +++ b/nonguix/transformations.scm @@ -128,11 +128,10 @@ 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))) + (cons* "modprobe.blacklist=nouveau" + (string-append + "nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0")) + (operating-system-user-kernel-arguments os))) (services `(,(or (assoc-ref %presets driver) (leave From 70a0de71d0c85c6c69b81c22040478081663d394 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 16 Jun 2025 00:18:54 +0800 Subject: [PATCH 5/7] transformations: Deduplicate transformed field values. * nonguix/transformations.scm (nonguix-transformation-guix)[substitute-urls]: Delete duplicates. (nonguix-transformation-nvidia)[kernel-arguments]: Likewise. --- nonguix/transformations.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/nonguix/transformations.scm b/nonguix/transformations.scm index 1647c5bd..f3b5e771 100644 --- a/nonguix/transformations.scm +++ b/nonguix/transformations.scm @@ -2,6 +2,8 @@ ;;; Copyright © 2025 Hilton Chain (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,10 +131,13 @@ TODO: Xorg configuration." (operating-system (inherit os) (kernel-arguments - (cons* "modprobe.blacklist=nouveau" - (string-append - "nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0")) - (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 From bfe682b9ab94de5ca58b214b134260f700321d73 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 19 Jun 2025 10:13:21 +0200 Subject: [PATCH 6/7] nongnu: signal-desktop: Update to 7.58.0. * nongnu/packages/messaging.scm (signal-desktop): Update to 7.58.0. Signed-off-by: Hilton Chain --- nongnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 12d88625..675c6d2c 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.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 From 382df31152dc01cd6fe4a75525e14a9d05bf0c9b Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 20 Jun 2025 20:38:44 +0800 Subject: [PATCH 7/7] nongnu: nvidia-driver: Update to 570.169. * nongnu/packages/nvidia.scm (nvidia-driver): Update to 570.169. (nvidia-settings): Likewise. --- nongnu/packages/nvidia.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index 86d4b26d..8e0b234d 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 "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