diff --git a/nongnu/packages/fonts.scm b/nongnu/packages/fonts.scm index bdc02cdc..afe2b475 100644 --- a/nongnu/packages/fonts.scm +++ b/nongnu/packages/fonts.scm @@ -15,6 +15,7 @@ #:use-module (guix packages) #:use-module (guix build-system font) #:use-module (guix build-system copy) + #:use-module ((guix licenses) #:prefix license:) #:use-module (nonguix licenses)) (define mscorefont @@ -293,21 +294,22 @@ automatically align with text labels.")) (define-public font-apple-color-emoji (package (name "font-apple-color-emoji") - (version "18.0d4e1") + (version "17.4") (source (origin (method url-fetch) (uri (string-append - "https://github.com/pharcosyle/apple-fonts" - "/releases/download" - "/Apple-Color-Emoji-" version "/Apple.Color.Emoji.ttc")) + "https://github.com/samuelngs/apple-emoji-linux" + "/releases/download/v" version "/AppleColorEmoji.ttf")) (sha256 - (base32 "06i1ady7b2g1i2hl3f8yxn64g2i82c2ni9vdw25gpdqdj28vyqw3")))) + (base32 "1wahjmbfm1xgm58madvl21451a04gxham5vz67gqz1cvpi0cjva8")))) (build-system font-build-system) - (home-page "https://www.apple.com") - (synopsis "Apple Color Emoji typeface by Apple.") - (description "Color and black-and-white Apple emoji fonts.") - (license (nonfree "https://www.apple.com")))) + (home-page "https://github.com/samuelngs/apple-emoji-linux") + (synopsis "Apple Color Emoji for Linux") + (description "A color typeface used by iOS and macOS to display emoji.") + (license + (list license:asl2.0 + (nonfree "https://www.apple.com"))))) (define-public font-apple-symbols (package 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 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 diff --git a/nonguix/transformations.scm b/nonguix/transformations.scm index 90dab066..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,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