d42784eb48
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
49 lines
1,017 B
Nix
49 lines
1,017 B
Nix
{ depot, pkgs, ... }:
|
|
|
|
let
|
|
inherit (depot.nix) buildLisp;
|
|
src = with pkgs; srcOnly sbcl.pkgs.str;
|
|
in
|
|
buildLisp.library {
|
|
name = "str";
|
|
|
|
deps = with depot.third_party.lisp; [
|
|
{
|
|
sbcl = buildLisp.bundled "uiop";
|
|
default = buildLisp.bundled "asdf";
|
|
}
|
|
cl-ppcre
|
|
cl-ppcre.unicode
|
|
cl-change-case
|
|
];
|
|
|
|
srcs = [
|
|
(pkgs.runCommand "str.lisp" { } ''
|
|
substitute ${src}/str.lisp $out \
|
|
--replace-fail \
|
|
'(asdf:component-version (asdf:find-system "str"))' \
|
|
'"${pkgs.sbcl.pkgs.str.version}"'
|
|
'')
|
|
];
|
|
|
|
brokenOn = [
|
|
"ccl" # In REPLACE-USING: Shouldn't assign to variable I
|
|
];
|
|
|
|
tests = {
|
|
name = "str-test";
|
|
srcs = [ (src + "/test/test-str.lisp") ];
|
|
deps = [
|
|
{
|
|
sbcl = depot.nix.buildLisp.bundled "uiop";
|
|
default = depot.nix.buildLisp.bundled "asdf";
|
|
}
|
|
depot.third_party.lisp.prove
|
|
depot.third_party.lisp.fiveam
|
|
];
|
|
|
|
expression = ''
|
|
(fiveam:run! 'str::test-str)
|
|
'';
|
|
};
|
|
}
|