Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5566bf97e56e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1874678d12df
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 21, 2018

  1. nixos/manual: Don't depend on non-bin outputs of libxml2 and libxslt 

    Might fix https://hydra.nixos.org/build/71580290.
    @dezgeg
    dezgeg committed Mar 21, 2018
    Copy the full SHA
    3918182 View commit details

  2. make-dbus-conf: Don't depend on unnecessary libxslt outputs 

    Might fix https://hydra.nixos.org/build/71580290.
    @dezgeg
    dezgeg committed Mar 21, 2018
    Copy the full SHA
    1874678 View commit details
Showing with 6 additions and 6 deletions.
  1. +5 −5 nixos/doc/manual/default.nix
  2. +1 −1 pkgs/development/libraries/dbus/make-dbus-conf.nix
10 changes: 5 additions & 5 deletions nixos/doc/manual/default.nix
View file
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ let

manual-combined = runCommand "nixos-manual-combined"
{ inherit sources;
nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
meta.description = "The NixOS manual as plain docbook XML";
}
''
@@ -194,7 +194,7 @@ let

olinkDB = runCommand "manual-olinkdb"
{ inherit sources;
nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
}
''
xsltproc \
@@ -244,7 +244,7 @@ in rec {
# Generate the NixOS manual.
manual = runCommand "nixos-manual"
{ inherit sources;
nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
meta.description = "The NixOS manual in HTML format";
allowedReferences = ["out"];
}
@@ -272,7 +272,7 @@ in rec {

manualEpub = runCommand "nixos-manual-epub"
{ inherit sources;
buildInputs = [ libxml2 libxslt zip ];
buildInputs = [ libxml2.bin libxslt.bin zip ];
}
''
# Generate the epub manual.
@@ -302,7 +302,7 @@ in rec {
# Generate the NixOS manpages.
manpages = runCommand "nixos-manpages"
{ inherit sources;
nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
allowedReferences = ["out"];
}
''
2 changes: 1 addition & 1 deletion pkgs/development/libraries/dbus/make-dbus-conf.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ runCommand "dbus-1"
rewritePrefix="file://${dbus}/share/xml/dbus/"/>
</catalog>
'';
nativeBuildInputs = [ libxslt ];
nativeBuildInputs = [ libxslt.bin ];
}
''
mkdir -p $out