feat(3p): upgrade sbcl to 2.1.2
sbcl 2.0.9 introduced a new warning: > minor incompatible change: the compiler signals a warning at > compile-time when an initform of T, NIL or 0 does not match > a STANDARD-CLASS slot's declared type. This broke a few packages, but they all have been fixed upstream in the meantime and we only need to bump their versions. The culprits are: * defclass-std which possibly has become unmaintained since the fix (december 2020). * cl-prevalence which also needs one symbol from bt now * lisp-binary which also includes a new file now Change-Id: I06bb47a129d5ef912a623315c1281aedd1ceac2a Reviewed-on: https://cl.tvl.fyi/c/depot/+/2934 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
parent
f39b5a8a0d
commit
968effb5dc
4 changed files with 10 additions and 10 deletions
5
third_party/lisp/cl-prevalence.nix
vendored
5
third_party/lisp/cl-prevalence.nix
vendored
|
@ -5,13 +5,14 @@
|
|||
let src = pkgs.fetchFromGitHub {
|
||||
owner = "40ants";
|
||||
repo = "cl-prevalence";
|
||||
rev = "da3ed6c4594b1c2fca90c178c1993973c4bf16c9";
|
||||
sha256 = "0bq905hv1626dl6b7s0zn4lbdh608g1pxaljl1fda6pwp9hmj95a";
|
||||
rev = "b1f90a525f37be0335a8761051fa5661aa74b696";
|
||||
sha256 = "1svw58pp7jxb9l08cgnqxf0cf8qa9qsb0z2fnv86a51z7pfz4c0g";
|
||||
};
|
||||
in depot.nix.buildLisp.library {
|
||||
name = "cl-prevalence";
|
||||
|
||||
deps = with depot.third_party.lisp; [
|
||||
bordeaux-threads
|
||||
s-xml
|
||||
s-sysdeps
|
||||
];
|
||||
|
|
6
third_party/lisp/defclass-std.nix
vendored
6
third_party/lisp/defclass-std.nix
vendored
|
@ -1,10 +1,12 @@
|
|||
# A shortcut macro to write DEFCLASS forms quickly
|
||||
# Seems to be unmaintained (since early 2021)
|
||||
{ depot, pkgs, ... }:
|
||||
|
||||
let src = pkgs.fetchFromGitHub {
|
||||
owner = "EuAndreh";
|
||||
repo = "defclass-std";
|
||||
rev = "0300f171c1308e5ff3efd66b4f4e766f2bcde259";
|
||||
sha256 = "0ggzh80ajx4k6w5c3xprnd7m27q5hx9xx9lxs4jv0pbrlg18ijcw";
|
||||
rev = "a4d32260a619eddf3a3e49df3af304f3c07ccec6";
|
||||
sha256 = "1c0ymb49wd205lzxmnmsrpqyv0pn61snn2xvsbk5iis135r4fr18";
|
||||
};
|
||||
in depot.nix.buildLisp.library {
|
||||
name = "defclass-std";
|
||||
|
|
5
third_party/lisp/lisp-binary.nix
vendored
5
third_party/lisp/lisp-binary.nix
vendored
|
@ -4,8 +4,8 @@
|
|||
let src = pkgs.fetchFromGitHub {
|
||||
owner = "j3pic";
|
||||
repo = "lisp-binary";
|
||||
rev = "1aefc8618b7734f68697ddf59bc93cb8522aa0bf";
|
||||
sha256 = "1hflzn3mjp32jz9fxx9wayp3c3x58s77cgjfbs06nrynqkv0c6df";
|
||||
rev = "052df578900dea59bf951e0a6749281fa73432e4";
|
||||
sha256 = "1i1s5g01aimfq6lndcl1pnw7ly5hdh0wmjp2dj9cjjwbkz9lnwcf";
|
||||
};
|
||||
in depot.nix.buildLisp.library {
|
||||
name = "lisp-binary";
|
||||
|
@ -26,5 +26,6 @@ in depot.nix.buildLisp.library {
|
|||
"reverse-stream.lisp"
|
||||
"binary-1.lisp"
|
||||
"binary-2.lisp"
|
||||
"types.lisp"
|
||||
];
|
||||
}
|
||||
|
|
4
third_party/overlays/tvl.nix
vendored
4
third_party/overlays/tvl.nix
vendored
|
@ -24,8 +24,4 @@ self: super: {
|
|||
clang-tools = (super.clang-tools.override {
|
||||
llvmPackages = self.llvmPackages_11;
|
||||
});
|
||||
|
||||
# Pick an older version of SBCL as the default, to avoid issues with
|
||||
# warnings in newer SBCL.
|
||||
sbcl = super.sbcl_2_0_8;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue