From patchwork Wed Apr 26 17:33:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 49552 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 1490327BBE9; Wed, 26 Apr 2023 18:35: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.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 85D5D27BBE2 for ; Wed, 26 Apr 2023 18:34:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prj1s-00079Z-AG; 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 1prj1n-00078a-8a 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 1prj1m-0001mu-W9 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 1prj1m-0002Ys-O8 for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63094] [PATCH] gnu: maven-resolver-provider: 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:02 +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.16825304139761 (code B ref 63094); Wed, 26 Apr 2023 17:34:02 +0000 Received: (at 63094) by debbugs.gnu.org; 26 Apr 2023 17:33:33 +0000 Received: from localhost ([127.0.0.1]:56925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prj1J-0002XN-GW for submit@debbugs.gnu.org; Wed, 26 Apr 2023 13:33:33 -0400 Received: from mail-ej1-f53.google.com ([209.85.218.53]:52406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prj1I-0002XA-NU for 63094@debbugs.gnu.org; Wed, 26 Apr 2023 13:33:33 -0400 Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-95369921f8eso1195897666b.0 for <63094@debbugs.gnu.org>; Wed, 26 Apr 2023 10:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682530407; x=1685122407; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=s4EEFIBOWMwrPwSKyXENU9GWpPQKFBtdGgtXtYYWG2E=; b=n6/V2ye3B6N68lGzInhG2Nl+QLIxZuxBr66r84cg3CnCmRZMGXyEfqvyTWvRQLn568 X45LL6pqJENIalh9QDzbgXEQ7O+nriV/MacqjoVS5zbk6tM9vtXQuc6+cMtnpKneZObc 37GhqtvdoyZ+plRO5Zb8+iKZqrt5ztoa52xdAzIUEiIilWk5mC0YbWE6WZu/hgdFjOL+ vGdLzA061rrgzT4hm/Rue19HEI84YE57efqBJjinXEOZ67Mg7Z98aEvwg1uP7tX7k4KL SEPF9iqC6TNnvGa0+ueFmuaaoKVdL+l8DmRDvGdVeuBZtN3KDgDhqW2xABSnk54Hp431 9oiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682530407; x=1685122407; 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=s4EEFIBOWMwrPwSKyXENU9GWpPQKFBtdGgtXtYYWG2E=; b=hqdlbWbzRBW1nogmARZnmxcYs8w50uUurvrCRO/GN356CyrRVhPdSKXcu0/ksQccHO 81qK0rp8dutDaGck+VTWIZnDJjFNvlISyNypjMat0HWUmmIMEohEZE8Tac962KBFnMwP E6ex8qiiia8JmobZdIS/fGZemsrS73kXnbX600bRxctK6czhYkLx//eBTKXombd8dINQ O6ldEQGcQOGJ+G4qSOB/6qmlSCCxz2RbVu/2QtdM+9InCQVL1WuMKQksux4Q2cFFCZy+ OKI0Seh0s7gW1sdFAqIROKtbMRKuuCxhe4TasRx0fO++7GUll4wVY26dDZGfg33w+v8R Cp3A== X-Gm-Message-State: AAQBX9fjXWbljUIQgnDdsnzCzgBg9s9jncq8sqKwuUytxHXc9tLo2YOc O6Z7veMponW8Oz37kvBt1eAZiLbzxk8= X-Google-Smtp-Source: AKy350ZqALbn5Qc4ZA3tdXMFkDVN6n9oTmLzrKMPVA58ebgNJcuaEs/cyhW5RgQ6DAKWYMXTpx2x1A== X-Received: by 2002:a17:906:454a:b0:953:82d7:1c5a with SMTP id s10-20020a170906454a00b0095382d71c5amr15165660ejq.11.1682530406542; Wed, 26 Apr 2023 10:33:26 -0700 (PDT) Received: from magi (host-47-152-66-217.spbmts.ru. [217.66.152.47]) by smtp.gmail.com with ESMTPSA id y21-20020a170906471500b0094f663bced2sm8467312ejq.33.2023.04.26.10.33.25 for <63094@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Apr 2023 10:33:26 -0700 (PDT) From: Aleksandr Vityazev Date: Wed, 26 Apr 2023 20:33:25 +0300 Message-ID: <87cz3qeefu.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-resolver-provider)[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 cfadec0a01..e57b288779 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1509,6 +1509,10 @@ (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")