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

Commits on Apr 1, 2020

  1. Revert "make-options-doc: fix string context issues" 

    This reverts commit 3c15d57.

See #83863
    @jtojnar
    jtojnar committed Apr 1, 2020
    Copy the full SHA
    513cec9 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/lib/make-options-doc/default.nix
2 changes: 1 addition & 1 deletion nixos/lib/make-options-doc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ let
optionsList = lib.sort optionLess optionsListDesc;

# Convert the list of options into an XML file.
optionsXML = pkgs.writeText "options.xml" (builtins.toXML optionsList);
optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList);

optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList);