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
34
third_party/lisp/trivial-clock.nix
vendored
Normal file
34
third_party/lisp/trivial-clock.nix
vendored
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ depot, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (depot.nix) buildLisp;
|
||||
src = pkgs.srcOnly pkgs.sbcl.pkgs.trivial-clock;
|
||||
in
|
||||
|
||||
buildLisp.library {
|
||||
name = "trivial-clock";
|
||||
|
||||
srcs = [
|
||||
"${src}/trivial-clock.lisp"
|
||||
];
|
||||
deps = [
|
||||
depot.third_party.lisp.cffi
|
||||
];
|
||||
|
||||
tests = {
|
||||
name = "trivial-clock-tests";
|
||||
deps = [
|
||||
depot.third_party.lisp.fiveam
|
||||
];
|
||||
srcs = [
|
||||
"${src}/trivial-clock-test.lisp"
|
||||
];
|
||||
expression = ''
|
||||
(fiveam:run! :trivial-clock)
|
||||
'';
|
||||
};
|
||||
|
||||
brokenOn = [
|
||||
"ecl" # dyn cffi
|
||||
];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue