public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lispPackages.dbi: break test-only dependency loops

Browse Source
This commit is contained in:
Michael Raskin 2020-10-24 13:25:53 +02:00
parent a84b759e99
commit da2a4ce7f4
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
View File

@ -32,9 +32,9 @@ in
''; '';
preInstall = '' preInstall = ''
type gcc type gcc
mkdir -p "$out/lib/common-lisp/" mkdir -p "$out/lib/common-lisp/"
cp -r . "$out/lib/common-lisp/cl-fuse/" cp -r . "$out/lib/common-lisp/cl-fuse/"
"gcc" "-x" "c" "$out/lib/common-lisp/cl-fuse/fuse-launcher.c-minus" "-fPIC" "--shared" "-lfuse" "-o" "$out/lib/common-lisp/cl-fuse/libfuse-launcher.so" "gcc" "-x" "c" "$out/lib/common-lisp/cl-fuse/fuse-launcher.c-minus" "-fPIC" "--shared" "-lfuse" "-o" "$out/lib/common-lisp/cl-fuse/libfuse-launcher.so"
''; '';
}; };
}; };
@ -134,15 +134,15 @@ $out/lib/common-lisp/query-fs"
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
,(unique-dir-name))) ,(unique-dir-name)))
(user-homedir-pathname))) (user-homedir-pathname)))
-(defvar *fasl-directory* (default-fasl-dir) -(defvar *fasl-directory* (default-fasl-dir)
+(defvar *fasl-directory* #P"$out/lib/common-lisp/swank/fasl/" +(defvar *fasl-directory* #P"$out/lib/common-lisp/swank/fasl/"
"The directory where fasl files should be placed.") "The directory where fasl files should be placed.")
(defun binary-pathname (src-pathname binary-dir) (defun binary-pathname (src-pathname binary-dir)
@@ -277,12 +277,7 @@ @@ -277,12 +277,7 @@
(contrib-dir src-dir)))) (contrib-dir src-dir))))
(defun delete-stale-contrib-fasl-files (swank-files contrib-files fasl-dir) (defun delete-stale-contrib-fasl-files (swank-files contrib-files fasl-dir)
- (let ((newest (reduce #'max (mapcar #'file-write-date swank-files)))) - (let ((newest (reduce #'max (mapcar #'file-write-date swank-files))))
- (dolist (src contrib-files) - (dolist (src contrib-files)
@ -151,7 +151,7 @@ $out/lib/common-lisp/query-fs"
- (<= (file-write-date fasl) newest)) - (<= (file-write-date fasl) newest))
- (delete-file fasl)))))) - (delete-file fasl))))))
+ (declare (ignore swank-files contrib-files fasl-dir))) + (declare (ignore swank-files contrib-files fasl-dir)))
(defun compile-contribs (&key (src-dir (contrib-dir *source-directory*)) (defun compile-contribs (&key (src-dir (contrib-dir *source-directory*))
(fasl-dir (contrib-dir *fasl-directory*)) (fasl-dir (contrib-dir *fasl-directory*))
EOD EOD
@ -215,4 +215,16 @@ $out/lib/common-lisp/query-fs"
''; '';
}; };
}; };
dbi = x: {
parasites = [];
deps = pkgs.lib.filter
(x:
(
x.name != quicklisp-to-nix-packages.dbd-mysql.name &&
x.name != quicklisp-to-nix-packages.dbd-postgres.name &&
x.name != quicklisp-to-nix-packages.dbd-sqlite3.name &&
x.name != quicklisp-to-nix-packages.dbi-test.name &&
true))
x.deps;
};
} }