From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 08 12:19:24 2022 Received: (at submit) by debbugs.gnu.org; 8 Mar 2022 17:19:24 +0000 Received: from localhost ([127.0.0.1]:57564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRdUZ-00072f-3t for submit@debbugs.gnu.org; Tue, 08 Mar 2022 12:19:23 -0500 Received: from lists.gnu.org ([209.51.188.17]:33396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRcyv-0005WA-Vb for submit@debbugs.gnu.org; Tue, 08 Mar 2022 11:46:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRcyv-0004tW-ND for guix-patches@gnu.org; Tue, 08 Mar 2022 11:46:41 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:56108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1nRcyt-0003YE-2J for guix-patches@gnu.org; Tue, 08 Mar 2022 11:46:41 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4KCh6x0c77z9scd for ; Tue, 8 Mar 2022 17:46:33 +0100 (CET) From: Till Robin Zickel DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=illegalaliensfrom.space; s=MBO0001; t=1646757992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bI3Ut3gmhC+FGrJPp5zjR0ALtDJQRplQezBvCPldOyU=; b=Amgn0XgLfI4Xru3pw7gxX1MXyaR9rn2V549ZFEpk+rcZnZ6a8pZ7SDBBC+XZFMPKuMdO4q IVA/+dxqulae3moygoRL0BqK/I0GQYY6zsGhL220ClNm6UVK3eOGlP+5ry2KDlaZV4pt3V 9zF6chw7aHERr/LlI3bDlGe7L4nFD6rAfEfigXqvtb/JNfTioHPaiuXqFkZw5L6r1FVgjI Q5p+0rsp4+eb62YtAsBh/VH+qRnZYzKE7XPDmosjzvIVA/w2A/DSV1vnGpZ5P4SMjutt6u sDhRYKRXILXSWpboQXn6XdDcPlAqIefVXlrTaDq2urTbTNa2dvXuGeAqvw+r1w== To: guix-patches@gnu.org Subject: [PATCH 01/27] added alacritty 0.10.1 Date: Tue, 8 Mar 2022 17:46:28 +0100 Message-Id: <20220308164628.19298-1-trzickel@illegalaliensfrom.space> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=80.241.56.161; envelope-from=trzickel@illegalaliensfrom.space; helo=mout-p-103.mailbox.org X-Spam_score_int: 17 X-Spam_score: 1.7 X-Spam_bar: + X-Spam_report: (1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.997, PDS_OTHER_BAD_TLD=1.997, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 2.8 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- gnu/packages/terminals.scm | 131 +++++++++++++++++++ 1 file changed, 68 insertions(+), 63 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 06fa341472..89620840ff 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -31,6 +31,7 @@ ;;; Copyrig [...] Content analysis details: (2.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: illegalaliensfrom.space (space)] 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [209.51.188.17 listed in wl.mailspike.net] 2.0 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Tue, 08 Mar 2022 12:19:22 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) --- gnu/packages/terminals.scm | 131 +++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 63 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 06fa341472..89620840ff 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2022 Felipe Balbi +;;; Copyritht © 2022 Till Robin Zickel ;;; ;;; This file is part of GNU Guix. ;;; @@ -1387,25 +1388,25 @@ (define-public tio (define-public alacritty (package (name "alacritty") - (version "0.9.0") - (source - (origin - ;; XXX: The crate at "crates.io" has limited contents. In particular, - ;; it does not contain "extra" directory with completions, icon, etc. - (method git-fetch) - (uri (git-reference - (url "https://github.com/jwilm/alacritty") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "068y0b1a0m33r7a3j2xf6k602sc8062gm4d5568ynfx6w5n481lj")))) + (version "0.10.1") + (source (origin + ;; XXX: The crate at "crates.io" has limited contents. In particular, + ;; it does not contain "extra" directory with completions, icon, etc. + (method git-fetch) + (uri (git-reference + (url "https://github.com/jwilm/alacritty") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s38gyx0ifcf1vcr6n8gzbk7rg1apxrz7js8cp8x5k1s0m3abys3")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f ; virtual manifest - #:cargo-test-flags '("--release" "--" "--skip=config_read_eof") + `(#: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-alacritty-config-derive" ,rust-alacritty-config-derive-0.1) ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.15) ("rust-clap" ,rust-clap-2) ("rust-cocoa" ,rust-cocoa-0.24) ("rust-copypasta" ,rust-copypasta-0.7) @@ -1415,7 +1416,7 @@ (define-public alacritty ("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.28) ("rust-log" ,rust-log-0.4) ("rust-notify" ,rust-notify-4) ("rust-objc" ,rust-objc-0.2) @@ -1425,6 +1426,8 @@ (define-public alacritty ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-signal-hook-mio" ,rust-signal-hook-mio-0.2) + ("rust-structopt" ,rust-structopt-0.3) ("rust-time" ,rust-time-0.1) ("rust-urlocator" ,rust-urlocator-0.1) ("rust-x11-dl" ,rust-x11-dl-2) @@ -1437,17 +1440,20 @@ (define-public alacritty (("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.28)) (glutin-version , + (package-version + rust-glutin-0.28)) (glutin-api (string-append glutin-name "-" glutin-version ".tar.gz/src/api/")) - (smithay-client-toolkit-name - ,(package-name rust-smithay-client-toolkit-0.12)) - (smithay-client-toolkit-version - ,(package-version rust-smithay-client-toolkit-0.12)) - (smithay-client-toolkit-src - (string-append smithay-client-toolkit-name "-" - smithay-client-toolkit-version ".tar.gz/src")) + (smithay-client-toolkit-name ,(package-name + rust-smithay-client-toolkit-0.15)) + (smithay-client-toolkit-version ,(package-version + rust-smithay-client-toolkit-0.15)) + (smithay-client-toolkit-src (string-append + smithay-client-toolkit-name + "-" + smithay-client-toolkit-version + ".tar.gz/src")) (libxkbcommon (assoc-ref inputs "libxkbcommon")) (mesa (assoc-ref inputs "mesa"))) ;; Fix dlopen()ing some libraries on pure Wayland (no $DISPLAY): @@ -1459,26 +1465,25 @@ (define-public alacritty (substitute* (string-append vendor-dir "/" smithay-client-toolkit-src "/seat/keyboard/ffi.rs") - (("libxkbcommon\\.so") - (string-append libxkbcommon "/lib/libxkbcommon.so"))) - + (("libxkbcommon\\.so") (string-append libxkbcommon + "/lib/libxkbcommon.so"))) ;; Mesa is needed everywhere. - (substitute* - (string-append vendor-dir "/" glutin-api "glx/mod.rs") + (substitute* (string-append vendor-dir "/" glutin-api + "glx/mod.rs") (("libGL.so") (string-append mesa "/lib/libGL.so"))) - (substitute* - (string-append vendor-dir "/" glutin-api "egl/mod.rs") + (substitute* (string-append vendor-dir "/" glutin-api + "egl/mod.rs") (("libEGL.so") (string-append mesa "/lib/libEGL.so"))) #t))) (replace 'install ;; Upstream install script only takes care of executable. (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) + (let* ((out (assoc-ref outputs "out")) (bin (string-append out + "/bin")) (share (string-append out "/share")) (icons (string-append share "/icons/hicolor/scalable/apps")) - (tic (search-input-file inputs "/bin/tic")) - (man (string-append share "/man/man1")) + (tic (search-input-file inputs "/bin/tic")) + (man (string-append share "/man/man1")) (alacritty-bin "target/release/alacritty")) ;; Install the executable. (install-file alacritty-bin bin) @@ -1497,8 +1502,12 @@ (define-public alacritty (mkdir-p (string-append share "/terminfo")) ;; We don't compile alacritty-common entry because ;; it's being used only for inheritance. - (invoke tic "-x" "-e" "alacritty,alacritty-direct" - "-o" (string-append share "/terminfo/") + (invoke tic + "-x" + "-e" + "alacritty,alacritty-direct" + "-o" + (string-append share "/terminfo/") "extra/alacritty.info") ;; Install completions. (install-file "extra/completions/alacritty.bash" @@ -1508,30 +1517,26 @@ (define-public alacritty (install-file "extra/completions/alacritty.fish" (string-append share "/fish/vendor_completions.d")) #t)))))) - (native-inputs - `(("cmake" ,cmake) - ("ncurses" ,ncurses) - ("pkg-config" ,pkg-config) - ("python3" ,python))) - (inputs - `(("expat" ,expat) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("libx11" ,libx11) - ("libxcb" ,libxcb) - ("libxcursor" ,libxcursor) - ("libxi" ,libxi) - ("libxkbcommon" ,libxkbcommon) - ("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-inputs `(("cmake" ,cmake) ("ncurses" ,ncurses) + ("pkg-config" ,pkg-config) + ("python3" ,python))) + (inputs `(("expat" ,expat) ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxcursor" ,libxcursor) + ("libxi" ,libxi) + ("libxkbcommon" ,libxkbcommon) + ("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.29) + ("rust-winapi" ,rust-winapi-0.3) + ("wayland" ,wayland))) (native-search-paths ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is ;; provided for usability reasons. See . -- 2.34.0