summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-02-20 17:28:50 +0000
committerAlyssa Ross <hi@alyssa.is>2020-02-20 17:28:50 +0000
commita9847c36e6aa003998c1ef5518e5710658ca5770 (patch)
tree447433d13af676e0600c4fdc2d58a7b0bbbe04d0 /nixos
parent515d3cfa24df96c9e134ac5b87c2396f81354551 (diff)
parentd57c05acd165ba8a428b13457c87d24175f58136 (diff)
downloadnixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar
nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar.gz
nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar.bz2
nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar.lz
nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar.xz
nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar.zst
nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.zip
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/programs/fish_completion-generator.patch12
1 files changed, 7 insertions, 5 deletions
diff --git a/nixos/modules/programs/fish_completion-generator.patch b/nixos/modules/programs/fish_completion-generator.patch
index a8c797d185a..997f38c5066 100644
--- a/nixos/modules/programs/fish_completion-generator.patch
+++ b/nixos/modules/programs/fish_completion-generator.patch
@@ -1,11 +1,13 @@
 --- a/create_manpage_completions.py
 +++ b/create_manpage_completions.py
-@@ -776,8 +776,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
-
+@@ -844,10 +844,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
+ 
              built_command_output.insert(0, "# " + CMDNAME)
-
+ 
 -            # Output the magic word Autogenerated so we can tell if we can overwrite this
--            built_command_output.insert(1, "# Autogenerated from man page " + manpage_path)
+-            built_command_output.insert(
+-                1, "# Autogenerated from man page " + manpage_path
+-            )
              # built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABILE PARSER! Was really using Type2 but reporting TypeDeroffManParser
-
+ 
              for line in built_command_output: