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

Conflicts: pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
parent 89f8af55f1 ce623950ad
commit 06fc1ec34d
244 changed files with 5400 additions and 908 deletions
@@ -21,7 +21,7 @@ composableDerivation {
        # latest release
      args.fetchhg {
            url = "https://vim.googlecode.com/hg/";
-            tag = "v7-4-316";
+            rev = "v7-4-316";
            sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
      };

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {

  src = fetchhg {
    url = "https://vim.googlecode.com/hg/";
-    tag = "v7-4-316";
+    rev = "v7-4-316";
    sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
  };