@@ -57,15 +57,20 @@ let #TODO: Upstream
57 heist = doJailbreak super.heist; #TODO: Move up to reflex-platform; create tests for r-p supported packages
57 heist = doJailbreak super.heist; #TODO: Move up to reflex-platform; create tests for r-p supported packages
60+ cleanSource = builtins.filterSource (name: _: let baseName = builtins.baseNameOf name; in !(
61+ builtins.match "^\\.ghc\\.environment.*" baseName != null ||
62+ baseName == "cabal.project.local"
60 addLibs = self: super: {
65 addLibs = self: super: {
61 obelisk-asset-manifest = self.callCabal2nix "obelisk-asset-manifest" (hackGet ./lib/asset + "/manifest") {};
66 obelisk-asset-manifest = self.callCabal2nix "obelisk-asset-manifest" (hackGet ./lib/asset + "/manifest") {};
62 obelisk-asset-serve-snap = self.callCabal2nix "obelisk-asset-serve-snap" (hackGet ./lib/asset + "/serve-snap") {};
67 obelisk-asset-serve-snap = self.callCabal2nix "obelisk-asset-serve-snap" (hackGet ./lib/asset + "/serve-snap") {};
63− obelisk-backend = self.callCabal2nix "obelisk-backend" ./lib/backend {};
68+ obelisk-backend = self.callCabal2nix "obelisk-backend" (cleanSource ./lib/backend) {};
64− obelisk-command = (self.callCabal2nix "obelisk-command" ./lib/command {}).override { Cabal = super.Cabal_2_0_0_2; };
69+ obelisk-command = (self.callCabal2nix "obelisk-command" (cleanSource ./lib/command) {}).override { Cabal = super.Cabal_2_0_0_2; };
65− obelisk-run-frontend = self.callCabal2nix "obelisk-run-frontend" ./lib/run-frontend {};
70+ obelisk-run-frontend = self.callCabal2nix "obelisk-run-frontend" (cleanSource ./lib/run-frontend) {};
66− obelisk-selftest = self.callCabal2nix "obelisk-selftest" ./lib/selftest {};
71+ obelisk-selftest = self.callCabal2nix "obelisk-selftest" (cleanSource ./lib/selftest) {};
67− obelisk-snap = self.callCabal2nix "obelisk-snap" ./lib/snap {};
72+ obelisk-snap = self.callCabal2nix "obelisk-snap" (cleanSource ./lib/snap) {};
68− obelisk-snap-extras = self.callCabal2nix "obelisk-snap-extras" ./lib/snap-extras {};
73+ obelisk-snap-extras = self.callCabal2nix "obelisk-snap-extras" (cleanSource ./lib/snap-extras) {};
71 defaultHaskellOverrides = composeExtensions fixUpstreamPkgs addLibs;
76 defaultHaskellOverrides = composeExtensions fixUpstreamPkgs addLibs;