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,29 @@
diff --git a/build.xml b/build.xml
index d0493d8..50d4286 100644
--- a/build.xml
+++ b/build.xml
@@ -221,11 +221,6 @@
</jar>
</target>
<target depends="init,compile-core,copyres" name="jar-core">
- <propertyfile file="${versionfile}">
- <!-- <entry key="versionMicro" type="int" value="1" operation="+"/> -->
- <entry key="versionDate" type="date" value="now" pattern="yyyyMMdd"/>
- </propertyfile>
-
<jar jarfile="${build}/jar/${ant.project.name}-core.jar">
<!-- fileset dir="${build}/classes" excludes="ch/interlis/ili2c/tests/**/*.class" includes="ch/interlis/models/**/*.class,ch/interlis/ili2c/parser/**/*.class,ch/interlis/ili2c/generator/**/*.class,ch/interlis/ili2c/modelscan/**/*.class,ch/interlis/ili2c/metamodel/**/*.class,ch/interlis/ili2c/config/**/*.class,ch/interlis/ili2c/CompilerLogEvent.class,ch/interlis/ili2c/Ili2cException.class,ch/interlis/ili2c/Ili2cFailure.class,ch/interlis/ili2c/gui/UserSettings.class,ch/interlis/ilirepository/ReposManager.class,ch/interlis/ilirepository/impl/RepositoryAccessException.class,ch/interlis/ilirepository/Dataset.class"/-->
<fileset dir="${build}/classes-core" excludes="ch/interlis/ili2c/tests/**/*.class" />
diff --git a/src-core/ch/interlis/ili2c/metamodel/TransferDescription.java b/src-core/ch/interlis/ili2c/metamodel/TransferDescription.java
index 9e165af..86d8f89 100644
--- a/src-core/ch/interlis/ili2c/metamodel/TransferDescription.java
+++ b/src-core/ch/interlis/ili2c/metamodel/TransferDescription.java
@@ -219,7 +219,7 @@ public static final String MIMETYPE_XTF = "application/interlis+xml;version=2.3"
ret.append(branch);
ret.append('-');
}
- ret.append(resVersion.getString("versionDate"));
+ ret.append("nixpkgs");
version = ret.toString();
}
return version;

View File

@@ -0,0 +1,71 @@
{
lib,
stdenv,
fetchFromGitHub,
ant,
jdk8,
jre8,
makeWrapper,
stripJavaArchivesHook,
}:
let
jdk = jdk8;
jre = jre8;
in
stdenv.mkDerivation (finalAttrs: {
pname = "ili2c";
version = "5.1.1"; # There are newer versions, but they use gradle
nativeBuildInputs = [
ant
jdk
makeWrapper
stripJavaArchivesHook
];
src = fetchFromGitHub {
owner = "claeis";
repo = "ili2c";
rev = "ili2c-${finalAttrs.version}";
hash = "sha256-FHhx+f253+UdbFjd2fOlUY1tpQ6pA2aVu9CBSwUVoKQ=";
};
patches = [
# avoids modifying Version.properties file because that would insert the current timestamp into the file
./dont-use-build-timestamp.patch
];
buildPhase = ''
runHook preBuild
ant jar
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm644 build/jar/ili2c.jar -t $out/share/ili2c
makeWrapper ${jre}/bin/java $out/bin/ili2c \
--add-flags "-jar $out/share/ili2c/ili2c.jar"
runHook postInstall
'';
meta = with lib; {
description = "INTERLIS Compiler";
longDescription = ''
Checks the syntactical correctness of an INTERLIS data model.
'';
homepage = "https://www.interlis.ch/downloads/ili2c";
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # source bundles dependencies as jars
];
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ das-g ];
teams = [ teams.geospatial ];
platforms = platforms.unix;
mainProgram = "ili2c";
};
})