From patchwork Tue Jul 4 19:59:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51552 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 6D3EF27BBEB; Tue, 4 Jul 2023 21:01:59 +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 240F727BBE2 for ; Tue, 4 Jul 2023 21:01:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGmD7-0002yt-2h; Tue, 04 Jul 2023 16:01:17 -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-0002vK-Qm 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 1qGmCs-0004W8-JU for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGmCs-0000UC-5G for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 1/7] gnu: maven-pom: Add missing shebangs. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:02 +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.16885008041636 (code B ref 64466); Tue, 04 Jul 2023 20:01:02 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:04 +0000 Received: from localhost ([127.0.0.1]:36651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmBv-0000QJ-Ez for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:03 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmBs-0000PM-Cx for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:01 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 9CD7B20998 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 21:59:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 0843080099; Tue, 4 Jul 2023 21:59:59 +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 jY5M_fJ3JM0C; Tue, 4 Jul 2023 21:59:58 +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 6657980098; Tue, 4 Jul 2023 21:59:58 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:47 +0100 Message-Id: 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 * gnu/packages/patches/maven-generate-component-xml.patch: Add missing shebang. * gnu/packages/patches/maven-generate-javax-inject-named.patch: Likewise. --- gnu/packages/patches/maven-generate-component-xml.patch | 3 ++- gnu/packages/patches/maven-generate-javax-inject-named.patch | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) base-commit: 3b630604d1f6325444509b5badd6cee15b3ce1b4 diff --git a/gnu/packages/patches/maven-generate-component-xml.patch b/gnu/packages/patches/maven-generate-component-xml.patch index 6cb23c7858..289556fbef 100644 --- a/gnu/packages/patches/maven-generate-component-xml.patch +++ b/gnu/packages/patches/maven-generate-component-xml.patch @@ -17,7 +17,8 @@ new file mode 100755 index 0000000..c6748bd --- /dev/null +++ b/components.sh -@@ -0,0 +1,148 @@ +@@ -0,0 +1,149 @@ ++#!/bin/sh +## This script generates a rough plexus/components.xml file. It is meant to +## replace plexus-component-metadata as it eventually has a recursive dependency +## on itself. diff --git a/gnu/packages/patches/maven-generate-javax-inject-named.patch b/gnu/packages/patches/maven-generate-javax-inject-named.patch index b8eba5ab90..38c4565e81 100644 --- a/gnu/packages/patches/maven-generate-javax-inject-named.patch +++ b/gnu/packages/patches/maven-generate-javax-inject-named.patch @@ -13,7 +13,8 @@ new file mode 100755 index 0000000..979f373 --- /dev/null +++ b/sisu.sh -@@ -0,0 +1,12 @@ +@@ -0,0 +1,13 @@ ++#!/bin/sh +## This script generates a rough javax.inject.Named file. It is meant to +## replace sisu-maven-plugin as it eventually has a recursive dependency +## on maven. From patchwork Tue Jul 4 19:59:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51554 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 0BCD727BBE9; Tue, 4 Jul 2023 21:02:06 +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=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 7137927BBE2 for ; Tue, 4 Jul 2023 21:02:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGmD7-0002yx-5Q; Tue, 04 Jul 2023 16:01:17 -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-0002vM-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 1qGmCs-0004WG-LQ 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 1qGmCs-0000UJ-HI for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 2/7] Revert "gnu: maven-embedder: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:02 +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.16885008121734 (code B ref 64466); Tue, 04 Jul 2023 20:01:02 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:12 +0000 Received: from localhost ([127.0.0.1]:36654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmC3-0000Ru-To for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:12 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:43988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmC1-0000Rj-SK for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:11 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 20F6620EBC for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 620E980099; Tue, 4 Jul 2023 22:00:05 +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 Sitgwwpuctrj; Tue, 4 Jul 2023 22:00:04 +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 D9B7B80098; Tue, 4 Jul 2023 22:00:03 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:48 +0100 Message-Id: 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 87ba11eff1b7a1784c94c897d468ba28822b0609. --- gnu/packages/maven.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index dc25f7640e..c8767d423e 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -4,7 +4,6 @@ ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2022 Artyom V. Poptsov -;;; Copyright © 2023 Aleksandr Vityazev ;;; ;;; This file is part of GNU Guix. ;;; @@ -1839,10 +1838,6 @@ (define-public maven-embedder #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") From patchwork Tue Jul 4 19:59:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51555 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 7FBF627BBE9; Tue, 4 Jul 2023 21:08:21 +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=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 A90A527BBE2 for ; Tue, 4 Jul 2023 21:08:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGmJi-0004Lv-4N; Tue, 04 Jul 2023 16:08: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 1qGmJf-0004KF-V9 for guix-patches@gnu.org; Tue, 04 Jul 2023 16:08:03 -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 1qGmJf-0006gU-0A for guix-patches@gnu.org; Tue, 04 Jul 2023 16:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGmJe-0000hJ-B6 for guix-patches@gnu.org; Tue, 04 Jul 2023 16:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 3/7] Revert "gnu: maven-core-bootstrap: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:08:02 +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.16885012232585 (code B ref 64466); Tue, 04 Jul 2023 20:08:02 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:07:03 +0000 Received: from localhost ([127.0.0.1]:36677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmIh-0000fd-0e for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:07:03 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:50114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmIf-0000f9-0J for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:07:02 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 1B4CE20E32 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:06:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 5E0DF80099; Tue, 4 Jul 2023 22:00:13 +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 zHY2QZylRCeQ; Tue, 4 Jul 2023 22:00:12 +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 8209A80098; Tue, 4 Jul 2023 22:00:12 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:49 +0100 Message-Id: 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 1a93ff9a8b0c64ccb0e365f4e5c199e0ac8b9de6. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index c8767d423e..053884d901 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1603,10 +1603,6 @@ (define-public maven-core-bootstrap #:tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'configure 'chdir (lambda _ ;; Required for generating components.xml in maven-core From patchwork Tue Jul 4 19:59:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51553 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 18F5227BBE2; Tue, 4 Jul 2023 21:02:01 +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=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 E273E27BBE9 for ; Tue, 4 Jul 2023 21:01:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGmD7-0002zO-IZ; Tue, 04 Jul 2023 16:01:17 -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-0002vL-Q3 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 1qGmCt-0004WL-1t 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 1qGmCs-0000UT-TK for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 4/7] Revert "gnu: maven-resolver-provider: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:02 +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.16885008211763 (code B ref 64466); Tue, 04 Jul 2023 20:01:02 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:21 +0000 Received: from localhost ([127.0.0.1]:36657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCD-0000SN-93 for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:21 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCC-0000SC-2F for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:20 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 96D11209A8 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id E72178009C; Tue, 4 Jul 2023 22:00:15 +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 7vA_rV8v9Cug; Tue, 4 Jul 2023 22:00:15 +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 5F75B8009A; Tue, 4 Jul 2023 22:00:15 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:50 +0100 Message-Id: <7b506b1cfe6c9585a3ed23e8efee72dfafc11c16.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 3d2ce30f6b4b505c9680369d118c2aa9f7bacff4. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 053884d901..e6cb02c744 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1509,10 +1509,6 @@ (define-public maven-resolver-provider #:tests? #f; dependency loop on maven-core (@Component RepositorySystem) #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") From patchwork Tue Jul 4 19:59:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51549 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 F0CD627BBE9; Tue, 4 Jul 2023 21:01:30 +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=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 25E7027BBE2 for ; Tue, 4 Jul 2023 21:01:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGmD5-0002ym-Go; 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-0002vN-Pw 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 1qGmCt-0004WO-FR 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 1qGmCt-0000Ua-BC for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 5/7] Revert "gnu: maven-model-builder: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:03 +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.16885008251780 (code B ref 64466); Tue, 04 Jul 2023 20:01:03 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:25 +0000 Received: from localhost ([127.0.0.1]:36660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCH-0000Se-JT for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:25 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCG-0000SW-1Q for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:24 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 18479209B9 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6C8FE8009A; Tue, 4 Jul 2023 22:00:16 +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 POPsAYwvQ0uD; Tue, 4 Jul 2023 22:00:15 +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 AFA778009B; Tue, 4 Jul 2023 22:00:15 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:51 +0100 Message-Id: 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 04f9ac0cfaf86f9e590e0fdc62855d9c87245104. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index e6cb02c744..5bbf37377f 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1410,10 +1410,6 @@ (define-public maven-model-builder (copy-recursively "src/main/resources" "build/classes") #t)) - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") From patchwork Tue Jul 4 19:59:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51550 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 E1B2B27BBE9; Tue, 4 Jul 2023 21:01:42 +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=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 0EE6C27BBE2 for ; Tue, 4 Jul 2023 21:01:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGmD4-0002y2-Ns; Tue, 04 Jul 2023 16:01:14 -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-0002vO-Ql 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 1qGmCt-0004WR-Vy 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 1qGmCt-0000Uh-Qt for guix-patches@gnu.org; Tue, 04 Jul 2023 16:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64466] [PATCH 6/7] Revert "gnu: maven-settings-builder: Fix build." Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 20:01:03 +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.16885008381818 (code B ref 64466); Tue, 04 Jul 2023 20:01:03 +0000 Received: (at 64466) by debbugs.gnu.org; 4 Jul 2023 20:00:38 +0000 Received: from localhost ([127.0.0.1]:36664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCT-0000TF-Sv for submit@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:38 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:40406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGmCR-0000Sp-S9 for 64466@debbugs.gnu.org; Tue, 04 Jul 2023 16:00:36 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 92265209A8 for <64466@debbugs.gnu.org>; Tue, 4 Jul 2023 22:00:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id DA5218009B; Tue, 4 Jul 2023 22:00:21 +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 ivMNZL2HqYxb; Tue, 4 Jul 2023 22:00:21 +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 4C7EF8009A; Tue, 4 Jul 2023 22:00:21 +0200 (CEST) From: Bruno Victal Date: Tue, 4 Jul 2023 20:59:52 +0100 Message-Id: <756d3f2008069615d0ddd394d813ce13aa215a97.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 c0a0cec87ff01ba3ee6f9baaafdb92b7ecc94489. --- gnu/packages/maven.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 5bbf37377f..1a5962df36 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1365,10 +1365,6 @@ (define-public maven-settings-builder #:test-dir "maven-settings-builder/src/test" #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-sisu-shebang - (lambda _ - (substitute* "sisu.sh" - (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu") 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")