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,77 @@
diff --git a/leafletmap/pom.xml b/leafletmap/pom.xml
index f1c0089..2fccca4 100644
--- a/leafletmap/pom.xml
+++ b/leafletmap/pom.xml
@@ -10,6 +10,12 @@
<packaging>jar</packaging>
<version>1.0.9</version>
+ <parent>
+ <groupId>de.saring</groupId>
+ <artifactId>st-parent</artifactId>
+ <version>1.0.0</version>
+ </parent>
+
<organization>
<name>Saring</name>
<url>https://www.saring.de</url>
diff --git a/pom.xml b/pom.xml
index 9446306..0c14ddc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,6 +182,55 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.2.5</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.5.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.4.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>3.1.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.20.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>3.1.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.4.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
</plugins>
</build>

View File

@@ -0,0 +1,101 @@
{
lib,
jdk21,
openjfx21,
maven,
fetchFromGitHub,
makeDesktopItem,
copyDesktopItems,
wrapGAppsHook3,
gtk3,
}:
let
jdkWithJFX =
if jdk21.pname == "openjdk" then
jdk21.override {
enableJavaFX = true;
openjfx21 = openjfx21.override { withWebKit = true; };
}
else
throw "bad jdk variant";
in
maven.buildMavenPackage rec {
pname = "sportstracker";
version = "8.0.1";
src = fetchFromGitHub {
owner = "ssaring";
repo = "sportstracker";
rev = "SportsTracker-${version}";
hash = "sha256-5TRTZmBwu33CJieYyt4OtlzVjlfY1FLef9WwKl9iUIw=";
};
patches = [
# We use nixpkgs's JavaFX instead of the one originally fetched by Maven,
# so we don't even need to fetch it. This avoids having platform-dependent hashes.
./remove-pom-jfx.patch
./fix-maven-plugin-versions.patch
];
mvnJdk = jdkWithJFX;
mvnHash = "sha256-dAANjxM9cEEw+y3tOLHykxjdlVQh8I7pd/9k3lbkgzY=";
mvnParameters = toString [
"-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # set fixed build timestamp for deterministic jar
"-Dtest=!BindingUtilsToggleGroupTest" # uses DISPLAY
];
nativeBuildInputs = [
copyDesktopItems
wrapGAppsHook3
];
buildInputs = [ gtk3 ];
installPhase = ''
runHook preInstall
install -Dm644 sportstracker/target/sportstracker-*.jar $out/share/sportstracker/sportstracker.jar
install -Dm644 sportstracker/target/lib/*.jar -t $out/share/sportstracker/lib
install -Dm644 sportstracker/docs/* -t $out/share/doc/sportstracker
install -Dm644 st-packager/icons/linux/SportsTracker.png -t $out/share/pixmaps
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "sportstracker";
exec = "SportsTracker";
icon = "SportsTracker";
desktopName = "SportsTracker";
comment = meta.description;
terminal = false;
categories = [
"Sports"
"Utility"
];
})
];
# don't double-wrap
dontWrapGApps = true;
postFixup = ''
makeWrapper ${jdkWithJFX}/bin/java $out/bin/SportsTracker \
--add-flags "-Djava.awt.headless=true" \
--add-flags "-jar $out/share/sportstracker/sportstracker.jar" \
"''${gappsWrapperArgs[@]}"
'';
meta = {
changelog = "https://www.saring.de/sportstracker/CHANGES.txt";
description = "Desktop application for people who want to record and analyze their sporting activities";
homepage = "https://www.saring.de/sportstracker";
license = lib.licenses.gpl2Only;
mainProgram = "SportsTracker";
maintainers = with lib.maintainers; [ tomasajt ];
platforms = jdkWithJFX.meta.platforms;
};
}

View File

@@ -0,0 +1,37 @@
diff --git a/leafletmap/pom.xml b/leafletmap/pom.xml
index f1c0089..e13d634 100644
--- a/leafletmap/pom.xml
+++ b/leafletmap/pom.xml
@@ -23,16 +23,6 @@
</properties>
<dependencies>
- <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.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
diff --git a/pom.xml b/pom.xml
index 9446306..d2cb9ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,11 +43,6 @@
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
</dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-fxml</artifactId>
- <version>${javafx.version}</version>
- </dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>