diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-07 14:58:29 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-07 14:58:29 +0100 |
| commit | ad899504860973e98351c922ecb934595f2c0f19 (patch) | |
| tree | b1260cc90947e834af941c6cb6aed51dc68f50b5 /nixpkgs/pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch | |
| parent | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (diff) | |
| parent | dc676e1b5014069a2b06e236242e2f0990384934 (diff) | |
| download | nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.gz nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.bz2 nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.lz nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.xz nixlib-ad899504860973e98351c922ecb934595f2c0f19.tar.zst nixlib-ad899504860973e98351c922ecb934595f2c0f19.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch b/nixpkgs/pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch new file mode 100644 index 000000000000..e3388c54ab53 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch @@ -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; |