Skip to content

Commit

Permalink
lispPackages.quicklisp: 2018-04-30 -> 2018-08-31 ; regenerate packages
Browse files Browse the repository at this point in the history
Added a wrapper package that creates symlinks to OpenSSL libraries with
the actual versions, because we have 1.0.2 with .so-suffix .1.0.0 and
cl-async-ssl is unhappy because of that.

I continue to dislike cl-postgres and simple-date upstream packaging.
  • Loading branch information
7c6f434c committed Sep 12, 2018
1 parent ee6ecb0 commit 5048b0d
Show file tree
Hide file tree
Showing 102 changed files with 666 additions and 522 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/lisp-modules/lisp-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ let lispPackages = rec {
quicklispdist = pkgs.fetchurl {
# Will usually be replaced with a fresh version anyway, but needs to be
# a valid distinfo.txt
url = "http://beta.quicklisp.org/dist/quicklisp/2018-04-30/distinfo.txt";
sha256 = "0zpabwgvsmy90yca25sfixi6waixqdchllayyvcsdl3jaibbz4rq";
url = "http://beta.quicklisp.org/dist/quicklisp/2018-08-31/distinfo.txt";
sha256 = "1im4p6vcxkp5hrim28cdf5isyw8a1v9aqsz2xfsfp3z3qd49dixd";
};
buildPhase = '' true; '';
postInstall = ''
Expand Down
18 changes: 18 additions & 0 deletions pkgs/development/lisp-modules/openssl-lib-marked.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
with import ../../../default.nix {};
runCommand "openssl-lib-marked" {} ''
mkdir -p "$out/lib"
for lib in ssl crypto; do
version="${(builtins.parseDrvName openssl.name).version}"
ln -s "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version"
version="$(echo "$version" | sed -re 's/[a-z]+$//')"
while test -n "$version"; do
ln -sfT "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version"
nextversion="''${version%.*}"
if test "$version" = "$nextversion"; then
version=
else
version="$nextversion"
fi
done
done
''
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, ... }:
args @ { fetchurl, ... }:
rec {
baseName = ''alexandria'';
version = ''20170830-git'';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ fetchurl, ... }:
args @ { fetchurl, ... }:
rec {
baseName = ''array-utils'';
version = ''20180131-git'';
version = ''20180831-git'';

description = ''A few utilities for working with arrays.'';

deps = [ ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz'';
sha256 = ''01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0'';
url = ''http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz'';
sha256 = ''1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7'';
};

packageName = "array-utils";
Expand All @@ -18,8 +18,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
SHA256 01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0 URL
http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz
MD5 339670a03dd7d865cd045a6556d705c6 NAME array-utils FILENAME array-utils
DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS (array-utils-test)
SHA256 1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7 URL
http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz
MD5 fa07e8fac5263d4fed7acb3d53e5855a NAME array-utils FILENAME array-utils
DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS (array-utils-test)
PARASITES NIL) */
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, ... }:
args @ { fetchurl, ... }:
rec {
baseName = ''asdf-system-connections'';
version = ''20170124-git'';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''bordeaux-threads'';
version = ''v0.8.5'';
version = ''v0.8.6'';

parasites = [ "bordeaux-threads/test" ];

Expand All @@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."fiveam" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz'';
sha256 = ''1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y'';
};

packageName = "bordeaux-threads";
Expand All @@ -21,10 +21,10 @@ rec {
}
/* (SYSTEM bordeaux-threads DESCRIPTION
Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL
http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz
MD5 67e363a363e164b6f61a047957b8554e NAME bordeaux-threads FILENAME
1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y URL
http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz
MD5 f959d3902694b1fe6de450a854040f86 NAME bordeaux-threads FILENAME
bordeaux-threads DEPS
((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
DEPENDENCIES (alexandria fiveam) VERSION v0.8.5 SIBLINGS NIL PARASITES
DEPENDENCIES (alexandria fiveam) VERSION v0.8.6 SIBLINGS NIL PARASITES
(bordeaux-threads/test)) */
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ rec {

description = ''Tool for building up an xml dom of an excel spreadsheet nicely.'';

deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
Expand Down Expand Up @@ -34,16 +34,17 @@ rec {
(NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
(NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
(NAME iterate FILENAME iterate) (NAME puri FILENAME puri)
(NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank)
(NAME symbol-munger FILENAME symbol-munger)
(NAME iterate FILENAME iterate)
(NAME named-readtables FILENAME named-readtables)
(NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
(NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
DEPENDENCIES
(alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop
closure-common closure-html collectors cxml cxml-dom cxml-klacks cxml-test
cxml-xml flexi-streams iterate puri split-sequence swank symbol-munger
trivial-features trivial-gray-streams)
cxml-xml flexi-streams iterate named-readtables puri split-sequence swank
symbol-munger trivial-features trivial-gray-streams)
VERSION buildnode-20170403-git SIBLINGS
(buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode)
PARASITES NIL) */
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ rec {

description = ''Tool for building up an xml dom nicely.'';

deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
Expand Down Expand Up @@ -35,15 +35,17 @@ rec {
(NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
(NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
(NAME named-readtables FILENAME named-readtables)
(NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
(NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
DEPENDENCIES
(alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode
closer-mop closure-common closure-html collectors cxml cxml-dom
cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri
split-sequence swank symbol-munger trivial-features trivial-gray-streams)
cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2
named-readtables puri split-sequence swank symbol-munger trivial-features
trivial-gray-streams)
VERSION 20170403-git SIBLINGS
(buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml
buildnode-xul)
Expand Down
37 changes: 21 additions & 16 deletions pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''caveman'';
version = ''20171019-git'';
version = ''20180831-git'';

description = ''Web Application Framework for Common Lisp'';

deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz'';
sha256 = ''0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra'';
url = ''http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz'';
sha256 = ''0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s'';
};

packageName = "caveman";
Expand All @@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256
0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra URL
http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz
MD5 41318d26a0825e504042fa693959feaf NAME caveman FILENAME caveman DEPS
0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s URL
http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz
MD5 b417563f04b2619172127a6abeed786a NAME caveman FILENAME caveman DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)
(NAME bordeaux-threads FILENAME bordeaux-threads)
Expand All @@ -38,22 +38,26 @@ rec {
(NAME cl-syntax FILENAME cl-syntax)
(NAME cl-syntax-annot FILENAME cl-syntax-annot)
(NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
(NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
(NAME clack-socket FILENAME clack-socket)
(NAME clack-test FILENAME clack-test)
(NAME clack-v1-compat FILENAME clack-v1-compat)
(NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode)
(NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
(NAME flexi-streams FILENAME flexi-streams)
(NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
(NAME http-body FILENAME http-body)
(NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
(NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
(NAME lack-component FILENAME lack-component)
(NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
(NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
(NAME local-time FILENAME local-time) (NAME map-set FILENAME map-set)
(NAME marshal FILENAME marshal) (NAME myway FILENAME myway)
(NAME marshal FILENAME marshal) (NAME md5 FILENAME md5)
(NAME myway FILENAME myway)
(NAME named-readtables FILENAME named-readtables)
(NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
(NAME prove FILENAME prove) (NAME quri FILENAME quri)
(NAME smart-buffer FILENAME smart-buffer)
(NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
(NAME split-sequence FILENAME split-sequence)
(NAME static-vectors FILENAME static-vectors)
(NAME trivial-backtrace FILENAME trivial-backtrace)
Expand All @@ -67,14 +71,15 @@ rec {
(alexandria anaphora babel babel-streams bordeaux-threads cffi cffi-grovel
cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text
cl-base64 cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project
cl-reexport cl-syntax cl-syntax-annot cl-utilities clack clack-test
clack-v1-compat dexador do-urlencode fast-http fast-io flexi-streams
http-body ironclad jonathan lack lack-component lack-middleware-backtrace
lack-util let-plus local-time map-set marshal myway named-readtables
nibbles proc-parse prove quri smart-buffer split-sequence static-vectors
cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
clack-handler-hunchentoot clack-socket clack-test clack-v1-compat dexador
do-urlencode fast-http fast-io flexi-streams http-body hunchentoot
ironclad jonathan lack lack-component lack-middleware-backtrace lack-util
let-plus local-time map-set marshal md5 myway named-readtables nibbles
proc-parse prove quri rfc2388 smart-buffer split-sequence static-vectors
trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
trivial-mimes trivial-types usocket xsubseq)
VERSION 20171019-git SIBLINGS
VERSION 20180831-git SIBLINGS
(caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test
caveman2)
PARASITES NIL) */
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, ... }:
args @ { fetchurl, ... }:
rec {
baseName = ''chipz'';
version = ''20180328-git'';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, ... }:
args @ { fetchurl, ... }:
rec {
baseName = ''cl-aa'';
version = ''cl-vectors-20180228-git'';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, ... }:
args @ { fetchurl, ... }:
rec {
baseName = ''cl-anonfun'';
version = ''20111203-git'';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-async-repl'';
version = ''cl-async-20171130-git'';
version = ''cl-async-20180711-git'';

description = ''REPL integration for CL-ASYNC.'';

deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
};

packageName = "cl-async-repl";
Expand All @@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-repl FILENAME
1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-repl FILENAME
cl-async-repl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
Expand All @@ -39,5 +39,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
VERSION cl-async-20171130-git SIBLINGS
VERSION cl-async-20180711-git SIBLINGS
(cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
Loading

0 comments on commit 5048b0d

Please sign in to comment.