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: 5b3dc48f19f0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d7c4106ce089
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 6, 2019

  1. nixos/doc/manual: Fix Makefile 

    We had `./options-to-docbook.xsl` as a dependency for `generated` target but it was moved to a package in #66328.
    @jtojnar
    jtojnar committed Sep 6, 2019
    Copy the full SHA
    81e755f View commit details

  2. Merge pull request #68197 from jtojnar/nixos-doc-make-fix 

    nixos/doc/manual: Fix Makefile
    @domenkozar
    domenkozar authored Sep 6, 2019
    Copy the full SHA
    d7c4106 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/doc/manual/Makefile
2 changes: 1 addition & 1 deletion nixos/doc/manual/Makefile
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ fix-misc-xml:
clean:
rm -f manual-combined.xml generated

generated: ./options-to-docbook.xsl
generated:
nix-build ../../release.nix \
--attr manualGeneratedSources.x86_64-linux \
--out-link ./generated