diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-23 11:27:53 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-23 11:27:53 +0200 |
| commit | cd71f7a2e660440cbcf634ba97eaae310084d11a (patch) | |
| tree | a40196e3795a4f18ff8fcc9d0f93af0fc1afa3cb /pkgs/applications/editors | |
| parent | c1cf0b7dd5fccb16c8c470d8c766a050fd7a4a36 (diff) | |
| parent | 25b395bc8d8b1590723dc42edd97561611f8db68 (diff) | |
| download | nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.gz nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.bz2 nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.lz nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.xz nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.zst nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.zip | |
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts: pkgs/development/interpreters/ruby/ruby-19.nix pkgs/development/libraries/libc++/default.nix pkgs/development/libraries/libc++abi/default.nix pkgs/tools/text/sgml/opensp/default.nix
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/vim/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/editors/vim/macvim.nix | 5 |
2 files changed, 5 insertions, 6 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; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index feafa7b99777..ad40344f19f4 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,9 +1,8 @@ -{ stdenv, stdenvAdapters, gccApple, fetchFromGitHub, ncurses, gettext, +{ stdenv, stdenvAdapters, fetchFromGitHub, ncurses, gettext, pkgconfig, cscope, python, ruby, tcl, perl, luajit }: -let inherit (stdenvAdapters.overrideGCC stdenv gccApple) mkDerivation; -in mkDerivation rec { +stdenv.mkDerivation rec { name = "macvim-${version}"; version = "7.4.355"; |