alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #44569 from xeji/p/drop-vimNox

Browse source 
vimNox: drop
This commit is contained in:
Jörg Thalheim 2018-08-07 01:26:47 +01:00 committed by GitHub
parent 9d825127b5 d0a2767e60
commit 3a609282a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/editors/vim/configurable.nix
View file

@ -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;

4
pkgs/games/ezquake/default.nix
View file

@ -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

5
pkgs/top-level/all-packages.nix
View file

@ -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 {