about summary refs log tree commit diff
path: root/pkgs/development/web
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-11 23:48:08 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-11 23:48:08 +0100
commitf33fa1b66bbf181503e87a957e05c841093f2f8d (patch)
tree8cbe0596681358965ebea30c2320dc3f53297827 /pkgs/development/web
parent5cf4905f3bec4c787820fae7a050c52be886c00a (diff)
parentea49ac04966380be9bc77c62c0d01862b515e6a6 (diff)
downloadnixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar
nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.gz
nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.bz2
nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.lz
nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.xz
nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.tar.zst
nixlib-f33fa1b66bbf181503e87a957e05c841093f2f8d.zip
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
Diffstat (limited to 'pkgs/development/web')
-rw-r--r--pkgs/development/web/remarkjs/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix
index bebf2d80caad..153b165da1e5 100644
--- a/pkgs/development/web/remarkjs/default.nix
+++ b/pkgs/development/web/remarkjs/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://remarkjs.com;
-    description = "A simple, in-browser, markdown-driven slideshow tool.";
+    description = "A simple, in-browser, markdown-driven slideshow tool";
     maintainers = [ stdenv.lib.maintainers.rickynils ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.mit;