From patchwork Tue Jan 21 08:49:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 19931 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 E150817AB2; Tue, 21 Jan 2020 08:50:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 53B9417A85 for ; Tue, 21 Jan 2020 08:50:20 +0000 (GMT) Received: from localhost ([::1]:49988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itpEp-0003fb-Re for patchwork@mira.cbaines.net; Tue, 21 Jan 2020 03:50:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54065) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itpEc-0003WV-T1 for guix-patches@gnu.org; Tue, 21 Jan 2020 03:50:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itpEY-0007eL-Vj for guix-patches@gnu.org; Tue, 21 Jan 2020 03:50:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40481) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itpEY-0007eE-Mf for guix-patches@gnu.org; Tue, 21 Jan 2020 03:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1itpEY-00037q-Ls for guix-patches@gnu.org; Tue, 21 Jan 2020 03:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39159] [PATCH] Add Tokei Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2020 08:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39159 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 39159@debbugs.gnu.org Received: via spool by 39159-submit@debbugs.gnu.org id=B39159.157959658211976 (code B ref 39159); Tue, 21 Jan 2020 08:50:02 +0000 Received: (at 39159) by debbugs.gnu.org; 21 Jan 2020 08:49:42 +0000 Received: from localhost ([127.0.0.1]:46453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itpEA-00036z-FO for submit@debbugs.gnu.org; Tue, 21 Jan 2020 03:49:42 -0500 Received: from mail-vs1-f68.google.com ([209.85.217.68]:46854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itpE4-00036i-Cr for 39159@debbugs.gnu.org; Tue, 21 Jan 2020 03:49:36 -0500 Received: by mail-vs1-f68.google.com with SMTP id t12so1214669vso.13 for <39159@debbugs.gnu.org>; Tue, 21 Jan 2020 00:49:32 -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=TaMr9/cpgzVPgGTmiHAP7B+xIRq8kzp3/KYEXXlZDmg=; b=WND8mBcJLyAo0BTOKTu3F9uBYE9S+0cwaMYl1wxyVOKTt3ivTWWqi2GCkJnvWZc1lx BUb4sbuxmUoem6wEMsg6cGnM7/mkG38w3y+yvUNUb/eDwb+ldBV0RMI+nqMVLDGAPhMg yuPOgm8Eb4Zs3wSkzCLVoxbtk/u3CSPOg2prNvpV+V5bGXt7ogLCsLvQiqNGb9qqI+Cm n4+QD8560/XXFKLOnvjpf+Qy7GoOmQA09qFTEK5IVGnW6WmOgtkT+NbKylygWj+bkHzJ S3wZEPvhc4k+JMH94JA5aQvXCgRvwbVOv6y+z2DAGTeGOFdABCINCHTl+hYONolYtc+g 1l5w== 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=TaMr9/cpgzVPgGTmiHAP7B+xIRq8kzp3/KYEXXlZDmg=; b=M8luZMJ3LlbuuZuonZXC7iwjFtTa+vn+18l/q3TkkLk6AQAy+yIM4UGYdWc958Cpbl 5JzIzsWNF6vczh2IlsZRrTAEsEEX8agsXTsTHWOckNnmOB2vTgQZ4mzT3XOvHKpHMFAC TSv1kClBEnHQ4ZrxDyAEGC3fiVV/ntVmTS2AhXRwkNV8tXQKhltTmpg6ezynOpY08+at mW04K9fs0rNr7LvilD5BtxKKhVTEFX9hAuQ8PxN7MzznM9aIyjWgWRSJlz8C9aCMzhwb 8MpvPaF7u+pD0GjH0oDszES94tTQu8dOos6/1FenexLknQkm/E/NemVzoCHCSOdk7XtS A27A== X-Gm-Message-State: APjAAAUBXNEXpp3uLtTllmHzzLvuNyrZbq5YTTUXMAykVv7IynOMK/OA q2Vc+kkIL9iBqFciz8Oxa4yVx0DqbJ4Cn9cYFnDKkKVK X-Google-Smtp-Source: APXvYqyYh4kMBmL25XiQ/nwDmbpRjT2lxrThxaQ1bl0LCrkpBiLxxuRn+LWkmFzQD/nqB5jjvUZOu/AgOlEe7VZMi4s= X-Received: by 2002:a05:6102:511:: with SMTP id l17mr1967223vsa.49.1579596566657; Tue, 21 Jan 2020 00:49:26 -0800 (PST) MIME-Version: 1.0 References: <20200120072549.GD1603@E5400> <4EE3AF80-3720-44BF-87AC-B64DCFD2CAAB@asu.edu> In-Reply-To: <4EE3AF80-3720-44BF-87AC-B64DCFD2CAAB@asu.edu> From: John Soo Date: Tue, 21 Jan 2020 08:49:15 +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 Efraim, I updated the vendored package replacement in librsvg after these patches. This should fix librsvg-next building after tokei is in. I'd like to fix what I can from the coordination thread without conflicting too much with what you've done already. Ripgrep and cbindgen both build correctly after the package updates. Thanks again, John From 13183521b5939b1cced40540f0a29133df499263 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 21 Jan 2020 00:42:32 -0800 Subject: [PATCH] gnu: librsvg-next-source: Replace and update some dependencies. * gnu/packages/gnome.scm (librsvg-next-source): Update vendored replacements. --- gnu/packages/gnome.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 064ce86956..d2dc392969 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2019 Jonathan Brielmaier ;;; Copyright © 2019 Leo Prikler ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -2184,7 +2185,7 @@ from forcing GEXP-PROMISE." (lambda (crate) (delete-file-recursively (string-append "vendor/" (car crate))) (invoke "tar" "xvf" (cdr crate) "-C" "vendor")) - '(;("aho-corasick" . #+(package-source rust-aho-corasick-0.7)) + '(("aho-corasick" . #+(package-source rust-aho-corasick-0.7)) ;; alga 0.9 ("approx" . #+(package-source rust-approx-0.3)) ("arrayvec" . #+(package-source rust-arrayvec-0.4)) @@ -2203,9 +2204,9 @@ from forcing GEXP-PROMISE." ("criterion" . #+(package-source rust-criterion-0.2)) ("criterion-plot" . #+(package-source rust-criterion-plot-0.3)) ("crossbeam-deque" . #+(package-source rust-crossbeam-deque-0.7)) - ;("crossbeam-epoch" . #+(package-source rust-crossbeam-epoch-0.7)) - ("crossbeam-queue" . #+(package-source rust-crossbeam-queue-0.1)) - ("crossbeam-utils" . #+(package-source rust-crossbeam-utils-0.6)) + ("crossbeam-epoch" . #+(package-source rust-crossbeam-epoch-0.8)) + ("crossbeam-queue" . #+(package-source rust-crossbeam-queue-0.2)) + ("crossbeam-utils" . #+(package-source rust-crossbeam-utils-0.7)) ;; cssparser 0.25 ;; cssparser-macros 0.3 ("csv" . #+(package-source rust-csv-1.1)) @@ -2234,7 +2235,7 @@ from forcing GEXP-PROMISE." ;; glib 0.8 ;; glib-sys 0.9 ;; gobject-sys 0.9 -;; idna 0.2 + ("idna" . #+(package-source rust-idna-0.2)) ("itertools" . #+(package-source rust-itertools-0.8)) ("itoa" . #+(package-source rust-itoa-0.4)) ("language-tags" . #+(package-source rust-language-tags-0.2)) @@ -2248,8 +2249,8 @@ from forcing GEXP-PROMISE." ;; markup5ever 0.9 ("matches" . #+(package-source rust-matches-0.1)) ;; matrixmultiply 0.2 - ;("memchr" . #+(package-source rust-memchr-2.2)) -;; memoffset 0.5 + ("memchr" . #+(package-source rust-memchr-2.2)) + ("memoffset" . #+(package-source rust-memoffset-0.5)) ;; nalgebra 0.18 ("new_debug_unreachable" . #+(package-source rust-new-debug-unreachable-1.0)) ("nodrop" . #+(package-source rust-nodrop-0.1)) @@ -2285,15 +2286,15 @@ from forcing GEXP-PROMISE." ("rand_os" . #+(package-source rust-rand-os-0.1)) ("rand_pcg" . #+(package-source rust-rand-pcg-0.1)) ("rand_xorshift" . #+(package-source rust-rand-xorshift-0.1)) -;; rand_xoshiro 0.1 + ("rand_xoshiro" . #+(package-source rust-rand-xoshiro-0.1)) ;; rawpointer 0.2 -;; rayon 1.2 -;; rayon-core 1.6 + ("rayon" . #+(package-source rust-rayon-1.3)) + ("rayon-core" . #+(package-source rust-rayon-core-1.7)) ;; rctree 0.3 ("rdrand" . #+(package-source rust-rdrand-0.4)) -;; regex 1.3 + ("regex" . #+(package-source rust-regex-1.3)) ("regex-automata" . #+(package-source rust-regex-automata-0.1)) - ;("regex-syntax" . #+(package-source rust-regex-syntax-0.6)) + ("regex-syntax" . #+(package-source rust-regex-syntax-0.6)) ("rustc_version" . #+(package-source rust-rustc-version-0.2)) ("ryu" . #+(package-source rust-ryu-1.0)) ("same-file" . #+(package-source rust-same-file-1.0)) @@ -2311,14 +2312,14 @@ from forcing GEXP-PROMISE." ("syn" . #+(package-source rust-syn-1.0)) ("tendril" . #+(package-source rust-tendril-0.4)) ("textwrap" . #+(package-source rust-textwrap-0.11)) - ("thread_local" . #+(package-source rust-thread-local-0.3)) + ("thread_local" . #+(package-source rust-thread-local-1.0)) ("tinytemplate" . #+(package-source rust-tinytemplate-1.0)) ("typenum" . #+(package-source rust-typenum-1.10)) ("unicode-bidi" . #+(package-source rust-unicode-bidi-0.3)) ("unicode-normalization" . #+(package-source rust-unicode-normalization-0.1)) ("unicode-width" . #+(package-source rust-unicode-width-0.1)) ("unicode-xid" . #+(package-source rust-unicode-xid-0.2)) -;; url 2.1 + ("url" . #+(package-source rust-url-2.1)) ("utf-8" . #+(package-source rust-utf-8-0.7)) ("walkdir" . #+(package-source rust-walkdir-2.2)) ("winapi" . #+(package-source rust-winapi-0.3)) -- 2.25.0