summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuc Tielen <luc.tielen@kabisa.nl>2019-09-16 21:52:08 +0200
committerPeter Simons <simons@cryp.to>2019-09-18 19:36:58 +0200
commitb55447925deb439c5ec16d0ee072379346ad0379 (patch)
tree07bb988a31c9ba6cc2580c51dc583164b25573ec
parentfce1182f4b72f0d0cac968aede357bf439c43151 (diff)
downloadnixpkgs-b55447925deb439c5ec16d0ee072379346ad0379.tar
nixpkgs-b55447925deb439c5ec16d0ee072379346ad0379.tar.gz
nixpkgs-b55447925deb439c5ec16d0ee072379346ad0379.tar.bz2
nixpkgs-b55447925deb439c5ec16d0ee072379346ad0379.tar.lz
nixpkgs-b55447925deb439c5ec16d0ee072379346ad0379.tar.xz
nixpkgs-b55447925deb439c5ec16d0ee072379346ad0379.tar.zst
nixpkgs-b55447925deb439c5ec16d0ee072379346ad0379.zip
Update dhall: 1.25.0 -> 1.26.0
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 88557fba162..12c6d1bcbfd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1197,8 +1197,8 @@ self: super: {
   temporary-resourcet = doJailbreak super.temporary-resourcet;
 
   # Requires dhall >= 1.23.0
-  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_25_0; };
-  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_25_0; };
+  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_0; };
+  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_0; };
 
   # Test suite doesn't work with current QuickCheck
   # https://github.com/pruvisto/heap/issues/11
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 88ec8ad85ff..5db25686fc6 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -589,7 +589,7 @@ self: super: builtins.intersectAttrs super {
   snap-server = dontCheck super.snap-server;
 
   # Tests require internet
-  dhall_1_25_0 = dontCheck super.dhall_1_25_0;
+  dhall_1_26_0 = dontCheck super.dhall_1_26_0;
   http-download = dontCheck super.http-download;
   pantry = dontCheck super.pantry;