From 21880ab6fb2622e2bd13049c0807ab1f9300b5f4 Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Sat, 1 Nov 2014 23:21:01 +0900
Subject: [PATCH 1/2] Update the sha256sum of the new MacVim build

Correct the update from #4576
---
 pkgs/applications/editors/vim/macvim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 8fc3a4108d2d..d7156321f1db 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "genoma";
     repo = "macvim";
     rev = "f9c084b97fa9d5cad2448dfd3eff3d9b7f0fac59";
-    sha256 = "190bngg8m4bwqcia7w24gn7mmqkhk0mavxy81ziwysam1f652ymf";
+    sha256 = "1f6l39s6cgyzzr9ix729axmc299mpl29abbc7571g4vply17m7nv";
   };
 
   enableParallelBuilding = true;

From c6089871bb6278d1a579474725b5a6a633648046 Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Sun, 2 Nov 2014 09:43:19 +0900
Subject: [PATCH 2/2] Use fetchurl and the exact release tag

---
 pkgs/applications/editors/vim/macvim.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index d7156321f1db..0003779a52e2 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ncurses, gettext,
+{ stdenv, fetchurl, ncurses, gettext,
   pkgconfig, cscope, python, ruby, tcl, perl, luajit
 }:
 
@@ -7,10 +7,8 @@ stdenv.mkDerivation rec {
 
   version = "7.4.479";
 
-  src = fetchFromGitHub {
-    owner = "genoma";
-    repo = "macvim";
-    rev = "f9c084b97fa9d5cad2448dfd3eff3d9b7f0fac59";
+  src = fetchurl {
+    url = "https://github.com/genoma/macvim/archive/g-snapshot-21.tar.gz";
     sha256 = "1f6l39s6cgyzzr9ix729axmc299mpl29abbc7571g4vply17m7nv";
   };