jing-trang: 20151127 -> 20181222
This commit is contained in:
parent
e2730a7423
commit
f07f124d3a
|
@ -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
|
||||
|
|
47
pkgs/tools/text/xml/jing-trang/no-git-during-build.patch
Normal file
47
pkgs/tools/text/xml/jing-trang/no-git-during-build.patch
Normal file
|
@ -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
|
||||
|
Loading…
Reference in a new issue