From patchwork Sat Apr 18 08:08:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 21347 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 8988F27BBE4; Sat, 18 Apr 2020 09:09:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, UNPARSEABLE_RELAY,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 ESMTP id 55DC227BBE1 for ; Sat, 18 Apr 2020 09:09:24 +0100 (BST) Received: from localhost ([::1]:55798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPiXT-0005KA-Ph for patchwork@mira.cbaines.net; Sat, 18 Apr 2020 04:09:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53836) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPiXD-0005IC-G3 for guix-patches@gnu.org; Sat, 18 Apr 2020 04:09:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPiXA-0003Px-Hr for guix-patches@gnu.org; Sat, 18 Apr 2020 04:09:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58653) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jPiX9-0003GS-02 for guix-patches@gnu.org; Sat, 18 Apr 2020 04:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jPiX7-0001F9-Sm for guix-patches@gnu.org; Sat, 18 Apr 2020 04:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40684] [PATCH v2] guix: self: Use guile with libgc-7. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Apr 2020 08:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40684 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40684@debbugs.gnu.org Received: via spool by 40684-submit@debbugs.gnu.org id=B40684.15871973334765 (code B ref 40684); Sat, 18 Apr 2020 08:09:01 +0000 Received: (at 40684) by debbugs.gnu.org; 18 Apr 2020 08:08:53 +0000 Received: from localhost ([127.0.0.1]:41966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPiWz-0001El-4S for submit@debbugs.gnu.org; Sat, 18 Apr 2020 04:08:53 -0400 Received: from mira.cbaines.net ([212.71.252.8]:58472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPiWx-0001Ed-HA for 40684@debbugs.gnu.org; Sat, 18 Apr 2020 04:08:52 -0400 Received: from localhost (unknown [46.237.173.52]) by mira.cbaines.net (Postfix) with ESMTPSA id 62B4127BBE1 for <40684@debbugs.gnu.org>; Sat, 18 Apr 2020 09:08:50 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f1dcc97f for <40684@debbugs.gnu.org>; Sat, 18 Apr 2020 08:08:47 +0000 (UTC) From: Christopher Baines Date: Sat, 18 Apr 2020 09:08:47 +0100 Message-Id: <20200418080847.24298-1-mail@cbaines.net> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200417172142.23741-1-mail@cbaines.net> References: <20200417172142.23741-1-mail@cbaines.net> 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 Rather than libgc version 8. This should avoid crashes that can occur, particularly when loading data in to the Guix Data Service [1]. 1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525 * gnu/packages/guile.scm (guile-3.0/libgc-7): New variable. * guix/self.scm (specification->package): Use guile-3.0/libgc-7 for guile. --- gnu/packages/guile.scm | 11 +++++++++++ guix/self.scm | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8ccbc22f26..a262553ba1 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -309,6 +309,17 @@ without requiring the source code to be rewritten.") (define-public guile-next guile-3.0) +(define-public guile-3.0/libgc-7 + ;; Using libgc-7 avoid crashes that can occur, particularly when loading + ;; data in to the Guix Data Service: + ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525 + (hidden-package + (package + (inherit guile-3.0) + (propagated-inputs + `(("bdw-gc" ,libgc-7) + ,@(srfi-1:alist-delete "bdw-gc" (package-propagated-inputs guile-3.0))))))) + (define-public guile-3.0/fixed ;; A package of Guile that's rarely changed. It is the one used in the ;; `base' module, and thus changing it entails a full rebuild. diff --git a/guix/self.scm b/guix/self.scm index 842161400e..905f931aeb 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -48,7 +48,7 @@ (let ((ref (lambda (module variable) (module-ref (resolve-interface module) variable)))) (match-lambda - ("guile" (ref '(gnu packages guile) 'guile-3.0)) + ("guile" (ref '(gnu packages guile) 'guile-3.0/libgc-7)) ("guile-json" (ref '(gnu packages guile) 'guile-json-3)) ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) ("guile-git" (ref '(gnu packages guile) 'guile-git))