From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OLgtLbGlWWF9hgAAgWs5BA (envelope-from ) for ; Sun, 03 Oct 2021 14:44:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id YEiiKLGlWWFGRgAAbx9fmQ (envelope-from ) for ; Sun, 03 Oct 2021 12:44:33 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 862BC2F51 for ; Sun, 3 Oct 2021 14:44:33 +0200 (CEST) Received: from localhost ([::1]:37068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mX0r2-00070y-Lx for larch@yhetil.org; Sun, 03 Oct 2021 08:44:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mX0qY-0006iD-8C for guix-patches@gnu.org; Sun, 03 Oct 2021 08:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mX0qY-0000uA-0G for guix-patches@gnu.org; Sun, 03 Oct 2021 08:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mX0qX-0006Ir-Tu for guix-patches@gnu.org; Sun, 03 Oct 2021 08:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50878] [PATCH 1/4] guix: build: Promote local define-inline to a define-constant util. References: <20210928214044.437-1-attila@lendvai.name> In-Reply-To: <20210928214044.437-1-attila@lendvai.name> Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Oct 2021 12:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50878@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 50878-submit@debbugs.gnu.org id=B50878.163326501724164 (code B ref 50878); Sun, 03 Oct 2021 12:44:01 +0000 Received: (at 50878) by debbugs.gnu.org; 3 Oct 2021 12:43:37 +0000 Received: from localhost ([127.0.0.1]:33096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mX0q9-0006Hf-AP for submit@debbugs.gnu.org; Sun, 03 Oct 2021 08:43:37 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:44812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mX0q4-0006HQ-In for 50878@debbugs.gnu.org; Sun, 03 Oct 2021 08:43:37 -0400 Received: by mail-wr1-f41.google.com with SMTP id d6so24926620wrc.11 for <50878@debbugs.gnu.org>; Sun, 03 Oct 2021 05:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MusHtuw/9wxb7MJDhJo1+iJh4W7M+pquI/8vKYVGtnU=; b=iX8Yu9Xz5MqNsHrLnFZBf/PrN4JlFOBC52gJ554F4mf1JQqR1MMyU5ok/vAeaVMJ06 igDCPuUBCtlLB6KwKgXYlr5/nkm2IwDImDx1+DDD0rvlKPrYxTnkJLWsGLLVplJUYYYV weUPKiLihvkpYNEwGUrJt5MuaPSRLLQvYqqLqZ7GLH8mO7FMiOLlSACQ/EOclsDhmCp1 lNy/WSn1ShzHL2O9ML9+nIzOEYIqIw+W5+29rG4k0Io+i5vl2J4Fh44/jJT5wjtrXenE z6pFlK6R0ndlCJbSYxYXySxUGB22ZJLi7oCYBflJZ0zPD0joF0f9E+sVdgKsy3fQ+zfk QqHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=MusHtuw/9wxb7MJDhJo1+iJh4W7M+pquI/8vKYVGtnU=; b=GYKYeBV805LE6pCkWQwDueILt6PjLPK8fp9m+KCbuGfChNyebnueQTmpXtKHkdNTOA vv8aL/7zC6k77fvUo4ciXsnc+jgmn8+GLiaeo35i1rbueVM+bQZjUyXL0w47b0IXNDW9 xSOjmb0rd8UOGb+xDWafsQTg398EabRj6krdTv+JlJXXNbxz/YkLdZ4ozdJVvB5Z5d2z PAITY/LpL9aMEU+PkZ3R7WgGy5v55GQE75qyyLpYWTwV10D1yT2T4wR5Krv4hXmfdckF KPavOyhp6ieEkZhEM7uZEiCjYKaUZEWDOKdPkoZAgigeB0aULPDJF/GmaQUbf9PnDK3s U7OQ== X-Gm-Message-State: AOAM533Enp+TGFmO7QxGdNKWlCOsXsjUux6+ju/Af2D5g8Ct1unUZqDD U1dStA3Qfhol8Xa5AyrZLqAE8V3a6Oo= X-Google-Smtp-Source: ABdhPJyYCqNGouxSTvCxEGVNLRPoM1vIPRe5mNjpvtJiN234GqIIvBF2oxN5cZLKfq8D+3IQ/KyHOQ== X-Received: by 2002:a05:6000:168b:: with SMTP id y11mr8346313wrd.350.1633265006473; Sun, 03 Oct 2021 05:43:26 -0700 (PDT) Received: from lelap.lan (catv-213-222-131-28.catv.broadband.hu. [213.222.131.28]) by smtp.gmail.com with ESMTPSA id v10sm11800474wri.29.2021.10.03.05.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 05:43:25 -0700 (PDT) From: Attila Lendvai Date: Sun, 3 Oct 2021 14:43:00 +0200 Message-Id: <20211003124303.8277-1-attila@lendvai.name> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633265073; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=aZ0GWvIwPq9nHTAw6oC49KMhD72xOmFy4OuHDFlvpow=; b=FBdjahmsOxPr57ly/3X9v8umWzmovekX9qLnJMirUQ4JKlfqH1oKNUZEBneYhfeqEZ8R7u e1SR5HfBlFU2n26F4GWsGjEQWMxSrE7nKpHc4JyXBAPWv5xaw8tC9/yd3vAb4MDE8oowH3 EOyp6+r1VSocYKBgX+u6mLf9KcHSzNDoMrI0XtGHbIh9W4FuIyN3IeUHNOyPpL50C3PAPu jMyMvcqNQEJ7f0Mxh76jwuOSy+kOITgVc1WMXFr+dj0aMBi6ul60SpEhkta/9r7GaNctws NJpX96mp7aeQ9tiL0+DOOsnqPGYbteGnahyQMQbsrgAKGrsBnZWNskJPr6sbTQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633265073; a=rsa-sha256; cv=none; b=advvPQh4vxC7I4k1eMRIxizeROjGe3Act3O1ebd7ZoBB90zev4JJ5ddlHW8pYLOop1svrs UuGN4MhJwfIJfKpDCnqZN3a5OjfG6xK1rOvC3UFbnHEszZ1WagV7LdfSEdkPBVMX/AMNA2 iq5deTvC3oTJX9dU1uBrURsIfXzrxH60SgVZ5+pk4D3kdlJFqD7bTonR/Mi+9sHcDbNkYB 0wytExHGgtlOI6Ija1PXDZsPuz0lmLaw0I2OJdCbSKIfsbPZsjCeUvmOKJl6IMGYlFpVQo cdtBZWsPZJTx4YCG9CWyX4ZUUAMe9VHRqmlEs3QJgtJJz1JVJ9RjysuelRehCg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=iX8Yu9Xz; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.59 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=iX8Yu9Xz; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 862BC2F51 X-Spam-Score: 3.59 X-Migadu-Scanner: scn0.migadu.com X-TUID: y1SzgjyQflft * guix/build/utils.scm: Moved/renamed define-inline from grafts.scm to an exported define-constant util. --- guix/build/graft.scm | 5 +---- guix/build/utils.scm | 12 ++++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/guix/build/graft.scm b/guix/build/graft.scm index f04c35fa74..daac958d4f 100644 --- a/guix/build/graft.scm +++ b/guix/build/graft.scm @@ -44,10 +44,7 @@ ;;; ;;; Code: -(define-syntax-rule (define-inline name val) - (define-syntax name (identifier-syntax val))) - -(define-inline hash-length 32) +(define-constant hash-length 32) (define nix-base32-char? (cute char-set-contains? diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 419c10195b..f3d913aa70 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -73,6 +73,8 @@ list->search-path-as-string which + define-constant + every* alist-cons-before alist-cons-after @@ -112,6 +114,16 @@ locale-category->string)) + +;;; +;;; Syntax +;;; + +;; Note that in its current form VAL doesn't get evaluated, just simply +;; inlined. TODO? +(define-syntax-rule (define-constant name val) + (define-syntax name (identifier-syntax val))) + ;;; ;;; Guile 2.0 compatibility later. -- 2.33.0