Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: edce2b759cc31d6ee5ad1682819240f59b1b03a8
https://github.com/NixOS/nixpkgs/commit/edce2b759cc31d6ee5ad1682819240f59b1b03a8
Author: aszlig <[email protected]>
Date: 2017-02-20 (Mon, 20 Feb 2017)
Changed paths:
M pkgs/development/libraries/dbus/make-dbus-conf.nix
Log Message:
-----------
make-dbus-conf: Don't try to access network
This is the output of the builder:
building path(s) `/nix/store/khkcfb8433i9mabb6wnb8ik6p9skg644-dbus-1'
error : connection refused
error : connection refused
However, even when using --nonet we'd still get this:
I/O error : Attempt to load network entity
http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd
So in order to avoid this, we now provide an XML catalog file, mapping
the public URLs to the local DTD paths inside the store instead of using
--path (which doesn't seem to work with xsltproc).
Tested this by comparing the SHA256 (nix-hash --type sha256) of the
output path generated by:
nix-build -E '(import ./. {}).makeDBusConf {
suidHelper = "SUIDHELPER";
serviceDirectories = [ "SERVICEDIR1" "SERVICEDIR1" ];
}'
... with the SHA256 of the generated output path prior to this commit
and they have the same hash:
6f3f9594b12fddbff9407b85252b6f649da11f56b7fd514f761966c11399a7ab
Signed-off-by: aszlig <[email protected]>
Cc: @abbradar
Commit: fc6684054d054ad677a49e2a3ba162563e126093
https://github.com/NixOS/nixpkgs/commit/fc6684054d054ad677a49e2a3ba162563e126093
Author: aszlig <[email protected]>
Date: 2017-02-20 (Mon, 20 Feb 2017)
Changed paths:
M pkgs/development/libraries/dbus/make-dbus-conf.nix
Log Message:
-----------
make-dbus-conf: Use libxslt.bin instead of .dev
The problem with using libxslt as buildInputs is that the dev output is
used for building the dbus config.
This is one of the reasons why the installer tests are failing since
ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd, because the tests do not have
libxslt.dev in their closure and really shouldn't.
Signed-off-by: aszlig <[email protected]>
Cc: @abbradar
Commit: c5b2714bc79a27230690821c1c6bd99bdd457c63
https://github.com/NixOS/nixpkgs/commit/c5b2714bc79a27230690821c1c6bd99bdd457c63
Author: aszlig <[email protected]>
Date: 2017-02-20 (Mon, 20 Feb 2017)
Changed paths:
M pkgs/development/libraries/dbus/default.nix
M pkgs/development/libraries/dbus/make-dbus-conf.nix
Log Message:
-----------
dbus: Put DTDs into $out instead of $doc
First of all, these "documents" are not really documentation, so it
really doesn't make much sense to put it into $doc.
The main point however is that the installer tests are failing since
this was introduced in ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd.
One way to circumvent this is putting dbus.doc into
system.extraDependencies of the installer tests, but given the first
point this sounds a bit odd to me.
So I went for the second way of putting it into $out, because it's now
basically necessary to build a NixOS system.
With this the NixOS installer tests should now work again, although I
have only tested this with the installer.simple test.
Signed-off-by: aszlig <[email protected]>
Cc: @abbradar
Compare: https://github.com/NixOS/nixpkgs/compare/68f01b3b8c59...c5b2714bc79a_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
