mbox series

[bug#64466,0/7] Fix maven package breakage.

Message ID cover.1688500290.git.mirai@makinata.eu
Headers show
Series Fix maven package breakage. | expand

Message

Bruno Victal July 4, 2023, 7:57 p.m. UTC 
This patch-series fixes some maven build failures (in particular
maven-settings-builder@3.0).

Since sisu.sh and component.sh files are created by guix, the
substitute approaches in #63094 and #64026 are unnecessary and have
been reverted. Regarding #63145, it partially obsoletes some of the
patches and will require a rebase.

[1]: <https://issues.guix.gnu.org/63094>
[2]: <https://issues.guix.gnu.org/63145>
[3]: <https://issues.guix.gnu.org/64026>

Bruno Victal (7):
  gnu: maven-pom: Add missing shebangs.
  Revert "gnu: maven-embedder: Fix build."
  Revert "gnu: maven-core-bootstrap: Fix build."
  Revert "gnu: maven-resolver-provider: Fix build."
  Revert "gnu: maven-model-builder: Fix build."
  Revert "gnu: maven-settings-builder: Fix build."
  Revert "gnu: maven-model-builder@3.0: Fix build."

 gnu/packages/maven.scm                        | 25 -------------------
 .../maven-generate-component-xml.patch        |  3 ++-
 .../maven-generate-javax-inject-named.patch   |  3 ++-
 3 files changed, 4 insertions(+), 27 deletions(-)


base-commit: 3b630604d1f6325444509b5badd6cee15b3ce1b4

Comments

Liliana Marie Prikler July 9, 2023, 5:35 a.m. UTC | #1 
Am Dienstag, dem 04.07.2023 um 20:57 +0100 schrieb Bruno Victal:
> This patch-series fixes some maven build failures (in particular
> maven-settings-builder@3.0).
> 
> Since sisu.sh and component.sh files are created by guix, the
> substitute approaches in #63094 and #64026 are unnecessary and have
> been reverted. Regarding #63145, it partially obsoletes some of the
> patches and will require a rebase.
> 
> [1]: <https://issues.guix.gnu.org/63094>
> [2]: <https://issues.guix.gnu.org/63145>
> [3]: <https://issues.guix.gnu.org/64026>
> 
> Bruno Victal (7):
>   gnu: maven-pom: Add missing shebangs.
>   Revert "gnu: maven-embedder: Fix build."
>   Revert "gnu: maven-core-bootstrap: Fix build."
>   Revert "gnu: maven-resolver-provider: Fix build."
>   Revert "gnu: maven-model-builder: Fix build."
>   Revert "gnu: maven-settings-builder: Fix build."
>   Revert "gnu: maven-model-builder@3.0: Fix build."
Pushed, as it seems to unbreak packages on CI, at least on x86-64.  For
other arches, I'm not sure what is going on, but since the change is
"Unknown", I guess it's some timeout elsewhere.

Cheers