From 0a6c8c77749e4b2fac220228a2f4255c351cfeb5 Mon Sep 17 00:00:00 2001 From: Joseph Warren Date: Fri, 15 Nov 2024 01:59:46 +0000 Subject: [PATCH] Fix opencascade-hs As of [this PR](https://github.com/NixOS/cabal2nix/pull/630) opencascade-hs does not require the dependency on opencascade-occt to be manually specified. It does however still require the include path to be defined. --- .../haskell-modules/configuration-common.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e1d497a992e950..fac5ac5de72a93 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3066,4 +3066,29 @@ self: super: { ''; }) super.quickcheck-state-machine; + testcontainers = lib.pipe super.testcontainers [ + dontCheck # Tests require docker + doJailbreak # https://github.com/testcontainers/testcontainers-hs/pull/58 + ]; + + # https://bitbucket.org/echo_rm/hailgun/pull-requests/27 + hailgun = appendPatches [ + (fetchpatch { + url = "https://bitbucket.org/nh2/hailgun/commits/ac2bc2a3003e4b862625862c4565fece01c0cf57/raw"; + sha256 = "sha256-MWeK9nzMVP6cQs2GBFkohABgL8iWcT7YzwF+tLOkIjo="; + }) + (fetchpatch { + url = "https://bitbucket.org/nh2/hailgun/commits/583daaf87265a7fa67ce5171fe1077e61be9b39c/raw"; + sha256 = "sha256-6WITonLoONxZzzkS7EI79LwmwSdkt6TCgvHA2Hwy148="; + }) + (fetchpatch { + url = "https://bitbucket.org/nh2/hailgun/commits/b9680b82f6d58f807828c1bbb57e26c7af394501/raw"; + sha256 = "sha256-MnOc51tTNg8+HDu1VS2Ct7Mtu0vuuRd3DjzOAOF+t7Q="; + }) + ] super.hailgun; + + # opencascade-hs requires the include path configuring relative to opencascade-occt + opencascade-hs = let occt = pkgs.opencascade-occt; + in appendConfigureFlag "--extra-include-dirs=${occt}/include/opencascade" super.opencascade-hs; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super