From patchwork Wed Apr 26 17:33:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 49551 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 9430F27BBE2; Wed, 26 Apr 2023 18:34:53 +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.2 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,RCVD_IN_SORBS_WEB,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 348EF27BBE9 for ; Wed, 26 Apr 2023 18:34:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prj1y-0007DA-Gc; Wed, 26 Apr 2023 13:34: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 1prj1o-00078c-1L for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:05 -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 1prj1n-0001n6-7y for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1prj1n-0002Yz-4M for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63094] [PATCH] gnu: maven-core-bootstrap: Fix build. References: <87h6t2eeke.fsf@posteo.org> In-Reply-To: <87h6t2eeke.fsf@posteo.org> Resent-From: Aleksandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2023 17:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63094 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63094@debbugs.gnu.org Received: via spool by 63094-submit@debbugs.gnu.org id=B63094.16825304299793 (code B ref 63094); Wed, 26 Apr 2023 17:34:03 +0000 Received: (at 63094) by debbugs.gnu.org; 26 Apr 2023 17:33:49 +0000 Received: from localhost ([127.0.0.1]:56928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prj1Y-0002Xs-RO for submit@debbugs.gnu.org; Wed, 26 Apr 2023 13:33:49 -0400 Received: from mail-ej1-f50.google.com ([209.85.218.50]:61815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prj1W-0002Xc-6F for 63094@debbugs.gnu.org; Wed, 26 Apr 2023 13:33:47 -0400 Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-94f0dd117dcso1093052666b.3 for <63094@debbugs.gnu.org>; Wed, 26 Apr 2023 10:33:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682530420; x=1685122420; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=gGl8tIgRNvTMU75AmMzaBYlzUe8IrQttZF0ejUTOc6E=; b=MeAujYTs2g1AP2X8wdBXOvvyQFrtW4G9xg16/UyWYLgcipeayiZ/DEbMjkMtp85weS Vb5vjKP5l3Zv+PEGHSS1rOp2BMifE3VzZtsUNyuSOVxxpaeA9EHAp1YV1yp19YdW/AA9 j3gab5E7ijok958p8Nbo64v558GJOGbHHbHLXIKlT9l4r6aQqgfECzyBknpn7WeMSQ8g Mf36SPXGeznq6VPexBFWzk6OlkxB3QLZLa7u0cmAOc498/bloXxB+bEfDdxKxajG0qhv Q88vFzCjtTJEmzPx3aG3XqUr9GvE1ghP8SVnjym1NfHq3dYiSn8/LzQq0mDB9OR900+G ZeBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682530420; x=1685122420; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gGl8tIgRNvTMU75AmMzaBYlzUe8IrQttZF0ejUTOc6E=; b=fjODK3e0ckkfIHzM+ve9M7cZBkI1ulYfyp0czpGbXr4GQnIMjS/d0d8Y/RlhMzbJds q/7ASDT1UbkhniFua8LPbIlpMUeEmV2I22KGE9IMDGnORisKEssaWo2yNHjG3F6bUTk+ 19t0zzvGtZRjI3NnueaoMzHSJcgCu+GaINivaYWun7lewI0zT243A4XwqU/kW3W7POVP luM8UhKfm809jAORuVSoR+aPapbIA6wAObLPGwSCuur6lfNdvffHSUpI9flSrd7v/O7l C1/yV2m4hoU3wJ8pO22VJz8xWLj8HNUtXL0WoDiztEbx0H9XZ4X/zGpPedwQLjPY+mSn CDCA== X-Gm-Message-State: AAQBX9cqG0mkdgsVlHGyMaRz8LQI5C5ntJOhgwqDT/lWpdeX2dbsscvT 0DYCfkzutFqzVA7XR8YiGsRg2Kv+qFc= X-Google-Smtp-Source: AKy350ZNdHlOQOMJGnQ16RK3ITAAgOa0a7mfMBiY6tGwFaPQAgoXUjd2UQj1sI6OLOaV3sV9OdWzDg== X-Received: by 2002:a17:906:144d:b0:94b:d57e:9d4e with SMTP id q13-20020a170906144d00b0094bd57e9d4emr17159704ejc.3.1682530420052; Wed, 26 Apr 2023 10:33:40 -0700 (PDT) Received: from magi (host-47-152-66-217.spbmts.ru. [217.66.152.47]) by smtp.gmail.com with ESMTPSA id lh21-20020a170906f8d500b0094eeab34ad5sm8456205ejb.124.2023.04.26.10.33.39 for <63094@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Apr 2023 10:33:39 -0700 (PDT) From: Aleksandr Vityazev Date: Wed, 26 Apr 2023 20:33:38 +0300 Message-ID: <87bkjaeefh.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) 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/maven (maven-core-bootstrap)[arguments]: Add the'add-sisu-shebang phase after unpack. --- gnu/packages/maven.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index e57b288779..6c2958fa11 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1603,6 +1603,10 @@ (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