diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-11 23:48:08 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-11 23:48:08 +0100 |
| commit | f33fa1b66bbf181503e87a957e05c841093f2f8d (patch) | |
| tree | 8cbe0596681358965ebea30c2320dc3f53297827 /pkgs/development/lisp-modules | |
| parent | 5cf4905f3bec4c787820fae7a050c52be886c00a (diff) | |
| parent | ea49ac04966380be9bc77c62c0d01862b515e6a6 (diff) | |
| download | nixpkgs-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar nixpkgs-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.gz nixpkgs-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.bz2 nixpkgs-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.lz nixpkgs-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.xz nixpkgs-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.zst nixpkgs-f33fa1b66bbf181503e87a957e05c841093f2f8d.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/development/libraries/boost/generic.nix
Diffstat (limited to 'pkgs/development/lisp-modules')
| -rw-r--r-- | pkgs/development/lisp-modules/lisp-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 0d9383a465f..2b4cda88ef8 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -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"; |