merge 'staging' into modular-stdenv

In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
parent a8fc68a5c0 773595540b
commit 1e389c976c
1133 changed files with 11926 additions and 2831 deletions
@@ -14,11 +14,11 @@ let
 in stdenv.mkDerivation rec {
  name = "remarkjs-${version}";

-  version = "0.6.4";
+  version = "0.6.5";

  src = fetchurl {
    url = "https://github.com/gnab/remark/archive/v${version}.tar.gz";
-    sha256 = "0sdhpn91b05qdqfqbfrhkfx8rkqrgm9pqg4bgjhxf9prfjhvmlrn";
+    sha256 = "1bh3hmhq99qqd3qg747xwjqkyppc9vf3b5nhi56556rwc02cn17p";
  };

  buildInputs = with nodePackages; [