Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

stdenv.mkDerivation rec {
pname = "sbcl";
version = "2.0.0";
version = "2.0.9";

src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
sha256 = "1krgd69cirp4ili2pfsh1a0mfvq722jbknlvmf17qhsxh1b94dlh";
sha256 = "sha256:17wvrcwgp45z9b6arik31fjnz7908qhr5ackxq1y0gqi1hsh1xy4";
};

buildInputs = [texinfo];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/sbcl/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

stdenv.mkDerivation rec {
pname = "sbcl";
version = "2.0.2";
version = "2.0.8";

src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
sha256 = "07pyzdjnhcpqwvr3rrk4i18maqdywbq1qj93fnpx1h4b7dp08r28";
sha256 = "sha256:1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390";
};

buildInputs = [texinfo];
Expand Down
8 changes: 8 additions & 0 deletions pkgs/development/lisp-modules/README.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
Want to add a package? There are 3 simple steps!
1. Add the needed system names to quicklisp-to-nix-systems.txt.
2. cd <path to quicklisp-to-nix-systems.txt> ; nix-shell --run 'quicklisp-to-nix .'
You might want to specify also the --cacheSystemInfoDir and --cacheFaslDir
parameters to preserve some data between runs. For example, it is very
useful when you add new packages with native dependencies and fail to
specify the native dependencies correctly the first time.
(Might be nice to ensure the cache directories exist)
3. Add native libraries and whatever else is needed to quicklisp-to-nix-overrides.nix.
4. Sometimes there are problems with loading implementation-provided systems.
In this case you might need to add more systems in the implementation's (so
SBCL's) entry into *implementation-systems* in quicklisp-to-nix/system-info.lisp

To update to a more recent quicklisp dist modify
lispPackages.quicklisp to have a more recent distinfo.
Expand Down
26 changes: 24 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 = "https://beta.quicklisp.org/dist/quicklisp/2019-12-27/distinfo.txt";
sha256 = "0fz0k7ydmddxvxyid0nkifap21n6bxap602qhqsac2dxglv3i4cs";
url = "https://beta.quicklisp.org/dist/quicklisp/2020-10-16/distinfo.txt";
sha256 = "sha256:090xjcnyqcv8az9n1a7m0f6vzz2nwcncy95ha7ixb7fnd2rj1n65";
};
buildPhase = '' true; '';
postInstall = ''
Expand Down Expand Up @@ -77,5 +77,27 @@ let lispPackages = rec {
'';
dontStrip = true;
};

clx-truetype = buildLispPackage rec {
baseName = "clx-truetype";
version = ''20160825-git'';

buildSystems = [ "clx-truetype" ];
parasites = [ "clx-truetype-test" ];

description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.'';
deps = with pkgs.lispPackages; [
alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store
cl-vectors clx trivial-features zpb-ttf
];
src = pkgs.fetchurl {
url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67'';
};

packageName = "clx-truetype";

asdFilesToKeep = ["clx-truetype.asd"];
};
};
in lispPackages
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
args @ { fetchurl, ... }:
rec {
baseName = ''_3bmd-ext-code-blocks'';
version = ''3bmd-20200925-git'';

description = ''extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma'';

deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz'';
sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw'';
};

packageName = "3bmd-ext-code-blocks";

asdFilesToKeep = ["3bmd-ext-code-blocks.asd"];
overrides = x: x;
}
/* (SYSTEM 3bmd-ext-code-blocks DESCRIPTION
extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma
SHA256 0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw URL
http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz MD5
3b2c0b2094e473234742d150ac84abdd NAME 3bmd-ext-code-blocks FILENAME
_3bmd-ext-code-blocks DEPS
((NAME 3bmd FILENAME _3bmd) (NAME alexandria FILENAME alexandria)
(NAME colorize FILENAME colorize) (NAME esrap FILENAME esrap)
(NAME html-encode FILENAME html-encode)
(NAME split-sequence FILENAME split-sequence))
DEPENDENCIES (3bmd alexandria colorize esrap html-encode split-sequence)
VERSION 3bmd-20200925-git SIBLINGS
(3bmd-ext-definition-lists 3bmd-ext-math 3bmd-ext-tables
3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube 3bmd)
PARASITES NIL) */
18 changes: 9 additions & 9 deletions pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''_3bmd'';
version = ''20171019-git'';
version = ''20200925-git'';

description = ''markdown processor in CL using esrap parser.'';

deps = [ args."alexandria" args."esrap" args."split-sequence" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz'';
sha256 = ''1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz'';
url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz'';
sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw'';
};

packageName = "3bmd";
Expand All @@ -18,13 +18,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256
1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz URL
http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz MD5
d691962a511f2edc15f4fc228ecdf546 NAME 3bmd FILENAME _3bmd DEPS
0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw URL
http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz MD5
3b2c0b2094e473234742d150ac84abdd NAME 3bmd FILENAME _3bmd DEPS
((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap)
(NAME split-sequence FILENAME split-sequence))
DEPENDENCIES (alexandria esrap split-sequence) VERSION 20171019-git
DEPENDENCIES (alexandria esrap split-sequence) VERSION 20200925-git
SIBLINGS
(3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables
3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)
(3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-math
3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)
PARASITES NIL) */
27 changes: 0 additions & 27 deletions pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''alexandria'';
version = ''20191227-git'';
version = ''20200925-git'';

description = ''Alexandria is a collection of portable public domain utilities.'';

deps = [ ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/alexandria/2019-12-27/alexandria-20191227-git.tgz'';
sha256 = ''1vq19i7mcx3dk8vd8l92ld33birs9qhwcs7hbwwphvrwsrxbnd89'';
url = ''http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz'';
sha256 = ''1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl'';
};

packageName = "alexandria";
Expand All @@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM alexandria DESCRIPTION
Alexandria is a collection of portable public domain utilities. SHA256
1vq19i7mcx3dk8vd8l92ld33birs9qhwcs7hbwwphvrwsrxbnd89 URL
http://beta.quicklisp.org/archive/alexandria/2019-12-27/alexandria-20191227-git.tgz
MD5 634105318a9c82a2a2729d0305c91667 NAME alexandria FILENAME alexandria
DEPS NIL DEPENDENCIES NIL VERSION 20191227-git SIBLINGS (alexandria-tests)
1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl URL
http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz
MD5 59c8237a854de6f4f93328cd5747cd14 NAME alexandria FILENAME alexandria
DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS (alexandria-tests)
PARASITES NIL) */

This file was deleted.

This file was deleted.

14 changes: 7 additions & 7 deletions pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''babel'';
version = ''20191130-git'';
version = ''20200925-git'';

description = ''Babel, a charset conversion library.'';

deps = [ args."alexandria" args."trivial-features" ];

src = fetchurl {
url = ''http://beta.quicklisp.org/archive/babel/2019-11-30/babel-20191130-git.tgz'';
sha256 = ''0rnb7waq3fi51g2fxrazkyr2fmksqp0syjhni005vzzlbykmkavd'';
url = ''http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz'';
sha256 = ''1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi'';
};

packageName = "babel";
Expand All @@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256
0rnb7waq3fi51g2fxrazkyr2fmksqp0syjhni005vzzlbykmkavd URL
http://beta.quicklisp.org/archive/babel/2019-11-30/babel-20191130-git.tgz
MD5 80087c99fe351d24e56bb279a62effeb NAME babel FILENAME babel DEPS
1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi URL
http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz
MD5 7f64d3be80bcba19d9caeaede5dea6d8 NAME babel FILENAME babel DEPS
((NAME alexandria FILENAME alexandria)
(NAME trivial-features FILENAME trivial-features))
DEPENDENCIES (alexandria trivial-features) VERSION 20191130-git SIBLINGS
DEPENDENCIES (alexandria trivial-features) VERSION 20200925-git SIBLINGS
(babel-streams babel-tests) PARASITES NIL) */
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''bordeaux-threads'';
version = ''v0.8.7'';
version = ''v0.8.8'';

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/2019-11-30/bordeaux-threads-v0.8.7.tgz'';
sha256 = ''1an8fgam16nyhfninm0gl8k666f93k9j7kwmg43g8qcimyaj3l6w'';
url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz'';
sha256 = ''1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp'';
};

packageName = "bordeaux-threads";
Expand All @@ -21,10 +21,10 @@ rec {
}
/* (SYSTEM bordeaux-threads DESCRIPTION
Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
1an8fgam16nyhfninm0gl8k666f93k9j7kwmg43g8qcimyaj3l6w URL
http://beta.quicklisp.org/archive/bordeaux-threads/2019-11-30/bordeaux-threads-v0.8.7.tgz
MD5 071b427dd047999ffe038a2ef848ac13 NAME bordeaux-threads FILENAME
1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp URL
http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz
MD5 1922316721bcaa10142ed07c31b178e5 NAME bordeaux-threads FILENAME
bordeaux-threads DEPS
((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
DEPENDENCIES (alexandria fiveam) VERSION v0.8.7 SIBLINGS NIL PARASITES
DEPENDENCIES (alexandria fiveam) VERSION v0.8.8 SIBLINGS NIL PARASITES
(bordeaux-threads/test)) */
Loading