diff options
author | sterni <sternenseemann@systemli.org> | 2021-08-13T20·24+0200 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2021-08-24T22·00+0000 |
commit | d7e70b1d7270548272267e9b01dc9867f94f5f74 (patch) | |
tree | 492becced0f6f1862f14783f0fd07f40656896a7 /third_party | |
parent | 02566cdcfb15043070c990ec17c0405313a13874 (diff) |
feat(nix/buildLisp): add ccl r/2772
This adds support for Clozure's CL implementation to buildLisp. This is quite trivial in comparison to ECL since SBCL and CCL have very similar in how they work (so much so that CCL also suffers from b/136). Also the similarities in the code actually added here are striking, so I'll try to make an effort to reduce the code duplication in the future. To fix builds with CCL the following changes were made: * //3p/lisp/nibbles: The double inclusion of the types.lisp file was fixed. CCL doesn't like double definitions and refuses to compile otherwise. * //3p/lisp/physical-quantities: Update to a new bug fix release which contains a compilation fix for CCL. * //3p/lisp/routes: apply a patch fixing the build which was previously failing due to a double definition. * //3p/lisp/usocket: only depend on sb-bsd-sockets for SBCL and ECL, the latter of which seems to have a SBCL compatible implementation of the package. * Conditionally include a few CCL-specific source files and add `badImplementation` entries for the remaining failures which are //fun/gemma (to be expected) and //web/panettone which fails with an incredibly vague message. Change-Id: I666efdc39a0f16ee1bb6e23225784c709b04e740 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3350 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to '')
-rw-r--r-- | third_party/lisp/cffi.nix | 1 | ||||
-rw-r--r-- | third_party/lisp/cl-fad.nix | 3 | ||||
-rw-r--r-- | third_party/lisp/cl-plus-ssl.nix | 7 | ||||
-rw-r--r-- | third_party/lisp/closer-mop.nix | 1 | ||||
-rw-r--r-- | third_party/lisp/ironclad.nix | 2 | ||||
-rw-r--r-- | third_party/lisp/nibbles.nix | 1 | ||||
-rw-r--r-- | third_party/lisp/physical-quantities.nix | 5 | ||||
-rw-r--r-- | third_party/lisp/routes.nix | 22 | ||||
-rw-r--r-- | third_party/lisp/trivial-features.nix | 1 | ||||
-rw-r--r-- | third_party/lisp/usocket.nix | 9 |
10 files changed, 40 insertions, 12 deletions
diff --git a/third_party/lisp/cffi.nix b/third_party/lisp/cffi.nix index 89fe9fcad4f4..c8d240c8cd0e 100644 --- a/third_party/lisp/cffi.nix +++ b/third_party/lisp/cffi.nix @@ -19,6 +19,7 @@ in buildLisp.library { { ecl = src + "/src/cffi-ecl.lisp"; sbcl = src + "/src/cffi-sbcl.lisp"; + ccl = src + "/src/cffi-openmcl.lisp"; } ] ++ map (f: src + ("/src/" + f)) [ "package.lisp" diff --git a/third_party/lisp/cl-fad.nix b/third_party/lisp/cl-fad.nix index 2249db66ac18..905e0821cac7 100644 --- a/third_party/lisp/cl-fad.nix +++ b/third_party/lisp/cl-fad.nix @@ -22,6 +22,9 @@ in buildLisp.library { srcs = map (f: src + ("/" + f)) [ "packages.lisp" + ] ++ [ + { ccl = "${src}/openmcl.lisp"; } + ] ++ map (f: src + ("/" + f)) [ "fad.lisp" "path.lisp" "temporary-files.lisp" diff --git a/third_party/lisp/cl-plus-ssl.nix b/third_party/lisp/cl-plus-ssl.nix index 1dab7c3abba4..e6a616b95e46 100644 --- a/third_party/lisp/cl-plus-ssl.nix +++ b/third_party/lisp/cl-plus-ssl.nix @@ -17,8 +17,11 @@ in buildLisp.library { trivial-features trivial-garbage trivial-gray-streams - (buildLisp.bundled "uiop") - (buildLisp.bundled "sb-posix") + { + scbl = buildLisp.bundled "uiop"; + default = buildLisp.bundled "asdf"; + } + { sbcl = buildLisp.bundled "sb-posix"; } ]; native = [ pkgs.openssl ]; diff --git a/third_party/lisp/closer-mop.nix b/third_party/lisp/closer-mop.nix index d6a677625e4d..21fb3ba14bef 100644 --- a/third_party/lisp/closer-mop.nix +++ b/third_party/lisp/closer-mop.nix @@ -18,6 +18,7 @@ in depot.nix.buildLisp.library { { sbcl = "${src}/closer-sbcl.lisp"; ecl = "${src}/closer-ecl.lisp"; + ccl = "${src}/closer-clozure.lisp"; } ]; } diff --git a/third_party/lisp/ironclad.nix b/third_party/lisp/ironclad.nix index fe0e052c32bc..cdd829924ee5 100644 --- a/third_party/lisp/ironclad.nix +++ b/third_party/lisp/ironclad.nix @@ -43,6 +43,8 @@ in depot.nix.buildLisp.library { { sbcl = getSrc "opt/sbcl/x86oid-vm.lisp"; } { ecl = getSrc "opt/ecl/c-functions.lisp"; } + + { ccl = getSrc "opt/ccl/x86oid-vm.lisp"; } ] ++ map getSrc [ "common.lisp" diff --git a/third_party/lisp/nibbles.nix b/third_party/lisp/nibbles.nix index b797c83a5fa1..da542fe91130 100644 --- a/third_party/lisp/nibbles.nix +++ b/third_party/lisp/nibbles.nix @@ -21,7 +21,6 @@ in depot.nix.buildLisp.library { "package.lisp" "types.lisp" "macro-utils.lisp" - "types.lisp" "vectors.lisp" "streams.lisp" ] ++ [ diff --git a/third_party/lisp/physical-quantities.nix b/third_party/lisp/physical-quantities.nix index 6e124a913209..b8079e8ebaaf 100644 --- a/third_party/lisp/physical-quantities.nix +++ b/third_party/lisp/physical-quantities.nix @@ -4,9 +4,10 @@ let src = pkgs.fetchFromGitHub { owner = "mrossini-ethz"; repo = "physical-quantities"; - rev = "8feb66ef3293fcb9ff4c4bd3ee872bfc385a590e"; - sha256 = "1qznv0hmn2n7g9dxx1iw0qpr0pf2lnbahn0x0b3v50xzcb65kgig"; + rev = "v0.2.1"; + sha256 = "0mb2s94s6fhw5vfa89naalw7ld11sdsszlqpz0c65dvpfyfmmdmh"; }; + in depot.nix.buildLisp.library { name = "physical-quantities"; diff --git a/third_party/lisp/routes.nix b/third_party/lisp/routes.nix index 61c674966094..a76912c651a9 100644 --- a/third_party/lisp/routes.nix +++ b/third_party/lisp/routes.nix @@ -2,11 +2,22 @@ let - src = pkgs.fetchFromGitHub { - owner = "archimag"; - repo = "cl-routes"; - rev = "1b79e85aa653e1ec87e21ca745abe51547866fa9"; - sha256 = "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1"; + src = pkgs.applyPatches { + name = "routes-source"; + src = pkgs.fetchFromGitHub { + owner = "archimag"; + repo = "cl-routes"; + rev = "1b79e85aa653e1ec87e21ca745abe51547866fa9"; + sha256 = "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1"; + }; + + patches = [ + (pkgs.fetchpatch { + name = "fix-build-with-ccl.patch"; + url = "https://github.com/archimag/cl-routes/commit/2296cdc316ef8e34310f2718b5d35a30040deee0.patch"; + sha256 = "007c19kmymalam3v6l6y2qzch8xs3xnphrcclk1jrpggvigcmhax"; + }) + ]; }; in depot.nix.buildLisp.library { @@ -24,5 +35,4 @@ in depot.nix.buildLisp.library { "route.lisp" "mapper.lisp" ]; - } diff --git a/third_party/lisp/trivial-features.nix b/third_party/lisp/trivial-features.nix index 3ad424b8abdc..13a63bab1aba 100644 --- a/third_party/lisp/trivial-features.nix +++ b/third_party/lisp/trivial-features.nix @@ -10,6 +10,7 @@ in depot.nix.buildLisp.library { { sbcl = src + "/src/tf-sbcl.lisp"; ecl = src + "/src/tf-ecl.lisp"; + ccl = src + "/src/tf-openmcl.lisp"; } ]; } diff --git a/third_party/lisp/usocket.nix b/third_party/lisp/usocket.nix index dbbfd2fbf110..dc4281c795c0 100644 --- a/third_party/lisp/usocket.nix +++ b/third_party/lisp/usocket.nix @@ -14,7 +14,10 @@ in buildLisp.library { name = "usocket"; deps = with depot.third_party.lisp; [ (buildLisp.bundled "asdf") - (buildLisp.bundled "sb-bsd-sockets") + { + ecl = buildLisp.bundled "sb-bsd-sockets"; + sbcl = buildLisp.bundled "sb-bsd-sockets"; + } split-sequence ]; @@ -40,5 +43,9 @@ in buildLisp.library { # but usocket also has some ECL specific code { ecl = "${src}/backend/sbcl.lisp"; } { ecl = "${src}/backend/ecl.lisp"; } + + # Same for CCL + { ccl = "${src}/backend/openmcl.lisp"; } + { ccl = "${src}/backend/clozure.lisp"; } ]); } |