diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 497e201fb1a9..60a361250332 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -81,11 +81,25 @@ self: super: {
   snap-server = doJailbreak super.snap-server;
   exact-pi = doJailbreak super.exact-pi;
   time-compat = doJailbreak super.time-compat;
-  http-media = doJailbreak super.http-media;
-  servant-server = doJailbreak super.servant-server;
+  http-media = unmarkBroken (doJailbreak super.http-media);
+  servant-server = unmarkBroken (doJailbreak super.servant-server);
   foundation = dontCheck super.foundation;
   vault = dontHaddock super.vault;
 
+  servant = unmarkBroken super.servant;
+  servant-auth = unmarkBroken super.servant-auth;
+  servant-conduit = unmarkBroken super.servant-conduit;
+  servant-auth-client = unmarkBroken super.servant-auth-client;
+  servant-client = unmarkBroken super.servant-client;
+  servant-client-core = unmarkBroken super.servant-client-core;
+  servant-auth-server = unmarkBroken super.servant-auth-server;
+  servant-auth-swagger = unmarkBroken super.servant-auth-swagger;
+  servant-swagger = unmarkBroken super.servant-swagger;
+  servant-blaze = unmarkBroken super.servant-blaze;
+  servant-swagger-ui-core = unmarkBroken super.servant-swagger-ui-core;
+  swagger2 = unmarkBroken super.swagger2;
+  cachix-api = unmarkBroken super.cachix-api;
+
   # https://github.com/snapframework/snap-core/issues/288
   snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail   = Fail.fail' ''"; });
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 694ee99191e5..f2b3d51431f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12298,7 +12298,7 @@ in
   c-blosc = callPackage ../development/libraries/c-blosc { };
 
   # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
-  cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
+  cachix = haskell.lib.justStaticExecutables (haskell.lib.unmarkBroken haskell.packages.ghc883.cachix);
 
   hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };