From 5724dddf1745ba3908d1e2db54fcdb36ec6f5184 Mon Sep 17 00:00:00 2001 From: libjared Date: Thu, 21 Apr 2022 14:23:33 -0500 Subject: [PATCH] haskellPackages.sensei: mark unbroken, override Sensei had an issue on NixOS relating to tmpfs, and 0.6.2 fixes that. But it still needs an override because it (the binary *and* the tests) require the git binary and latest hspec. --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cf47ea821666..95271c1fc64d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -851,6 +851,18 @@ self: super: { # test suite requires git and does a bunch of git operations restless-git = dontCheck super.restless-git; + # requires git at test-time *and* runtime, but we'll just rely on users to + # bring their own git at runtime + sensei = overrideCabal (drv: { + testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ]; + testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; + }) (super.sensei.overrideScope (self: super: { + hspec-meta = self.hspec-meta_2_9_3; + hspec = self.hspec_2_9_7; + hspec-core = dontCheck self.hspec-core_2_9_7; + hspec-discover = self.hspec-discover_2_9_7; + })); + # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; fluid-idl-scotty = markBroken super.fluid-idl-scotty; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f18d261ce1a1..b942853b0bc5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4467,7 +4467,6 @@ broken-packages: - semigroups-actions - sendgrid-haskell - sendgrid-v3 - - sensei - sensu-run - sentry - separated diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7387c81da321..af58a443114a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -241978,8 +241978,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Automatically run Hspec tests on file modifications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "sensenet" = callPackage