From 121e455aacb83c2355facbcdd35b196c596a9e0e Mon Sep 17 00:00:00 2001 From: Krzysztof Baranowski Date: Sat, 24 Aug 2024 09:40:58 -0700 Subject: [PATCH 01/11] nongnu: font-apple-sf-pro: Update to 20.0d8e1. * nongnu/packages/fonts (font-apple-sf-pro): Update to 20.0d8e1. --- nongnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/fonts.scm b/nongnu/packages/fonts.scm index 7b6eb758..4989e328 100644 --- a/nongnu/packages/fonts.scm +++ b/nongnu/packages/fonts.scm @@ -213,10 +213,10 @@ Included fonts: (define-public font-apple-sf-pro (apple-font #:font-name "SF Pro" - #:archive-timestamp "20230710073336" + #:archive-timestamp "20240527221252" #:file "SF-Pro" - #:version "19.0d6e1" - #:hash "19qa6fs6x5614sqw9a6idlizzsssw8256crz1ps2p2n6gwp2fvaq" + #:version "20.0d8e1" + #:hash "153k3q8h5mpd358b1lsa8ha32qxv7vc2q661k20j4nnf3ndjkv9j" #:description "This neutral, flexible, sans-serif typeface is the system font for iOS, iPad OS, macOS and tvOS. SF Pro features nine weights, variable optical sizes for optimal legibility, four widths, and includes a rounded From 4674639f4343c8fabedca48677ec95a7d38950b3 Mon Sep 17 00:00:00 2001 From: Krzysztof Baranowski Date: Sat, 24 Aug 2024 09:42:38 -0700 Subject: [PATCH 02/11] nongnu: font-apple-sf-compact: Update to 20.0d8e1. * nongnu/packages/fonts (font-apple-sf-compact): Update to 20.0d8e1. --- nongnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/fonts.scm b/nongnu/packages/fonts.scm index 4989e328..890d7190 100644 --- a/nongnu/packages/fonts.scm +++ b/nongnu/packages/fonts.scm @@ -226,10 +226,10 @@ scripts.")) (define-public font-apple-sf-compact (apple-font #:font-name "SF Compact" - #:archive-timestamp "20230710073418" + #:archive-timestamp "20240527221317" #:file "SF-Compact" - #:version "19.0d6e1" - #:hash "02127drlqvwscq6vaphmvsp85cn8j4zfhi0kb9a3fzc0z8b95hdq" + #:version "20.0d8e1" + #:hash "01j7k95rnmg667hyhj88fxqrgsah2mnk2ws7fmclif92mqcgwirj" #:description "Sharing many features with SF Pro, SF Compact features an efficient, compact design that is optimized for small sizes and narrow columns. SF Compact is the system font for watchOS and includes a rounded variant.")) From 64dd30d3021952594059b7d4da17fc75d4fced2c Mon Sep 17 00:00:00 2001 From: Krzysztof Baranowski Date: Sat, 24 Aug 2024 09:44:10 -0700 Subject: [PATCH 03/11] nongnu: font-apple-sf-mono: Update to 20.0d8e1. * nongnu/packages/fonts (font-apple-sf-mono): Update to 20.0d8e1. --- nongnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/fonts.scm b/nongnu/packages/fonts.scm index 890d7190..a98dd49d 100644 --- a/nongnu/packages/fonts.scm +++ b/nongnu/packages/fonts.scm @@ -237,10 +237,10 @@ SF Compact is the system font for watchOS and includes a rounded variant.")) (define-public font-apple-sf-mono (apple-font #:font-name "SF Mono" - #:archive-timestamp "20230710073457" + #:archive-timestamp "20240527221346" #:file "SF-Mono" - #:version "19.0d6e1" - #:hash "0vjdpl3xyxl2rmfrnjsxpxdizpdr4canqa1nm63s5d3djs01iad6" + #:version "20.0d8e1" + #:hash "0cxj1wk6nbz1ysi0cg1w79b7ja48n00dypxkrsc3mvrn1vmdb4dm" #:description "This monospaced variant of San Francisco enables alignment between rows and columns of text, and is used in coding environments like Xcode. SF Mono features six weights and supports Latin, Greek, and Cyrillic scripts.")) From 2e3b8f313adbf3e8795fb6bd1f02a50bf2ff1474 Mon Sep 17 00:00:00 2001 From: Krzysztof Baranowski Date: Sat, 24 Aug 2024 09:44:38 -0700 Subject: [PATCH 04/11] nongnu: font-apple-sf-arabic: Update to 20.0d8e1. * nongnu/packages/fonts (font-apple-sf-arabic): Update to 20.0d8e1. --- nongnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nongnu/packages/fonts.scm b/nongnu/packages/fonts.scm index a98dd49d..adcf5848 100644 --- a/nongnu/packages/fonts.scm +++ b/nongnu/packages/fonts.scm @@ -248,10 +248,10 @@ SF Mono features six weights and supports Latin, Greek, and Cyrillic scripts.")) (define-public font-apple-sf-arabic (apple-font #:font-name "SF Arabic" - #:archive-timestamp "20230710073501" + #:archive-timestamp "20240527221359" #:file "SF-Arabic" - #:version "19.0d6e1" - #:hash "0phl3wi0lq7djcg8nqg1ml1f73bsfjzmvd2n8hkl6dbprmw614jp" + #:version "20.0d8e1" + #:hash "0sm7w5i19n3jdj6d04344nxizqacg264rladjiwhxhwa3ksfbxsn" #:description "A contemporary interpretation of the Naskh style with a rational and flexible design, this extension of San Francisco is the Arabic system font on Apple platforms. Like San Francisco, SF Arabic features nine From f70b0b8bb51dbeafd89ed1407e69df3b88b25e01 Mon Sep 17 00:00:00 2001 From: Krzysztof Baranowski Date: Sat, 24 Aug 2024 09:46:07 -0700 Subject: [PATCH 05/11] nongnu: font-apple-new-york: Update source archive. No visible version change but all the other Apple font packages got an update to a newer internet archive timestamp so New York gets one too. * nongnu/packages/fonts (font-apple-new-york): Update source archive. --- nongnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/fonts.scm b/nongnu/packages/fonts.scm index adcf5848..a9acd45f 100644 --- a/nongnu/packages/fonts.scm +++ b/nongnu/packages/fonts.scm @@ -261,10 +261,10 @@ based on the point size, and includes a rounded variant.")) (define-public font-apple-new-york (apple-font #:font-name "New York" - #:archive-timestamp "20230710073506" + #:archive-timestamp "20240527221356" #:file "NY" #:version "17.0d5e1" - #:hash "1hgxyizpgam7y1xh36fsypd3a1nn417wdnnfk1zahq9vhxrrds2w" + #:hash "06d8pnfp4z5nb82mh7g7pnz5m4njph3zy17ww1m8x0m34hn50zdn" #:description "A companion to San Francisco, this serif typeface is based on essential aspects of historical type styles. New York features six weights, supports Latin, Greek and Cyrillic scripts, and features variable optical sizes From 922f4bb6fd1591ac83d5e71d7bd39387f9270d03 Mon Sep 17 00:00:00 2001 From: Krzysztof Baranowski Date: Sat, 24 Aug 2024 09:52:15 -0700 Subject: [PATCH 06/11] nongnu: font-apple-sf-symbols: Update to 6. * nongnu/packages/fonts (font-apple-sf-symbols): Update to 6. --- nongnu/packages/fonts.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nongnu/packages/fonts.scm b/nongnu/packages/fonts.scm index a9acd45f..a561b80e 100644 --- a/nongnu/packages/fonts.scm +++ b/nongnu/packages/fonts.scm @@ -278,10 +278,10 @@ graphic display face at larger sizes.")) (define-public font-apple-sf-symbols (apple-font #:font-name "SF Symbols" - #:archive-timestamp "20230710073513" - #:file "SF-Symbols-5" - #:version "5" - #:hash "1bwlq1nf75bv0x36qdk371r2pd5slf3jlv50wgsl0kpj1dds22sf" + #:archive-timestamp "20240701100406" + #:file "SF-Symbols-6" + #:version "6" + #:hash "1hyghp03zpsiks2p6kmghnmg28kkjj3qqk2hgwva855kly6r4hv8" #:description "With over 5,000 symbols, SF Symbols is a library of iconography designed to integrate seamlessly with San Francisco, the system font for Apple platforms. Symbols come in nine weights and three scales, and From 8e6ff96702983f4f91a56c9fc941b798fe5740b2 Mon Sep 17 00:00:00 2001 From: Krzysztof Baranowski Date: Sat, 24 Aug 2024 09:54:09 -0700 Subject: [PATCH 07/11] nongnu: font-apple-color-emoji: Update to 17.4. And switch over from my silly li'l copy to this very nice project I just discovered that also offers the Apple color emoji for linux. They have their own versioning which unfortunately is will make it appear to Guix as if this version is older than the current one (17.4 < 18.0d4e1) so `guix upgrade` won't switch to it automatically but whatever, the only alternative is formal deprecation of the existing package and adding this one under a new one which doesn't feel worth it. * nongnu/packages/fonts (font-apple-color-emoji): Update to 17.4. [source]: Change for new upstream. [home-page]: Change for new upstream. [synopsis]: Change for new upstream. [description]: Change for new upstream. [license]: Change for new upstream. --- nongnu/packages/fonts.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/nongnu/packages/fonts.scm b/nongnu/packages/fonts.scm index a561b80e..ab3343ca 100644 --- a/nongnu/packages/fonts.scm +++ b/nongnu/packages/fonts.scm @@ -12,6 +12,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 @@ -290,21 +291,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 From 5c13dbf132cb2a542ff2899da51b0ad2dba2714a Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 16 Jun 2025 22:17:31 +0800 Subject: [PATCH 08/11] 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 09/11] 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 10/11] 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 11/11] 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