diff options
6 files changed, 135 insertions, 10 deletions
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix new file mode 100644 index 00000000000..9f4abb8e475 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clsql-postgresql-socket''; + version = ''clsql-20160208-git''; + + description = ''Common Lisp SQL PostgreSQL Socket Driver''; + + deps = [ args."clsql" args."md5" args."uffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; + sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + }; + + packageName = "clsql-postgresql-socket"; + + asdFilesToKeep = ["clsql-postgresql-socket.asd"]; + overrides = x: x; +} +/* (SYSTEM clsql-postgresql-socket DESCRIPTION + Common Lisp SQL PostgreSQL Socket Driver SHA256 + 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL + http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz + MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql-postgresql-socket FILENAME + clsql-postgresql-socket DEPS + ((NAME clsql FILENAME clsql) (NAME md5 FILENAME md5) + (NAME uffi FILENAME uffi)) + DEPENDENCIES (clsql md5 uffi) VERSION clsql-20160208-git SIBLINGS + (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket3 + clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests clsql-uffi clsql) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix new file mode 100644 index 00000000000..add3a15d27c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clsql-postgresql''; + version = ''clsql-20160208-git''; + + description = ''Common Lisp PostgreSQL API Driver''; + + deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; + sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + }; + + packageName = "clsql-postgresql"; + + asdFilesToKeep = ["clsql-postgresql.asd"]; + overrides = x: x; +} +/* (SYSTEM clsql-postgresql DESCRIPTION Common Lisp PostgreSQL API Driver + SHA256 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL + http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz + MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql-postgresql FILENAME + clsql-postgresql DEPS + ((NAME clsql FILENAME clsql) (NAME clsql-uffi FILENAME clsql-uffi) + (NAME uffi FILENAME uffi)) + DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20160208-git SIBLINGS + (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket + clsql-postgresql-socket3 clsql-sqlite clsql-sqlite3 clsql-tests clsql-uffi + clsql) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix new file mode 100644 index 00000000000..8243a337585 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix @@ -0,0 +1,30 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clsql-uffi''; + version = ''clsql-20160208-git''; + + description = ''Common UFFI Helper functions for Common Lisp SQL Interface Library''; + + deps = [ args."clsql" args."uffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; + sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + }; + + packageName = "clsql-uffi"; + + asdFilesToKeep = ["clsql-uffi.asd"]; + overrides = x: x; +} +/* (SYSTEM clsql-uffi DESCRIPTION + Common UFFI Helper functions for Common Lisp SQL Interface Library SHA256 + 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL + http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz + MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql-uffi FILENAME clsql-uffi + DEPS ((NAME clsql FILENAME clsql) (NAME uffi FILENAME uffi)) DEPENDENCIES + (clsql uffi) VERSION clsql-20160208-git SIBLINGS + (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket + clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 + clsql-tests clsql) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 762c7d47424..fab5f2f5048 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -36,6 +36,8 @@ cl-ppcre-unicode cl-reexport cl-smtp clsql +clsql-postgresql +clsql-postgresql-socket clss cl+ssl cl-syntax-annot @@ -69,7 +71,6 @@ form-fiddle fset http-body hu.dwim.asdf -hu.dwim.def hunchentoot idna ieee-floats diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 2b6b6e3817d..1047b60f1fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -540,14 +540,6 @@ let quicklisp-to-nix-packages = rec { })); - "md5" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."md5" or (x: {})) - (import ./quicklisp-to-nix-output/md5.nix { - inherit fetchurl; - })); - - "cl-postgres" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-postgres" or (x: {})) @@ -617,6 +609,24 @@ let quicklisp-to-nix-packages = rec { })); + "md5" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."md5" or (x: {})) + (import ./quicklisp-to-nix-output/md5.nix { + inherit fetchurl; + })); + + + "clsql-uffi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-uffi" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-uffi.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + "trivial-garbage" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-garbage" or (x: {})) @@ -1931,6 +1941,28 @@ let quicklisp-to-nix-packages = rec { })); + "clsql-postgresql-socket" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-postgresql-socket" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "md5" = quicklisp-to-nix-packages."md5"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clsql-postgresql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-postgresql" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-postgresql.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + "clsql" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clsql" or (x: {})) diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index 8480fe573bf..b29ba53159e 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -10,6 +10,6 @@ self = rec { lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mariadb}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mariadb}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; }; in stdenv.mkDerivation self |