From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ENjAJD7+NGATDwAA0tVLHw (envelope-from ) for ; Tue, 23 Feb 2021 13:08:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id aCo+ID7+NGA0JwAAB5/wlQ (envelope-from ) for ; Tue, 23 Feb 2021 13:08:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2BEF41071E for ; Tue, 23 Feb 2021 14:08:14 +0100 (CET) Received: from localhost ([::1]:37570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEXQD-0005bS-CA for larch@yhetil.org; Tue, 23 Feb 2021 08:08:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEXQ2-0005VT-Rg for guix-patches@gnu.org; Tue, 23 Feb 2021 08:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEXQ2-00087R-KW for guix-patches@gnu.org; Tue, 23 Feb 2021 08:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lEXQ2-00030p-GH for guix-patches@gnu.org; Tue, 23 Feb 2021 08:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46717] [PATCH 2/2] gnu: r-haven: Unvendor readstat. References: In-Reply-To: Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Feb 2021 13:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46717 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46717@debbugs.gnu.org Received: via spool by 46717-submit@debbugs.gnu.org id=B46717.161408565011527 (code B ref 46717); Tue, 23 Feb 2021 13:08:02 +0000 Received: (at 46717) by debbugs.gnu.org; 23 Feb 2021 13:07:30 +0000 Received: from localhost ([127.0.0.1]:58528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEXPV-0002zr-TS for submit@debbugs.gnu.org; Tue, 23 Feb 2021 08:07:30 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:52638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEXPR-0002zb-7y for 46717@debbugs.gnu.org; Tue, 23 Feb 2021 08:07:28 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4DlK8R2VZrzQlRp for <46717@debbugs.gnu.org>; Tue, 23 Feb 2021 14:07:19 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1614085637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ICBprWzcTGfvHw1aOihn91KMUDHfTWXszeDmy9JQGNw=; b=aAUxFl1rkPFOGc8wxeJpsNhvYnwhl1125W190q36F/yL76ASezGE8G0W1f+KZgialXyrZh PnzQX6Sgs4AirxgR+eXHoWFGRDnBnKtTEI0eA6zLLMDNpeWuF8S1D3ghrO6X1RJHginqC2 2sy5CyDoSuXPw8UkryEMmttcbiAIt+GGfbv1/Ly/+JdMwqr49J07fkMOzKQe1mkfVjElUD XZngPk02+B98CTT3gRODnUjRqvbjDlh/ACfPAlPTYDE04IyMg4ICRuZsuQD1rLxYpVN/xu /CL7Iv/GAgphtNuavpF8sX0fZiepI1r0AxY74jD6N52e8ahh165Tov1jK6ojbw== Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id qlCWfSIX5HQ7 for <46717@debbugs.gnu.org>; Tue, 23 Feb 2021 14:07:16 +0100 (CET) Date: Tue, 23 Feb 2021 14:07:14 +0100 From: Lars-Dominik Braun Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: X-Rspamd-Score: -4.86 / 15.00 / 15.00 X-Rspamd-Queue-Id: 605DC17B4 X-Rspamd-UID: 448a9a 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.27 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b=aAUxFl1r; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 2BEF41071E X-Spam-Score: -1.27 X-Migadu-Scanner: scn1.migadu.com X-TUID: 6iRL3NHOJy6L * gnu/packages/cran.scm (r-haven) [snippet]: Remove bundled readstat. [arguments]: Patch Makevars to use system readstat. [inputs]: Replace zlib with readstat. --- gnu/packages/cran.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4a88cf1677..d675b7e37a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2309,10 +2309,25 @@ including functions for geolocation and routing.") (uri (cran-uri "haven" version)) (sha256 (base32 - "03cypgqhdkrfbfpl1yx2wb7flczrbak1w654wkicmd5ajwr9zvkf")))) + "03cypgqhdkrfbfpl1yx2wb7flczrbak1w654wkicmd5ajwr9zvkf")) + (modules '((guix build utils))) + (snippet + '(begin + ;; unvendor readstat + (delete-file-recursively "src/readstat") + #t)))) (build-system r-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unbundle-readstat + (lambda _ + ;; Not required, since we’re not building readstat. + (substitute* "src/Makevars" + (("-lz") "-lreadstat")) + #t))))) (inputs - `(("zlib" ,zlib))) + `(("readstat" ,readstat))) (native-inputs `(("r-knitr" ,r-knitr))) (propagated-inputs -- 2.26.2