Skip to content

Commit 29e1afb

Browse files
committed
Remove seqan
1 parent f47d2be commit 29e1afb

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

.github/workflows/pkg.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
run: |
6767
sudo apt-get update
6868
sudo apt install -y sbcl
69-
./tools-for-build/nightly-version-bump --extensions=cando,seqan-clasp
69+
./tools-for-build/nightly-version-bump --extensions=cando
7070
rm -rf dependencies extensions src/lisp/kernel/contrib src/lisp/modules/asdf src/mps src/bdwgc src/libatomic_ops
7171
- name: Build Ubuntu packages
7272
uses: jtdor/build-deb-action@v1
@@ -152,7 +152,7 @@ jobs:
152152
run: |
153153
sudo apt-get update
154154
sudo apt install -y sbcl
155-
./tools-for-build/nightly-version-bump --extensions=cando,seqan-clasp
155+
./tools-for-build/nightly-version-bump --extensions=cando
156156
echo "(:skip-sync t)" > config.sexp
157157
- name: Build Debian packages
158158
uses: jtdor/build-deb-action@v1

debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ifneq (,$(filter clasp-cl,$(DOPACKAGES)))
2121
./koga --build-mode=bytecode-faso --reproducible-build --build-path=clasp-build/ --ldlibs=-ldl --package-path=$$(pwd)/debian/clasp-cl/ --bin-path=/usr/bin/ --share-path=/usr/share/clasp/ --lib-path=/usr/lib/clasp/ --dylib-path=/usr/lib/ --pkgconfig-path=/usr/lib/pkgconfig/
2222
endif
2323
ifneq (,$(filter cando,$(DOPACKAGES)))
24-
./koga --build-mode=bytecode-faso --reproducible-build --build-path=cando-build/ --extensions=cando,seqan-clasp --ldlibs=-ldl --package-path=$$(pwd)/debian/cando/ --bin-path=/usr/bin/ --share-path=/usr/share/clasp/ --lib-path=/usr/lib/clasp/ --dylib-path=/usr/lib/ --pkgconfig-path=/usr/lib/pkgconfig/
24+
./koga --build-mode=bytecode-faso --reproducible-build --build-path=cando-build/ --extensions=cando --ldlibs=-ldl --package-path=$$(pwd)/debian/cando/ --bin-path=/usr/bin/ --share-path=/usr/share/clasp/ --lib-path=/usr/lib/clasp/ --dylib-path=/usr/lib/ --pkgconfig-path=/usr/lib/pkgconfig/
2525
endif
2626

2727
override_dh_auto_build:

guix/cando.scm

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,9 @@
3636
(apply append
3737
(list (string-append source-dir "/src/bdwgc")
3838
(string-append source-dir "/src/libatomic_ops")
39-
(string-append source-dir "/src/lisp/modules/asdf")
40-
;; This is a special case: the parent is omitted
41-
;; from external-dirs, but added to descend-dirs.
42-
(string-append source-dir "/extensions/seqan-clasp/seqan"))
39+
(string-append source-dir "/src/lisp/modules/asdf"))
4340
(map-in-order scandir-absolute external-dirs)))
4441
(descend-dirs `(,@git-dirs
45-
,(string-append source-dir "/extensions/seqan-clasp")
4642
,@external-dirs))
4743
(predicates (map-in-order git-predicate (cons source-dir git-dirs))))
4844
(package
@@ -60,7 +56,7 @@
6056
(substitute-keyword-arguments (package-arguments clasp-cl)
6157
((#:configure-flags flags '())
6258
#~(cons*
63-
"--extensions=cando,seqan-clasp"
59+
"--extensions=cando"
6460
;; Had trouble simplifying this using find.
6561
;; This is prepended because Koga keeps the first instance
6662
;; of repeated options.

repos.sexp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,12 @@
219219
(:name :cando
220220
:repository "https://github.com/cando-developers/cando.git"
221221
:directory "extensions/cando/"
222-
:branch "dynamic-extension"
222+
:branch "main"
223223
:extension :cando)
224224
(:name :seqan-clasp
225225
:repository "https://github.com/clasp-developers/seqan-clasp.git"
226226
:directory "extensions/seqan-clasp/"
227-
:branch "dynamic-extension"
227+
:branch "main"
228228
:extension :seqan-clasp)
229229
(:name :seqan
230230
:repository "https://github.com/seqan/seqan.git"

0 commit comments

Comments
 (0)