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
38 lines
1.1 KiB
Nix
38 lines
1.1 KiB
Nix
{ depot, pkgs, ... }:
|
|
|
|
let
|
|
inherit (depot.nix.buildLisp) bundled;
|
|
src = with pkgs; srcOnly (sbcl.pkgs.nibbles.overrideAttrs (oldAttrs: {
|
|
patches = oldAttrs.patches or [ ] ++ [
|
|
# Restoring the weird progn apparently fixes unbound MAKE-EA and EAX-OFFSET
|
|
# which we were seeing during macroexpansion. Curiously, building niblbes
|
|
# with ASDF is not affected by this problem.
|
|
(pkgs.fetchpatch {
|
|
name = "nibbles-sbcl-x86-restore-weird-progn.patch";
|
|
url = "https://github.com/sharplispers/nibbles/commit/f37322b864ea12018bc0acbd70cb1e24bf0426eb.patch";
|
|
revert = true;
|
|
sha256 = "0h601g145qscmvykrzrf9bnlakfh5qawwmdd1z8f2cslfxrkj9jc";
|
|
})
|
|
];
|
|
}));
|
|
in
|
|
depot.nix.buildLisp.library {
|
|
name = "nibbles";
|
|
|
|
deps = with depot.third_party.lisp; [
|
|
(bundled "asdf")
|
|
];
|
|
|
|
srcs = map (f: src + ("/" + f)) [
|
|
"package.lisp"
|
|
"types.lisp"
|
|
"macro-utils.lisp"
|
|
"vectors.lisp"
|
|
"streams.lisp"
|
|
] ++ [
|
|
{ sbcl = "${src}/sbcl-opt/fndb.lisp"; }
|
|
{ sbcl = "${src}/sbcl-opt/nib-tran.lisp"; }
|
|
{ sbcl = "${src}/sbcl-opt/x86-vm.lisp"; }
|
|
{ sbcl = "${src}/sbcl-opt/x86-64-vm.lisp"; }
|
|
];
|
|
}
|