Merge pull request #57748 from nomeata/haskell-clock-patch

Import cross-compilation patch for clock
2019-03-20 23:18:52 +01:00
parent 5530900d54 c1eeb8f3ab
commit a61b989900
2 changed files with 61 additions and 1 deletions
@@ -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;