5 files changed, 7 insertions(+), 25 deletions(-)

M bunkplan/shell.nix
M cabinsheets/shell.nix
M codeworld-raycaster/default.nix
M codeworld-raycaster/shell.nix
M metscrape2/shell.nix

@@ 6,8 6,4 @@ let
   inherit (nixpkgs) pkgs;
   env = (import ./. { inherit nixpkgs compiler doBenchmark; }).env;
 in
-  env.overrideAttrs (oldAttrs: {
-    buildInputs = with pkgs.haskellPackages; oldAttrs.buildInputs ++ [
-      cabal-install cabal2nix ghcid
-    ];
-  })
+  env

@@ 6,8 6,4 @@ let
   inherit (nixpkgs) pkgs;
   env = (import ./. { inherit nixpkgs compiler doBenchmark; }).env;
 in
-  env.overrideAttrs (oldAttrs: {
-    buildInputs = with pkgs.haskellPackages; oldAttrs.buildInputs ++ [
-      cabal-install cabal2nix ghcid
-    ];
-  })
+  env

@@ 12,17 12,15 @@ let
 
   myHaskellPackages = haskellPackages.override {
     overrides = self: super: with pkgs.haskell.lib; {
-      codeworld-api = unmarkBroken super.codeworld-api;
-      patch = dontCheck (unmarkBroken super.patch);
-      reflex = unmarkBroken super.reflex;
+      codeworld-api = doJailbreak (unmarkBroken super.codeworld-api);
+      patch = doJailbreak (dontCheck (unmarkBroken super.patch));
+      reflex = doJailbreak (unmarkBroken super.reflex);
 
       blank-canvas =
         dontCheck (doJailbreak (super.callHackage "blank-canvas" "0.6.3" {}));
       colour = dontCheck (super.callHackage "colour" "2.3.4" {});
       dependent-map = super.callHackage "dependent-map" "0.3.1.0" {};
       dependent-sum = super.callHackage "dependent-sum" "0.6.1" {};
-      hashable = super.callHackage "hashable" "1.2.7.0" {};
-      witherable = super.callHackage "witherable" "0.3.1" {};
     };
   };
 

@@ 6,8 6,4 @@ let
   inherit (nixpkgs) pkgs;
   env = (import ./. { inherit nixpkgs compiler doBenchmark; }).env;
 in
-  env.overrideAttrs (oldAttrs: {
-    buildInputs = with pkgs.haskellPackages; oldAttrs.buildInputs ++ [
-      cabal-install cabal2nix ghcid
-    ];
-  })
+  env

@@ 6,8 6,4 @@ let
   inherit (nixpkgs) pkgs;
   env = (import ./. { inherit nixpkgs compiler doBenchmark; }).env;
 in
-  env.overrideAttrs (oldAttrs: {
-    buildInputs = with pkgs.haskellPackages; oldAttrs.buildInputs ++ [
-      cabal-install cabal2nix ghcid
-    ];
-  })
+  env