Merge pull request #163137 from Stunkymonkey/xml-dtd-pnem-version

This commit is contained in:
Sandro 2022-03-08 18:17:04 +01:00 committed by GitHub
commit ccd4b93696
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 37 deletions

View file

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation {
name = "docbook-xml-ebnf-1.2b1";
stdenv.mkDerivation rec {
pname = "docbook-xml-ebnf";
version = "1.2b1";
dtd = fetchurl {
url = "http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd";
url = "https://docbook.org/xml/ebnf/${version}/dbebnf.dtd";
sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95";
};
catalog = ./docbook-ebnf.cat;

View file

@ -1,27 +1,22 @@
{lib, stdenv, fetchurl, unzip, findXMLCatalogs}:
let
# Urgh, DocBook 4.1.2 doesn't come with an XML catalog. Use the one
# from 4.2.
docbook42catalog = fetchurl {
url = "http://www.docbook.org/xml/4.2/catalog.xml";
url = "https://docbook.org/xml/4.2/catalog.xml";
sha256 = "18lhp6q2l0753s855r638shkbdwq9blm6akdjsc9nrik24k38j17";
};
in
import ./generic.nix {
inherit lib stdenv unzip findXMLCatalogs;
name = "docbook-xml-4.1.2";
version = "4.1.2";
src = fetchurl {
url = "http://www.docbook.org/xml/4.1.2/docbkx412.zip";
url = "https://docbook.org/xml/4.1.2/docbkx412.zip";
sha256 = "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h";
};
postInstall = "
sed 's|V4.2|V4.1.2|g' < ${docbook42catalog} > catalog.xml
";
meta = {
branch = "4.1.2";
};
}

View file

@ -2,12 +2,9 @@
import ./generic.nix {
inherit lib stdenv unzip findXMLCatalogs;
name = "docbook-xml-4.2";
version = "4.2";
src = fetchurl {
url = "http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip";
url = "https://docbook.org/xml/4.2/docbook-xml-4.2.zip";
sha256 = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2";
};
meta = {
branch = "4.2";
};
}

View file

@ -2,12 +2,9 @@
import ./generic.nix {
inherit lib stdenv unzip findXMLCatalogs;
name = "docbook-xml-4.3";
version = "4.3";
src = fetchurl {
url = "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip";
url = "https://docbook.org/xml/4.3/docbook-xml-4.3.zip";
sha256 = "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3";
};
meta = {
branch = "4.3";
};
}

View file

@ -2,12 +2,9 @@
import ./generic.nix {
inherit lib stdenv unzip findXMLCatalogs;
name = "docbook-xml-4.4";
version = "4.4";
src = fetchurl {
url = "http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip";
url = "https://docbook.org/xml/4.4/docbook-xml-4.4.zip";
sha256 = "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82";
};
meta = {
branch = "4.4";
};
}

View file

@ -2,12 +2,9 @@
import ./generic.nix {
inherit lib stdenv unzip findXMLCatalogs;
name = "docbook-xml-4.5";
version = "4.5";
src = fetchurl {
url = "http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip";
url = "https://docbook.org/xml/4.5/docbook-xml-4.5.zip";
sha256 = "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf";
};
meta = {
branch = "4.5";
};
}

View file

@ -1,9 +1,10 @@
{ lib, stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }:
{ lib, stdenv, unzip, src, version, postInstall ? "true", findXMLCatalogs }:
stdenv.mkDerivation {
inherit src name postInstall;
inherit version src postInstall;
pname = "docbook-xml";
nativeBuildInputs = [unzip];
nativeBuildInputs = [ unzip ];
propagatedNativeBuildInputs = [ findXMLCatalogs ];
unpackPhase = ''
@ -17,7 +18,8 @@ stdenv.mkDerivation {
runHook postInstall
'';
meta = meta // {
meta = {
branch = version;
platforms = lib.platforms.unix;
};
}

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libxml2 }:
stdenv.mkDerivation {
name = "xhtml1-20020801";
pname = "xhtml1";
version = "unstable-2002-08-01";
src = fetchurl {
url = "http://www.w3.org/TR/xhtml1/xhtml1.tgz";
url = "https://www.w3.org/TR/xhtml1/xhtml1.tgz";
sha256 = "0rr0d89i0z75qvjbm8il93bippx09hbmjwy0y2sj44n9np69x3hl";
};