Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging

Conflicts: pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
parent ed867a50eb 899d81b37b
commit 7495c61d49
93 changed files with 1019 additions and 1035 deletions
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
  name = "vim-${version}";

-  version = "7.4.335";
+  version = "7.4.410";

  src = fetchhg {
    url = "https://vim.googlecode.com/hg/";
-    rev = "v7-4-335";
-    sha256 = "0qnpzfcbi6fhz82pj68l4vrnigca1akq2ksrxz6krwlfhns6jhhj";
+    rev = "v7-4-410";
+    sha256 = "145llhj6gq2bh9b7p8xkxc388krrximq80b87f3cn4w4d4k9fhqp";
  };

  enableParallelBuilding = true;