From 6dac5dab0f4e50f0b0d726bd8b02b8e01a38b1c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nade=C5=ADka?= Date: Mon, 5 Jan 2026 05:58:36 +0300 Subject: [PATCH] docbook_xml*: fix source not found --- .../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix | 13 ++++++------- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix | 6 ++---- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix | 6 ++---- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix | 6 ++---- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix | 6 ++---- .../sgml+xml/schemas/xml-dtd/docbook/generic.nix | 11 ++++++++--- 6 files changed, 22 insertions(+), 26 deletions(-) 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 9da4c655ad00..334b9f38bda4 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 @@ -7,11 +7,11 @@ }: let - # Urgh, DocBook 4.1.2 doesn't come with an XML catalog. Use the one + # Urgh, DocBook 4.1.2 doesn't come with an XML catalog. Use the one # from 4.2. docbook42catalog = fetchurl { - url = "https://docbook.org/xml/4.2/catalog.xml"; - sha256 = "18lhp6q2l0753s855r638shkbdwq9blm6akdjsc9nrik24k38j17"; + url = "https://www.oasis-open.org/docbook/xml/4.2/catalog.xml"; + hash = "sha256-J0g0JhEzZpuYlm0qU+lKmLc1oUbD5FKQHuUAKrC5kKI="; }; in @@ -19,14 +19,13 @@ import ./generic.nix { inherit lib stdenv + fetchurl unzip findXMLCatalogs ; version = "4.1.2"; - src = fetchurl { - url = "https://docbook.org/xml/4.1.2/docbkx412.zip"; - sha256 = "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h"; - }; + url = "https://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip"; + hash = "sha256-MPBkQGTg6nF1FDglGUCxQx9GrK2oFKBihw9IbHcud3I="; postInstall = " sed 's|V4.2|V4.1.2|g' < ${docbook42catalog} > catalog.xml "; 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 a4516f1a0921..0442d1b2668d 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 @@ -10,12 +10,10 @@ import ./generic.nix { inherit lib stdenv + fetchurl unzip findXMLCatalogs ; version = "4.2"; - src = fetchurl { - url = "https://docbook.org/xml/4.2/docbook-xml-4.2.zip"; - sha256 = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2"; - }; + hash = "sha256-rMRgHk+XoZYHa35ks2jZJIsHx6vyazSgLMpA7uvmD6I="; } 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 1e71c8ef44e8..287d72087a13 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 @@ -10,12 +10,10 @@ import ./generic.nix { inherit lib stdenv + fetchurl unzip findXMLCatalogs ; version = "4.3"; - src = fetchurl { - url = "https://docbook.org/xml/4.3/docbook-xml-4.3.zip"; - sha256 = "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3"; - }; + hash = "sha256-IwaKlOpv1ISwBMWnPsNqZqpH6o8Na2LMFpWTH1wUNGQ="; } 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 ddac44dfe95c..6b89f29b469d 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 @@ -10,12 +10,10 @@ import ./generic.nix { inherit lib stdenv + fetchurl unzip findXMLCatalogs ; version = "4.4"; - src = fetchurl { - url = "https://docbook.org/xml/4.4/docbook-xml-4.4.zip"; - sha256 = "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82"; - }; + hash = "sha256-AvFZ64jEJU2V6DHFHBRLGGOyFtkJtf9FdDoc5vUnMJA="; } 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 0e7bb9636510..100778e51dc3 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 @@ -10,12 +10,10 @@ import ./generic.nix { inherit lib stdenv + fetchurl unzip findXMLCatalogs ; version = "4.5"; - src = fetchurl { - url = "https://docbook.org/xml/4.5/docbook-xml-4.5.zip"; - sha256 = "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf"; - }; + hash = "sha256-Tk4DeiuDyYxslIGDkNS90/bhD27GLdeRiFlOJhkNx7Q="; } 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 bc85e352f5bd..f809a357018e 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -2,10 +2,15 @@ lib, stdenv, unzip, - src, - version, - postInstall ? "true", + fetchurl, findXMLCatalogs, + src ? fetchurl { + inherit hash url; + }, + version, + hash ? "", + url ? "https://www.oasis-open.org/docbook/xml/${version}/docbook-xml-${version}.zip", + postInstall ? "true", }: stdenv.mkDerivation {