diff options
author | Thomas Gerbet <thomas.gerbet@enalean.com> | 2021-11-26 12:30:49 +0100 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2021-11-28 01:16:05 +0100 |
commit | f07f124d3a1bf6e441a899410b65aa1b09902905 (patch) | |
tree | f15e4cc511e77fd121b439131e076a1678fb505c /pkgs/tools/text/xml | |
parent | e2730a74232fb6e003282f413e573c23bed83a1e (diff) |
jing-trang: 20151127 -> 20181222
Diffstat (limited to 'pkgs/tools/text/xml')
-rw-r--r-- | pkgs/tools/text/xml/jing-trang/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/text/xml/jing-trang/no-git-during-build.patch | 47 |
2 files changed, 59 insertions, 4 deletions
diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 542a4709efebd..02f745575adb9 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,20 +1,25 @@ { lib, stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "jing-trang"; - version = "20151127"; + version = "20181222"; src = fetchFromGitHub { owner = "relaxng"; repo = "jing-trang"; - rev = "47a0cbdaec2d48824b78a1c19879ac7875509598"; # needed to compile with jdk8 - sha256 = "1hhn52z9mv1x9nyvyqnmzg5yrs2lzm9xac7i15izppv02wp32qha"; + rev = "V${version}"; + sha256 = "sha256-Krupa3MGk5UaaQsaNpPMZuIUzHJytDiksz9ysCPkFS4="; + fetchSubmodules = true; }; buildInputs = [ jdk ant saxon ]; CLASSPATH = "lib/saxon.jar"; + patches = [ + ./no-git-during-build.patch + ]; + preBuild = "ant"; installPhase = '' @@ -32,6 +37,9 @@ stdenv.mkDerivation { chmod +x "$out"/bin/* ''; + doCheck = true; + checkPhase = "ant test"; + meta = with lib; { description = "A RELAX NG validator in Java"; # The homepage is www.thaiopensource.com, but it links to googlecode.com diff --git a/pkgs/tools/text/xml/jing-trang/no-git-during-build.patch b/pkgs/tools/text/xml/jing-trang/no-git-during-build.patch new file mode 100644 index 0000000000000..3fc9b3f6ef53c --- /dev/null +++ b/pkgs/tools/text/xml/jing-trang/no-git-during-build.patch @@ -0,0 +1,47 @@ +From db0ed6267f1a85f0785c81b8ee396f74795c77c0 Mon Sep 17 00:00:00 2001 +From: Thomas Gerbet <thomas@gerbet.me> +Date: Sat, 27 Nov 2021 10:24:07 +0100 +Subject: [PATCH] Do not rely on Git during the build + +--- + build.xml | 6 ------ + build.xsl | 6 ------ + 2 files changed, 12 deletions(-) + +diff --git a/build.xml b/build.xml +index e8ebaed8..2d26c72f 100644 +--- a/build.xml ++++ b/build.xml +@@ -431,12 +431,6 @@ + <target name="clean" + description="Remove almost all files created during the build process"> + <delete dir="${build.dir}"/> +- <exec executable="git"> +- <arg value="clean"/> +- <arg value="-d"/> +- <arg value="--force"/> +- <arg value="${doc.dir}"/> +- </exec> + </target> + + <target name="realclean" depends="clean" +diff --git a/build.xsl b/build.xsl +index fb9f3fef..fa384a27 100644 +--- a/build.xsl ++++ b/build.xsl +@@ -23,12 +23,6 @@ + <target name="dummy"/> + <target name="init"> + <mkdir dir="{$build}"/> +- <exec executable="git"> +- <arg value="submodule"/> +- <arg value="update"/> +- <arg value="--init"/> +- <arg value="--recursive"/> +- </exec> + <copy todir="{$doc}"> + <fileset dir="relaxng.org/jclark" includes="**"/> + </copy> +-- +2.34.1 + |