From patchwork Tue Feb 23 13:06:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 27206 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 6F22427BC49; Tue, 23 Feb 2021 13:08:08 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,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 3958F27BC48 for ; Tue, 23 Feb 2021 13:08:08 +0000 (GMT) Received: from localhost ([::1]:37356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEXQ7-0005Vf-Fo for patchwork@mira.cbaines.net; Tue, 23 Feb 2021 08:08:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEXQ2-0005VN-FY for guix-patches@gnu.org; Tue, 23 Feb 2021 08:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46982) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEXQ2-00087M-8d 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-00030i-3i for guix-patches@gnu.org; Tue, 23 Feb 2021 08:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46717] [PATCH 1/2] gnu: Add 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.161408562311481 (code B ref 46717); Tue, 23 Feb 2021 13:08:02 +0000 Received: (at 46717) by debbugs.gnu.org; 23 Feb 2021 13:07:03 +0000 Received: from localhost ([127.0.0.1]:58524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEXP5-0002z6-Iz for submit@debbugs.gnu.org; Tue, 23 Feb 2021 08:07:03 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:46504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEXP4-0002yT-19 for 46717@debbugs.gnu.org; Tue, 23 Feb 2021 08:07:02 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (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-101.mailbox.org (Postfix) with ESMTPS id 4DlK8004thzQlY0 for <46717@debbugs.gnu.org>; Tue, 23 Feb 2021 14:06:56 +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=1614085613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=fAtjDyfewvq+c1a4N2OiQcX6leHFe7fkm08uTih6ezA=; b=WcXYMb9LuumFKDVUh1a9IyvTrVAIXVTMA34VZEtdROSMpeQiIKHfqwWxdvMFHNVK3bpvlA aEScnnWrlPFiWt9BHVJeJ8abwY1WDch6zSKyeuBvNtm/WvjhqFrMqBg6cGOcAnrFYBpSF/ ZCYXscPzWLgfqBuxWMfPmTww1y5gCLx9sgIw8G4xIJ7YzkxrFMDkNf6vneFMRyYpPH7jkH 5M09XwM/hhG0UmAjxGHtFPDZeY+toMr3lFTbHbCVniRa0i2rdQxI+hh0XJQjE5uNGZMN1M nuztocwvgFsqz3doV03wm/tHug48TJWc1W6ZdGEQrdSu/Zn4aenjHFlI7WnePA== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id ti-uecAJAEnA for <46717@debbugs.gnu.org>; Tue, 23 Feb 2021 14:06:52 +0100 (CET) Date: Tue, 23 Feb 2021 14:06:51 +0100 From: Lars-Dominik Braun Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-MBO-SPAM-Probability: X-Rspamd-Score: -6.71 / 15.00 / 15.00 X-Rspamd-Queue-Id: BBE6C183D X-Rspamd-UID: 962516 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/statistics.scm (readstat): New variable. --- gnu/packages/statistics.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3821c86da9..be30fa712c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5904,3 +5904,31 @@ Java package that provides routines for various statistical distributions.") is designed to support editing of scripts and interaction with various statistical analysis programs such as R, Julia, and JAGS.") (license license:gpl3+)))) + +(define-public readstat + (package + (name "readstat") + (version "1.1.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/WizardMac/ReadStat.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00sdmaq0qzp6kyv53fpfi6jf3iv4pd0ap0gmw3mbfip52bbnl55w")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gnu-gettext) + ("libtool" ,libtool))) + (inputs + `(("zlib" ,zlib))) ; libz + (synopsis "Convert SAS, Stata, and SPSS files") + (description "Command-line tool and C library for reading files from +popular stats packages like SAS, Stata and SPSS.") + (home-page "https://github.com/WizardMac/ReadStat") + (license license:expat))) + From patchwork Tue Feb 23 13:07:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 27207 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 D73E227BC49; Tue, 23 Feb 2021 13:08:13 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,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 70C7627BC48 for ; Tue, 23 Feb 2021 13:08:13 +0000 (GMT) Received: from localhost ([::1]:37570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEXQC-0005bS-Mp for patchwork@mira.cbaines.net; Tue, 23 Feb 2021 08:08:12 -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-Disposition: inline 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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