Compare commits

...

12 commits

Author SHA1 Message Date
Krzysztof Baranowski
3050799aa8 Merge branch 'apple-fonts-updates' into 'master'
Update Apple Fonts

See merge request nonguix/nonguix!521
2025-06-21 08:45:02 +00: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
Krzysztof Baranowski
8e6ff96702 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.
2024-09-26 14:09:39 +00:00
Krzysztof Baranowski
922f4bb6fd nongnu: font-apple-sf-symbols: Update to 6.
* nongnu/packages/fonts (font-apple-sf-symbols): Update to 6.
2024-09-26 14:09:39 +00:00
Krzysztof Baranowski
f70b0b8bb5 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.
2024-09-26 14:09:39 +00:00
Krzysztof Baranowski
2e3b8f313a nongnu: font-apple-sf-arabic: Update to 20.0d8e1.
* nongnu/packages/fonts (font-apple-sf-arabic): Update to 20.0d8e1.
2024-09-26 14:09:39 +00:00
Krzysztof Baranowski
64dd30d302 nongnu: font-apple-sf-mono: Update to 20.0d8e1.
* nongnu/packages/fonts (font-apple-sf-mono): Update to 20.0d8e1.
2024-09-26 14:09:39 +00:00
Krzysztof Baranowski
4674639f43 nongnu: font-apple-sf-compact: Update to 20.0d8e1.
* nongnu/packages/fonts (font-apple-sf-compact): Update to 20.0d8e1.
2024-09-26 14:09:39 +00:00
Krzysztof Baranowski
121e455aac nongnu: font-apple-sf-pro: Update to 20.0d8e1.
* nongnu/packages/fonts (font-apple-sf-pro): Update to 20.0d8e1.
2024-09-26 14:09:39 +00:00
4 changed files with 31 additions and 24 deletions

View file

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

View file

@ -83,7 +83,7 @@ its core.")
(define-public signal-desktop (define-public signal-desktop
(package (package
(name "signal-desktop") (name "signal-desktop")
(version "7.57.0") (version "7.58.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -92,7 +92,7 @@ its core.")
"https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version "https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version
"_amd64.deb")) "_amd64.deb"))
(sha256 (sha256
(base32 "0xy4xfyx58v0869x0inypy9rgnbcxzrdnfh3r8qq00640wfj9j2c")))) (base32 "1bhh9z7mclxlzq4pfs695pnkb5x36wm5ihniydvzqqi2g3xjbqam"))))
(supported-systems '("x86_64-linux")) (supported-systems '("x86_64-linux"))
(build-system chromium-binary-build-system) (build-system chromium-binary-build-system)
(arguments (arguments

View file

@ -228,9 +228,9 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\
(define-public nvidia-driver (define-public nvidia-driver
(package (package
(name "nvidia-driver") (name "nvidia-driver")
(version "570.153.02") (version "570.169")
(source (nvidia-source (source (nvidia-source
version "1dp1bpx4scx7lzqnajn75q5zjlbfvpjych3ils7zlxlmyvj8d20l")) version "0r9phz9rv0n208f61lvv3m492387mjmqk4gph3ww7iawg53shcjz"))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:modules '((guix build copy-build-system) (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 (define-public nvidia-settings
(package (package
(name "nvidia-settings") (name "nvidia-settings")
(version "570.153.02") (version "570.169")
(source (nvidia-settings-source (source (nvidia-settings-source
name version "1qvvsrhlswpnv9aldqnynjch8y1x219ccsk3w4rfrw3swxm9qvp6")) name version "15sxzczan9kq55hyiq73arls95lsdakpfbbzf4b6741fjfgd8kfh"))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:tests? #f ;no test suite (list #:tests? #f ;no test suite

View file

@ -2,6 +2,8 @@
;;; Copyright © 2025 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2025 Hilton Chain <hako@ultrarare.space>
(define-module (nonguix transformations) (define-module (nonguix transformations)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (guix channels) #:use-module (guix channels)
#:use-module (guix diagnostics) #:use-module (guix diagnostics)
#:use-module (guix gexp) #:use-module (guix gexp)
@ -74,10 +76,11 @@ FIXME: GUIX-SOURCE? is disabled by default due to performance issue."
(cons %nonguix-signing-key (cons %nonguix-signing-key
(guix-configuration-authorized-keys config))) (guix-configuration-authorized-keys config)))
(substitute-urls (substitute-urls
(delete-duplicates
`(,@(guix-configuration-substitute-urls config) `(,@(guix-configuration-substitute-urls config)
,@(if substitutes? ,@(if substitutes?
'("https://substitutes.nonguix.org") '("https://substitutes.nonguix.org")
'())))))))))) '())))))))))))
(define* (nonguix-transformation-linux #:key (linux linux) (define* (nonguix-transformation-linux #:key (linux linux)
(firmware (list linux-firmware)) (firmware (list linux-firmware))
@ -128,11 +131,13 @@ TODO: Xorg configuration."
(operating-system (operating-system
(inherit os) (inherit os)
(kernel-arguments (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 (services
`(,(or (assoc-ref %presets driver) `(,(or (assoc-ref %presets driver)
(leave (leave