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")