Skip to content

Commit

Permalink
Remove seqan
Browse files Browse the repository at this point in the history
  • Loading branch information
yitzchak committed Dec 11, 2024
1 parent f47d2be commit 29e1afb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
run: |
sudo apt-get update
sudo apt install -y sbcl
./tools-for-build/nightly-version-bump --extensions=cando,seqan-clasp
./tools-for-build/nightly-version-bump --extensions=cando
rm -rf dependencies extensions src/lisp/kernel/contrib src/lisp/modules/asdf src/mps src/bdwgc src/libatomic_ops
- name: Build Ubuntu packages
uses: jtdor/build-deb-action@v1
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
run: |
sudo apt-get update
sudo apt install -y sbcl
./tools-for-build/nightly-version-bump --extensions=cando,seqan-clasp
./tools-for-build/nightly-version-bump --extensions=cando
echo "(:skip-sync t)" > config.sexp
- name: Build Debian packages
uses: jtdor/build-deb-action@v1
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ifneq (,$(filter clasp-cl,$(DOPACKAGES)))
./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/
endif
ifneq (,$(filter cando,$(DOPACKAGES)))
./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/
./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/
endif

override_dh_auto_build:
Expand Down
8 changes: 2 additions & 6 deletions guix/cando.scm
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,9 @@
(apply append
(list (string-append source-dir "/src/bdwgc")
(string-append source-dir "/src/libatomic_ops")
(string-append source-dir "/src/lisp/modules/asdf")
;; This is a special case: the parent is omitted
;; from external-dirs, but added to descend-dirs.
(string-append source-dir "/extensions/seqan-clasp/seqan"))
(string-append source-dir "/src/lisp/modules/asdf"))
(map-in-order scandir-absolute external-dirs)))
(descend-dirs `(,@git-dirs
,(string-append source-dir "/extensions/seqan-clasp")
,@external-dirs))
(predicates (map-in-order git-predicate (cons source-dir git-dirs))))
(package
Expand All @@ -60,7 +56,7 @@
(substitute-keyword-arguments (package-arguments clasp-cl)
((#:configure-flags flags '())
#~(cons*
"--extensions=cando,seqan-clasp"
"--extensions=cando"
;; Had trouble simplifying this using find.
;; This is prepended because Koga keeps the first instance
;; of repeated options.
Expand Down
4 changes: 2 additions & 2 deletions repos.sexp
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,12 @@
(:name :cando
:repository "https://github.com/cando-developers/cando.git"
:directory "extensions/cando/"
:branch "dynamic-extension"
:branch "main"
:extension :cando)
(:name :seqan-clasp
:repository "https://github.com/clasp-developers/seqan-clasp.git"
:directory "extensions/seqan-clasp/"
:branch "dynamic-extension"
:branch "main"
:extension :seqan-clasp)
(:name :seqan
:repository "https://github.com/seqan/seqan.git"
Expand Down

0 comments on commit 29e1afb

Please sign in to comment.