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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
This commit is contained in:
Eelco Dolstra
2014-11-11 23:48:08 +01:00
parent 5cf4905f3b ea49ac0496
commit f33fa1b66b
307 changed files with 605 additions and 4972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/lisp-modules/lisp-packages.nix
View File

@@ -48,7 +48,7 @@ let lispPackages = rec {
alexandria = buildLispPackage rec {
baseName = "alexandria";
version = "git-20131029";
description = "Alexandria is a collection of portable public domain utilities.";
description = "A collection of portable public domain utilities";
deps = [];
src = pkgs.fetchgit {
url = "git://common-lisp.net/projects/alexandria/alexandria.git";
@@ -88,7 +88,7 @@ let lispPackages = rec {
esrap = buildLispPackage rec {
baseName = "esrap";
version = "git-20131029";
description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp.";
description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp";
deps = [alexandria];
src = pkgs.fetchgit {
url = "https://github.com/scymtym/esrap.git";