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: 05d15b143fe3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8e18f4e41431
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 30, 2019

  1. hydra: fix build (#58592) 

    Apply patch from NixOS/hydra#648
    @danbst
    danbst authored Mar 30, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 02935DA8AF8674CB
    Learn about vigilant mode
    Copy the full SHA
    8e18f4e View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/development/tools/misc/hydra/default.nix
5 changes: 5 additions & 0 deletions pkgs/development/tools/misc/hydra/default.nix
View file
Original file line number Diff line number Diff line change
@@ -110,6 +110,11 @@ in releaseTools.nixBuild rec {
url = "https://github.com/NixOS/hydra/commit/08de434bdd0b0a22abc2081be6064a6c846d3920.patch";
sha256 = "0kz77njp5ynn9l81g3q8zrryvnsr06nk3iw0a60187wxqzf5fmf8";
})
] ++ [
(fetchpatch {
url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch";
sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx";
})
];

configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];