Unverified Commit 77e4976d authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #315034 from NixOS/backport-314627-to-release-24.05

[Backport release-24.05] haskellPackages.di-core: unbreak on darwin
parents 5c2584e9 02c22a63
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -325,6 +325,14 @@ self: super: ({
    libraryHaskellDepends = with self; [ base bytestring jsaddle-wkwebview reflex reflex-dom-core text ]; # cabal2nix doesn't add darwin-only deps
  }) super.reflex-dom;

  # Remove a problematic assert, the length is sometimes 1 instead of 2 on darwin
  di-core = overrideCabal (drv: {
    preConfigure = ''
      substituteInPlace test/Main.hs --replace \
        "2 @=? List.length (List.nub (List.sort (map Di.log_time logs)))" ""
    '';
  }) super.di-core;

} // lib.optionalAttrs pkgs.stdenv.isAarch64 {  # aarch64-darwin

  # https://github.com/fpco/unliftio/issues/87