From patchwork Sat Jan 23 21:30:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthew James Kraai X-Patchwork-Id: 26582 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 C6C3A27BC18; Sat, 23 Jan 2021 21:32:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED 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 29B6127BC17 for ; Sat, 23 Jan 2021 21:32:09 +0000 (GMT) Received: from localhost ([::1]:45614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3QVs-0002mj-Bz for patchwork@mira.cbaines.net; Sat, 23 Jan 2021 16:32:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3QVm-0002mV-QG for guix-patches@gnu.org; Sat, 23 Jan 2021 16:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l3QVm-0004AC-JM for guix-patches@gnu.org; Sat, 23 Jan 2021 16:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l3QVm-0001rb-Gz for guix-patches@gnu.org; Sat, 23 Jan 2021 16:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46058] [PATCH] gnu: Test rust-juniper-codegen. Resent-From: Matthew Kraai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Jan 2021 21:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46058 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46058@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16114374627069 (code B ref -1); Sat, 23 Jan 2021 21:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jan 2021 21:31:02 +0000 Received: from localhost ([127.0.0.1]:35403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3QUh-0001pa-KD for submit@debbugs.gnu.org; Sat, 23 Jan 2021 16:31:02 -0500 Received: from lists.gnu.org ([209.51.188.17]:38948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3QUf-0001pT-RW for submit@debbugs.gnu.org; Sat, 23 Jan 2021 16:30:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3QUf-0002OP-LS for guix-patches@gnu.org; Sat, 23 Jan 2021 16:30:53 -0500 Received: from mail.ftbfs.org ([52.8.68.13]:38710 helo=aws.ftbfs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3QUd-0003iT-O2 for guix-patches@gnu.org; Sat, 23 Jan 2021 16:30:53 -0500 Received: from ip68-5-94-190.oc.oc.cox.net ([68.5.94.190] helo=localhost.localdomain) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l3QUb-0006me-H4; Sat, 23 Jan 2021 21:30:50 +0000 From: Matthew Kraai Date: Sat, 23 Jan 2021 13:30:47 -0800 Message-Id: <20210123213047.31750-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org; helo=aws.ftbfs.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Cc: Matthew Kraai Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/rust-juniper-codegen-use-__private.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/crates-io.scm (rust-juniper-codegen-0.14)[source]: Use it. [arguments]: Do not set #:tests? to #false. --- gnu/local.mk | 2 ++ gnu/packages/crates-io.scm | 7 ++++--- .../rust-juniper-codegen-use-__private.patch | 13 +++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/rust-juniper-codegen-use-__private.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0553c12f28..2a51d913dd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -40,6 +40,7 @@ # Copyright © 2020 Malte Frank Gerdes # Copyright © 2020 Vinicius Monego # Copyright © 2021 Björn Höfling +# Copyright © 2021 Matthew Kraai # # This file is part of GNU Guix. # @@ -1604,6 +1605,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-1.48-linker-locale.patch \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \ + %D%/packages/patches/rust-juniper-codegen-use-__private.patch \ %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \ %D%/packages/patches/rust-nettle-disable-vendor.patch \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6d0115e820..9a379e4d8a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 André Batista ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Antoine Côté +;;; Copyright © 2021 Matthew Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -16873,11 +16874,11 @@ friction with idiomatic Rust structs to ease interopability.") (uri (crate-uri "juniper_codegen" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06ym8568k9p75kvnfc4ywqbkzaa4ib6gngx9vpbsjwg9v0sg42nl")))) + (base32 "06ym8568k9p75kvnfc4ywqbkzaa4ib6gngx9vpbsjwg9v0sg42nl")) + (patches (search-patches "rust-juniper-codegen-use-__private.patch")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;FIXME: fail due to unresolved import - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)) diff --git a/gnu/packages/patches/rust-juniper-codegen-use-__private.patch b/gnu/packages/patches/rust-juniper-codegen-use-__private.patch new file mode 100644 index 0000000000..79b03e6cfc --- /dev/null +++ b/gnu/packages/patches/rust-juniper-codegen-use-__private.patch @@ -0,0 +1,13 @@ +diff --git a/src/util.rs b/src/util.rs +index 4df1b295..711aced1 100644 +--- a/src/util.rs ++++ b/src/util.rs +@@ -840,7 +840,7 @@ impl GraphQLTypeDefiniton { + #[cfg(test)] + mod test { + use super::*; +- use quote::__rt::*; ++ use quote::__private::*; + use syn::{Ident, LitStr}; + + fn strs_to_strings(source: Vec<&str>) -> Vec {