From patchwork Tue Sep 10 01:27:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 67844 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 3155427BBE2; Tue, 10 Sep 2024 02:29:49 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C1B7F27BBEA for ; Tue, 10 Sep 2024 02:29:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgl-0005UP-Pd; Mon, 09 Sep 2024 21:29:03 -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 1snpgj-0005Tb-Gy for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:01 -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 1snpgh-0000HQ-Qe; Mon, 09 Sep 2024 21:29:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=FFViA7D+bTyt1H8PlbgMoor8QdvGjO7gDPqJNsvgB1U=; b=r5X+BurfMEC7xhZhPzU6zOJEzpjvt3eEIJO80W6pPoyhzcIK7+/CLXrU5eQkzZfHd+mmHYJqEmYdIt0bd9E9D3kbgFjuc0208trJA/ID8DbgLlTaLZRAa/IaPYbye5WoADGVyJiQHH72GOw5+bBsbZXYtgzVHQRKH6oIslDtiBFcqJzDx9k6+3OA6TfuEfEQ22uDE4ms8ZyxFkUPmnhNpAYnsznA+FXoegO8iQuanmQakqdUq4xeWe09dZPJVHulylzWE2clrX3ylfSqOBY/x7Kygid+DwQoYrMKL07RvW5ilBVf4zVsi2ixMjCth7GnwejzP79WKgqh/WnNIZZSwQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgk-0000ps-7O; Mon, 09 Sep 2024 21:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 1/8] guix: packages: Allow origin inside inputs with "new style". Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 01:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73073@debbugs.gnu.org Cc: Simon Tournier , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.17259317173087 (code B ref 73073); Tue, 10 Sep 2024 01:29:02 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:37 +0000 Received: from localhost ([127.0.0.1]:34430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgK-0000nX-Qk for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:37 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:43472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgI-0000n2-EW for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:34 -0400 Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-374c5bab490so3702375f8f.1 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931644; x=1726536444; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FFViA7D+bTyt1H8PlbgMoor8QdvGjO7gDPqJNsvgB1U=; b=Y+xUvrN/ENAJqL9Dh/p6wVKLtBB0Kv6qCaZQbx2bVdmcfy5QnypOJPD/1mynt6TPL7 XqSCRZfQABBKRzEj8oTNJP+a6hecJ/Wta1ijCPgoqESv0lJ04YO7FL9MIJy2Gg/DZAO/ bBgih7xghR3lVqB0ikbaoSbBYwYGVkPeuM8eeoH5PQiQrl7j0JG9b6YVngU5n2EHCyUe Z/CSIFL6N58MkTyeZthd5f/gUkjNhSyNa6z5Giy8PIk4RPFgy5gvLQFYkiUHA7gobGsb acSARiCdIx4Hycb5OruVTia+MtxIPRvo2tkNTJWO7IRiD3vQIuMST5orFAoEaWctXbiw R0Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931644; x=1726536444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FFViA7D+bTyt1H8PlbgMoor8QdvGjO7gDPqJNsvgB1U=; b=aUpexcAYIGwsBz2WKtz8bEgDc+lj2IzQGQEGqk6SwavNFzhPXwZsq1h8wwTCY0wQBj FGRwsW9Yq+mJvvoIaygg4ISRCaVzvzTOj7hkGXdX8RgIiawLsuJkJYrkc24cCcduMk7t URQsFO3bM7aiUOUJ/ERFXSLkywBiuKb5zT4VTvY19kfZzm54/oYO7b6J0st12+a9ejkr mRDX4Go3IqzFP8/VNhLCnR9GR6SJaYW7tUHqUOPyEM4uqI8PsHdEMbjgQvtvRvG0CYYy 9MNTGT1RJy4oSTQV2drDXEBq6dU6MIAO5WR2w6fw07ZpdObh6pSuSNqr5OOGfzJpfZqi RzZQ== X-Gm-Message-State: AOJu0YxbszKVsAfd2Sh+XBCra7Z7X017SGAxc1xq+ENweuYUZjvHJ3RY hASF6ee7a43b3W0vvZObj/GD0EEvqcpDMqXnBmV1Zhgk2GIQXnLXulN/fw== X-Google-Smtp-Source: AGHT+IGo8o8kwtIe+CliisbL2kwdNROK3fBKq6439Fzxz4Asvn2szF4TV/GDWIR36xZ8kTNl4BiAMw== X-Received: by 2002:a5d:5261:0:b0:374:c57e:1ea9 with SMTP id ffacd0b85a97d-378a8a7aac9mr602508f8f.18.1725931644189; Mon, 09 Sep 2024 18:27:24 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:5ac1:7013:f8b9:fc1a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb45c81sm93204255e9.28.2024.09.09.18.27.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:23 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:09 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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 * guix/packages.scm (add-input-label): Rely on 'origin-actual-file-name' for internal inputs labels. (maybe-add-input-labels): Special case to avoid world rebuild. Change-Id: I6ba5352b1b1b8ab810da3730b09cb9db61d6429c --- guix/packages.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index f373136d22..35dba6adc3 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -444,6 +444,9 @@ (define (maybe-add-input-labels inputs) ((and (pair? (car inputs)) (string? (caar inputs))) inputs) + ((and (origin? (car inputs)) ;XXXX: Remove next world rebuild + (null? (cdr inputs))) ;special case tzdata + (list (list "_" (car inputs)))) (else (map add-input-label inputs)))) (define (add-input-labels . inputs) @@ -676,6 +679,13 @@ (define (add-input-label input) "_") ,obj ,@(if (string=? output "out") '() (list output))))) + ((? origin? origin) ;XXXX: Remove next world rebuild + (let ((texlive (package-source + (module-ref (resolve-interface '(gnu packages tex)) + 'texlive-latex)))) + (if (eq? input texlive) + (list "_" origin) + (list (or (origin-actual-file-name origin) "_") origin)))) (x `("_" ,x)))) From patchwork Tue Sep 10 01:27:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 67838 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 8C49427BBEA; Tue, 10 Sep 2024 02:29:38 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 D50CF27BBEA for ; Tue, 10 Sep 2024 02:29:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgm-0005Uo-Ni; Mon, 09 Sep 2024 21:29:04 -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 1snpgi-0005Sx-Lc for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29: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 1snpgh-0000HO-8M for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=yUn8v+jXOmuz97zDxcgKEM+gchsQQNlazQmpn57hYao=; b=GLlt/TLpWUK+tGGuTbF724G03UTBw/4YFsJNa+k+2C1QwvUltoSHeBKlxUz0CuJKkWN3QtC4XqTAjPWLa7lb4yHPwL6JyG5HIcbjgVxjFYLx6UVOPC8On8U9jF34diHZLq7IQ0Ebz8Ef5xkP5KBlsaBizvWn/dJysWUPaW37tlirxaf/zK4tUU0X+wRxgxD8HIS4q7KzFmNp+xOA+ljmY0CMJfTioxGDPtrDcX4VyT3kV9uzCrIvAyGn1m7Fchi/D0wa6bac8VbcTxA5KFrV3Esn9WndOkWaNHX0Bx5gDkQbf1H/pNpkkOzuPKy8K6KxcIVsoeqjdnHGyxjSlZajEw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgk-0000pz-Or; Mon, 09 Sep 2024 21:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 2/8] gnu: gnome-recipes: Move libgd origin from phases to native-inputs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 01:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73073@debbugs.gnu.org Cc: Simon Tournier , Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.17259317213115 (code B ref 73073); Tue, 10 Sep 2024 01:29:02 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:41 +0000 Received: from localhost ([127.0.0.1]:34435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgO-0000o5-F0 for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:40 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:55394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgK-0000n8-9m for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:37 -0400 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-42cbc22e1c4so7121905e9.2 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931646; x=1726536446; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yUn8v+jXOmuz97zDxcgKEM+gchsQQNlazQmpn57hYao=; b=I1ZE/qWn9ZjYKPP7DUZPhwRWEFqsTnor4CHICUgmEPdrbS4pTnhOKC5BDDRYsi2XX5 LHbyEU0UiCpG/ECQfv3gzIGmbIy1VUibQStvkVLQeHB+ajftXYnkJba8CUAFL/sEGsUP AuGh0DIJ6OgJw6muHI5gBZD6vL26/cKx+HSTgeRms8+E51h0zefhVzvt6SnI1H5j5Sls xDiaxcGHRDdZzkw4KG8m0xUhc3gbHy0be4R8VVljPDg3gP+wBMt68PHkAm5ZW6uXUUDO Y0Ylr3z03yY3S/wPiRp6oOBzW0BMrpq06S2WiBFOeJsNfMhMnSDwZK18zSoXsYXLuvmi b4jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931646; x=1726536446; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yUn8v+jXOmuz97zDxcgKEM+gchsQQNlazQmpn57hYao=; b=ArcvzRt+zq30kAxHoAWfpOU6r6S+0kE46+QvHjQLv31NYFZ1IfS0Xh8d4fQJ/DSEqD PuQ1HfQo+n8+16C5HM4Gbs+EG4QQeCVVkOLcuWa6kNS7DYMh6YYWYgJQfd9E5ApAJZ1v bKy7YhqARNNnFVvY/HBnPh5C+lVreJS0I8ydVy7CasH9ZNllPeg9PW+zPfe9H0mKV1M0 SHtrfdWZYmN4gs6/45ef84NY5IdQjJ0Ex1Uo+ywSH0/nND/LPg0T9vwnWW/t+GEQFI0A z92x7Cf4vl75tz7tEENVrPSwOK9g+7crk0LKOCxoQr1B4UVolOQj+Xx89MpK3J42IBzF +QKA== X-Gm-Message-State: AOJu0YwguG3K8Wd8LIfWf3b3HCmwMnJoXvifqByhFimE6K77h79xEPyG wC4QQ1N2hcub+rOWZRTFW/8hYAZRnWc5U4plI3JTKdV29aphVJ2OknYl9g== X-Google-Smtp-Source: AGHT+IHW677wJ/p7iXc7dz1OouY2lGce2ElckonnDsHvfXtlr2jqghCQHO8iZd8JTdp4FiWirjamaA== X-Received: by 2002:a05:600c:3b24:b0:426:6edf:6597 with SMTP id 5b1f17b1804b1-42cae73d9b2mr58641095e9.19.1725931645642; Mon, 09 Sep 2024 18:27:25 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:5ac1:7013:f8b9:fc1a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb45c81sm93204255e9.28.2024.09.09.18.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:25 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:10 +0200 Message-ID: <718328743b18d6a8b5f60bf40c8bdc14cf5ad1bc.1725930587.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/dlang.scm (gnome-recipes)[arguments]: Move libgd origin from here... [native-inputs]: ...to here. Change-Id: Ic1775a66608e114b5b31058386c8b739c155b7a5 --- gnu/packages/gnome.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7339000436..d80d8cf33f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -799,15 +799,7 @@ (define-public gnome-recipes (add-after 'unpack 'unpack-libgd (lambda _ (copy-recursively - #$(origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.gnome.org/GNOME/libgd") - (commit "c7c7ff4e05d3fe82854219091cf116cce6b19de0"))) - (file-name (git-file-name "libgd" version)) - (sha256 - (base32 - "16yld0ap7qj1n96h4f2sqkjmibg7xx5xwkqxdfzam2nmyfdlrrrs"))) + #$(this-package-native-input (git-file-name "libgd" version)) "subprojects/libgd")))))) (inputs (list glib gnome-autoar @@ -821,6 +813,15 @@ (define-public gnome-recipes (native-inputs (list desktop-file-utils ;for update-desktop-database gettext-minimal `(,glib "bin") + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/libgd") + (commit "c7c7ff4e05d3fe82854219091cf116cce6b19de0"))) + (file-name (git-file-name "libgd" version)) + (sha256 + (base32 + "16yld0ap7qj1n96h4f2sqkjmibg7xx5xwkqxdfzam2nmyfdlrrrs"))) itstool pkg-config python)) From patchwork Tue Sep 10 01:27:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 67840 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 6A2CC27BBEB; Tue, 10 Sep 2024 02:29:39 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 8088827BBE9 for ; Tue, 10 Sep 2024 02:29:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgk-0005UJ-ML; Mon, 09 Sep 2024 21:29: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 1snpgi-0005Su-KR for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29: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 1snpgg-0000HN-Ve for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3HnNyXjp4d1Wo/aE2eneBAfomikGijhwTwSbUXoOnWw=; b=fi0wce0UgtCFD66m/ATF2akQZQ4oFWMh3bkOddqdWtKza+uKrdJJ6JMYjilXN1YwRzHl7iNjQW7ljErWJ/j3KwrqBqWHrbi3abEF0PlfIkBC1caoiFOaC5ttrVmjEbsWnFvUo2AblPHJHEmdrbQ5zJ3kmedOtQtwrsRJpDrmWzL/6RmB1LsQLyr+TSHprG6EDyebZeJBAV9UKCq7bZ+Ec24+S5KwOlC/hRVbosOHMuL0f1GMHkk/cDeei4Vn3eFKcHl8mHhNpNU9j6mQmeKDcSnO8Pk9Yy9sW2Zc2jcGNDJNhm5xJiweSZX491Y8fWYCgAsUS90aTdU4Fnimkul3Qg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgl-0000q5-6k for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 3/8] gnu: dmd-bootstrap: Move phobos origin from phases to native-inputs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 01:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73073@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.17259317213124 (code B ref 73073); Tue, 10 Sep 2024 01:29:03 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:41 +0000 Received: from localhost ([127.0.0.1]:34437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgO-0000oC-T4 for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:41 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:44442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgL-0000nA-0l for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:37 -0400 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-42cba6cdf32so10124025e9.1 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931647; x=1726536447; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3HnNyXjp4d1Wo/aE2eneBAfomikGijhwTwSbUXoOnWw=; b=U74Az6Z8clv9hu1n47BCTsuZa1j/0PrlnxD5wQFCSunxTreFAvCucdGppSWL66hcsQ ARXfGYm3LbALYr09Bf6QFfAoURb49ZPfWxIQ7Cp8yMs+jObrigodYArP9En+8/wjHqMo TASOirPrH75B0Ny8sZRd96NJs4tV+ymQLgWH2RpqNIaC67cnBUPOodEEifFKNoiiPmjO TlUFcgguAsOPxPY/YmEcG5GSXm3upHsfKCdojlbRR+cJFhhtx0yOUVZs6zG/kvYfba+8 dr2s+NpE3+IOQJK3RBzxBFloiuAdsxpZwu95Vzu6NWJuZoCS2wrw9qlzP320mM/JhXo5 d+Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931647; x=1726536447; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3HnNyXjp4d1Wo/aE2eneBAfomikGijhwTwSbUXoOnWw=; b=XWjdCkCLGyfB/RRKddsuNkTk5/soxft57UB8r3GHEuIxEvHrLF1H2TPK9P/OjG6uf3 FVfs/gfLN0IzwRou9sVW2NA2qPOF5fkxa7E36jgsawNknC3t04CtjVLZgrCnFsSX0gvS 7wptYzt0ht+jMi4nWvs/t9Li5XmYOKNJ6bmy3f3mWFgjTn19abtrPhYV+0RAdNx8iLLG ylNPTeIvzpZghT5jP4Ag7Zw1L8xC/YivXh3W+XLx4zMCacP+/M10kZaruuoOW0RWp1fO 8SpvIUEc1E7aPloIRsrboGFt2lzd+fZe164/nDeaSfbqttipQTXOfqH5aWvLFYZucgwB BQZw== X-Gm-Message-State: AOJu0Yxx5O36hZaxtELroQ4ZHq+qCT3HiLS17ehIC7FxwVDIevUW++w4 smMz0MacW9QaP1gDuX/uknQ1Oj6MGfG2YsYKQheOG8iCkLMsg75/sSDAyA== X-Google-Smtp-Source: AGHT+IGkOW1G7xOXHa7XN4L6TSyhO99I5wAa1GdR653UkRKKbjewX4KodS+1PRiG1RCEXC024ycMSA== X-Received: by 2002:a05:600c:1e11:b0:42c:ba1f:5452 with SMTP id 5b1f17b1804b1-42cba1f596fmr27479345e9.25.1725931646954; Mon, 09 Sep 2024 18:27:26 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:5ac1:7013:f8b9:fc1a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb45c81sm93204255e9.28.2024.09.09.18.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:26 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:11 +0200 Message-ID: <7d8122f6519b77f5accf4f83ee03169ad03ad7b1.1725930587.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/dlang.scm (dmd-bootstrap)[arguments]: Move phobos origin from here... [native-inputs]: ...to here. Change-Id: I10cb5f628dad2fdbb01df58134996bdcd0b73d62 --- gnu/packages/dlang.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 8bf0ee685e..1fd1c8d58c 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -456,15 +456,7 @@ (define dmd-bootstrap (lambda _ (symlink "." "dmd") ;to please the build system expected layout (copy-recursively - #$(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dlang/phobos") - (commit (string-append "v" version)))) - (file-name (git-file-name "phobos" version)) - (sha256 - (base32 - "1yw7nb5d78cx9m7sfibv7rfc7wj3w0dw9mfk3d269qpfpnwzs4n9"))) + #$(this-package-native-input (git-file-name "phobos" version)) "phobos") (chdir "phobos"))) (add-after 'copy-phobos-source-and-chdir 'adjust-phobos-install-dirs @@ -519,7 +511,16 @@ (define dmd-bootstrap "lib") (("\\.\\./src/(phobos|druntime/import)") "include/dmd"))))))) - (native-inputs (list gdmd which)) + (native-inputs (list gdmd which + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlang/phobos") + (commit (string-append "v" version)))) + (file-name (git-file-name "phobos" version)) + (sha256 + (base32 + "1yw7nb5d78cx9m7sfibv7rfc7wj3w0dw9mfk3d269qpfpnwzs4n9"))))) (home-page "https://github.com/dlang/dmd") (synopsis "Reference D Programming Language compiler") (description "@acronym{DMD, Digital Mars D compiler} is the reference From patchwork Tue Sep 10 01:27:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 67842 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 8070027BBE9; Tue, 10 Sep 2024 02:29:46 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 003B227BBE2 for ; Tue, 10 Sep 2024 02:29:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgk-0005UK-Tt; Mon, 09 Sep 2024 21:29: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 1snpgi-0005Sw-LZ for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29: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 1snpgh-0000HP-Cz for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=wREEzSl5waJh3SX52KCIls372gLF3FO3DCv/yfzZSTY=; b=o0C0wnqp5xZtOlOQPnyrpT3mndAyRvEFGrs6JmRo20eSRQ/sGwE4vOgE+FrzgbLVa+wHm28muhktoJAB16EOBeKYiCtWvFI+dH7eMVH0mGy4CGQEjWTCYBlre37HkIG7LjMfu+6VPvtSGhRlXqJRmA1/rORCwWJwKHsPORiqz03CQFK4dFrHRvHQ7J3lxphdSbDEMRwrNtn/dE1oL7GA9naaV9le2FNJ2aOYFIuWjG1s9kvnw28KM723cufG55oBVT1i2Lwn3AT3/ktQ9yrpkk/FjIeWcFTgjLofJg068s4VmlMP5sV4csjQT7/7dyQXbAKoRAX+iqiMuvMrW4K4jg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgl-0000qF-Kb for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 4/8] gnu: smithforth: Move system.fs origin from phases to native-inputs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 01:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73073@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.17259317223130 (code B ref 73073); Tue, 10 Sep 2024 01:29:03 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:42 +0000 Received: from localhost ([127.0.0.1]:34439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgP-0000oL-BU for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:41 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:53700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgM-0000nE-8W for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:38 -0400 Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-42cbface8d6so2759395e9.3 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931648; x=1726536448; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wREEzSl5waJh3SX52KCIls372gLF3FO3DCv/yfzZSTY=; b=R0FhQFPffsFCuhhxsYY98SOg1A0aa9ZCUFHT7EC4GrV97Z1R34oLuJYXV+qg4WyZWp Nr4pdnq9HCzrk+3geKmsmfh5x6dkthpgoVSbf71xVZHwlirWihdtJ77ot7dQEBDy5TJ7 cedOd9I4n8/HgYtUHtRbNiCPaS/xxrC0jSKBHbv+bxqts495ZEAhgJ6Ga4iyjjBEpp/y OB1cF+nVSFkacLchlQ8uqisXgNfO4zLPMZe0k26ae2nIHW1AcwIit8QnPvZMacObXbAH QIjzVvpls/uQXPe0O3s1qFgBWF7gs16e6+i3NyU1pmlHCTUfPYe1nK3zo8cQ08uavK28 u9jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931648; x=1726536448; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wREEzSl5waJh3SX52KCIls372gLF3FO3DCv/yfzZSTY=; b=ECKvHXOG6RO7fuzqjDZaDtrvNdngF7YPG5LBXC0O+kvo3SMrRVnHxUeAu2eyoIewvm bOn8YRDq/n5qcNy5rupS421BAEKpbWjOKWpHCylzBsMB1GnQ65hCJD5HX0Qm3orl07bR 6Bx2yL9uMy+oFvi+fw7bEkCrdjzjAGzFFOukn/cFNJh6a/qghR8SLS0gxhwhweHeJ2WM LRHw0Wn3sSUo4iEivBnIJgKSs2z+HXVMdpyvesLML1DfE4CDCh1bEz/IfihgzULYlD1w l2F6brHt6Z7l3a6VSW7pbEjFgzgt9PjhEZQyvaR9AAL4WiKuBbWEWM/S5p/x54sBhF2n H8+Q== X-Gm-Message-State: AOJu0Yx399VpvKtXG8ucfziZuMFFC8hMOozbs93SBiBtqTGPJVRCGJal A8DmCF9eQFVVfYGnRNhYu0VQpx2HUfTPdUNjbpDrvPSP59CoFARVdd1+YA== X-Google-Smtp-Source: AGHT+IEJwRV2N/37Tnt6tdnzTuaw6QFQ9Q3c8Ss1KE7TEm3ahqN/F4S8panyMqrvxEOmm4Q28XzQ3g== X-Received: by 2002:a05:600c:3c88:b0:426:59fe:ac27 with SMTP id 5b1f17b1804b1-42c9f9e087amr119196525e9.26.1725931648311; Mon, 09 Sep 2024 18:27:28 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:5ac1:7013:f8b9:fc1a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb45c81sm93204255e9.28.2024.09.09.18.27.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:27 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:12 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/dlang.scm (smithforth)[arguments]: Move system.fs origin from here... [native-inputs]: ...to here. Change-Id: I82ff81f72dbe2ecf70fbbd44674596e1a62cadcf --- gnu/packages/forth.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/forth.scm b/gnu/packages/forth.scm index 6e8d8cdc4c..c523887871 100644 --- a/gnu/packages/forth.scm +++ b/gnu/packages/forth.scm @@ -75,7 +75,15 @@ (define-public smithforth (sha256 (base32 "0a39pv7529llsa3f48fmvwvlcp3f9v8qkn5ziw2l6kxf0qvli3lm")))) (build-system trivial-build-system) - (native-inputs (list xxd)) + (native-inputs (list xxd + (origin + (method url-fetch) + (uri (string-append + "https://dacvs.neocities.org/SF/system" + version "fs.txt")) + (sha256 + (base32 + "17v1pp64s6n8q8w3kg48nd7zdcx2208y4svr5fpfms5lkyzg7z1m"))))) (arguments (list #:modules '((guix build utils)) @@ -84,14 +92,8 @@ (define-public smithforth (use-modules (guix build utils) (ice-9 textual-ports)) (let* ((sforth.dmp #$(package-source this-package)) - (system.fs #$(origin - (method url-fetch) - (uri (string-append - "https://dacvs.neocities.org/SF/system" - version "fs.txt")) - (sha256 - (base32 - "17v1pp64s6n8q8w3kg48nd7zdcx2208y4svr5fpfms5lkyzg7z1m")))) + (system.fs #$(this-package-native-input + (string-append "system" version "fs.txt"))) (xxd (string-append (assoc-ref %build-inputs "xxd") "/bin/xxd")) (bin (string-append (assoc-ref %outputs "out") "/bin"))) From patchwork Tue Sep 10 01:27:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 67843 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 DFEEB27BBEC; Tue, 10 Sep 2024 02:29:48 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 36E7B27BBE2 for ; Tue, 10 Sep 2024 02:29:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgm-0005UV-3m; Mon, 09 Sep 2024 21:29:04 -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 1snpgi-0005Sv-KT for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29: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 1snpgh-0000HR-RF for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=udMmsNIlKVtzlZ6dhonSMwrilZBj7RodKvTI5WTfoZE=; b=G7YXpWPiFAgh4t2sElUrqR27yP4RRlZTqctgx7n/r3dfRlGofftISWiMtZn5oWeHUgQTZUlU+hzfSnfFI89zNADL1DvtgewyE6Ui7mQBtAUgkU3jMBHDbU210eV0bsACEOxevYbmM8y+j2gqhA4esN2w+oCYTI4lSSDT+6EmED/MYn35TIMEb8ar8H4SMtax/2xvuaiz6rNbINau3l0ZpvAlUF/+tgoX+wVTWkRvoC860OHuJUHETHxsjUr4bNlBcbYgwljbzwSeHv6MSeZwHOPNnLNFViReOqZ9zBmWI4mnalNL1eOB4MJvuzSF291B/9TkCKhwPuwnS0dL+J+d+A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgm-0000qM-3I for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 5/8] gnu: farstream: Move common origin from phases to native-inputs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 01:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73073@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.17259317273160 (code B ref 73073); Tue, 10 Sep 2024 01:29:04 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:47 +0000 Received: from localhost ([127.0.0.1]:34444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgV-0000ot-0K for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:47 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:51317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgN-0000nI-RK for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:40 -0400 Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-428e0d184b4so42364235e9.2 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931650; x=1726536450; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=udMmsNIlKVtzlZ6dhonSMwrilZBj7RodKvTI5WTfoZE=; b=N8mmtVOBxGkgPQeYhePE+Bzm/44B6EKCC2PcbqxWhtUAl9li7xtjwmkYaEhZvR0/6u T0Ru/kSJJJrfUqUeSgXEVVH4m0pygVxO67EweBxBU95XndguO08peU5w2bIe6HFH5kiB 1gzYGquCpD+7UUDQRNQVzD4NxULRyKqT4ltHO+5OmiWvWhjP3az1s+gGQau2ruO37ChE Pb9GA/N/nRE7WKgzm/7oyUmP1vX++oGQNfMin7qKjRiYuEDMkw0G7+5IR+XxGZVv8V82 L2nJL3eeDtWv7bq1qPW0DKlLID3SLwCZpShwi8uU604RY4Yfxzs2eVvrbjH8an4ldSZt uu/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931650; x=1726536450; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=udMmsNIlKVtzlZ6dhonSMwrilZBj7RodKvTI5WTfoZE=; b=FqlK9xD5eb+wDT29hMRMlFztRxNqGc2A+m12Z6x1iEyZkjD71RAso+iMFKB70J/Um0 d6Lurn597SRc0LisRj96mXcP1AWSWd4SoS6PzMlKAuROqWo5usUnQKMJIuBvpnR3JZWd iUp5Rdy9FONxHuZvg3HwyQADlxTOaD29TAuD+n0JsKwi0WUmwmIli1HTUUyZaumvAMA3 50owyjIRt7LVvXvrwLL6Ce670fHAq52rRbj9lULiw1wDvG5AxZC1uX773GEltI0mgpJP P+C32IqD2nyCjHFqT8dfrAcQtQCf2BGqMS4kYEVvgnE4b5VueE7u/RLF0H8v4ETwBkV0 DKJA== X-Gm-Message-State: AOJu0Yx6qLRDxM0ppfi9murO2jc+G/b533JAVAhpsCuiYOBc57i3LnRx yVqQh6BaMbFzZ9Ird1b9mmdCQsECRTcjRqZP77C57bBNeBkUHbfVg3I5Mw== X-Google-Smtp-Source: AGHT+IHYHLJ6wcQDN8B0wbT2g9IF/qpoQnfQCbgDCOGwxVJtUBFCaqC7uAqo4o3Oj0wZ7ZtqrYjOlQ== X-Received: by 2002:a05:600c:458a:b0:42c:b2fa:1c15 with SMTP id 5b1f17b1804b1-42cb2fa1e7emr53147185e9.15.1725931649747; Mon, 09 Sep 2024 18:27:29 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:5ac1:7013:f8b9:fc1a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb45c81sm93204255e9.28.2024.09.09.18.27.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:29 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:13 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/dlang.scm (farstream)[arguments]: Move common origin from here... [native-inputs]: ...to here. Change-Id: I0023bca2fc021b82875b1ec7329c7e37116df0b3 --- gnu/packages/freedesktop.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index cb1d625d24..56bd54a27f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -263,16 +263,8 @@ (define-public farstream (lambda _ (delete-file "autogen.sh") (copy-recursively - #$(origin - (method git-fetch) - (uri - (git-reference - (url "https://gitlab.freedesktop.org/gstreamer/common.git") - (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e"))) - (file-name (git-file-name "common" "latest.52adcdb")) - (sha256 - (base32 - "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r"))) + #$(this-package-native-input + (git-file-name "common" "latest.52adcdb")) "common"))) (add-after 'unpack 'disable-problematic-tests (lambda _ @@ -296,7 +288,17 @@ (define-public farstream libxslt perl pkg-config - python-wrapper)) + python-wrapper + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.freedesktop.org/gstreamer/common.git") + (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e"))) + (file-name (git-file-name "common" "latest.52adcdb")) + (sha256 + (base32 + "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r"))))) (inputs (list glib gtk+ From patchwork Tue Sep 10 01:27:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 67845 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 A4DDA27BBE9; Tue, 10 Sep 2024 02:29:54 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 6B8C127BBE2 for ; Tue, 10 Sep 2024 02:29:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgn-0005VX-15; Mon, 09 Sep 2024 21:29:05 -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 1snpgi-0005Sy-Ly for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29: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 1snpgi-0000HS-Bt for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ZGtUopnHINuZlVN4o3hWHBJdW1fxewpgPz3vhFbZaVI=; b=Np5S1a+tz6SUI7vn9TjRnr7E0FpmZz0ZIaqqGelMbAak6qvk91kdxSKxF5wUpFBec8/whF2XBE924z4WAuI6D9IBcoeJkHrPA3Ko29lgboJSWQESbm87yev2EAmfFcDjIdIM+SOWgePvmUxQWN4i1WtpZpwi3MByqRAvkrC2wJU54/h551J7ufczcOe3D6W/2jOD5y8YpiSkcX1VzT4pwqYg7bf7jzm+bC/J73syM1XwZWuC4FldWxqDabTQGCkuTjorwPIN1JcEZbzry5kZNPO41BcjQ0uKtJy8mKe8xhrYu3IoQqyyC3PjblWkZ8d9UfOCjyzRjfrNTAVBYlKXsw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgm-0000qW-Ie for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 6/8] gnu: gnulib: Move phobos origin from phases to native-inputs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 01:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73073@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.17259317283168 (code B ref 73073); Tue, 10 Sep 2024 01:29:04 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:48 +0000 Received: from localhost ([127.0.0.1]:34446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgV-0000ov-Du for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:48 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:48636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgP-0000nU-CL for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:42 -0400 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-42cb0f28bfbso1718365e9.1 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931651; x=1726536451; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZGtUopnHINuZlVN4o3hWHBJdW1fxewpgPz3vhFbZaVI=; b=JK1F7rF3tuOQ9tEUOWIiZOvc3hbsXERUmMEsVraAHNPC0Nbx/VT061pvd3xuaESKp5 zYfKYGtf4ILanQSgno8lt1+bjAlVeBroHYxJkVa+8JSN6UhEX/6PUkORP6KXdhnN9QAO SPnAPZXNfdD3LUgsYQ7JZMHOoPk2M3X8iCuPAetmhS4v7IjyVJdl4lNuTFPRLPXzEzCu MUJLhmAbK2jugysNffTPB07rna0tdJjhIQX2YYhII1bP2Qk4a0QJ/Ty1YJ2BbnH47Bet BYlCGes8/Q4FEL5W4IOHebPK5nd+jXJtTixZ9B9v9LYcFUaiUQnghMvMFXcNILHUD2FX Jvkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931651; x=1726536451; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZGtUopnHINuZlVN4o3hWHBJdW1fxewpgPz3vhFbZaVI=; b=FcOpUlNt2QfvgoJo5A6T/rzo53VheAKhUr3/pr4KawCThGbX0yiQQX4ZquNqU6Th2/ 3+ciT7pWav3eiRZ6cETcLKWdbpWxaxl5K+3ZQjl6L+dGJ+iSnZpEdjLamC5NUsqejCPu Cosh9xE+9yzkFxJEiSFV9oGRLSi5o/y47sKXnzFjl3OaO4k/5PhIF0woh8yaJJR/G7qg DRjGtJVGY4rG5QtY+RWdAB0NThhWWPl5jMhDIVh4qyBsuJbl1LEDf1bSEGFO4oKm7nx7 mIHWCpLwK2f5ShH+a85udP5Y+Up3F5z3XUTVAwBy3GuG7FKIFjAlmozgMklMX+F/JRBR lBOA== X-Gm-Message-State: AOJu0YwXuGOjyeVFKWcm5e/mz7HZB2P81t5YD4IPJXMgMPUqXh8dL6qR MQ/Ehks3npDETGCGD4FazYeC1jAaPIZ/7kHnG+X88NosI27MtehT79yTVQ== X-Google-Smtp-Source: AGHT+IG2VwGeyjUSiqOVsitCwVmHR/E424fkgSTAMSVvcb9Y8xX6V+lPUao/l0IPG7s62TYcFXAiqw== X-Received: by 2002:a05:600c:4690:b0:42c:bfd6:9d4d with SMTP id 5b1f17b1804b1-42cbfd6a340mr3504775e9.2.1725931651047; Mon, 09 Sep 2024 18:27:31 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:5ac1:7013:f8b9:fc1a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb45c81sm93204255e9.28.2024.09.09.18.27.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:30 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:14 +0200 Message-ID: <9396e6ba9704f53b8123b0e712b5e9895719f63d.1725930587.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/dlang.scm (gnulib-checkout)[arguments]: Move PropList origin from here... [native-inputs]: ...to here. Change-Id: I3576a169837039bc6beaae0d68ab459ed642e3c8 --- gnu/packages/build-tools.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 21df25e4f5..61901c0bbb 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -942,14 +942,7 @@ (define*-public (gnulib-checkout #:key "Scripts.txt" "Blocks.txt") (list - #$(origin - (method url-fetch) - (uri (string-append - "https://www.unicode.org/Public/" - "3.0-Update1/PropList-3.0.1.txt")) - (sha256 - (base32 - "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh")))) + #$(this-package-native-input "PropList.txt")) (find-ucd-files "BidiMirroring.txt" "EastAsianWidth.txt" "LineBreak.txt" @@ -982,6 +975,15 @@ (define*-public (gnulib-checkout #:key bash-minimal python perl clisp ;; Unicode data: ucd + (origin + (method url-fetch) + (uri (string-append + "https://www.unicode.org/Public/" + "3.0-Update1/PropList-3.0.1.txt")) + (file-name "PropList.txt") + (sha256 + (base32 + "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh"))) ;; Programs for the tests: cppi indent git-minimal/pinned autoconf)) (home-page "https://www.gnu.org/software/gnulib/") From patchwork Tue Sep 10 01:27:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 67841 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 EEE8027BBE2; Tue, 10 Sep 2024 02:29:39 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 84F1127BBE9 for ; Tue, 10 Sep 2024 02:29:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgl-0005UM-9W; Mon, 09 Sep 2024 21:29:03 -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 1snpgj-0005TU-44 for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:01 -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 1snpgi-0000Hq-R2 for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Y/kTGxzMFI0Z8HmaIDUmCqgRrgmlKD4LWGAyOLSQ7/8=; b=llm7+z+5cjrpbsdRbkPc3NSGcCyIOrbHPnMeQLti61SwVHU/vyfMT6nPneWYFgcdVcATU/Bw7qQayVX6pEMANlA4xgSQRFF0E7KUsDi18vdp47WZhsohNoHbHVYQNnDvygOGEKvA6oTCi4/bzL8EWUZEM3IumEh3WJDJRKs/plJxvd4dhg7IO2VUAjywBJJpjCyD8GAptGlQffebRfvrZ4s2fN1py1Sk8WD+UiZN5YZOz137ZhAwUG/vrcp0aYBKB6wetHgPakvptFoEK8ybfGjg4kViiKhoXLM0E9Kg7a9oregKqotdVLwLtA8F+/72txE8h9dHX6jQjXr6BnPFUg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgn-0000qf-2h for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 7/8] gnu: git: Move git-manpages origin from phases to native-inputs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 01:29:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73073@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.17259317293175 (code B ref 73073); Tue, 10 Sep 2024 01:29:05 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:49 +0000 Received: from localhost ([127.0.0.1]:34448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgW-0000p4-Lc for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:48 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:60829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgQ-0000nd-8C for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:42 -0400 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4280ca0791bso45335635e9.1 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931652; x=1726536452; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y/kTGxzMFI0Z8HmaIDUmCqgRrgmlKD4LWGAyOLSQ7/8=; b=UvNhnvICorhW0X1mycu1v+0MkcRFlFoO9VvmUsRIT7wZfzVJm+3+1/OlFPB52aKyNV 9X83B5wueiCgw8d8kDQW8TGWE+87AojMSHG9KkRA5Wi17cszzDFFotPaZh3gjOnHq7b3 1q9Lu85B3KGBtPXKf+dncp6wnbpxw7bd3263P9DrVLuVXFwwjg5i/RX5oVih9Zbt56x8 9zlwJIbYKIND4R9fFWZWHB3IN6OZLYLqkRPHeSiN3VvqJE0KVab5SH0yxVI5j2cNnuUA uasDBIcfHPHsHt8wi/B+hrrdPPHsV5LOo5dBCluuGZ881JzF9JGJkjBZ23jx6NE81AS4 f61Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931652; x=1726536452; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y/kTGxzMFI0Z8HmaIDUmCqgRrgmlKD4LWGAyOLSQ7/8=; b=W43caYz8NDgGkchMFQ1DoaTVynpplt1CNdrslQyZakPb6sRur1qmtW1qTAnPoO4z9H KKpd+w5F1F3DQdfXEF6pKtIKOrmgpwEiQm9gXhrPwIto8FJ6VWWGlWBJ7oF+KNBDNDBu eG+CBxZI3mH6/JLq5y7Xdh7TJwxRJ4ApxDGV8Co7v/uTQcjJ7MYOz9pMK6EoTPmTKP+n +6IF4tOgYoEXytJBFwaArJ2JzwEvrlNAgDi3T8Ox9+udPj9pG7TfcT0ViAb2nC4P7m6v bjuQQQIp49KtiC9Ehr6ldBjrTJkO6v7MCcrkSqhA1utld2mgR/zmAWF0kT03Z+euBiFp WKfw== X-Gm-Message-State: AOJu0YyDnaIll7g8OOxwhWgUjDjQ/tzVGGMwL4fSvi6XWGO3tZTwyRRO Zeecfx9wI0/nXYI72T4nfzYbJPSV0d3ZvMojBsiqyN9OV9oO5gzcclzCgQ== X-Google-Smtp-Source: AGHT+IGsAEQP8FwcHlTwAwMGGHXu7HhpaCFyU78Ad5dINxXaxXrHUB5uigTonXoScquXWv3M2Pesrw== X-Received: by 2002:a05:600c:1f90:b0:425:7c95:75d0 with SMTP id 5b1f17b1804b1-42c9f9850d1mr90950315e9.18.1725931652204; Mon, 09 Sep 2024 18:27:32 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:5ac1:7013:f8b9:fc1a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb45c81sm93204255e9.28.2024.09.09.18.27.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:31 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:15 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/version-control.scm (git)[arguments]: Move git-manpages origin from here... [native-inputs]: ...to here. Change-Id: I4affbb032523e634b82c7e33343d0dc0797cb393 --- gnu/packages/version-control.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 0c4cdedce8..a0fdcb0da9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -693,15 +693,9 @@ (define-public git (with-directory-excursion man (invoke "tar" "xvf" - #$(origin - (method url-fetch) - (uri (string-append - "mirror://kernel.org/software/scm/git/" - "git-manpages-" (package-version this-package) - ".tar.xz")) - (sha256 - (base32 - "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw")))))))))))) + #$(this-package-native-input + (string-append + "git-manpages-" (package-version this-package) ".tar.xz"))))))))))) (native-inputs (modify-inputs (package-native-inputs git-minimal) ;; For subtree documentation. @@ -712,7 +706,18 @@ (define-public git libxslt pkg-config texinfo - xmlto))) + xmlto + ;; To build the man pages from the git sources, we would need a dependency + ;; on a full XML tool chain, and building it actually takes ages. So we + ;; use this lazy approach and use released tarball. + (origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/software/scm/git/git-manpages-" + (package-version this-package) ".tar.xz")) + (sha256 + (base32 + "1pqrp46kwbxycqld39027ph1cvkq9am156y3sswn6w2khsg30f09")))))) (inputs (modify-inputs (package-inputs git-minimal) (append bash-minimal ;for wrap-program From patchwork Tue Sep 10 01:27:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 67839 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 0005727BBEB; Tue, 10 Sep 2024 02:29:38 +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=-6.5 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 8802027BBE2 for ; Tue, 10 Sep 2024 02:29:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgm-0005UT-1u; Mon, 09 Sep 2024 21:29:04 -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 1snpgj-0005Th-KB for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:01 -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 1snpgj-0000I1-AB for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=YqqzGPB25IgJi8rnQLcbWxmikRY4ciI/jvPNMgROfUo=; b=eAn3FmEgERc1i31QBJ6xD7NfdAkofoDJTlKcWndKqodmqAisppcR4CexF3xtjeSZZqCwt7wgSMaSSR/DW5HdU6uEi+jezES8Cs+yOs7UuVfsctor2EOQFXaeojPk+BB/QvpQ0fwPmPygYkqhliEbf/UAz9lHmtHo992C0/H0Sfv7RuMorIhkWY6MERI14kWHCcF5tiJsajBH68O671+aEpxcui4yjjhgw+g8JO3EHOWf+Qxfou9IWGq2EgM4ILJ/ztoUC5PHlvZcuVPDdyT8PDh13Y5LLR70tp0xAkv3g+5YwtR/FEbL+WY6PpKSye4//KHDO6RXCbSpMMbYM451OQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgn-0000qm-Hs for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 8/8] gnu: cgit: Remove input labels. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 01:29:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73073@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.17259317313185 (code B ref 73073); Tue, 10 Sep 2024 01:29:05 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:51 +0000 Received: from localhost ([127.0.0.1]:34450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgZ-0000pI-1D for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:51 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:51582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgR-0000nx-L9 for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:46 -0400 Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-42cbe624c59so3013865e9.3 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931653; x=1726536453; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YqqzGPB25IgJi8rnQLcbWxmikRY4ciI/jvPNMgROfUo=; b=lFubBtqf6sUdU4XYhMsauaT7+gAdZEqzhueNaszDJs0fWzejzRufFKvTlZNhiZRZjd xn9iU1rI0P7KdvVyTWKBa13yU2Mu6sRgX8RC/t3anNRA2aC1eGUUXl9QwVlLag1UTacB IFkzKMGPUhf4hwLLnGh5tX9feo6AWL55FFB9+84kk2FDwa4H5xcKu9/SudPyy7ZHit4z BTe7hLaiqhz1BCYsOGtzMMekcMzoHI7bWCzv8ARY0dr415qI7kX2+uFS6mFRgAMRkXPv uGSc+9cZyYv3Ekdk4Iw1ARl+96VexhuVg/X510eFWYNmNLyktGIEJzTYkR5ri3Kqzq1p bwYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931653; x=1726536453; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YqqzGPB25IgJi8rnQLcbWxmikRY4ciI/jvPNMgROfUo=; b=ZcebNrQ+E9YeNfvmCPV6h2y7pFtxa15bkVwsi4fgQA3fDKHcFzqHKi4tSlw29S5uYu CKUEINA3WYHcFZssWIZonwQB/deRqC1uUfzFX1yMSGS7wteUfFBZQUKSbt/ZRwMXUlXk VBGUW8ephIEI5KwvsVo32DTlKkwqUeBWkBlM9UeyZmAXVGaOEJkVP/0Xu2V5/vjMb3Cm +yVR+an65agtyb8n3AFifZJCDbrd1+i3Ofw7nP63X0hJXR0hTnRFiPyVruH/C6yyZyUX 8OvVojqPitz2WzNiUEMXxfEBwuSG4m7MEMkEy59NuwtIC6KiEU64PzXkueCv5qQX58mh LV7Q== X-Gm-Message-State: AOJu0Yyyj1pQFbWs7RgGe19k35twTfEVyxBp5gobsSCk27VZJMbsowNL SKJ/BDKYGwygMQgn9Hqp4wwfU3fP5c01MwAYAdZDyxSv9hJ50u2lMXeQbw== X-Google-Smtp-Source: AGHT+IGliG3Dey8J6CkZhk4eCSjtAt1HSU6bXRIH3hQObENAzejQeGaoMLfGV8sb5Zu6Z73gIM5eSA== X-Received: by 2002:a05:600c:46c6:b0:42c:b9b1:8342 with SMTP id 5b1f17b1804b1-42cb9b18468mr25972165e9.19.1725931653626; Mon, 09 Sep 2024 18:27:33 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:5ac1:7013:f8b9:fc1a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb45c81sm93204255e9.28.2024.09.09.18.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:33 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:16 +0200 Message-ID: <19f279c682308ff8bf719c8073e8c3d10856e08e.1725930587.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/version-control.scm (cgit) [inputs]: Remove labels. [arguments]: Adjust. Change-Id: Iff479fa636f7a4c4fef5137ae22934d4e213223b --- gnu/packages/version-control.scm | 50 +++++++++++++++++--------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a0fdcb0da9..5b28eeaa9e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1315,7 +1315,7 @@ (define-public cgit (lambda* (#:key inputs #:allow-other-keys) ;; Unpack the source of git into the 'git' directory. (invoke "tar" "--strip-components=1" "-C" "git" "-xf" - (assoc-ref inputs "git-source")))) + #$(this-package-input "git-source")))) (add-after 'unpack 'patch-absolute-file-names (lambda* (#:key inputs outputs #:allow-other-keys) (define (quoted-file-name input path) @@ -1370,29 +1370,31 @@ (define-public cgit ;; For building manpage. (list asciidoc)) (inputs - `( ;; Building cgit requires a Git source tree. - ("git-source" - ,(origin - (method url-fetch) - ;; cgit is tightly bound to git. Use GIT_VER from the Makefile, - ;; which may not match the current (package-version git). - (uri "mirror://kernel.org/software/scm/git/git-2.46.0.tar.xz") - (sha256 - (base32 "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz")))) - ("bash-minimal" ,bash-minimal) - ("openssl" ,openssl) - ("python" ,python) - ("python-docutils" ,python-docutils) - ("python-markdown" ,python-markdown) - ("python-pygments" ,python-pygments) - ("zlib" ,zlib) - ;; bzip2, groff, gzip and xz are inputs (not native inputs) - ;; since they are actually substituted into cgit source and - ;; referenced by the built package output. - ("bzip2" ,bzip2) - ("groff" ,groff) - ("gzip" ,gzip) - ("xz" ,xz))) + (list + ;; Building cgit requires a Git source tree. + (origin + (method url-fetch) + ;; cgit is tightly bound to git. Use GIT_VER from the Makefile, + ;; which may not match the current (package-version git). + (uri "mirror://kernel.org/software/scm/git/git-2.46.0.tar.xz") + (sha256 + (base32 "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz")) + (file-name "git-source")) + bash-minimal + openssl + python + python-docutils + python-markdown + python-pygments + zlib + ;; bzip2, groff, gzip and xz are inputs (not native inputs) + ;; since they are actually substituted into cgit source and + ;; referenced by the built package output. + + bzip2 + groff + gzip + xz)) (home-page "https://git.zx2c4.com/cgit/") (synopsis "Web frontend for git repositories") (description