summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-05-20 00:37:23 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-05-20 00:37:23 +0200
commit8014f4fe29a7fa7223716bd297dc041b4eaa5e0f (patch)
tree4cbd9ec9471afe94339a4797426951599043cb4b /pkgs/development/haskell-modules/configuration-common.nix
parent9b79de383c5f130657166f869e2ccd2f39c1bed6 (diff)
downloadnixpkgs-8014f4fe29a7fa7223716bd297dc041b4eaa5e0f.tar
nixpkgs-8014f4fe29a7fa7223716bd297dc041b4eaa5e0f.tar.gz
nixpkgs-8014f4fe29a7fa7223716bd297dc041b4eaa5e0f.tar.bz2
nixpkgs-8014f4fe29a7fa7223716bd297dc041b4eaa5e0f.tar.lz
nixpkgs-8014f4fe29a7fa7223716bd297dc041b4eaa5e0f.tar.xz
nixpkgs-8014f4fe29a7fa7223716bd297dc041b4eaa5e0f.tar.zst
nixpkgs-8014f4fe29a7fa7223716bd297dc041b4eaa5e0f.zip
haskellPackages.dhall-nix{,pkgs}: remove cabal revision pins
We got these cabal file revisions with our hackage update, so we can
remove it from the common configuration file.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix11
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 59d0248df9a..36993bc1dfc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -943,16 +943,7 @@ self: super: {
   # https://github.com/commercialhaskell/stackage/issues/5795
   # This issue can be mitigated with 'dontCheck' which skips the tests and their compilation.
   dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json);
-  # dhall-nix, dhall-nixpkgs: pull updated cabal files with updated bounds.
-  # Remove at next hackage update.
-  dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (overrideCabal super.dhall-nix {
-    revision = "2";
-    editedCabalFile = "1w90jrkzmbv5nasafkkv0kyfmnqkngldx2lr891113h2mqbbr3wx";
-  });
-  dhall-nixpkgs = overrideCabal super.dhall-nixpkgs {
-    revision = "1";
-    editedCabalFile = "1y08jxg51sbxx0i7ra45ii2v81plzf4hssmwlrw35l8n5gib1vcg";
-  };
+  dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix;
   dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml;
 
   # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558