From patchwork Mon Jan 7 10:48:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 697 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 6450F16A29; Mon, 7 Jan 2019 10:50:25 +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=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham 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 66EB316A28 for ; Mon, 7 Jan 2019 10:50:23 +0000 (GMT) Received: from localhost ([127.0.0.1]:32982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggSUA-0008AG-VZ for patchwork@mira.cbaines.net; Mon, 07 Jan 2019 05:50:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggSTr-0007xr-BD for guix-patches@gnu.org; Mon, 07 Jan 2019 05:50:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggSTq-0002qa-4d for guix-patches@gnu.org; Mon, 07 Jan 2019 05:50:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48396) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggSTq-0002qV-1D for guix-patches@gnu.org; Mon, 07 Jan 2019 05:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ggSTp-0004Ii-Tw for guix-patches@gnu.org; Mon, 07 Jan 2019 05:50:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34007] [PATCH 1/5] build: Require Guile 2.2. References: <20190107104700.6375-1-ludo@gnu.org> In-Reply-To: <20190107104700.6375-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Jan 2019 10:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34007 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34007@debbugs.gnu.org Received: via spool by 34007-submit@debbugs.gnu.org id=B34007.154685815316441 (code B ref 34007); Mon, 07 Jan 2019 10:50:01 +0000 Received: (at 34007) by debbugs.gnu.org; 7 Jan 2019 10:49:13 +0000 Received: from localhost ([127.0.0.1]:47667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ggSSx-0004Gl-7N for submit@debbugs.gnu.org; Mon, 07 Jan 2019 05:49:12 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:60124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ggSSv-0004GT-57 for 34007@debbugs.gnu.org; Mon, 07 Jan 2019 05:49:06 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 3F261EEE; Mon, 7 Jan 2019 11:49:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VAjyy2Pbq_g3; Mon, 7 Jan 2019 11:49:02 +0100 (CET) Received: from gnu.org (unknown [IPv6:2001:660:6102:320:e120:2c8f:8909:cdfe]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 7045A774; Mon, 7 Jan 2019 11:49:02 +0100 (CET) From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 7 Jan 2019 11:48:53 +0100 Message-Id: <20190107104857.6456-1-ludo@gnu.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 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 * configure.ac: Require Guile 2.2. * README: Adjust accordingly. * doc/guix.texi (Requirements): Likewise. * gnu/packages/package-management.scm (guile2.0-guix): Deprecate. (guix-minimal): Inherit from GUIX, not from GUILE2.0-GUIX. --- README | 2 +- configure.ac | 6 +---- doc/guix.texi | 5 ++-- gnu/packages/package-management.scm | 39 ++++++++++------------------- 4 files changed, 17 insertions(+), 35 deletions(-) diff --git a/README b/README index e7871917f2..296df41516 100644 --- a/README +++ b/README @@ -20,7 +20,7 @@ Guix is based on the [[https://nixos.org/nix/][Nix]] package manager. GNU Guix currently depends on the following packages: - - [[https://gnu.org/software/guile/][GNU Guile 2.2.x or 2.0.x]], version 2.0.13 or later + - [[https://gnu.org/software/guile/][GNU Guile 2.2.x]] - [[https://notabug.org/cwebber/guile-gcrypt][Guile-Gcrypt]] 0.1.0 or later - [[https://www.gnu.org/software/make/][GNU Make]] - [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled diff --git a/configure.ac b/configure.ac index 2817e6e24d..891fce28ae 100644 --- a/configure.ac +++ b/configure.ac @@ -93,16 +93,12 @@ m4_pattern_forbid([^GUIX_]) dnl Search for 'guile' and 'guild'. This macro defines dnl 'GUILE_EFFECTIVE_VERSION'. -GUILE_PKG([2.2 2.0]) +GUILE_PKG([2.2]) GUILE_PROGS if test "x$GUILD" = "x"; then AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) fi -if test "x$GUILE_EFFECTIVE_VERSION" = "x2.0"; then - PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.13]) -fi - dnl Installation directories for .scm and .go files. guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION" guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache" diff --git a/doc/guix.texi b/doc/guix.texi index fcb5b8c088..8376ce77a1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17,7 +17,7 @@ @set SUBSTITUTE-SERVER ci.guix.info @copying -Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès@* +Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* @@ -641,8 +641,7 @@ in the Guix source tree for additional details. GNU Guix depends on the following packages: @itemize -@item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.13 or -later, including 2.2.x; +@item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.2.x; @item @url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, version 0.1.0 or later; @item diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 85c95a75e9..8eb4e2eefe 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2018 Oleg Pykhalov @@ -362,36 +362,23 @@ the Nix package manager.") (delete 'wrap-program))))))) (define-public guile2.0-guix - (package - (inherit guix) - (name "guile2.0-guix") - (inputs - `(("guile" ,guile-2.0) - ,@(alist-delete "guile" (package-inputs guix)))) - (propagated-inputs - `(("gnutls" ,gnutls/guile-2.0) - ("guile-gcrypt" ,guile2.0-gcrypt) - ("guile-json" ,guile2.0-json) - ("guile-sqlite3" ,guile2.0-sqlite3) - ("guile-ssh" ,guile2.0-ssh) - ("guile-git" ,guile2.0-git))))) + (deprecated-package "guile2.0-guix" guix)) (define-public guix-minimal ;; A version of Guix which is built with the minimal set of dependencies, as ;; outlined in the README "Requirements" section. Intended as a CI job, so ;; marked as hidden. - (let ((guix guile2.0-guix)) - (hidden-package - (package - (inherit guix) - (name "guix-minimal") - (inputs - `(("guile" ,guile-2.0.13) - ,@(alist-delete "guile" (package-inputs guix)))) - (propagated-inputs - (fold alist-delete - (package-propagated-inputs guix) - '("guile-ssh"))))))) + (hidden-package + (package + (inherit guix) + (name "guix-minimal") + (inputs + `(("guile" ,guile-2.2) + ,@(alist-delete "guile" (package-inputs guix)))) + (propagated-inputs + (fold alist-delete + (package-propagated-inputs guix) + '("guile-ssh")))))) (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical