# HG changeset patch # User ellis # Date 1704325280 18000 # Node ID 25af64bdea593b6ee2d0f360efb56ec85080b06d # Parent 8d8da0d4d52f56e896d51da52689a7e75193c697 quicklisp tweaks diff -r 8d8da0d4d52f -r 25af64bdea59 etc/skel/.sbclrc --- a/etc/skel/.sbclrc Wed Jan 03 18:00:16 2024 -0500 +++ b/etc/skel/.sbclrc Wed Jan 03 18:41:20 2024 -0500 @@ -1,8 +1,11 @@ ;;; ~/.sbclrc --- sbcl user init file -*- mode: common-lisp; -*- (in-package :cl-user) #-quicklisp -(let ((quicklisp-init "/usr/local/share/lisp/quicklisp/setup.lisp")) +(let ((quicklisp-init "/usr/local/share/quicklisp/setup.lisp")) (when (probe-file quicklisp-init) (load quicklisp-init))) -(require :sb-aclrepl) \ No newline at end of file +(pushnew (truename "/usr/local/share/lisp/") ql:*local-project-directories*) +(pushnew (truename "/usr/share/lisp/") ql:*local-project-directories* ) + +(require :sb-aclrepl) diff -r 8d8da0d4d52f -r 25af64bdea59 scripts/quicklisp-install.sh --- a/scripts/quicklisp-install.sh Wed Jan 03 18:00:16 2024 -0500 +++ b/scripts/quicklisp-install.sh Wed Jan 03 18:41:20 2024 -0500 @@ -13,7 +13,4 @@ # installs to /usr/local/share/lisp sbcl --non-interactive \ --load build/quicklisp.lisp \ - --eval "(quicklisp-quickstart:install :path \"/usr/local/share/lisp/quicklisp\" :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \ - -mkdir -pv /usr/local/share/lisp -cp build/quicklisp.lisp /usr/local/share/lisp/ + --eval "(quicklisp-quickstart:install :path \"/usr/local/share/quicklisp\" :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \ diff -r 8d8da0d4d52f -r 25af64bdea59 virt/build-ci-worker.sh --- a/virt/build-ci-worker.sh Wed Jan 03 18:00:16 2024 -0500 +++ b/virt/build-ci-worker.sh Wed Jan 03 18:41:20 2024 -0500 @@ -7,7 +7,7 @@ buildah add $id etc/skel/ /etc/skel/ buildah copy $id etc/skel/ /root/ buildah run $id adduser worker -D -buildah run $id apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl perl llvm clang +buildah run $id apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl perl llvm clang pkg-config buildah run $id mkdir /store buildah run $id mkdir /stash buildah run $id mkdir /usr/share/lisp