diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
| commit | 5185bc177309c62e53dad1ad346d1220f0e77bd4 (patch) | |
| tree | 52f5878b394abf2ef326765d46880ccbabd84903 /pkgs/applications/editors/vim/configurable.nix | |
| parent | 07615735077db344539eb9131823600593f0eddf (diff) | |
| parent | f402c6321aa3c6e56f5e1f1e36c4ad459c881309 (diff) | |
| download | nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.gz nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.bz2 nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.lz nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.xz nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.zst nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/editors/vim/configurable.nix')
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index d041295ee9fb..f0d76eae3b4f 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,6 +1,6 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc -args@{pkgs, source ? "default", fetchurl, fetchhg, stdenv, ncurses, pkgconfig, gettext +args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgconfig, gettext , composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -50,10 +50,11 @@ composableDerivation { builtins.getAttr source { "default" = # latest release - args.fetchhg { - url = "http://vim.googlecode.com/hg/"; - rev = "v${version}"; - sha256 = "01m67lvnkz0ad28ifj964zcg63y5hixplbnzas5xarj8vl3pc5a0"; + args.fetchFromGitHub { + owner = "vim"; + repo = "vim"; + rev = "v${version}"; + sha256 = "04hp2gqbbj9h872bgj1g9xcaj5qlg9q45v6by2ch9n105dng9aj3"; }; "vim-nox" = |