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

Unbreak haskellPackages.dhall-nix

Browse Source
This commit is contained in:
Dmitry Bogatov 2020-08-23 09:07:29 -04:00
parent 73bd4806f1
commit 0a7abe4625
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -913,7 +913,12 @@ self: super: {
# Generate cli completions for dhall.
dhall = generateOptparseApplicativeCompletion "dhall" super.dhall;
dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json;
dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (super.dhall-nix);
dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (
super.dhall-nix.overrideScope (self: super: {
dhall = super.dhall_1_34_0;
repline = self.repline_0_4_0_0;
haskeline = self.haskeline_0_8_0_0;
}));
# https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
netrc = doJailbreak super.netrc;

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

@ -4412,7 +4412,6 @@ broken-packages:
- dhall-check
- dhall-docs
- dhall-fly
- dhall-nix
- dhall-text
- dhall-to-cabal
- dhall-yaml