From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sIR1FFBL/F9GUAAA0tVLHw (envelope-from ) for ; Mon, 11 Jan 2021 12:57:52 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id gCRLEFBL/F9lIgAA1q6Kng (envelope-from ) for ; Mon, 11 Jan 2021 12:57:52 +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 6FC809404CA for ; Mon, 11 Jan 2021 12:57:51 +0000 (UTC) Received: from localhost ([::1]:48178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kywla-00019o-Dp for larch@yhetil.org; Mon, 11 Jan 2021 07:57:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kywRS-0004hS-Ey for guix-patches@gnu.org; Mon, 11 Jan 2021 07:37:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44441) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kywRS-0007Qt-6e for guix-patches@gnu.org; Mon, 11 Jan 2021 07:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kywRS-0004Ly-3t for guix-patches@gnu.org; Mon, 11 Jan 2021 07:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44736] [Shepherd PATCH] build: Add guix.scm helper file. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Jan 2021 12:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44736 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Received: via spool by 44736-submit@debbugs.gnu.org id=B44736.161036861616719 (code B ref 44736); Mon, 11 Jan 2021 12:37:02 +0000 Received: (at 44736) by debbugs.gnu.org; 11 Jan 2021 12:36:56 +0000 Received: from localhost ([127.0.0.1]:55987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kywRL-0004La-Rs for submit@debbugs.gnu.org; Mon, 11 Jan 2021 07:36:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kywRJ-0004LN-Fi for 44736@debbugs.gnu.org; Mon, 11 Jan 2021 07:36:55 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35809) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kywRE-0007P7-9z; Mon, 11 Jan 2021 07:36:48 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57774 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kywR6-0004j3-2E; Mon, 11 Jan 2021 07:36:42 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20201119125244.3674-1-efraim@flashner.co.il> Date: Mon, 11 Jan 2021 13:36:38 +0100 In-Reply-To: <20201119125244.3674-1-efraim@flashner.co.il> (Efraim Flashner's message of "Thu, 19 Nov 2020 14:52:44 +0200") Message-ID: <87o8hvfy5l.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Cc: 44736@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.85 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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: 6FC809404CA X-Spam-Score: -2.85 X-Migadu-Scanner: scn0.migadu.com X-TUID: Xnmqv2q+EuJO Hello! Efraim Flashner skribis: > * build-aux/guix.scm: New file. Could you (1) add a copyright header, and (2) add this file to =E2=80=98EXTRA_DIST=E2=80=99 in =E2=80=98Makefile.am=E2=80=99? > +(define (keep-file? file stat) > + (not (any (lambda (my-string) > + (string-contains file my-string)) > + (list ".git" ".dir-locals.el" "build-aux")))) FWIW, I=E2=80=99m never quite sure what to do here. In Guile-zstd, I wrote something that works even from a tarball (not a Git checkout), but it=E2=80= =99s a bit verbose: https://notabug.org/guile-zstd/guile-zstd/src/master/guix.scm > +(define (build-from-git base) > + (package > + (inherit base) > + (version (git-version (package-version base) "HEAD" %git-commit)) > + (source (local-file %source-dir > + #:recursive? #t > + #:select? keep-file?)) [=E2=80=A6] > +(list (build-from-git (specification->package "shepherd")) > + (build-from-git (specification->package "guile2.2-shepherd")) > + ;; This version FTBFS due to an import of '(ice-9 threads)' in mod= ules/shepherd.scm > + ;(build-from-git (specification->package "guile2.0-shepherd")) > + ) Should it be a manifest instead, so that =E2=80=98guix build -f=E2=80=99 wo= rks? The downside of returning several packages is that =E2=80=98guix environmen= t -l guix.scm=E2=80=99 won=E2=80=99t work. Thanks, Ludo=E2=80=99.