From patchwork Fri Apr 17 17:21:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 21343 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 F1B0A27BBE4; Fri, 17 Apr 2020 18:23:11 +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 B994627BBE1 for ; Fri, 17 Apr 2020 18:23:11 +0100 (BST) Received: from localhost ([::1]:49986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPUhr-0007IQ-9h for patchwork@mira.cbaines.net; Fri, 17 Apr 2020 13:23:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58111) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPUhj-0007Fb-7Z for guix-patches@gnu.org; Fri, 17 Apr 2020 13:23:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPUhh-0007Ph-V4 for guix-patches@gnu.org; Fri, 17 Apr 2020 13:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58293) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jPUhh-0007PT-SM for guix-patches@gnu.org; Fri, 17 Apr 2020 13:23:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jPUhh-0007qZ-NA for guix-patches@gnu.org; Fri, 17 Apr 2020 13:23:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40684] [PATCH core-updates] guix: self: Use guile with libgc-7. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Apr 2020 17:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40684 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40684@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158714414630104 (code B ref -1); Fri, 17 Apr 2020 17:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Apr 2020 17:22:26 +0000 Received: from localhost ([127.0.0.1]:41606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPUh8-0007pU-4A for submit@debbugs.gnu.org; Fri, 17 Apr 2020 13:22:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:58795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPUh5-0007pM-Vf for submit@debbugs.gnu.org; Fri, 17 Apr 2020 13:22:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57391) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPUh4-0007D2-NU for guix-patches@gnu.org; Fri, 17 Apr 2020 13:22:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPUh2-0006Tc-L8 for guix-patches@gnu.org; Fri, 17 Apr 2020 13:22:22 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:53819) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jPUh1-0006Hh-PI for guix-patches@gnu.org; Fri, 17 Apr 2020 13:22:20 -0400 Received: from localhost (unknown [46.237.173.52]) by mira.cbaines.net (Postfix) with ESMTPSA id 516D027BBE1 for ; Fri, 17 Apr 2020 18:22:07 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id dc6c20be for ; Fri, 17 Apr 2020 17:22:03 +0000 (UTC) From: Christopher Baines Date: Fri, 17 Apr 2020 18:21:43 +0100 Message-Id: <20200417172142.23741-1-mail@cbaines.net> X-Mailer: git-send-email 2.26.0 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 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 | 12 ++++++++++++ guix/self.scm | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8ccbc22f26..6b7bd492ed 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -309,6 +309,18 @@ without requiring the source code to be rewritten.") (define-public guile-next guile-3.0) +(define-public guile-3.0/libgc-7 + (hidden-package + (package + (inherit guile-3.0) + (propagated-inputs + (map (lambda (input) + (if (string=? (car input) + "bdw-gc") + (list "bdw-gc" libgc-7) + input)) + (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))