From patchwork Sun Sep 8 23:35:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 15326 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 5CB41173A1; Mon, 9 Sep 2019 00:36:20 +0100 (BST) 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,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 500401739E for ; Mon, 9 Sep 2019 00:36:13 +0100 (BST) Received: from localhost ([::1]:51232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i76j6-0005Rz-Pk for patchwork@mira.cbaines.net; Sun, 08 Sep 2019 19:36:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37278) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i76iz-0005Rq-Bb for guix-patches@gnu.org; Sun, 08 Sep 2019 19:36:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i76iw-0006Km-AY for guix-patches@gnu.org; Sun, 08 Sep 2019 19:36:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58715) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i76iw-0006KI-5H for guix-patches@gnu.org; Sun, 08 Sep 2019 19:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i76iw-0003HR-1I for guix-patches@gnu.org; Sun, 08 Sep 2019 19:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37346] [PATCH] Move diffoscope from package-management to it's own module. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2019 23:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37346 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37346@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156798575912598 (code B ref -1); Sun, 08 Sep 2019 23:36:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Sep 2019 23:35:59 +0000 Received: from localhost ([127.0.0.1]:39303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i76ih-0003Gq-Fd for submit@debbugs.gnu.org; Sun, 08 Sep 2019 19:35:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:56352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i76iV-0003GW-2w for submit@debbugs.gnu.org; Sun, 08 Sep 2019 19:35:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37205) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i76iR-0005P6-TI for guix-patches@gnu.org; Sun, 08 Sep 2019 19:35:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i76iN-00057v-Nz for guix-patches@gnu.org; Sun, 08 Sep 2019 19:35:31 -0400 Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]:47546) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1i76iN-00053Z-9Z for guix-patches@gnu.org; Sun, 08 Sep 2019 19:35:27 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100b]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 0B4781AA2C for ; Sun, 8 Sep 2019 16:35:24 -0700 (PDT) From: Vagrant Cascadian Date: Sun, 08 Sep 2019 16:35:19 -0700 Message-ID: <87ftl6cqfc.fsf@yucca> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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 I was having infinite recursion issues importing additional modules such as android.scm, bootloaders.scm and statistics.scm into package-management.scm with use-modules calls, along these lines: error: googletest: unbound variable hint: Did you forget a `use-modules' form? ... error: curl: unbound variable hint: Did you forget a `use-modules' form? guix build: error: diffoscope: unknown package Moving diffoscope to it's own package module seemed to at least work around the issue. Diffoscope itself attempts to deal with an arbitrary and growing number of file types, so pulls in quite a few other package modules, so at least splitting it into a separate module might limit the impacts on other modules. Attached are two patches attempting the split; comments welcome! The first patch is the move itself, and also moves trydiffoscope; the second patch adds the package modules that previously would fail to import properly before the move. This allows diffoscope to run a few additional tests, getting the test suite down to only about 68 skipped tests (and falling); it was around 140 skipped tests before I started this mad rush... live well, vagrant From c4ef8545514b4d594ab6fc083c954a22eace3786 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 8 Sep 2019 15:35:33 -0700 Subject: [PATCH 2/2] gnu: diffoscope: Add additional test dependencies. * gnu/packages/diffoscope (diffoscope)[native-inputs]: Add abootimg, dtc, and r-minimal. (use-module): Add android, bootloaders and statistics, respectively. --- gnu/packages/diffoscope.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 6eb5c1d9fe..828e06a818 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -25,8 +25,10 @@ #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages admin) + #:use-module (gnu packages android) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages bootloaders) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -50,6 +52,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) + #:use-module (gnu packages statistics) #:use-module (gnu packages textutils) #:use-module (gnu packages video) #:use-module (gnu packages vim) @@ -137,6 +140,7 @@ (native-inputs `(("python-pytest" ,python-pytest) ("python-chardet" ,python-chardet) ;; test suite skips tests when tool is missing + ("abootimg" ,abootimg) ("bdb" ,bdb) ("binutils" ,binutils) ("bzip2" ,bzip2) @@ -144,6 +148,7 @@ ("colord" ,colord) ("cpio" ,cpio) ("docx2txt" ,docx2txt) + ("dtc" ,dtc) ("e2fsprogs" ,e2fsprogs) ("ffmpeg" ,ffmpeg) ("gettext" ,gettext-minimal) @@ -163,6 +168,7 @@ ("openssh" ,openssh) ("pgpdump" ,pgpdump) ("poppler" ,poppler) + ("r-minimal" ,r-minimal) ("rpm" ,rpm) ("sng" ,sng) ("sqlite" ,sqlite) -- 2.20.1