refactor(3p/lisp): Use sources from nixpkgs where possible
nixpkgs includes a lispPackages set which is generated from something. In the meantime, we pretty much never update our Lisp deps. This commit ties our sources to nixpkgs.lispPackages where the desired package is included in nixpkgs (which is actually most of them!) Change-Id: I520a006535980271b2fa4e0ed4e34029475dcbef Reviewed-on: https://cl.tvl.fyi/c/depot/+/4331 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
parent
b0614b5c83
commit
e9bfa84aaf
49 changed files with 172 additions and 359 deletions
25
third_party/lisp/uax-15.nix
vendored
25
third_party/lisp/uax-15.nix
vendored
|
@ -3,16 +3,7 @@
|
|||
let
|
||||
inherit (pkgs) runCommand;
|
||||
inherit (depot.nix.buildLisp) bundled;
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "sabracrolleton";
|
||||
repo = "uax-15";
|
||||
rev = "a62fc7253663fac6467fc6b6bb69a73a0e8dfaa0";
|
||||
sha256 = "028kc3yfi29qjxs2nyr7dbrr2rcrr8lwpvbxvrq3g8bcwamc4jz4";
|
||||
};
|
||||
|
||||
# src = ../../../uax-15;
|
||||
|
||||
src = with pkgs; srcOnly lispPackages.uax-15;
|
||||
in depot.nix.buildLisp.library {
|
||||
name = "uax-15";
|
||||
|
||||
|
@ -23,22 +14,28 @@ in depot.nix.buildLisp.library {
|
|||
];
|
||||
|
||||
srcs = [
|
||||
"${src}/uax-15.asd"
|
||||
"${src}/src/package.lisp"
|
||||
"${src}/src/utilities.lisp"
|
||||
"${src}/src/trivial-utf-16.lisp"
|
||||
|
||||
# uax-15 has runtime data files that need to have their references
|
||||
# replaced with store paths.
|
||||
#
|
||||
# additionally there are some wonky variable usages of variables
|
||||
# that are never defined, for which we patch in defvar statements.
|
||||
(runCommand "precomputed-tables.lisp" {} ''
|
||||
substitute ${src}/src/precomputed-tables.lisp precomputed-tables.lisp \
|
||||
--replace "(asdf:system-source-directory (asdf:find-system 'uax-15 nil))" \
|
||||
'"${src}/"'
|
||||
|
||||
sed -i precomputed-tables.lisp \
|
||||
-e '17i(defvar *canonical-decomp-map*)' \
|
||||
-e '17i(defvar *compatible-decomp-map*)' \
|
||||
-e '17i(defvar *canonical-combining-class*)'
|
||||
-e '10i(defvar *canonical-decomp-map*)' \
|
||||
-e '10i(defvar *compatible-decomp-map*)' \
|
||||
-e '10i(defvar *canonical-combining-class*)'
|
||||
|
||||
cp precomputed-tables.lisp $out
|
||||
'')
|
||||
|
||||
"${src}/src/normalize-backend.lisp"
|
||||
"${src}/src/uax-15.lisp"
|
||||
];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue