From patchwork Tue Jul 4 19:59:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51551 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 0D07727BBEA; Tue, 4 Jul 2023 21:01:58 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 1841C27BBE2 for ; Tue, 4 Jul 2023 21:01:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGmD5-0002yX-1L; Tue, 04 Jul 2023 16:01:15 -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 1qGmCw-0002vP-QB for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:12 -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 1qGmCu-0004WS-C9 for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGmCu-0000Up-83 for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 7/7] Revert "gnu: maven-model-builder@3.0: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64466@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64466-submit@debbugs.gnu.org id=B64466.16885008381825 (code B ref 64466); Tue, 04 Jul 2023 20:01:04 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:38 +0000 Received: from localhost ([127.0.0.1]:36666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCU-0000TH-5M for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:38 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:44060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCS-0000T0-F6 for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:36 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id B35E220EBC for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 14B0A8009C; Tue, 4 Jul 2023 22:00:27 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id kNIaeUntrv0H; Tue, 4 Jul 2023 22:00:26 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 8B3B08009B; Tue, 4 Jul 2023 22:00:26 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:53 +0100 Message-Id: <57c6858185fe7f6674d134645bbe235ae4ef02c2.1688500745.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 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 This reverts commit d54faf155aeeeb2aceb5cc19f141c2b8d0e0720a. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 1a5962df36..fc3a63c263 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2403,10 +2403,6 @@ (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")