diff options
Diffstat (limited to 'pkgs/data/sgml+xml')
8 files changed, 24 insertions, 37 deletions
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index 1c6e57b3e7a73..6be2e89dcd2ef 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -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; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index 8a10defa0fb53..c367e2a1d0cdf 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -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"; - }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index 9a9abc0588bd9..8f778ea7505d9 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -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"; - }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 4d821ce2ffb85..a58370ec4ac66 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -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"; - }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index ca847d3e436ea..3b46fe81bd7a8 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -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"; - }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 7be810fe30712..c4ab1f6f3a9bd 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -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"; - }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 3d6edd300ec35..7a635f612af8f 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -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; }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index c698098e6c127..f05788076a69d 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -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"; }; |