diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 61 |
1 files changed, 37 insertions, 24 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/infra/libkookie/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 909ddc5d1a9e..96d5867a3b30 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -32,9 +32,9 @@ in ''; preInstall = '' type gcc - mkdir -p "$out/lib/common-lisp/" + mkdir -p "$out/lib/common-lisp/" 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" ''; }; }; @@ -105,18 +105,6 @@ $out/lib/common-lisp/query-fs" ''; }; }; - serapeum = x: { - overrides = y: (x.overrides y) //{ - # Override src until quicklisp catches up to 65837f8 (see serapeum - # issue #42) - src = pkgs.fetchFromGitHub { - owner = "ruricolist"; - repo = "serapeum"; - rev = "65837f8a0d65b36369ec8d000fff5c29a395b5fe"; - sha256 = "0clwf81r2lvk1rbfvk91s9zmbkas9imf57ilqclw12mxaxlfsnbw"; - }; - }; - }; sqlite = x: { propagatedBuildInputs = [pkgs.sqlite]; overrides = y: (x.overrides y) // { @@ -134,15 +122,15 @@ $out/lib/common-lisp/query-fs" @@ -155,7 +155,7 @@ ,(unique-dir-name))) (user-homedir-pathname))) - + -(defvar *fasl-directory* (default-fasl-dir) +(defvar *fasl-directory* #P"$out/lib/common-lisp/swank/fasl/" "The directory where fasl files should be placed.") - + (defun binary-pathname (src-pathname binary-dir) @@ -277,12 +277,7 @@ (contrib-dir src-dir)))) - + (defun delete-stale-contrib-fasl-files (swank-files contrib-files fasl-dir) - (let ((newest (reduce #'max (mapcar #'file-write-date swank-files)))) - (dolist (src contrib-files) @@ -151,7 +139,7 @@ $out/lib/common-lisp/query-fs" - (<= (file-write-date fasl) newest)) - (delete-file fasl)))))) + (declare (ignore swank-files contrib-files fasl-dir))) - + (defun compile-contribs (&key (src-dir (contrib-dir *source-directory*)) (fasl-dir (contrib-dir *fasl-directory*)) EOD @@ -159,9 +147,6 @@ $out/lib/common-lisp/query-fs" }; }; uiop = x: { - parasites = (x.parasites or []) ++ [ - "uiop/version" - ]; overrides = y: (x.overrides y) // { postInstall = ((x.overrides y).postInstall or "") + '' cp -r "${pkgs.asdf}/lib/common-lisp/asdf/uiop/contrib" "$out/lib/common-lisp/uiop" @@ -200,9 +185,18 @@ $out/lib/common-lisp/query-fs" parasites = pkgs.lib.filter (x: x!= "buildnode-test") x.parasites; }; postmodern = x: { - overrides = y : (x.overrides y) // { - meta.broken = true; # 2018-04-10 - }; + asdFilesToKeep = (x.asdFilesToKeep or []) ++ ["postmodern.asd" "simple-date.asd"]; + parasites = (pkgs.lib.filter (x: x!= "postmodern/tests") x.parasites) ++ + ["simple-date/postgres-glue"]; + deps = pkgs.lib.filter + (x: x.name != quicklisp-to-nix-packages.simple-date.name) + x.deps; + }; + s-sql = x: { + parasites = pkgs.lib.filter (x: x!= "s-sql/tests") x.parasites; + deps = pkgs.lib.filter + (x: x.name != quicklisp-to-nix-packages.postmodern.name) + x.deps; }; split-sequence = x: { overrides = y: (x.overrides y) // { @@ -218,4 +212,23 @@ $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; + }; + cl-cffi-gtk-glib = addNativeLibs [pkgs.glib]; + cl-cffi-gtk-gdk-pixbuf = addNativeLibs [pkgs.gdk_pixbuf]; + cl-cffi-gtk-cairo = addNativeLibs [pkgs.cairo]; + cl-cffi-gtk-pango = addNativeLibs [pkgs.pango]; + cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3]; + cl-cffi-gtk-gtk3 = addNativeLibs [pkgs.gtk3]; + cl-webkit2 = addNativeLibs [pkgs.webkitgtk]; } |