From patchwork Sun Jul 11 14:55:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Domagoj Stolfa X-Patchwork-Id: 31328 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 81FBD27BC83; Sun, 11 Jul 2021 15:58:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5135827BC81 for ; Sun, 11 Jul 2021 15:58:49 +0100 (BST) Received: from localhost ([::1]:51338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2auu-0001ts-Dv for patchwork@mira.cbaines.net; Sun, 11 Jul 2021 10:58:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2atM-0006aw-6k for guix-patches@gnu.org; Sun, 11 Jul 2021 10:57:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2atL-0007Ec-V4 for guix-patches@gnu.org; Sun, 11 Jul 2021 10:57:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2atL-0003fD-Uy for guix-patches@gnu.org; Sun, 11 Jul 2021 10:57:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49383] [PATCH v2 25/26] gnu: Add rust-colored-2 Resent-From: Domagoj Stolfa Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Jul 2021 14:57:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49383 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49383@debbugs.gnu.org Cc: Domagoj Stolfa Received: via spool by 49383-submit@debbugs.gnu.org id=B49383.162601541813884 (code B ref 49383); Sun, 11 Jul 2021 14:57:11 +0000 Received: (at 49383) by debbugs.gnu.org; 11 Jul 2021 14:56:58 +0000 Received: from localhost ([127.0.0.1]:35671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2at8-0003bl-GZ for submit@debbugs.gnu.org; Sun, 11 Jul 2021 10:56:58 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:34652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2asz-0003Yh-E2 for 49383@debbugs.gnu.org; Sun, 11 Jul 2021 10:56:49 -0400 Received: by mail-wr1-f49.google.com with SMTP id p8so20846637wrr.1 for <49383@debbugs.gnu.org>; Sun, 11 Jul 2021 07:56:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eKIA52tX9CrwknV08sCbi3sRMaoLHz6OaSTlk/cRlxI=; b=jNqKoBR4cZ2HmEC/OG7hS7ZMjZ5ls6pxY37CMvqC7zpWyKCX6DrHSVZ9PlTjrkVRCa p+P35VPNp1ZTZWYywtzVChOJbpT5dt1cFtfhw4y1eOmPSgpeRnPDz3ujE1ZSrO0HFI3Q xD+PtVUtpGCU8SwJCCZFuw4DrlIDeXeKZDPBWP5U79nQvSx2pNse+i/kdqaX/dfEl0Ua PRPxZ8kVDyot43srY6ZNkEY/8jqvkvoLD6QEX+cob2R8D1Cw6+MiH9LkNdJO0pwK8KNa F5wOnCaoI6HkFm0Vu8IwX9TbtTSZl14pvMJ5yCp33BRcWrAdRdO47Gl5tNHmoHxiol+V BVrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eKIA52tX9CrwknV08sCbi3sRMaoLHz6OaSTlk/cRlxI=; b=RVz5w7TQ8jG2zRQZ5w7w2VrRO2CGuFrAcJrSVEvt+8FtR3NQ9OMY99TKg5EL34fwuR pvhI8s/l9vkoN+I+Cs/Ilw4ExiT78OxNEB4ZKJ5TckAZ44yDBpctUp4GaAcxObrWqKS7 3x9wzZytQ/rZTSeAzmAP/sQ5IjE6+WiR7+T0F4DaSHjelugce6HB1imVloP4axZNdPdl 5c6EVANZnyXnIl+SGH1dqQeg72BfdwikqFBCgw6iYXSRKflkxF52l4cscQ8z7z/MH3L8 OHyXXal0Frnc03nF1QE5B7AwB7OixaI+JnqCN+FGDBMdPikqZCzDaBaYnfxngqAeo9eU SK6w== X-Gm-Message-State: AOAM531nKC8IOMNP5GEKUp3Smh+YBxxNSmBgEPEF6HBR/E8/JH2nvNPx +0lR8968Qul4er4L1VTDKrJsbaAYwxuvRA== X-Google-Smtp-Source: ABdhPJyVEjGb/k1LY6SxFGnvi9zjMYt43AbP+gXHsmG1gk6D0gQnAbOsX/8gLgMBRhNFl8iro9aXww== X-Received: by 2002:adf:fbce:: with SMTP id d14mr1387066wrs.236.1626015403923; Sun, 11 Jul 2021 07:56:43 -0700 (PDT) Received: from pepehands.quns.cam.ac.uk (ds815.queens.cam.ac.uk. [131.111.128.28]) by smtp.googlemail.com with ESMTPSA id b16sm11827632wrs.51.2021.07.11.07.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 07:56:43 -0700 (PDT) From: Domagoj Stolfa X-Google-Original-From: Domagoj Stolfa Date: Sun, 11 Jul 2021 15:55:57 +0100 Message-Id: <20210711145558.20441-26-ds815@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210711145558.20441-1-ds815@gmx.com> References: <20210711145558.20441-1-ds815@gmx.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-colored-2): New public variable. --- gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7f68e4e4eb..7fdbe1658f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8637,19 +8637,19 @@ diagnostics easy and relatively painless for everyone!") colors.") (license license:expat))) -(define-public rust-colored-1 +(define-public rust-colored-2 (package (name "rust-colored") - (version "1.9.3") + (version "2.0.0") (source (origin (method url-fetch) (uri (crate-uri "colored" version)) (file-name - (string-append name "-" version ".tar.gz")) + (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0nbc1czs512h1k696y7glv1kjrb2b914zpxraic6q5fgv80wizzl")))) + (base32 + "1gbcijscmznzy42rn213yp9ima7210zakgaqibgg1n441dsnyqdk")))) (build-system cargo-build-system) (arguments `(#:tests? #f @@ -8673,9 +8673,41 @@ colors.") "The most simple way to add colors in your terminal.") (license license:mpl2.0))) +(define-public rust-colored-1 + (package + (inherit rust-colored-2) + (name "rust-colored") + (version "1.9.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "colored" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nbc1czs512h1k696y7glv1kjrb2b914zpxraic6q5fgv80wizzl")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-atty" ,rust-atty-0.2) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-lazy-static" ,rust-lazy-static-1)) + #:cargo-development-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-rspec" ,rust-rspec-1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-version-requirements + (lambda _ + (substitute* "Cargo.toml" + (("1.0.0-beta.3") ,(package-version rust-rspec-1))) + #t))))))) + (define-public rust-colored-1.9.1 (package - (inherit rust-colored-1) + (inherit rust-colored-2) (name "rust-colored") (version "1.9.1") (source