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

Merge pull request #117023 from maralorn/niv

Browse Source 
haskellPackages.niv: Try to fix build
This commit is contained in:
maralorn 2021-03-20 13:40:33 +01:00 committed by GitHub
commit 6f54d970dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -946,7 +946,10 @@ self: super: {
# Generate shell completion. # Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; 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; ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
stack = generateOptparseApplicativeCompletion "stack" super.stack; stack = generateOptparseApplicativeCompletion "stack" super.stack;

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2753,6 +2753,7 @@ extra-packages:
- haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 - haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08
- haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 - haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08
- lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08 - lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08
- optparse-applicative < 0.16 # needed for niv-0.2.19
package-maintainers: package-maintainers:
peti: peti:

19
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -192102,6 +192102,25 @@ self: {
broken = true; broken = true;
}) {}; }) {};
"optparse-applicative_0_15_1_0" = callPackage
({ mkDerivation, ansi-wl-pprint, base, bytestring, process
, QuickCheck, transformers, transformers-compat
}:
mkDerivation {
pname = "optparse-applicative";
version = "0.15.1.0";
sha256 = "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd";
revision = "1";
editedCabalFile = "0zmhqkd96v2z1ilhqdkd9z4jgsnsxb8yi2479ind8m5zm9363zr9";
libraryHaskellDepends = [
ansi-wl-pprint base process transformers transformers-compat
];
testHaskellDepends = [ base bytestring QuickCheck ];
description = "Utilities and combinators for parsing command line options";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"optparse-applicative" = callPackage "optparse-applicative" = callPackage
({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
, transformers, transformers-compat , transformers, transformers-compat