diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-08-07 01:26:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 01:26:47 +0100 |
| commit | 3a609282a7f2d5fc179fc655f28d2c632c1069cb (patch) | |
| tree | e8a2bc67bec377c3a5b9eedb6555b5ca7cf4798b /pkgs | |
| parent | 9d825127b5e10d1e205a19b35d0c1ba429a87c2f (diff) | |
| parent | d0a2767e603ff1e06cfc60a957a71249c6187c7d (diff) | |
Merge pull request #44569 from xeji/p/drop-vimNox
vimNox: drop
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 9 | ||||
| -rw-r--r-- | pkgs/games/ezquake/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 7a700e0956b82..36450237b5a9e 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/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index ff39d1b996500..14885e7a3b2b3 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91ad3bbb83cd9..226a1ccc635bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18784,11 +18784,6 @@ with pkgs; guiSupport = "gtk3"; }); - 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 { |