From patchwork Sat Aug 27 10:10:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?44Ku44Oj44Op?= X-Patchwork-Id: 41994 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DAB2727BBEA; Sat, 27 Aug 2022 11:14:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2B23C27BBE9 for ; Sat, 27 Aug 2022 11:14:22 +0100 (BST) Received: from localhost ([::1]:58840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRspZ-0001mI-AC for patchwork@mira.cbaines.net; Sat, 27 Aug 2022 06:14:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRspH-0001cJ-Az for guix-patches@gnu.org; Sat, 27 Aug 2022 06:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37282) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRspH-0007y6-2d for guix-patches@gnu.org; Sat, 27 Aug 2022 06:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oRspG-0000VF-U8 for guix-patches@gnu.org; Sat, 27 Aug 2022 06:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57448] [PATCH 5/5] gnu: exa: Update to 0.10.1 Resent-From: gyara Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Aug 2022 10:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57448 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57448@debbugs.gnu.org Cc: gyara Received: via spool by 57448-submit@debbugs.gnu.org id=B57448.16615952341904 (code B ref 57448); Sat, 27 Aug 2022 10:14:02 +0000 Received: (at 57448) by debbugs.gnu.org; 27 Aug 2022 10:13:54 +0000 Received: from localhost ([127.0.0.1]:55263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRsp7-0000Ud-Dr for submit@debbugs.gnu.org; Sat, 27 Aug 2022 06:13:53 -0400 Received: from mail-ej1-f47.google.com ([209.85.218.47]:40862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRsp4-0000UN-Sc for 57448@debbugs.gnu.org; Sat, 27 Aug 2022 06:13:51 -0400 Received: by mail-ej1-f47.google.com with SMTP id w19so7180495ejc.7 for <57448@debbugs.gnu.org>; Sat, 27 Aug 2022 03:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gyara.moe; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=6tirHqISnfWILWlwobRtF3WbBri41mgX5M1p2M2gaJA=; b=i2OFNO+473MV5F5OYhB6UI0M5H0+UTanExA3JG3K04RuZIUlDUdIReLm87GvJuk0Eh 5KSWKBgjPXBkfxtkjeOd7awFE2GyIXrquboUuuZBc0UJdQX/g/5XID+hIc9rutxo1v9q lzDo0mTRPYj2PF+uhpBgE3Gaz4FS1uPx1p7fSpVB/RxCUoWmcXMaoUr6NT8LgHyBSZqL FF1c0a5cupo5U68p2OzuVtJOlFRzKuHrxWikDEBI/pZKZfG1n7Ijjs6GsAhGph/b89ub JaVD1jnGiHkGojacWEw6a4VxdQuoGNEJ3000sKv7kZ730hoznj1bYGiom4/DJ10sZG/7 GWUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=6tirHqISnfWILWlwobRtF3WbBri41mgX5M1p2M2gaJA=; b=SrEtDw2PU7FkbuTbMKL5U9Jsgkb57HnPpNMp2QqQR063vD0Pn5/6OZ+sfwbUy3B/Xd 9atbIL0DW2xtoG3z/gFPTLzSJSrlU5xeWPUpbGS9YBaYhbXppkOQTPo0Tzh6fhGCh2Eh Or97nX62uuHnvxKho86Oy2a2JKMZKqvnMlF+gW4UwPf+y64eYyDkbtL9mo7I+BB6DnsM hnQ2uTcHko/V+YvCbv83upjjJ9te5TpByODBoGG5Ej3GjRpW36xwjDo5GuWxqcocrwS/ leakT02Kml7ZWNfs5DQGP5UxLYi09WHqiTwW3uk/1eEmTxb/6ymbaV5CIQwPY8z48SU0 TKow== X-Gm-Message-State: ACgBeo0eykZdyG5zhR8VXl0cWvg/tHbtNhTl2MCald4AusfmReVs77ua WiUdlHwxfbUcNccUb8vwf4X1A16KaliTN/uclww= X-Google-Smtp-Source: AA6agR7bUeQBlIs+bkavqsGxJiHsUVLKTrtTtZb6lmCC+XcYXknhN5QITuOhLYmADGwX5Rt/5GJJVA== X-Received: by 2002:a17:906:668b:b0:730:a5b7:8985 with SMTP id z11-20020a170906668b00b00730a5b78985mr7376487ejo.548.1661595224897; Sat, 27 Aug 2022 03:13:44 -0700 (PDT) Received: from localhost ([103.251.167.20]) by smtp.gmail.com with ESMTPSA id a6-20020a1709063a4600b0073c5192cba6sm1889967ejf.114.2022.08.27.03.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Aug 2022 03:13:44 -0700 (PDT) Date: Sat, 27 Aug 2022 19:10:45 +0900 Message-Id: <1d6ed59cd852a3a074fe053703872d0703da4883.1661595040.git.me@gyara.moe> X-Mailer: git-send-email 2.37.2 In-Reply-To: <50418f56637b6ee94b0e39d3d494cce73dfeb63d.1661595039.git.me@gyara.moe> References: <50418f56637b6ee94b0e39d3d494cce73dfeb63d.1661595039.git.me@gyara.moe> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: gyara X-ACL-Warn: , gyara via Guix-patches X-Patchwork-Original-From: gyara via Guix-patches via From: =?utf-8?b?44Ku44Oj44Op?= X-getmail-retrieved-from-mailbox: Patches --- Add pandoc to build manual. All test works now, so delete code that disable them. gnu/packages/rust-apps.scm | 143 ++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 81 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 0d5034ffb7..d570ec1848 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -50,6 +50,7 @@ (define-module (gnu packages rust-apps) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages ibus) @@ -362,91 +363,71 @@ (define-public dutree (define-public exa (package (name "exa") - (version "0.9.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "exa" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1s902xgplz1167k0r7x235p914lprpsqy2if0kpa1mlb0fswqqq4")))) + (version "0.10.1") + (source (origin + (method url-fetch) + (uri (crate-uri "exa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dd7waq2bnxc1xwygqphi8k1g2qzykr6fk0q4rgrhhxp2jd09f04")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-datetime" ,rust-datetime-0.4) - ("rust-env-logger" ,rust-env-logger-0.6) - ("rust-git2" ,rust-git2-0.9) - ("rust-glob" ,rust-glob-0.3) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-locale" ,rust-locale-0.2) - ("rust-log" ,rust-log-0.4) - ("rust-natord" ,rust-natord-1) - ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-number-prefix" ,rust-number-prefix-0.3) - ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) - ("rust-term-grid" ,rust-term-grid-0.1) - ("rust-term-size" ,rust-term-size-0.3) - ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-users" ,rust-users-0.9) - ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.4)) - #:cargo-development-inputs - (("rust-datetime" ,rust-datetime-0.4)) - #:phases - (modify-phases %standard-phases - ;; Ignoring failing tests. - ;; Reported in https://github.com/ogham/exa/issues/318 - (add-before 'check 'disable-failing-tests - (lambda _ - (substitute* "src/options/mod.rs" - (("^.*fn oneline_across.*" oneline-across) - (string-append "#[ignore]\n" oneline-across))) - - (substitute* "src/options/view.rs" - (("test!\\(across:.*") "") - (("test!\\(cr:.*") "") - (("test!\\(empty:.*") "") - (("test!\\(gracross:.*") "") - (("test!\\(grid:.*") "") - (("test!\\(icons:.*") "") - (("test!\\(just_binary:.*") "") - (("test!\\(just_blocks:.*") "") - (("test!\\(just_bytes:.*") "") - (("test!\\(just_git:.*") "") - (("test!\\(just_group:.*") "") - (("test!\\(just_header:.*") "") - (("test!\\(just_inode:.*") "") - (("test!\\(just_links:.*") "") - (("test!\\(leg:.*") "") - (("test!\\(lid:.*") "") - (("test!\\(original_g:.*") "")) - #t)) - (add-after 'install 'install-extras - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share")) - (man1 (string-append share "/man/man1"))) - (install-file "contrib/man/exa.1" man1) - (mkdir-p (string-append out "/etc/bash_completion.d")) - (mkdir-p (string-append share "/fish/vendor_completions.d")) - (mkdir-p (string-append share "/zsh/site-functions")) - (copy-file "contrib/completions.bash" - (string-append out "/etc/bash_completion.d/exa")) - (copy-file "contrib/completions.fish" - (string-append share "/fish/vendor_completions.d/exa.fish")) - (copy-file "contrib/completions.zsh" - (string-append share "/zsh/site-functions/_exa")) - #t)))))) - (inputs - (list libgit2 zlib)) - (native-inputs - (list pkg-config)) + `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-datetime" ,rust-datetime-0.5) + ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-git2" ,rust-git2-0.13) + ("rust-glob" ,rust-glob-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-locale" ,rust-locale-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-natord" ,rust-natord-1) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-number-prefix" ,rust-number-prefix-0.4) + ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) + ("rust-term-grid" ,rust-term-grid-0.1) + ("rust-term-size" ,rust-term-size-0.3) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-users" ,rust-users-0.11) + ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.5)) + #:cargo-development-inputs (("rust-datetime" ,rust-datetime-0.5)) + #:phases (modify-phases %standard-phases + (add-after 'build 'build-manual + (lambda _ + (map (lambda (page) + (system (string-append + "pandoc --standalone -f markdown -t man man/" + page ".md > " page))) + `("exa.1" "exa_colors.5")) #t)) + (add-after 'install 'install-extras + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (man1 (string-append share "/man/man1")) + (man5 (string-append share "/man/man5"))) + (install-file "exa.1" man1) + (install-file "exa_colors.5" man5) + (mkdir-p (string-append out "/etc/bash_completion.d")) + (mkdir-p (string-append share + "/fish/vendor_completions.d")) + (mkdir-p (string-append share "/zsh/site-functions")) + (copy-file "completions/completions.bash" + (string-append out + "/etc/bash_completion.d/exa")) + (copy-file "completions/completions.fish" + (string-append share + "/fish/vendor_completions.d/exa.fish")) + (copy-file "completions/completions.zsh" + (string-append share + "/zsh/site-functions/_exa")) + #t)))))) + (inputs (list libgit2 zlib)) + (native-inputs (list pkg-config pandoc)) (home-page "https://the.exa.website/") (synopsis "Modern replacement for ls") - (description "@code{exa} is a modern replacement for the command-line + (description + "@code{exa} is a modern replacement for the command-line program @code{ls}. It uses colours to distinguish file types and metadata. It also knows about symlinks, extended attributes, and Git.") (license license:expat)))