From e9ec56a59613dc42876db19989fa8d7f77902afa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 29 Dec 2013 19:38:43 +0400 Subject: [PATCH] Update vim_configurable to the same source tag as default vim --- pkgs/applications/editors/vim/configurable.nix | 18 ++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 789ddcc1039..28e610f27f9 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -19,10 +19,12 @@ composableDerivation { builtins.getAttr source { "default" = # latest release - args.fetchurl { - url = ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2; - sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh"; - }; + args.fetchhg { + url = "https://vim.googlecode.com/hg/"; + tag = "v7-4-131"; + sha256 = "1akr0i4pykbrkqwrglm0dfn5nwpncb9pgg4h7fl6a8likbr5f3wb"; + }; + "vim-nox" = { # vim nox branch: client-server without X by uing sockets @@ -53,14 +55,6 @@ composableDerivation { prePatch = "cd src"; - patches = - [ ./patches/7.4.001 ./patches/7.4.002 ./patches/7.4.003 ./patches/7.4.004 - ./patches/7.4.005 ./patches/7.4.006 ./patches/7.4.007 ./patches/7.4.008 - ./patches/7.4.009 ./patches/7.4.010 ./patches/7.4.011 ./patches/7.4.012 - ./patches/7.4.013 ./patches/7.4.014 ./patches/7.4.015 ./patches/7.4.016 - ./patches/7.4.017 ./patches/7.4.018 ./patches/7.4.019 ./patches/7.4.020 - ./patches/7.4.021 ./patches/7.4.022 ./patches/7.4.023 ]; - # most interpreters aren't tested yet.. (see python for example how to do it) flags = { ftNix = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75c1782ab63..7584e01e95f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9028,7 +9028,7 @@ let vimHugeX = vim_configurable; vim_configurable = callPackage ../applications/editors/vim/configurable.nix { - inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext + inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext composableDerivation lib config glib gtk python perl tcl ruby; inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE;