diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
| commit | 7495c61d49208a9fc90b937bca548d9005ff17c8 (patch) | |
| tree | 5eec5f802d3146b8b1f788aa1275ea1c44a24d31 /pkgs/applications/editors | |
| parent | ed867a50eb89a90db3b1741bf4c0bf0cd4557dba (diff) | |
| parent | 899d81b37ba6dc26431b82b40300505f19504e03 (diff) | |
| download | nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.gz nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.bz2 nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.lz nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.xz nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.zst nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.zip | |
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts: pkgs/applications/editors/vim/macvim.nix
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/vim/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 95f654eb8cac..8f27f5409975 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -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; |