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
32 lines
702 B
Nix
32 lines
702 B
Nix
{ depot, pkgs, ... }:
|
|
|
|
let
|
|
inherit (depot.nix) buildLisp;
|
|
inherit (pkgs.sbcl.pkgs.frugal-uuid) src;
|
|
in
|
|
|
|
buildLisp.library {
|
|
# TODO(sterni): can't use / since name influences paths
|
|
name = "frugal-uuid-non-frugal";
|
|
|
|
deps = [
|
|
depot.third_party.lisp.frugal-uuid
|
|
depot.third_party.lisp.babel
|
|
depot.third_party.lisp.bordeaux-threads
|
|
depot.third_party.lisp.ironclad
|
|
depot.third_party.lisp.trivial-clock
|
|
];
|
|
|
|
# Note that these can be built individually, but we don't bother (yet)
|
|
srcs = builtins.map (f: "${src}/non-frugal/${f}") [
|
|
"strong-random"
|
|
"thread-safe"
|
|
"name-based"
|
|
"accurate-clock"
|
|
"minara"
|
|
];
|
|
|
|
brokenOn = [
|
|
"ecl" # trivial-clock
|
|
];
|
|
}
|