summaryrefslogtreecommitdiff
path: root/Biz/Bild
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2022-07-25 09:12:00 -0400
committerBen Sima <ben@bsima.me>2022-07-25 09:12:00 -0400
commit703f950a6316486bd626cb39e6cbe1484c5d2019 (patch)
tree01869e5ae2a034d8342dbd0a49b665ffbabe19f7 /Biz/Bild
parentf91d101dffb51c8eb207914833d1a5241149ae7b (diff)
Remove GHCJS support completely
I don't care about ghcjs anymore, the most javascript I want to do is jQuery.
Diffstat (limited to 'Biz/Bild')
-rw-r--r--Biz/Bild/Constants.nix1
-rw-r--r--Biz/Bild/Deps.nix26
-rw-r--r--Biz/Bild/Deps/Haskell.nix1
-rw-r--r--Biz/Bild/Sources.json26
4 files changed, 0 insertions, 54 deletions
diff --git a/Biz/Bild/Constants.nix b/Biz/Bild/Constants.nix
index 0ffc85d..161957a 100644
--- a/Biz/Bild/Constants.nix
+++ b/Biz/Bild/Constants.nix
@@ -1,4 +1,3 @@
{
ghcCompiler = "ghc923";
- ghcjsCompiler = "ghcjs86";
}
diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix
index 84639b5..79f7ac3 100644
--- a/Biz/Bild/Deps.nix
+++ b/Biz/Bild/Deps.nix
@@ -18,7 +18,6 @@ in rec
envy = doJailbreak sup.envy;
fast-tags = sup.fast-tags.overrideAttrs (old: old // { patches = []; });
generic-data = dontCheck sup.generic-data; # https://github.com/Lysxia/generic-data/issues/56
- ghcjs-base = null; # otherwise ghc tries to build this via overridePinnedDeps
readable = doJailbreak sup.readable; # why is this even being built?
servant-auth = doJailbreak (buildCabalSubdir sel {name = "servant-auth"; subdir = "servant-auth/servant-auth";});
servant-server = doJailbreak sup.servant-server;
@@ -29,31 +28,6 @@ in rec
wai-middleware-metrics = dontCheck sup.wai-middleware-metrics;
};
});
- #ghcjs86 = pkgs.haskell.packages.ghcjs86.override (old: {
- # overrides = with pkgs.haskell.lib; sel: sup:
- # super.overridePinnedDeps (buildCabal sel) // {
- # Glob = dontCheck sup.Glob;
- # QuickCheck = dontCheck sup.QuickCheck;
- # aeson = dontCheck sup.aeson;
- # base-compat-batteries = dontCheck sup.base-compat-batteries;
- # clay = dontCheck sup.clay;
- # comonad = dontCheck sup.comonad;
- # ghcjs-base = dontCheck (buildCabal sel "ghcjs-base");
- # jsaddle-warp = dontCheck (buildCabalSubdir sel {
- # name = "jsaddle-warp";
- # src = pkgs.sources.jsaddle;
- # });
- # http-types = dontCheck sup.http-types;
- # network-uri= dontCheck sup.network-uri;
- # scientific = dontCheck sup.scientific; # takes forever
- # servant = dontCheck sup.servant;
- # servant-auth = buildCabalSubdir sel "servant-auth";
- # tasty-quickcheck = dontCheck sup.tasty-quickcheck;
- # temporary = dontCheck sup.temporary;
- # time-compat = dontCheck sup.time-compat;
- # vector = dontCheck sup.vector;
- # };
- #});
};
};
diff --git a/Biz/Bild/Deps/Haskell.nix b/Biz/Bild/Deps/Haskell.nix
index 7e9f4fe..d8108d7 100644
--- a/Biz/Bild/Deps/Haskell.nix
+++ b/Biz/Bild/Deps/Haskell.nix
@@ -23,7 +23,6 @@ with hpkgs;
envy
fast-logger
filepath
- ghcjs-base
github
hashids
haskeline
diff --git a/Biz/Bild/Sources.json b/Biz/Bild/Sources.json
index b754685..d151bdc 100644
--- a/Biz/Bild/Sources.json
+++ b/Biz/Bild/Sources.json
@@ -37,19 +37,6 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "0.6.3.4"
},
- "ghcjs-base": {
- "branch": "master",
- "description": "base library for GHCJS for JavaScript interaction and marshalling, used by higher level libraries like JSC",
- "homepage": "",
- "owner": "ghcjs",
- "repo": "ghcjs-base",
- "rev": "18f31dec5d9eae1ef35ff8bbf163394942efd227",
- "sha256": "09h3rc639n4768y75v0dbrys9pnd4da538cdgzx11dzrjm971f60",
- "type": "tarball",
- "url": "https://github.com/ghcjs/ghcjs-base/archive/18f31dec5d9eae1ef35ff8bbf163394942efd227.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
- "version": "18f31dec5d9eae1ef35ff8bbf163394942efd227"
- },
"guix": {
"branch": "master",
"repo": "https://git.savannah.gnu.org/git/guix.git",
@@ -77,19 +64,6 @@
"url_template": "https://gitlab.com/kavalogic-inc/inspekt3d/-/archive/<version>/inspekt3d-<version>.tar.gz",
"version": "703f52ccbfedad2bf5240bf8183d1b573c9d54ef"
},
- "jsaddle": {
- "branch": "master",
- "description": "JavaScript interface that works with GHCJS or GHC",
- "homepage": "",
- "owner": "ghcjs",
- "repo": "jsaddle",
- "rev": "00b206288c2cd019b56ff9f0b72a065f67ffb242",
- "sha256": "179q0j4wmn28h1ny2p8qgpr25krl4v6dn3xmbn8zkvylkz4f3m42",
- "type": "tarball",
- "url": "https://github.com/ghcjs/jsaddle/archive/00b206288c2cd019b56ff9f0b72a065f67ffb242.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
- "version": "1e39844"
- },
"niv": {
"branch": "master",
"description": "Easy dependency management for Nix projects",