push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,60 @@
diff --git a/pom.xml b/pom.xml
index 193f7ca..45faa1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,6 +137,55 @@
</plugins>
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.3.0</version>
+ <executions>
+ <execution>
+ <id>require-all-plugin-versions-to-be-set</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requirePluginVersions />
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>4.0.0-M13</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>

View File

@@ -0,0 +1,106 @@
{
lib,
jdk21,
maven,
fetchFromGitHub,
makeDesktopItem,
copyDesktopItems,
glib,
makeWrapper,
wrapGAppsHook3,
}:
let
jdk = jdk21.override {
enableJavaFX = true;
};
in
maven.buildMavenPackage rec {
pname = "scenebuilder";
version = "21.0.1";
src = fetchFromGitHub {
owner = "gluonhq";
repo = "scenebuilder";
rev = version;
hash = "sha256-YEcW1yQK6RKDqSstsrpdOqMt972ZagenGDxcJ/gP+SA=";
};
patches = [
# makes the mvnHash platform-independent
./pom-remove-javafx.patch
# makes sure that maven upgrades don't change the mvnHash
./fix-default-maven-plugin-versions.patch
];
postPatch = ''
# set the build timestamp to $SOURCE_DATE_EPOCH
substituteInPlace app/pom.xml \
--replace-fail "\''${maven.build.timestamp}" "$(date -d "@$SOURCE_DATE_EPOCH" '+%Y-%m-%d %H:%M:%S')"
'';
mvnJdk = jdk;
mvnParameters = toString [
"-Dmaven.test.skip"
"-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"
];
mvnHash = "sha256-fS7dS2Q4ORThLBwDOzJJnRboNNRmhp0RG6Dae9fl+pw=";
nativeBuildInputs = [
copyDesktopItems
glib
makeWrapper
wrapGAppsHook3
];
dontWrapGApps = true; # prevent double wrapping
installPhase = ''
runHook preInstall
install -Dm644 app/target/lib/scenebuilder-${version}-SNAPSHOT-all.jar $out/share/scenebuilder/scenebuilder.jar
install -Dm644 app/src/main/resources/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png
runHook postInstall
'';
postFixup = ''
makeWrapper ${jdk}/bin/java $out/bin/scenebuilder \
--add-flags "--add-modules javafx.web,javafx.fxml,javafx.swing,javafx.media" \
--add-flags "--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED" \
--add-flags "-jar $out/share/scenebuilder/scenebuilder.jar" \
"''${gappsWrapperArgs[@]}"
'';
desktopItems = [
(makeDesktopItem {
name = "scenebuilder";
exec = "scenebuilder";
icon = "scenebuilder";
comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces.";
desktopName = "Scene Builder";
mimeTypes = [
"application/java"
"application/java-vm"
"application/java-archive"
];
categories = [ "Development" ];
})
];
meta = with lib; {
changelog = "https://github.com/gluonhq/scenebuilder/releases/tag/${src.rev}";
description = "Visual, drag'n'drop, layout tool for designing JavaFX application user interfaces";
homepage = "https://gluonhq.com/products/scene-builder/";
license = licenses.bsd3;
mainProgram = "scenebuilder";
maintainers = with maintainers; [ wirew0rm ];
platforms = jdk.meta.platforms;
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # deps
];
};
}

View File

@@ -0,0 +1,28 @@
diff --git a/kit/pom.xml b/kit/pom.xml
index 644d36c..e4d91fb 100644
--- a/kit/pom.xml
+++ b/kit/pom.xml
@@ -11,23 +11,6 @@
</parent>
<dependencies>
- <!-- JavaFX -->
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-fxml</artifactId>
- <version>${javafx.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-web</artifactId>
- <version>${javafx.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-swing</artifactId>
- <version>${javafx.version}</version>
- </dependency>
-
<!-- Eclipse Aether -->
<dependency>
<groupId>org.eclipse.aether</groupId>