From patchwork Fri Dec 20 17:44:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 16584 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 216791794E; Fri, 20 Dec 2019 17:46:39 +0000 (GMT) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9BEF117940 for ; Fri, 20 Dec 2019 17:46:38 +0000 (GMT) Received: from localhost ([::1]:59924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiMMH-0001MG-Se for patchwork@mira.cbaines.net; Fri, 20 Dec 2019 12:46:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48437) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiML5-0008Qm-EG for guix-patches@gnu.org; Fri, 20 Dec 2019 12:45:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iiMKu-0007HO-Ie for guix-patches@gnu.org; Fri, 20 Dec 2019 12:45:23 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41256) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iiMKm-00070h-D0 for guix-patches@gnu.org; Fri, 20 Dec 2019 12:45:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iiMKl-0003nx-6f for guix-patches@gnu.org; Fri, 20 Dec 2019 12:45:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38640] [PATCH] Add ripgrep and many rust dependencies Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Dec 2019 17:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38640 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38640@debbugs.gnu.org Cc: =?utf-8?q?Nicol=C3=B2?= Balzarotti , Efraim Flashner , Martin Becze Received: via spool by 38640-submit@debbugs.gnu.org id=B38640.157686390114600 (code B ref 38640); Fri, 20 Dec 2019 17:45:02 +0000 Received: (at 38640) by debbugs.gnu.org; 20 Dec 2019 17:45:01 +0000 Received: from localhost ([127.0.0.1]:47230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iiMKj-0003nP-0B for submit@debbugs.gnu.org; Fri, 20 Dec 2019 12:45:01 -0500 Received: from mail-vs1-f66.google.com ([209.85.217.66]:42966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iiMKg-0003nA-E5 for 38640@debbugs.gnu.org; Fri, 20 Dec 2019 12:44:58 -0500 Received: by mail-vs1-f66.google.com with SMTP id b79so6541676vsd.9 for <38640@debbugs.gnu.org>; Fri, 20 Dec 2019 09:44:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=E2nVw9h64l0IoM0CdUZ9BMThEkIVaPFHlxpjTWq2QSQ=; b=IsAT/yWzeeKwTRQVFMNWrgcpaDQiNmRyrS59hc4s+uON+EHNPa8xqZsLQZdCeMvD2z q4+68yDjkoA42iX/UeeGadtTP/fushNFqmVAQOsoi50zW2rjur06WhHRr1M6wR1QjsXP 524G4QAZQ7dbjUIPoWcHR+0ClG9yPCrNQTI3xLjGHvfRRvPGPxA+1AxktnHhvoWKvl6N zAKimfQ85D7M0OvRXCHWr66XVnSBBc0HrVXW2+o4z+Z5Wdj30yxico6AJgLtXiVlT90h qIa2/oOMfnVLS0/AwLS+nNLpTqJpzLV9KvVYDQ1Qxf12ojZUmS+JFplDpQNsN1TP0w0h IWMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=E2nVw9h64l0IoM0CdUZ9BMThEkIVaPFHlxpjTWq2QSQ=; b=VpTv8t1kRK/NuMyJ1msr+kPVczbZiUX0zSofjJzGnJrir4zTPSYZtfo+E/zFz/VWPv Tzx21M/h+02TOl9EDKf2fSwfI3ql80AewkPqiIYz9ry50NcjgbF42t8toWsjoTFAib0c 0LaRWuEd6iMduGmaFsD0LNCNuztk14W2La2RRCcaUJG2Odo6vD3WYsTOBWrz6cMTI7KO Z/+aJ+2s497+FIYIg/kAPSiEMnugbeZj5E8VBXdJvMo8bBnciJo3zpf8TW3ivPoGap/c hfn2JIM20h8s072J6XUy3ie3Jlt/k0IjnLWjvqtpsLGTffBeUxeHMdyBiwFoMu/yd1K/ nZBQ== X-Gm-Message-State: APjAAAV8NmK9QzIxInS335ffE+35qgEC2sMNVdGswGhO2yRVK06WdMko +ZjPD2j9GHkUX7dFu0cURwTHbLfBiItZs1BAelcm1ngb X-Google-Smtp-Source: APXvYqwS+4pQ662+sY/aaa3/1RinsSDw3A+5UL8T+XjcO/E1YoAnE4VovtnwwNNpJG9qlWZx3Zm2gyC8dg/k1USw21Y= X-Received: by 2002:a67:e9cc:: with SMTP id q12mr9349320vso.189.1576863891761; Fri, 20 Dec 2019 09:44:51 -0800 (PST) MIME-Version: 1.0 References: <002582d46228db8739fc12c0404ad177@riseup.net> <1e0988ded5edd72803b0660004614db0@riseup.net> <20191219072536.GB917@E5400> In-Reply-To: <20191219072536.GB917@E5400> From: John Soo Date: Fri, 20 Dec 2019 17:44:36 +0000 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 Hi all, Sorry it took a while. As it turns out, keeping #cargo-inputs and #cargo-development-inputs was a very good idea. It turns out I was missing about 60 more dependencies! I linted them as far as I could without breaking anything. I added #skip-build #t to all the other dependencies. The only issue here is that the commit order has somewhat lost the topological order of the dependencies because rebasing them all required too much conflict resolution. I rebased these on master this morning. Thanks for all your input! John From ca7ea6137ef582cf74f5ea300200fb7e8544031e Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 15 Dec 2019 11:27:39 -0800 Subject: [PATCH 263/263] gnu: Add ripgrep. * gnu/packages/rust-apps.scm (ripgrep): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/rust-apps.scm | 73 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 gnu/packages/rust-apps.scm diff --git a/gnu/local.mk b/gnu/local.mk index 5cb96cc354..b8f5afd69d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -433,6 +433,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/ruby.scm \ %D%/packages/rush.scm \ %D%/packages/rust.scm \ + %D%/packages/rust-apps.scm \ %D%/packages/rust-cbindgen.scm \ %D%/packages/samba.scm \ %D%/packages/sagemath.scm \ diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm new file mode 100644 index 0000000000..e48b933384 --- /dev/null +++ b/gnu/packages/rust-apps.scm @@ -0,0 +1,73 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 John Soo +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages rust-apps) + #:use-module (gnu packages crates-io) + #:use-module (guix build-system cargo) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +(define-public ripgrep + (package + (name "ripgrep") + (version "11.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ripgrep" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bn40lz9n08llq615p4qqqbi24zbkf0appfx3zgxg34a86ga9zds")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-bstr" ,rust-bstr-0.1) + ("rust-grep" ,rust-grep-0.2) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-num-cpus" ,rust-num-cpus-1.10) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-ryu" ,rust-ryu-1.0) + ("rust-strsim" ,rust-strsim-0.8) + ("rust-syn" ,rust-syn-1.0) + ("rust-textwrap" ,rust-textwrap-0.11) + ("rust-ucd-util" ,rust-ucd-util-0.1) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-unicode-xid" ,rust-unicode-xid-0.2) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-wincolor" ,rust-wincolor-1.0)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-lazy-static" ,rust-lazy-static-1.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0)))) + (home-page + "https://github.com/BurntSushi/ripgrep") + (synopsis + "Line-oriented search tool") + (description + "ripgrep is a line-oriented search tool that recursively searches +your current directory for a regex pattern while respecting your +gitignore rules. ripgrep has first class support on Windows, macOS +and Linux.") + (license `(,license:unlicense ,license:expat)))) -- 2.24.1