From patchwork Tue Apr 9 10:03:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 1877 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 77D3C27BBEA; Tue, 9 Apr 2024 11:05:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B454327BBE2 for ; Tue, 9 Apr 2024 11:05:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ru8Le-0005oU-O9; Tue, 09 Apr 2024 06:05:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ru8Lb-0005ni-Q0 for guix-patches@gnu.org; Tue, 09 Apr 2024 06:05:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ru8La-0002Ol-Ha; Tue, 09 Apr 2024 06:04:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ru8Le-0007wd-7r; Tue, 09 Apr 2024 06:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70303] [PATCH 0/2] Use guile-final for grafting. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 09 Apr 2024 10:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70303 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70303@debbugs.gnu.org Cc: Efraim Flashner , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.171265708230349 (code B ref -1); Tue, 09 Apr 2024 10:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Apr 2024 10:04:42 +0000 Received: from localhost ([127.0.0.1]:48315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru8LF-0007sx-Uz for submit@debbugs.gnu.org; Tue, 09 Apr 2024 06:04:41 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru8LB-0007rN-79 for submit@debbugs.gnu.org; Tue, 09 Apr 2024 06:04:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ru8Kv-0005ii-FW for guix-patches@gnu.org; Tue, 09 Apr 2024 06:04:17 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ru8Kt-0002Kg-FZ for guix-patches@gnu.org; Tue, 09 Apr 2024 06:04:17 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-416b606f3e3so958155e9.1 for ; Tue, 09 Apr 2024 03:04:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712657051; x=1713261851; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=CNvf12J4hH25EeC8eKVEbo5JR5RL4QcJsf0YU2AAMlw=; b=EA8xghWwcMGElpBdwJDVI0CDflvSJwmxp1z0uhmkl0VmmrjiHzh28eSDtZ60P/Vudv JdlOevZdXx8nEnIxZxjZVuIo+0cvE1NoZsbfQ9c3Sygir1Sauje8NRRpEJQeEavL7D8h vO/clVhFi71XY5YG4KerNkmRc1F6YcjA6jHQLei7ZFQx3HbxV8bl51wTlIw7bQB51ri1 pWw9M31AY/ncp8n2TBwrCzUKQpCUKWKOEBaBeAbEkVT/zljrfcusLAZ5CuiOfgpuh2c9 02EnaT8x0ZPOD5y2XYzDOLYhiReMw+yYIlQJh1J7hBjr30/A+br3DwuqxHm8567tzwbl eS0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712657051; x=1713261851; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CNvf12J4hH25EeC8eKVEbo5JR5RL4QcJsf0YU2AAMlw=; b=JEYDTDLaI2gM3rW1dairGMwDtwcyAcf0ZXwVSStc3984r8Iv9PRTrs11aDNZXQvsPP LO2kGmrm/BDbibinXTzYQeifiyP/gCS1hJAO9RhRG/yrnqatsOckjMbM246LhxoqC0Uv roYtONFoqzgLeTcDIkDVASYz6wzmUuEeBl7hjU615y5PryOJt6ikFNg1iBqUzVZkzZas OanOWwbcdrYtC32c4Ss46qcC99KnE5Zw5Ee5YqGyZBcQXy+akhcoh5N8Vf7n4gjGNv+9 Z8ieNMmjXQgydHeWFgWg2m1gxVv/l25crTXBJebk+nCXbSh7OEIHgLlzpvC1fJFSqrMn sNlA== X-Gm-Message-State: AOJu0YysacGlPn6cFrqhl3R5M0nirnharSGYjsUaekVj6bSjpHJ366ax hWEc5UVFR5VP/HgMLrpAkDqvrlg151TymqoR8jmD9LU+fWoKJtso7pWXF+laKZY= X-Google-Smtp-Source: AGHT+IH3EHojIR9NVytYdi/MVdoYLB0IjLn8TobEHJy1LOFjWxuMM6j3STZE5AKOcYvFqIoOHWoPMw== X-Received: by 2002:a05:600c:c89:b0:416:b91c:f310 with SMTP id fj9-20020a05600c0c8900b00416b91cf310mr58424wmb.22.1712657051121; Tue, 09 Apr 2024 03:04:11 -0700 (PDT) Received: from localhost ([141.226.11.200]) by smtp.gmail.com with ESMTPSA id p14-20020a05600c358e00b0041674bf7d4csm6647892wmq.48.2024.04.09.03.04.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 03:04:10 -0700 (PDT) From: Efraim Flashner Date: Tue, 9 Apr 2024 13:03:58 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=efraim.flashner@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Over the years the grafting code has changed bit by bit, with various attempts to speed it up. By switching the grafts to not use parallelism in rewriting the leaves we can finally switch the guile-for-grafts to be guile-final. The segfault is still there if we perform the grafts in parallel, but I believe it is fast enough that it should be fine to do them sequentially. There's probably room in replace-store-references in (guix build graft) for changes if we're not going to use guile-2.0 here anymore. There are also a number of default guiles in (guix grafts) which should maybe be %guile-for-grafts instead of %guile-for-build. Efraim Flashner (2): graft: Remove work-around for old guile. graft: Perform grafts with guile-final. guix/build/graft.scm | 55 +++++--------------------------------------- guix/packages.scm | 6 ++--- 2 files changed, 8 insertions(+), 53 deletions(-) base-commit: 51de844a0ff6ea224367a384092896bce6848b9f prerequisite-patch-id: ea387a4f9d860397a26c840c11c8742f0ac70fc3