From patchwork Mon Jun 12 18:23:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 50851 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 2E58927BBEA; Mon, 12 Jun 2023 19:44:18 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,TVD_SPACE_RATIO,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 6780227BBE2 for ; Mon, 12 Jun 2023 19:44:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8mWM-0005eO-Bf; Mon, 12 Jun 2023 14:44:06 -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 1q8mWK-0005db-09 for guix-patches@gnu.org; Mon, 12 Jun 2023 14:44:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8mWJ-0003B3-MV for guix-patches@gnu.org; Mon, 12 Jun 2023 14:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8mWH-0003Zi-Ve; Mon, 12 Jun 2023 14:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64026] [PATCH] gnu: maven-model-builder@3.0: Fix build. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Mon, 12 Jun 2023 18:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64026@debbugs.gnu.org Cc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller Received: via spool by submit@debbugs.gnu.org id=B.168659540113684 (code B ref -1); Mon, 12 Jun 2023 18:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jun 2023 18:43:21 +0000 Received: from localhost ([127.0.0.1]:40520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8mVc-0003Yc-Rc for submit@debbugs.gnu.org; Mon, 12 Jun 2023 14:43:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:41236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8mVb-0003YT-0j for submit@debbugs.gnu.org; Mon, 12 Jun 2023 14:43:20 -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 1q8mVa-0005RQ-F4 for guix-patches@gnu.org; Mon, 12 Jun 2023 14:43:18 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8mVX-0002yT-5p for guix-patches@gnu.org; Mon, 12 Jun 2023 14:43:17 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-51458187be1so8166145a12.2 for ; Mon, 12 Jun 2023 11:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686595391; x=1689187391; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=3pgG5zvdnTd/TzdV1KCzF80WNoO7ca07H+iqv7gNnrE=; b=FR73qqYTe5AFJVknN/2FxEmFPQnkpaUYVhIKXa6IWtLJjcV3RljwpPjHYASLuDscm7 ZuK0nvK420u9IQXJ3Fy8ThZuVVlkyLPe0Qj4fgM2nD/gsY8UbDGfWMsl5mBFFNQG7xJm GzIhZP+YOzqFJQY9lJliaGBilWS33Ddshhyt/VGli+ryaIfDCoYuSHPKZN/I0SOdQks1 VNuknQ9TAwPx1jSJwfiHXtZpqiw+VbZnzGoSvidNkzDC5CTwH3ICdOtNk9p1n6apM/qB YzLCSgpt+ySuo95iAB4B8aUGfUP75Dpz1ZeOGIuCR4jzyMgWADhgs83u5OFdxIIaF/xZ Z6dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686595391; x=1689187391; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3pgG5zvdnTd/TzdV1KCzF80WNoO7ca07H+iqv7gNnrE=; b=GZCmhvJM4CwcMfSxp1a4I1T9yr40EDMDeCt86Rj8njVTtaX1kubayKBHoKikfBkw1A JLhiVrgWhfRVwwij562qPHWjXb8toZE3k9Xsatvm3rEDxEsF++YT7LrBbIgsRW9s7Y2t WzcIrvxRPSi9dlZLVCy6aXxLlsqLLvi6P0xk+5hLwY6ik5z59oYyG7pY8qu+DOWLxDmj f9ZPl6mgH9Qg08mveev9n4LyooHLfAqCzajiS/o/puhT/W69Y9mc1cSf2ZPD84mxU03K 2nzg0pzZ+6zB3qGAPDV68Uk5y60RaM3ApIhrOp1sMnmVcWA6nO5jxPR2czRjbxpd5DTr VgUQ== X-Gm-Message-State: AC+VfDwiJjVC+LQ4bYklEB4SOmMdrz91gLAHU0rIGOuCS/T4m35+s9md BXRYw+plFkPpQj3t4y/+dpn9qx8Cu91fa8yx X-Google-Smtp-Source: ACHHUZ6UY0A5tnoyEwIHWTJTRXVpr6GBY59gyg3jmaL3c9k9JhxSKMRSaycyUZBuzsiO3jcf5tzzig== X-Received: by 2002:a05:6402:78b:b0:518:5f8e:4d2c with SMTP id d11-20020a056402078b00b005185f8e4d2cmr977513edy.27.1686595391205; Mon, 12 Jun 2023 11:43:11 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u14-20020a056402064e00b0051421010690sm5261990edx.21.2023.06.12.11.43.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 11:43:10 -0700 (PDT) Message-Id: From: Liliana Marie Prikler Date: Mon, 12 Jun 2023 20:23:31 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::543; envelope-from=liliana.prikler@gmail.com; helo=mail-ed1-x543.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_SPACE_RATIO=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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 * gnu/packages/maven.scm (maven-3.0-model-builder)[#:phases]: Add ‘add-components-shebang’. --- gnu/packages/maven.scm | 4 ++++ 1 file changed, 4 insertions(+) base-commit: 3fc26c6dc4b6bbf558a17b5e3ef8092ea0eeeacd diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index a805bda8e5..dc25f7640e 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2424,6 +2424,10 @@ (define-public maven-3.0-model-builder (substitute-keyword-arguments (package-arguments maven-model-builder) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'add-components-shebang + (lambda _ + (substitute* "components.sh" + (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-components.xml (lambda _ (mkdir-p "build/classes/META-INF/plexus")