From patchwork Sun Feb 25 23:45:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 61128 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 047D127BBE9; Sun, 25 Feb 2024 23:48:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CD06727BBE2 for ; Sun, 25 Feb 2024 23:48:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1reODd-0004CN-RU; Sun, 25 Feb 2024 18:47:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reODZ-0004C1-Hm for guix-patches@gnu.org; Sun, 25 Feb 2024 18:47:39 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reODZ-0002u7-8G for guix-patches@gnu.org; Sun, 25 Feb 2024 18:47:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1reODx-0002gm-Rw for guix-patches@gnu.org; Sun, 25 Feb 2024 18:48:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68890] [PATCH v4] gnu: pspp: Update to 2.0.0 References: <5d106ce0f68007a6cf0c6a565359048ef8790765.1706859256.git.atai@atai.org> In-Reply-To: <5d106ce0f68007a6cf0c6a565359048ef8790765.1706859256.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Feb 2024 23:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68890 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68890@debbugs.gnu.org, skyvine@protonmail.com, mail@nicolasgoaziou.fr Cc: Andy Tai Received: via spool by 68890-submit@debbugs.gnu.org id=B68890.170890485710254 (code B ref 68890); Sun, 25 Feb 2024 23:48:01 +0000 Received: (at 68890) by debbugs.gnu.org; 25 Feb 2024 23:47:37 +0000 Received: from localhost ([127.0.0.1]:33300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reODW-0002fE-2P for submit@debbugs.gnu.org; Sun, 25 Feb 2024 18:47:37 -0500 Received: from mail-pl1-f171.google.com ([209.85.214.171]:53320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reODQ-0002ee-8o for 68890@debbugs.gnu.org; Sun, 25 Feb 2024 18:47:32 -0500 Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1d95d67ff45so14518875ad.2 for <68890@debbugs.gnu.org>; Sun, 25 Feb 2024 15:47:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708904757; x=1709509557; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=Eed49/M1ZyGfU+x76nxfmmtdDFJnwfBul01P9sr1CBg=; b=QrA+ocZw3mz2ggPJ0viHiTIo/rad9W5qg0YUVVDS9MX9esouoAjzZoPNecB263Z098 LZHBvlxELgPOCe+ExZr8pO0lB+Ot3V6KRUqP8gpzvlCl0Cejt70GjoYViL5vxH8aGTku 0sP/XJOohhIIE5XD8JXMhOqJCPU1cTbT/rMApEvLCerWa2t/m4PNKrAV0b7QLPqLp0eE L9toqNihQN3IrMmZSUe2kpt79BLVRnWFudOaQ9IlNHEzxLzI+iXxPq5o5LxjSjML38o9 +AMaTgf8R0oIWwkU6qPRbQtCLO5VD0xXGFH1eH/CsO9UPIxNQnRDLX97dyWkHrZFDbB+ HvSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708904757; x=1709509557; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Eed49/M1ZyGfU+x76nxfmmtdDFJnwfBul01P9sr1CBg=; b=CFyRweRuqGwei/QBAhsq60lQKXMm5IqRZJrHj80IBs5ksWiPQWr+f6KkKVpWkyRyrr ja9ZH3gyi6bjrlovK0XN2WhIy/OmiEIw31DxxZXYcCBCChTmmJJLfqZvNgMT7WK3/h1n hLmxEGp1nUpPgB3NO5/5YPuZrN7xXOmh/cwHRCHtBAVS+UR0eEzp1O94rkIUNBAZHT3U jpGnHHiGXApmXi1lFIYQ6PcAOWV4av61jjJzKU08HAWmWBRejV3MOMoWxP2zJ9McXn0t D/hHDmfiEiBnVnR5lw1ut+OFntU/O4+YjsrAifJOO7XPmirS5BCMBq78MzlTR5SllWmy +yNg== X-Gm-Message-State: AOJu0YzqfRBjvR+4maguW0lc64bJVgA50+59Tm839H4qFyh6c+A4q8UU MotHphfzT4TtRoWdINYE2r8E+LH7Yvu7SGQDpQjLQN+ZbIdX0j67dKmN5Ko/ X-Google-Smtp-Source: AGHT+IHdbQBsCaBgQ/gwxNqqC1cp1STS+dg5VT0lhXr2CWZelXukZTy6WDK5Bvv0TWYTvYY/F7ga4A== X-Received: by 2002:a17:902:d506:b0:1dc:91da:a1c with SMTP id b6-20020a170902d50600b001dc91da0a1cmr2592905plg.50.1708904756834; Sun, 25 Feb 2024 15:45:56 -0800 (PST) Received: from DEskMiniX300.. (c-98-37-226-98.hsd1.ca.comcast.net. [98.37.226.98]) by smtp.gmail.com with ESMTPSA id p9-20020a1709026b8900b001dc78455383sm2680442plk.223.2024.02.25.15.45.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 15:45:56 -0800 (PST) From: Andy Tai Date: Sun, 25 Feb 2024 15:45:54 -0800 Message-Id: <08452a3e3c96b30de134b5fddf17a3e28b9321d9.1708904696.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/statistics.scm (pspp): Update to 2.0.0 [arguments](phases): Patch test case to make pass due to locale [native-inputs]: Switch from Python 2 to Python 3 Change-Id: I9feeab72789347033d2df8f23bda9ea27aaa7dd9 --- gnu/packages/statistics.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) base-commit: 05bbe9993f687da1fd684a31474c621f2a1c37b2 diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 01d5e25a1a..05bdb589f7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -115,7 +115,7 @@ (define-module (gnu packages statistics) (define-public pspp (package (name "pspp") - (version "1.4.1") + (version "2.0.0") (source (origin (method url-fetch) @@ -123,12 +123,17 @@ (define-public pspp version ".tar.gz")) (sha256 (base32 - "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan")))) + "1pyqlab9kw65wxc8pilcwb64l18w37xxdg3r6n287c7mda4cpxm8")))) (build-system gnu-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - (add-before 'check 'prepare-tests + (add-after 'unpack 'patch-test-suite + (lambda _ + (substitute* "tests/output/tex.at" + (("AT_CHECK\\(\\[LC_ALL=C.UTF-8 pspp") + "AT_CHECK([LC_ALL=en_US.UTF-8 pspp")))) + (add-before 'check 'prepare-tests ;; Prevent irrelevant errors that cause test output mismatches: ;; ‘Fontconfig error: No writable cache directories’ (lambda _ @@ -149,7 +154,7 @@ (define-public pspp `(,glib "bin") ;for glib-genmarshal perl pkg-config - python-2 ;for tests + python-3 ;for tests texinfo)) (home-page "https://www.gnu.org/software/pspp/") (synopsis "Statistical analysis")