From patchwork Wed Apr 26 17:33:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 49549 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 9805F27BBEB; Wed, 26 Apr 2023 18:34:50 +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=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 519CF27BBE2 for ; Wed, 26 Apr 2023 18:34:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prj1v-0007BI-PI; Wed, 26 Apr 2023 13:34:11 -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-00078N-Mr 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 1prj1m-0001mj-Es for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1prj1m-0002Yf-Ap 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-model-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: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.16825304049738 (code B ref 63094); Wed, 26 Apr 2023 17:34:02 +0000 Received: (at 63094) by debbugs.gnu.org; 26 Apr 2023 17:33:24 +0000 Received: from localhost ([127.0.0.1]:56922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prj1A-0002Wz-80 for submit@debbugs.gnu.org; Wed, 26 Apr 2023 13:33:24 -0400 Received: from mail-ej1-f52.google.com ([209.85.218.52]:48516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prj16-0002Wg-AE for 63094@debbugs.gnu.org; Wed, 26 Apr 2023 13:33:22 -0400 Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-95678d891d6so1341284666b.1 for <63094@debbugs.gnu.org>; Wed, 26 Apr 2023 10:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682530394; x=1685122394; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=m+oB6d22EYYO18BArzrZrHcf/8JhpTORc4/xYzYkyfA=; b=QRCEqWnz+et8g3+4EcF/1PTDKdBEvR0Jq6jzYTeHk1ng/f6kRu32f92k7y+t6UH1GC QrFzB/QRFplNKmIKcgI11U+TNF8LnaonlUgl+NGuYyaouGCnNapvjXvl8WEK9bxSSzNw MI51ocjYXgTkHqAGKp/5lxyirCk9Gb7R7bbogzX9qJtoHVJupwXbdI1aDCuqIf0s9e35 L1WwhF5ux/GFO4vJIkC0iblvla9I6jNBwpAQa4YwFHIgCCb/V3wGLrNorKJQGhARZnqD UYsQ/x5sEIEnWgRnAcafJhGYlrEWCPZeFdl40eK1F9aq3KXrgy2hSS8UVTjKSjpgsDas yKww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682530394; x=1685122394; 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=m+oB6d22EYYO18BArzrZrHcf/8JhpTORc4/xYzYkyfA=; b=aMrqZAwk04OTqgjfLDJmb+2sv476t8BivdyRR+Gbs+mFucR8uIjCzfX1FDq4M0+MXk ianpL46xjxSGLFg0nq2K5gWh+m1Jo1ptDqWmXa4Wnigvom1O4/UJs5Vmrs/b+fHzlsdS VKgycK3ardfJAXPDAJtrSpBMjhM8Re4lLH/bC9gi9ECr3fUGxMrP5Oe1dww5HTttQ47+ VXbNSLIyjU2jCuCh/vEmrMbkaYT6Hj4s/iJcqMxfMGAsaL+ovX0FU+Mc6k6t0KJzGU8S 5e+0tFKc21DTxLVC8z9KsFwLpL7CtIh1e8Dc09L4lFKFuEtKAoYdraEADI7jfr6XknQM ZPeQ== X-Gm-Message-State: AC+VfDzHlWK/99fkqp/mwhvW45W4gf3c4f/UHk5Qly6C5xsSjbXAbVjI XYNtZ4SKkjsP+8JazIZgNAuIo4HoESs= X-Google-Smtp-Source: ACHHUZ4ZfjNx0S4BSXGs7BenQlY3V+qWtV/a8zGDjWWMqLstyNf5qEzW1KCXVxdj1zm6HTJGDnkakQ== X-Received: by 2002:a17:907:9b88:b0:958:801b:9945 with SMTP id kq8-20020a1709079b8800b00958801b9945mr3036614ejc.31.1682530394186; Wed, 26 Apr 2023 10:33:14 -0700 (PDT) Received: from magi (host-47-152-66-217.spbmts.ru. [217.66.152.47]) by smtp.gmail.com with ESMTPSA id ch21-20020a170906c2d500b0094e6a138170sm8544471ejb.72.2023.04.26.10.33.13 for <63094@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Apr 2023 10:33:13 -0700 (PDT) From: Aleksandr Vityazev Date: Wed, 26 Apr 2023 20:33:12 +0300 Message-ID: <87edo6eeg7.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-model-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 5781d17238..cfadec0a01 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1410,6 +1410,10 @@ (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")