about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2019-03-20 23:18:52 +0100
committerGitHub <noreply@github.com>2019-03-20 23:18:52 +0100
commita61b989900a39551d8b6ecc306d023508141b5bc (patch)
treeb4aa1c5f7f333b02579680d21636b5e817673c3b /pkgs/development/haskell-modules/configuration-common.nix
parent5530900d543fed5bdb0b8f95e64d322e658448c0 (diff)
parentc1eeb8f3abe92e41e5d3bc0a584dcb1c924c4a57 (diff)
downloadnixlib-a61b989900a39551d8b6ecc306d023508141b5bc.tar
nixlib-a61b989900a39551d8b6ecc306d023508141b5bc.tar.gz
nixlib-a61b989900a39551d8b6ecc306d023508141b5bc.tar.bz2
nixlib-a61b989900a39551d8b6ecc306d023508141b5bc.tar.lz
nixlib-a61b989900a39551d8b6ecc306d023508141b5bc.tar.xz
nixlib-a61b989900a39551d8b6ecc306d023508141b5bc.tar.zst
nixlib-a61b989900a39551d8b6ecc306d023508141b5bc.zip
Merge pull request #57748 from nomeata/haskell-clock-patch
Import cross-compilation patch for clock
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4bdb11eeed28..298d8d581310 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -48,7 +48,6 @@ self: super: {
 
   # Break infinite recursions.
   attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; };
-  clock = dontCheck super.clock;
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;
   hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; };
@@ -1044,6 +1043,8 @@ self: super: {
   # https://github.com/dmwit/encoding/pull/3
   encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
 
+  clock = dontCheck (appendPatch super.clock ./patches/clock-0.7.2.patch);
+
   # Work around overspecified constraint on github ==0.18.
   github-backup = doJailbreak super.github-backup;