chore(3p/lisp): port to new new lisp-modules set
Build //3p/lisp from pkgs proper, i.e. nixpkgs' nixos-unstable channel
instead of nixos-23.11 (yikes).
Basically, multiple package sets are attached to the different lisp
implementations now instead of having a “generic” lispPackages
set (which defaults to sbcl). We can just use that instead even though
it looks a bit weird having `srcOnly sbcl.pkgs.foo` everywhere when the
packages is not necessarily related to SBCL.
We could in theory create a source only package set by abusing how the
infrastructure works internally, but it's probably somewhat brittle:
callPackage (pkgs.path + "/pkgs/development/lisp-modules/imported.nix") {
build-asdf-system = { src, ... }: src;
}
Since we do a pretty hefty jump in package versions, many packages have
to be adapted to internal changes and restructuring:
- bordeaux-threads
- cffi
- cl-colors2 (which has been deprecated, but is still required by other
packages)
- cl-smtp
- cl-plus-ssl
- cl-prevalence
- hunchentoot (compiling the asd file no longer seemed to work)
- ironclad (fixes for SBCL compiler warnings caused a CCL compiler
warning)
- nibbles (revert the only commit to sbcl-opt/x86-vm.lisp that's new
compared to canon since it broke compilation for unknown reasons)
The following new packages had to be added as existing packages added
new dependencies:
- frugal-uuid, frugal-uuid/non-frugal
- trivial-clock
Change-Id: I8b94894df0357907cf2b27cf1e34a7e804b68e02
Reviewed-on: https://cl.tvl.fyi/c/depot/+/13134
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
parent
984c930a7c
commit
d42784eb48
63 changed files with 253 additions and 84 deletions
17
third_party/lisp/cl-plus-ssl.nix
vendored
17
third_party/lisp/cl-plus-ssl.nix
vendored
|
|
@ -4,12 +4,9 @@
|
|||
with depot.nix;
|
||||
|
||||
let
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/cl-plus-ssl/cl-plus-ssl.git";
|
||||
rev = "29081992f6d7b4e3aa2c5eeece4cd92b745071f4";
|
||||
hash = "sha256:16lyrixl98b7vy29dbbzkbq0xaz789350dajrr1gdny5i55rkjq0";
|
||||
};
|
||||
src = pkgs.srcOnly pkgs.sbcl.pkgs.cl_plus_ssl;
|
||||
in
|
||||
|
||||
buildLisp.library {
|
||||
name = "cl-plus-ssl";
|
||||
deps = with depot.third_party.lisp; [
|
||||
|
|
@ -20,6 +17,7 @@ buildLisp.library {
|
|||
trivial-features
|
||||
trivial-garbage
|
||||
trivial-gray-streams
|
||||
usocket
|
||||
{
|
||||
scbl = buildLisp.bundled "uiop";
|
||||
default = buildLisp.bundled "asdf";
|
||||
|
|
@ -30,15 +28,18 @@ buildLisp.library {
|
|||
native = [ pkgs.openssl ];
|
||||
|
||||
srcs = map (f: src + ("/src/" + f)) [
|
||||
"config.lisp"
|
||||
"package.lisp"
|
||||
"reload.lisp"
|
||||
"conditions.lisp"
|
||||
"ffi.lisp"
|
||||
"x509.lisp"
|
||||
"bio.lisp"
|
||||
"conditions.lisp"
|
||||
"ssl-funcall.lisp"
|
||||
"init.lisp"
|
||||
"ffi-buffer-all.lisp"
|
||||
"ffi-buffer.lisp"
|
||||
"streams.lisp"
|
||||
"bio.lisp"
|
||||
"x509.lisp"
|
||||
"random.lisp"
|
||||
"context.lisp"
|
||||
"verify-hostname.lisp"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue