mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(nix/buildLisp): re-enable CCL

Browse source 
The problem went away once again, let's see how long it'll last this time.

As it turns out, CCL has a Unicode Standard conforming string
implementation that doesn't allow the use of (lone) surrogate code
points, requiring us to disable a test in cl-json which tested the
behavior of en- and decoding of such a (technically illegal) string.

Change-Id: I8bfa482934bbf94f86cecdde02d5c3d4e77950a5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6204
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
sterni 2022-08-30 15:23:09 +02:00 committed by clbot
parent e07556493f
commit 049ec22943
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nix/buildLisp/default.nix
View file

@ -154,8 +154,7 @@ let
let let
implementation = old.implementation or defaultImplementation; implementation = old.implementation or defaultImplementation;
brokenOn = old.brokenOn or [ ]; brokenOn = old.brokenOn or [ ];
# TODO(sterni): https://github.com/Clozure/ccl/issues/405 targets = lib.subtractLists (brokenOn ++ [ implementation.name ])
targets = lib.subtractLists (brokenOn ++ [ "ccl" implementation.name ])
(builtins.attrNames impls); (builtins.attrNames impls);
in in
{ {

4
third_party/lisp/cl-json.nix vendored
View file

@ -8,8 +8,8 @@ let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "sternenseemann"; owner = "sternenseemann";
repo = "cl-json"; repo = "cl-json";
rev = "479685029c511cb2011f2f2a99ca6c63aa2e4865"; rev = "c059bec94e28a11102a994d6949e2e52764f21fd";
sha256 = "1663xlzb0wj6kd0wy2cmhafrwip7vy0wlfckc519aj9j18aak5ja"; sha256 = "0l07syw1b1x2zi8kj4iph3rf6vi6c16b7fk69iv7x27wrdsr1qwj";
}; };
getSrcs = subdir: map (f: src + ("/" + subdir + "/" + f)); getSrcs = subdir: map (f: src + ("/" + subdir + "/" + f));