[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
386/459: gnu: alacritty: Update to 0.12.0.
From: |
guix-commits |
Subject: |
386/459: gnu: alacritty: Update to 0.12.0. |
Date: |
Mon, 24 Apr 2023 15:04:04 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 3165c49ce1dc835cb3e8fd23345a8118f8f626fc
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Apr 23 15:03:59 2023 +0300
gnu: alacritty: Update to 0.12.0.
* gnu/packages/terminals.scm (alacritty): Update to 0.12.0.
[cargo-inputs]: Add rust-alacritty-config-0.1, rust-bitflags-1,
rust-dirs-4, rust-libc-0.2, rust-once-cell-1, rust-unicode-width-0.1,
rust-wayland-client-0.29, rust-windows-sys-0.36, rust-winit-0.28.
Replace rust-alacritty-config-derive-0.1 with 0.2,
rust-alacritty-terminal-0.15 with 0.18, rust-clap-2 with 3,
rust-copypasta-0.7 with 0.8, rust-crossfont-0.3 with 0.5,
rust-glutin-0.26 with 0.30, rust-notify-4 with 5, rust-parking-lot-0.11
with 0.12, rust-png-0.16 with 0.17, rust-raw-window-handle-0.3 with 0.5.
Remove rust-time-0.1, rust-urlocator-0.1.
[cargo-development-inputs]: Add rust-clap-complete-3.
[arguments]: Remove custom 'use-new-nix phase. Adjust custom
'add-absolute-library-references phase to changes in the cargo inputs.
Remove trailing #t from phases.
[native-inputs]: Remove cmake.
[inputs]: Remove rust-bitflags-1, rust-dirs-3, rust-libc-0.2,
rust-unicode-width-0.1, rust-wayland-client-0.28, rust-winapi-0.3.
---
gnu/packages/terminals.scm | 65 +++++++++++++++++++++-------------------------
1 file changed, 30 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index ef9f16bce5..6af56ddc34 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -69,7 +69,6 @@
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages check)
- #:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-graphics)
@@ -1402,7 +1401,7 @@ basic input/output.")
(define-public alacritty
(package
(name "alacritty")
- (version "0.9.0")
+ (version "0.12.0")
(source
(origin
;; XXX: The crate at "crates.io" has limited contents. In particular,
@@ -1413,53 +1412,58 @@ basic input/output.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "068y0b1a0m33r7a3j2xf6k602sc8062gm4d5568ynfx6w5n481lj"))))
+ (base32 "00ksvn0k451wmppqxkzzsb5gdjllqxqrnxw81gam00k9wsq8bj6q"))))
(build-system cargo-build-system)
(arguments
`(#:install-source? #f ; virtual manifest
#:cargo-test-flags '("--release" "--" "--skip=config_read_eof")
#:cargo-inputs
- (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1)
- ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.15)
- ("rust-clap" ,rust-clap-2)
+ (("rust-alacritty-config" ,rust-alacritty-config-0.1)
+ ("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.2)
+ ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.18)
+ ("rust-bitflags" ,rust-bitflags-1)
+ ("rust-clap" ,rust-clap-3)
("rust-cocoa" ,rust-cocoa-0.24)
- ("rust-copypasta" ,rust-copypasta-0.7)
- ("rust-crossfont" ,rust-crossfont-0.3)
+ ("rust-copypasta" ,rust-copypasta-0.8)
+ ("rust-crossfont" ,rust-crossfont-0.5)
+ ("rust-dirs" ,rust-dirs-4)
("rust-embed-resource" ,rust-embed-resource-1)
("rust-fnv" ,rust-fnv-1)
("rust-gl-generator" ,rust-gl-generator-0.14)
;; XXX: Adjust `add-absolute-library-references' phase when updating
;; glutin input.
- ("rust-glutin" ,rust-glutin-0.26)
+ ("rust-glutin" ,rust-glutin-0.30)
+ ("rust-libc" ,rust-libc-0.2)
("rust-log" ,rust-log-0.4)
- ("rust-notify" ,rust-notify-4)
+ ("rust-notify" ,rust-notify-5)
("rust-objc" ,rust-objc-0.2)
- ("rust-parking-lot" ,rust-parking-lot-0.11)
- ("rust-png" ,rust-png-0.16)
- ("rust-raw-window-handle" ,rust-raw-window-handle-0.3)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-parking-lot" ,rust-parking-lot-0.12)
+ ("rust-png" ,rust-png-0.17)
+ ("rust-raw-window-handle" ,rust-raw-window-handle-0.5)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-serde-yaml" ,rust-serde-yaml-0.8)
- ("rust-time" ,rust-time-0.1)
- ("rust-urlocator" ,rust-urlocator-0.1)
+ ("rust-unicode-width" ,rust-unicode-width-0.1)
+ ("rust-wayland-client" ,rust-wayland-client-0.29)
+ ("rust-windows-sys" ,rust-windows-sys-0.36)
+ ("rust-winit" ,rust-winit-0.28)
("rust-x11-dl" ,rust-x11-dl-2)
("rust-xdg" ,rust-xdg-2))
+ #:cargo-development-inputs
+ (("rust-clap-complete" ,rust-clap-complete-3))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'use-new-nix
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "alacritty_terminal/Cargo.toml"
- (("0.22.0") "^0.23.0"))))
(add-after 'configure 'add-absolute-library-references
(lambda* (#:key inputs cargo-inputs vendor-dir #:allow-other-keys)
- (let* ((glutin-name ,(package-name rust-glutin-0.26))
- (glutin-version ,(package-version rust-glutin-0.26))
+ (let* ((glutin-name ,(package-name rust-glutin-0.30))
+ (glutin-version ,(package-version rust-glutin-0.30))
(glutin-api (string-append glutin-name "-" glutin-version
".tar.gz/src/api/"))
(smithay-client-toolkit-name
- ,(package-name rust-smithay-client-toolkit-0.12))
+ ,(package-name rust-smithay-client-toolkit-0.16))
(smithay-client-toolkit-version
- ,(package-version rust-smithay-client-toolkit-0.12))
+ ,(package-version rust-smithay-client-toolkit-0.16))
(smithay-client-toolkit-src
(string-append smithay-client-toolkit-name "-"
smithay-client-toolkit-version
".tar.gz/src"))
@@ -1483,8 +1487,7 @@ basic input/output.")
(("libGL.so") (string-append mesa "/lib/libGL.so")))
(substitute*
(string-append vendor-dir "/" glutin-api "egl/mod.rs")
- (("libEGL.so") (string-append mesa "/lib/libEGL.so")))
- #t)))
+ (("libEGL.so") (string-append mesa "/lib/libEGL.so"))))))
(replace 'install
;; Upstream install script only takes care of executable.
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -1522,11 +1525,9 @@ basic input/output.")
(install-file "extra/completions/_alacritty"
(string-append share "/zsh/site-functions"))
(install-file "extra/completions/alacritty.fish"
- (string-append share
"/fish/vendor_completions.d"))
- #t))))))
+ (string-append share
"/fish/vendor_completions.d"))))))))
(native-inputs
- `(("cmake" ,cmake)
- ("ncurses" ,ncurses)
+ `(("ncurses" ,ncurses)
("pkg-config" ,pkg-config)
("python3" ,python)))
(inputs
@@ -1541,12 +1542,6 @@ basic input/output.")
("libxrandr" ,libxrandr)
("libxxf86vm" ,libxxf86vm)
("mesa" ,mesa)
- ("rust-bitflags" ,rust-bitflags-1)
- ("rust-dirs" ,rust-dirs-3)
- ("rust-libc" ,rust-libc-0.2)
- ("rust-unicode-width" ,rust-unicode-width-0.1)
- ("rust-wayland-client" ,rust-wayland-client-0.28)
- ("rust-winapi" ,rust-winapi-0.3)
("wayland" ,wayland)))
(native-search-paths
;; FIXME: This should only be located in 'ncurses'. Nonetheless it is
- 345/459: gnu: rust-bytecheck-derive-0.6: Update to 0.6.10., (continued)
- 345/459: gnu: rust-bytecheck-derive-0.6: Update to 0.6.10., guix-commits, 2023/04/24
- 347/459: gnu: Add rust-rend-0.4., guix-commits, 2023/04/24
- 348/459: gnu: rust-rkyv-0.7: Update to 0.7.40., guix-commits, 2023/04/24
- 349/459: gnu: rust-proc-macro2-1: Update to 1.0.52., guix-commits, 2023/04/24
- 357/459: gnu: Add rust-structmeta-0.1., guix-commits, 2023/04/24
- 367/459: gnu: rust-1.68: Update to 1.68.2., guix-commits, 2023/04/24
- 371/459: gnu: rust-once-cell-1: Update to 1.17.1., guix-commits, 2023/04/24
- 373/459: gnu: newsboat: Update to 2.31., guix-commits, 2023/04/24
- 377/459: gnu: Add rust-nom-derive-impl-0.10., guix-commits, 2023/04/24
- 359/459: gnu: Add rust-compact-str-0.7., guix-commits, 2023/04/24
- 386/459: gnu: alacritty: Update to 0.12.0.,
guix-commits <=
- 374/459: gnu: rust-boxxy-0.11: Update to 0.12.1., guix-commits, 2023/04/24
- 384/459: gnu: rust-git2-0.14: Build with correct libgit2., guix-commits, 2023/04/24
- 356/459: gnu: Add rust-structmeta-derive-0.1., guix-commits, 2023/04/24
- 383/459: gnu: rust-libgit2-sys-0.12: Update to 0.12.26., guix-commits, 2023/04/24
- 362/459: gnu: Add rust-windows-0.46., guix-commits, 2023/04/24
- 375/459: gnu: rust-tls-parser-0.10: Update to 0.11.0., guix-commits, 2023/04/24
- 370/459: gnu: rust-lexopt: Update to 0.3.0., guix-commits, 2023/04/24
- 361/459: gnu: Add rust-windows-implement-0.46., guix-commits, 2023/04/24
- 363/459: gnu: rust-bytecount-0.6: Update to 0.6.2., guix-commits, 2023/04/24
- 153/459: gnu: Add rust-ntest-timeout-0.8., guix-commits, 2023/04/24