JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dbus: docs: make id's reproducible

Browse Source 
With this parameter, generating docs from the same sources will produce the
same 'bit-by-bit' result each time.

This is particularly important since dbus is part of the 'minimal' testset at
https://r13y.com/

Also submitted upstream (though in a slightly different form):
https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189
This commit is contained in:
Arnout Engelen 2020-11-05 21:21:20 +01:00
parent 34ad166a83
commit 13d86cc8e7
No known key found for this signature in database
GPG Key ID: 061107B0F74A6DAA
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/dbus/default.nix
View File

@ -30,7 +30,13 @@ stdenv.mkDerivation rec {
sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp";
};
patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
patches = [
# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
# Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189,
# expected in version 1.14
./docs-reproducible-ids.patch
] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch);
postPatch = ''
substituteInPlace tools/Makefile.in \

15
pkgs/development/libraries/dbus/docs-reproducible-ids.patch Normal file
View File

@ -0,0 +1,15 @@
diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in
--- dbus-1.12.20-original/doc/Makefile.in 2020-07-02 12:10:41.000000000 +0200
+++ dbus-1.12.20-hacked2/doc/Makefile.in 2020-11-07 09:57:15.297694773 +0100
@@ -870,8 +870,10 @@
.PRECIOUS: Makefile
+# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
+# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
@DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $<
@DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml
@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) man $<