From patchwork Sun Dec 2 05:18:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 365 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 9FEB116757; Sun, 2 Dec 2018 05:20:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 7B4E61672E for ; Sun, 2 Dec 2018 05:20:20 +0000 (GMT) Received: from localhost ([::1]:43450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTKB1-0002Qu-M9 for patchwork@mira.cbaines.net; Sun, 02 Dec 2018 00:20:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTKAn-0002Qm-Bp for guix-patches@gnu.org; Sun, 02 Dec 2018 00:20:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTKAk-0004yI-7I for guix-patches@gnu.org; Sun, 02 Dec 2018 00:20:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:53191) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gTKAk-0004yE-4O for guix-patches@gnu.org; Sun, 02 Dec 2018 00:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gTKAj-0005Oq-RB for guix-patches@gnu.org; Sun, 02 Dec 2018 00:20:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33572] [PATCH] Make Guile-JSON a required dependency. Resent-From: ericbavier@centurylink.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Dec 2018 05:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33572@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154372794820667 (code B ref -1); Sun, 02 Dec 2018 05:20:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Dec 2018 05:19:08 +0000 Received: from localhost ([127.0.0.1]:57449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gTK9k-0005Mq-9I for submit@debbugs.gnu.org; Sun, 02 Dec 2018 00:19:08 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gTK9e-0005MY-Pm for submit@debbugs.gnu.org; Sun, 02 Dec 2018 00:18:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTK9Y-0004TF-57 for submit@debbugs.gnu.org; Sun, 02 Dec 2018 00:18:49 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:57321) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gTK9Y-0004TB-2P for submit@debbugs.gnu.org; Sun, 02 Dec 2018 00:18:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTK9W-0001lk-Qr for guix-patches@gnu.org; Sun, 02 Dec 2018 00:18:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTK9T-0004Qf-LG for guix-patches@gnu.org; Sun, 02 Dec 2018 00:18:46 -0500 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:21184 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gTK9T-0004Q2-E5 for guix-patches@gnu.org; Sun, 02 Dec 2018 00:18:43 -0500 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1543727922; h=From:Subject:Date:To:MIME-Version; bh=6Dg/j7tk8uAFgDBgB0PLAVAmDFw=; b=31VShiyWMP+TZQqq1+z4I6cOd5/Z7H7HUWyZveRvXFnpMlTE+Zra0mn0su8+tlfi OFhx/xW9hxBbslnWshxWxhOnxL9EIQlsSAB+UZwRaUqtaOAAFb0nmvBDxr5Drf/k qyT8+QK6HJ3bNEM7q5r0cT7Dn6ddFvCd0/hZHg4vdOXi6BPs9EEEOrugX4ezyMCM 14Egx082V5Bn/7N+RiKCn30mbEfx5q5XHMrZuRjm++ORwLyNYr4oR+hVaDjCRxvU /49qqlzVj8odHIOqQQXReRKdu/uC4TuDJSuQkRP6FEDTNWQu94JJkowYg2yp1MB8 zsQT5AXrI5L99V/TZyGcSg==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.2 cv=Sbi1TbZu c=1 sm=1 tr=0 a=PfFp8hmzMLas+YAS7JUBXg==:117 a=PfFp8hmzMLas+YAS7JUBXg==:17 a=KGjhK52YXX0A:10 a=2ur7OfE09M0A:10 a=zSv6zi-ZgakA:10 a=inoG4m36AAAA:8 a=CcLUTRNvAAAA:8 a=FFLdh5n2AAAA:20 a=fXms6y0vAAAA:8 a=69wJf7TsAAAA:8 a=p-wP41oKWemYr1zPVNkA:9 a=_Qgj-RFg6mImvLaOgLPg:22 a=obhdfE27RNN5ZnF-s2K5:22 a=c6Zb8eaUoX5VaqycxFvw:22 a=Fg1AiH1G6rFz08G2ETeA:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp02.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [97.116.107.116] ([97.116.107.116:49464] helo=localhost.localdomain) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=DHE-RSA-AES128-GCM-SHA256) id 03/10-10541-13B630C5; Sun, 02 Dec 2018 00:18:42 -0500 From: ericbavier@centurylink.net Date: Sat, 1 Dec 2018 23:18:22 -0600 Message-Id: <20181202051822.8344-1-ericbavier@centurylink.net> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Bavier Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Eric Bavier * README (Requirements): Remove "optional" verbiage. * configure.ac (HAVE_GUILE_JSON): Remove Automake conditional. (have_guile_json): Error if not "yes". * Makefile.am (MODULE, SCM_TESTS)[HAVE_GUILE_JSON]: Add modules and tests unconditionally. * gnu/packages/package-mangement.scm (guix-minimal)[propagated-inputs]: Leave guile-json input. --- Makefile.am | 72 ++++++++++++----------------- README | 2 +- configure.ac | 6 ++- gnu/packages/package-management.scm | 2 +- 4 files changed, 36 insertions(+), 46 deletions(-) diff --git a/Makefile.am b/Makefile.am index e14ac57f2..32cebd591 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,7 +62,9 @@ MODULES = \ guix/base16.scm \ guix/base32.scm \ guix/base64.scm \ + guix/ci.scm \ guix/cpio.scm \ + guix/docker.scm \ guix/records.scm \ guix/pki.scm \ guix/progress.scm \ @@ -186,15 +188,24 @@ MODULES = \ guix/build/make-bootstrap.scm \ guix/search-paths.scm \ guix/packages.scm \ - guix/import/print.scm \ - guix/import/utils.scm \ - guix/import/gnu.scm \ - guix/import/snix.scm \ guix/import/cabal.scm \ + guix/import/cpan.scm \ guix/import/cran.scm \ - guix/import/hackage.scm \ + guix/import/crate.scm \ guix/import/elpa.scm \ + guix/import/gem.scm \ + guix/import/github.scm \ + guix/import/gnome.scm \ + guix/import/gnu.scm \ + guix/import/hackage.scm \ + guix/import/json.scm \ + guix/import/opam.scm \ + guix/import/print.scm \ + guix/import/pypi.scm \ + guix/import/snix.scm \ + guix/import/stackage.scm \ guix/import/texlive.scm \ + guix/import/utils.scm \ guix/scripts.scm \ guix/scripts/download.scm \ guix/scripts/perform-download.scm \ @@ -216,46 +227,29 @@ MODULES = \ guix/scripts/system/search.scm \ guix/scripts/lint.scm \ guix/scripts/challenge.scm \ + guix/scripts/import/crate.scm \ guix/scripts/import/cran.scm \ + guix/scripts/import/elpa.scm \ + guix/scripts/import/gem.scm \ guix/scripts/import/gnu.scm \ - guix/scripts/import/nix.scm \ guix/scripts/import/hackage.scm \ - guix/scripts/import/elpa.scm \ + guix/scripts/import/json.scm \ + guix/scripts/import/nix.scm \ + guix/scripts/import/opam.scm \ + guix/scripts/import/pypi.scm \ + guix/scripts/import/stackage.scm \ guix/scripts/import/texlive.scm \ guix/scripts/environment.scm \ guix/scripts/publish.scm \ guix/scripts/edit.scm \ guix/scripts/size.scm \ guix/scripts/graph.scm \ + guix/scripts/weather.scm \ guix/scripts/container.scm \ guix/scripts/container/exec.scm \ guix.scm \ $(GNU_SYSTEM_MODULES) -if HAVE_GUILE_JSON - -MODULES += \ - guix/ci.scm \ - guix/docker.scm \ - guix/import/cpan.scm \ - guix/import/crate.scm \ - guix/import/gem.scm \ - guix/import/github.scm \ - guix/import/gnome.scm \ - guix/import/json.scm \ - guix/import/opam.scm \ - guix/import/pypi.scm \ - guix/import/stackage.scm \ - guix/scripts/import/crate.scm \ - guix/scripts/import/gem.scm \ - guix/scripts/import/json.scm \ - guix/scripts/import/opam.scm \ - guix/scripts/import/pypi.scm \ - guix/scripts/import/stackage.scm \ - guix/scripts/weather.scm - -endif - if HAVE_GUILE_SSH MODULES += \ @@ -335,7 +329,10 @@ SCM_TESTS = \ tests/base16.scm \ tests/base32.scm \ tests/base64.scm \ + tests/cpan.scm \ tests/cpio.scm \ + tests/crate.scm \ + tests/gem.scm \ tests/pki.scm \ tests/print.scm \ tests/sets.scm \ @@ -389,22 +386,13 @@ SCM_TESTS = \ tests/services.scm \ tests/scripts-build.scm \ tests/containers.scm \ + tests/opam.scm \ tests/pack.scm \ + tests/pypi.scm \ tests/import-utils.scm \ tests/store-database.scm \ tests/store-deduplication.scm -if HAVE_GUILE_JSON - -SCM_TESTS += \ - tests/pypi.scm \ - tests/opam.scm \ - tests/cpan.scm \ - tests/gem.scm \ - tests/crate.scm - -endif - SH_TESTS = \ tests/guix-build.sh \ tests/guix-build-branch.sh \ diff --git a/README b/README index a7a818c5c..e7871917f 100644 --- a/README +++ b/README @@ -27,7 +27,7 @@ GNU Guix currently depends on the following packages: - [[https://notabug.org/guile-sqlite3/guile-sqlite3][Guile-SQLite3]], version 0.1.0 or later - [[https://gitlab.com/guile-git/guile-git][Guile-Git]] - [[http://www.zlib.net/][zlib]] - - optionally [[https://savannah.nongnu.org/projects/guile-json/][Guile-JSON]], for the 'guix import pypi' command + - [[https://savannah.nongnu.org/projects/guile-json/][Guile-JSON]] Unless `--disable-daemon' was passed, the following packages are needed: diff --git a/configure.ac b/configure.ac index 2a1edbc32..2817e6e24 100644 --- a/configure.ac +++ b/configure.ac @@ -122,9 +122,11 @@ if test "x$have_guile_git" != "xyes"; then AC_MSG_ERROR([Guile-Git is missing; please install it.]) fi -dnl Guile-JSON is used in various places. +dnl Check for Guile-JSON. GUILE_MODULE_AVAILABLE([have_guile_json], [(json)]) -AM_CONDITIONAL([HAVE_GUILE_JSON], [test "x$have_guile_json" = "xyes"]) +if test "x$have_guile_json" != "xyes"; then + AC_MSG_ERROR([Guile-JSON is missing; please install it.]) +fi dnl Guile-Sqlite3 is used by the (guix store ...) modules. GUIX_CHECK_GUILE_SQLITE3 diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 141d0e52f..c4e917102 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -389,7 +389,7 @@ the Nix package manager.") (propagated-inputs (fold alist-delete (package-propagated-inputs guix) - '("guile-json" "guile-ssh"))))))) + '("guile-ssh"))))))) (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical