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
94 lines
1.8 KiB
Nix
94 lines
1.8 KiB
Nix
{ depot, pkgs, ... }:
|
|
|
|
let
|
|
inherit (depot.nix.buildLisp) bundled;
|
|
src = with pkgs; srcOnly sbcl.pkgs.postmodern;
|
|
|
|
cl-postgres = depot.nix.buildLisp.library {
|
|
name = "cl-postgres";
|
|
deps = with depot.third_party.lisp; [
|
|
md5
|
|
split-sequence
|
|
ironclad
|
|
cl-base64
|
|
uax-15
|
|
usocket
|
|
];
|
|
|
|
srcs = map (f: src + ("/cl-postgres/" + f)) [
|
|
"package.lisp"
|
|
"features.lisp"
|
|
"config.lisp"
|
|
"oid.lisp"
|
|
"errors.lisp"
|
|
"data-types.lisp"
|
|
"sql-string.lisp"
|
|
"trivial-utf-8.lisp"
|
|
"strings-utf-8.lisp"
|
|
"communicate.lisp"
|
|
"messages.lisp"
|
|
"ieee-floats.lisp"
|
|
"interpret.lisp"
|
|
"saslprep.lisp"
|
|
"scram.lisp"
|
|
"protocol.lisp"
|
|
"public.lisp"
|
|
"bulk-copy.lisp"
|
|
];
|
|
};
|
|
|
|
s-sql = depot.nix.buildLisp.library {
|
|
name = "s-sql";
|
|
deps = with depot.third_party.lisp; [
|
|
cl-postgres
|
|
alexandria
|
|
];
|
|
|
|
srcs = map (f: src + ("/s-sql/" + f)) [
|
|
"package.lisp"
|
|
"config.lisp"
|
|
"s-sql.lisp"
|
|
];
|
|
};
|
|
|
|
postmodern = depot.nix.buildLisp.library {
|
|
name = "postmodern";
|
|
|
|
deps = with depot.third_party.lisp; [
|
|
alexandria
|
|
cl-postgres
|
|
s-sql
|
|
global-vars
|
|
split-sequence
|
|
cl-unicode
|
|
closer-mop
|
|
bordeaux-threads
|
|
];
|
|
|
|
srcs = [
|
|
"${src}/postmodern.asd"
|
|
] ++ (map (f: src + ("/postmodern/" + f)) [
|
|
"package.lisp"
|
|
"config.lisp"
|
|
"connect.lisp"
|
|
"json-encoder.lisp"
|
|
"query.lisp"
|
|
"prepare.lisp"
|
|
"roles.lisp"
|
|
"util.lisp"
|
|
"transaction.lisp"
|
|
"namespace.lisp"
|
|
"execute-file.lisp"
|
|
"table.lisp"
|
|
"deftable.lisp"
|
|
]);
|
|
|
|
brokenOn = [
|
|
"ecl" # TODO(sterni): https://gitlab.com/embeddable-common-lisp/ecl/-/issues/651
|
|
];
|
|
};
|
|
|
|
in
|
|
postmodern // {
|
|
inherit s-sql cl-postgres;
|
|
}
|