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

2
pkgs/development/web/remarkjs/default.nix
View File

@@ -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;