From patchwork Wed Apr 26 17:32:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 49550 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 8260327BBE2; Wed, 26 Apr 2023 18:34:51 +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 7962C27BBE9 for ; Wed, 26 Apr 2023 18:34:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prj1s-00079J-9v; Wed, 26 Apr 2023 13:34:08 -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 1prj1m-000780-6P for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:02 -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 1prj1l-0001mI-UA for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1prj1l-0002YW-QL for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63094] [PATCH] gnu: maven-settings-builder: 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:01 +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.16825303909705 (code B ref 63094); Wed, 26 Apr 2023 17:34:01 +0000 Received: (at 63094) by debbugs.gnu.org; 26 Apr 2023 17:33:10 +0000 Received: from localhost ([127.0.0.1]:56919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prj0v-0002WT-UN for submit@debbugs.gnu.org; Wed, 26 Apr 2023 13:33:10 -0400 Received: from mail-ed1-f46.google.com ([209.85.208.46]:59449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prj0t-0002W7-2I for 63094@debbugs.gnu.org; Wed, 26 Apr 2023 13:33:08 -0400 Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-504e232fe47so13609594a12.2 for <63094@debbugs.gnu.org>; Wed, 26 Apr 2023 10:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682530381; x=1685122381; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=tyajjBGjk5EPmj2NfxmwAfU32QHij2D6Cdvj4wgVS9o=; b=QbaN67Ko4V0psS4lxPLvf6uMhGnIJ8O2/rhrpFeD99OjAhCQWoofiM+6lB64T7DgIA mEkbPbXqXzfgueTloVQqakSmGegFJ82K8kGPUd9ugjYdwzvFQU4GrL53Vc4KNmCg7L0Z Piwtji8PrbuLiimJHUDDCy8lRKF7oIFdgR2b3nsXH7YFFqp4mfHLn9SNtk/YIopvZ80N tq6Pfk5CETXqR/dzj0Tqj4naHnwr+lRYHCZ4NrTQWjdmghOiFZwfTxGwRxqQ+zBOwgQJ 4Q4PyYjlxoCkSPGFMObjHsag2Fw6iveNotCsLrbFuC/VgXEbkRNuYaxL1svOlJbIHDSs qaJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682530381; x=1685122381; 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=tyajjBGjk5EPmj2NfxmwAfU32QHij2D6Cdvj4wgVS9o=; b=gBv5/2k0uTzYWO6DvwhVplZ2Bf/bHI4Ip2xQizsOP/8T4HuskT8x09Ug1sfWfoHH3I cfWyPEOB8e8scFn+mT/9Fu0YnhxFMlXEOLZDHKWZcoN9xC66OxZzmV+umg5qdDWm4Z28 WGjYMK4TlsU4QIoi7yAHtjpGvsPbrlk/+BLnTJbYsqgKrHXe1qIkJxJmqYq/S5/J9RAp rlfoRIRAtuMA3V6IriAKY2ZuzaaPh27r0Q12zI7RXHwjTbMfgRoY6M8fpc6IoiSrK+gC UHkRLFxlyp4E0tc27ai0YIRyVVpUIuJ704gaM0+hRfC+z7V7ghh3mXH6WWPbJFXPTrfI OeIw== X-Gm-Message-State: AAQBX9f/jIEiBre1Eoj5bE8aUg1qqpjSD2LiElpl5V/spO7pDyEl8mAr dnj8x+7tJTDb3FJSZlkhHFqWIcK+cfg= X-Google-Smtp-Source: AKy350aZaycVh7DQVyDEYSItPgH5FaspZlMros0xxLQcxSKxkiXQO0qInsfRD2M1wC59dHdZgG6AEw== X-Received: by 2002:aa7:d914:0:b0:508:4123:1e53 with SMTP id a20-20020aa7d914000000b0050841231e53mr16399910edr.7.1682530380767; Wed, 26 Apr 2023 10:33:00 -0700 (PDT) Received: from magi (host-47-152-66-217.spbmts.ru. [217.66.152.47]) by smtp.gmail.com with ESMTPSA id d9-20020aa7d5c9000000b005067d129267sm7054988eds.39.2023.04.26.10.33.00 for <63094@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Apr 2023 10:33:00 -0700 (PDT) From: Aleksandr Vityazev Date: Wed, 26 Apr 2023 20:32:59 +0300 Message-ID: <87fs8meegk.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-settings-builder)[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 fc3a63c263..5781d17238 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1365,6 +1365,10 @@ (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")