diff options
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d983934e83a5..c6faec61b541 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -957,4 +957,11 @@ self: super: { protolude = super.protolude_0_2; }; + # This tool needs the latest hackage-db version. Using the latest version of + # optparse-applicative allows us to generate completions for fish and zsh. + cabal2nix = super.cabal2nix.overrideScope (self: super: { + hackage-db = self.hackage-db_2_0; + optparse-applicative = self.optparse-applicative_0_14_0_0; + }); + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ba0c3add19a..7ad1b54dd5cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -808,8 +808,10 @@ with pkgs; makeWrapper $exe $out/bin/${drv.pname} \ --prefix PATH ":" "${nix}/bin" \ --prefix PATH ":" "${nix-prefetch-scripts}/bin" - mkdir -p $out/share/bash-completion/completions + mkdir -p $out/share/{bash-completion/completions,zsh/vendor-completions,fish/completions} $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname} + $exe --zsh-completion-script $exe >$out/share/zsh/vendor-completions/_${drv.pname} + $exe --fish-completion-script $exe >$out/share/fish/completions/${drv.pname}.fish ''; }); |