public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge origin/master into haskell-updates.

Browse Source
This commit is contained in:
Peter Simons
2021-03-22 22:39:48 +01:00
parent 5b8d47b26b fdb83b81b2
commit cf991521dc
469 changed files with 11438 additions and 7472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+4 -1
View File
@@ -946,7 +946,10 @@ self: super: {
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
niv = generateOptparseApplicativeCompletion "niv" super.niv;
niv = generateOptparseApplicativeCompletion "niv" (super.niv.overrideScope (self: super: {
# Needs override because of: https://github.com/nmattia/niv/issues/312
optparse-applicative = self.optparse-applicative_0_15_1_0;
}));
ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
stack = generateOptparseApplicativeCompletion "stack" super.stack;