From 9f96ec8b03322baff57d0ceafe6714c45630bf56 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Mon, 6 Aug 2018 21:36:00 +0200 Subject: [PATCH 1/2] vimNox: drop not updated since 2012, see #40876 --- pkgs/applications/editors/vim/configurable.nix | 9 --------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 14 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 7a700e0956b..36450237b5a 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -73,15 +73,6 @@ in stdenv.mkDerivation rec { src = builtins.getAttr source { "default" = common.src; # latest release - - "vim-nox" = - { - # vim nox branch: client-server without X by uing sockets - # REGION AUTO UPDATE: { name="vim-nox"; type="hg"; url="https://code.google.com/r/yukihironakadaira-vim-cmdsrv-nox/"; branch="cmdsrv-nox"; } - src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-nox-hg-2082fc3.tar.bz2"; sha256 = "293164ca1df752b7f975fd3b44766f5a1db752de6c7385753f083499651bd13a"; }); - name = "vim-nox-hg-2082fc3"; - # END - }.src; }; patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1623c1262d6..fecf17fa184 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18746,11 +18746,6 @@ with pkgs; inherit lua; }); - vimNox = lowPrio (vim_configurable.override { - source = "vim-nox"; - lua = pkgs.lua5_1; # vimNox source is from 2012, requires older lua - }); - qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { From d0a2767e603ff1e06cfc60a957a71249c6187c7d Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Mon, 6 Aug 2018 21:37:29 +0200 Subject: [PATCH 2/2] ezquake: replace vimNox with vim this was the only package depending on the outdated vimNox --- pkgs/games/ezquake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index ff39d1b9965..14885e7a3b2 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, curl, expat , jansson, libpng, libjpeg, libGLU_combined, libXxf86vm, pcre -, pkgconfig, SDL2, vimNox }: +, pkgconfig, SDL2, vim }: stdenv.mkDerivation rec { name = pname + "-" + version; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - expat curl jansson libpng libjpeg libGLU_combined libXxf86vm pcre SDL2 vimNox + expat curl jansson libpng libjpeg libGLU_combined libXxf86vm pcre SDL2 vim ]; installPhase = with stdenv.lib; let