diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2020-08-26 12:58:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-26 12:58:47 +0900 |
| commit | a6f317a345bf006738a786c93be7aff33553887f (patch) | |
| tree | d3fe65dc219dea0e0bded09b8843e136c18bbbe8 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 0a9d6077e5741d6dd73a34f8b5859a0197fae4bc (diff) | |
| parent | 0a7abe4625c1fc8f1772a1a86632f929d743ecc3 (diff) | |
| download | nixpkgs-a6f317a345bf006738a786c93be7aff33553887f.tar nixpkgs-a6f317a345bf006738a786c93be7aff33553887f.tar.gz nixpkgs-a6f317a345bf006738a786c93be7aff33553887f.tar.bz2 nixpkgs-a6f317a345bf006738a786c93be7aff33553887f.tar.lz nixpkgs-a6f317a345bf006738a786c93be7aff33553887f.tar.xz nixpkgs-a6f317a345bf006738a786c93be7aff33553887f.tar.zst nixpkgs-a6f317a345bf006738a786c93be7aff33553887f.zip | |
Merge pull request #96093 from KAction/unbreak-haskell-nix
Unbreak haskellPackages.dhall-nix
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1915a15dab3..e6bf4196bd7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -921,7 +921,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; |