diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-12-26 14:16:15 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-12-26 14:17:36 +0100 |
| commit | 77b6c3cd06a679140fb5a44f81f904497007f333 (patch) | |
| tree | e8ed1606b326cdafba719cc2a14c527c1b601f2e /pkgs/misc | |
| parent | 602bccd1a8262d4e6bd787838d21fc3c2c1c50ba (diff) | |
| parent | 4d2dd1554618831f0a5b159b8a4dff86612c02a9 (diff) | |
Merge remote-tracking branch 'origin/master' into gcc-9
Diffstat (limited to 'pkgs/misc')
91 files changed, 1501 insertions, 1727 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ffac9a97b2815..d18829673cc7d 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.2.12"; + version = if stdenv.isDarwin then "2.2.6" else "2.3.0"; passthru = { inherit version; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = if version == "2.2.6" then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20" - else "1a4sgx5y7z16flmpnchd2ix294bnzy0v8mdkd96a4j27kr2anq8g"; + else "19d1jpdpxy0fclq37pchi7ldnw9dssxx3zskcgqai3h0rwlh5bxc"; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index b6219e1c749ef..adc4ead94b791 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -1,49 +1,55 @@ -{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux }: +{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, pkgsi686Linux, zlib }: let i686_NIX_GCC = pkgsi686Linux.callPackage ({gcc}: gcc) {}; i686_libxml2 = pkgsi686Linux.callPackage ({libxml2}: libxml2) {}; + commonVer = "4.10"; + version = "3.70"; + dl = "8/0100007658/08"; + + versionNoDots = builtins.replaceStrings ["."] [""] version; src_canon = fetchurl { - url = "https://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip"; - sha256 = "1qpdmaaw42gm5fi21rp4lf05skffkq42ka5c8xkw8rckzb13sy9j"; + url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-uken-05.tar.gz"; + sha256 = "0424lvyrsvsb94qga4p4ldis7f714c5yw5ydv3f84mdl2a7papg0"; }; in stdenv.mkDerivation { - name = "canon-cups-ufr2-2.90"; + pname = "canon-cups-ufr2"; + version = version; src = src_canon; phases = [ "unpackPhase" "installPhase" ]; postUnpack = '' - (cd $sourceRoot; tar -xzf Sources/cndrvcups-common-2.90-1.tar.gz) - (cd $sourceRoot; tar -xzf Sources/cndrvcups-lb-2.90-1.tar.gz) + (cd $sourceRoot; tar -xzf Sources/cndrvcups-common-${commonVer}-1.tar.gz) + (cd $sourceRoot; tar -xzf Sources/cndrvcups-lb-${version}-1.tar.gz) ''; nativeBuildInputs = [ makeWrapper unzip autoreconfHook libtool ]; - buildInputs = [ cups ]; + buildInputs = [ cups zlib ]; installPhase = '' ## ## cndrvcups-common buildPhase ## - ( cd cndrvcups-common-2.90/buftool + ( cd cndrvcups-common-${commonVer}/buftool autoreconf -fi ./autogen.sh --prefix=$out --enable-progpath=$out/bin --libdir=$out/lib --disable-shared --enable-static make ) - ( cd cndrvcups-common-2.90/backend + ( cd cndrvcups-common-${commonVer}/backend ./autogen.sh --prefix=$out --libdir=$out/lib make ) - ( cd cndrvcups-common-2.90/c3plmod_ipc + ( cd cndrvcups-common-${commonVer}/c3plmod_ipc make ) @@ -51,19 +57,19 @@ stdenv.mkDerivation { ## cndrvcups-common installPhase ## - ( cd cndrvcups-common-2.90/buftool + ( cd cndrvcups-common-${commonVer}/buftool make install ) - ( cd cndrvcups-common-2.90/backend + ( cd cndrvcups-common-${commonVer}/backend make install ) - ( cd cndrvcups-common-2.90/c3plmod_ipc + ( cd cndrvcups-common-${commonVer}/c3plmod_ipc make install DESTDIR=$out/lib ) - ( cd cndrvcups-common-2.90/libs + ( cd cndrvcups-common-${commonVer}/libs chmod 755 * mkdir -p $out/lib32 mkdir -p $out/bin @@ -72,15 +78,22 @@ stdenv.mkDerivation { cp libc3pl.so.0.0.1 $out/lib32 cp libcaepcm.so.1.0 $out/lib32 cp libColorGear.so.0.0.0 $out/lib32 - cp libColorGearC.so.0.0.0 $out/lib32 + cp libColorGearC.so.1.0.0 $out/lib32 cp libcanon_slim.so.1.0.0 $out/lib32 cp c3pldrv $out/bin ) - (cd cndrvcups-common-2.90/data + (cd cndrvcups-common-${commonVer}/Rule + mkdir -p $out/share/usb + chmod 644 *.usb-quirks $out/share/usb + ) + + (cd cndrvcups-common-${commonVer}/data chmod 644 *.ICC mkdir -p $out/share/caepcm cp *.ICC $out/share/caepcm + cp *.icc $out/share/caepcm + cp *.PRF $out/share/caepcm ) (cd $out/lib32 @@ -96,8 +109,8 @@ stdenv.mkDerivation { ln -sf libcanon_slim.so.1.0.0 libcanon_slim.so ln -sf libColorGear.so.0.0.0 libColorGear.so.0 ln -sf libColorGear.so.0.0.0 libColorGear.so - ln -sf libColorGearC.so.0.0.0 libColorGearC.so.0 - ln -sf libColorGearC.so.0.0.0 libColorGearC.so + ln -sf libColorGearC.so.1.0.0 libColorGearC.so.1 + ln -sf libColorGearC.so.1.0.0 libColorGearC.so ) (cd $out/lib @@ -106,7 +119,7 @@ stdenv.mkDerivation { ) patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib" $out/lib32/libColorGear.so.0.0.0 - patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib" $out/lib32/libColorGearC.so.0.0.0 + patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib" $out/lib32/libColorGearC.so.1.0.0 patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32" $out/bin/c3pldrv @@ -127,18 +140,13 @@ stdenv.mkDerivation { ## cndrvcups-lb buildPhase ## - ( cd cndrvcups-lb-2.90/ppd - ./autogen.sh --prefix=$out + ( cd cndrvcups-lb-${version}/buftool + ./autogen.sh --prefix=$out --libdir=$out/lib --enable-progpath=$out/bin --enable-static make ) - ( cd cndrvcups-lb-2.90/pstoufr2cpca - CPPFLAGS="-I$out/include" LDFLAGS=" -L$out/lib" ./autogen.sh --prefix=$out --enable-progpath=$out/bin - make - ) - - ( cd cndrvcups-lb-2.90/cpca - CPPFLAGS="-I$out/include" LDFLAGS=" -L$out/lib" ./autogen.sh --prefix=$out --enable-progpath=$out/bin --enable-static + ( cd cndrvcups-lb-${version}/pstoufr2cpca + ./autogen.sh --prefix=$out --libdir=$out/lib make ) @@ -146,19 +154,11 @@ stdenv.mkDerivation { ## cndrvcups-lb installPhase ## - ( cd cndrvcups-lb-2.90/ppd + ( cd cndrvcups-lb-${version}/pstoufr2cpca make install ) - ( cd cndrvcups-lb-2.90/pstoufr2cpca - make install - ) - - ( cd cndrvcups-lb-2.90/cpca - make install - ) - - ( cd cndrvcups-lb-2.90/libs + ( cd cndrvcups-lb-${version}/libs chmod 755 * mkdir -p $out/lib32 mkdir -p $out/bin @@ -189,7 +189,7 @@ stdenv.mkDerivation { ln -sf libcnlbcm.so.1.0 libcnlbcm.so ) - ( cd cndrvcups-lb-2.90 + ( cd cndrvcups-lb-${version} chmod 644 data/CnLB* chmod 644 libs/cnpkbidi_info* chmod 644 libs/ThLB* @@ -201,6 +201,9 @@ stdenv.mkDerivation { cp libs/ThLB* $out/share/ufr2filter ) + mkdir -p $out/share/cups/model + install -c -m 644 cndrvcups-lb-${version}/ppd/CN*.ppd $out/share/cups/model/ + patchelf --set-rpath "$out/lib32:${i686_libxml2.out}/lib" $out/lib32/libcanonufr2.so.1.0.0 patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32" $out/bin/cnpkmoduleufr2 @@ -211,9 +214,12 @@ stdenv.mkDerivation { --prefix PATH ":" "$out/bin" ''; - meta = { + meta = with stdenv.lib; { description = "CUPS Linux drivers for Canon printers"; homepage = http://www.canon.com/; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; + maintainers = with maintainers; [ + kylesferrazza + ]; }; } diff --git a/pkgs/misc/cups/drivers/dymo/fix-includes.patch b/pkgs/misc/cups/drivers/dymo/fix-includes.patch index fa7df5591dda9..55f71369a0011 100644 --- a/pkgs/misc/cups/drivers/dymo/fix-includes.patch +++ b/pkgs/misc/cups/drivers/dymo/fix-includes.patch @@ -65,3 +65,16 @@ diff -rp dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h dymo-cups-driv #include <cups/raster.h> #include "LabelWriterDriver.h" #include "LabelWriterLanguageMonitor.h" +diff -rp dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.cpp dymo-cups-drivers-1.4.0.5-fix/src/common/CupsPrintEnvironment.cpp +*** dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.cpp 2019-12-16 19:37:23.429662838 +0000 +--- dymo-cups-drivers-1.4.0.5-fix/src/common/CupsPrintEnvironment.cpp 2019-12-16 19:41:48.506991614 +0000 +*************** +*** 23,28 **** +--- 23,29 ---- + #include "CupsPrintEnvironment.h" + #include <errno.h> + #include <cups/cups.h> ++ #include <cups/sidechannel.h> + #include <cassert> + + namespace DymoPrinterDriver diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 7e3b4b952f18d..76f68e507506d 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.25.11"; + version = "1.25.12"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; - sha256 = "0ni8krr4rf5833livn9401cd41gspjvxj0iiqnc1rfg3x90i0fxh"; + sha256 = "1kv25011iyzvd33n5zmmn1z2p6pzk26hmmw6qvjjnx8p3sp7raqn"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 779325c99b0b0..3b03c300db3f3 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils -, net_snmp, openssl, nettools +, cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils +, net-snmp, openssl, nettools , bash, coreutils, utillinux , qtSupport ? true , withPlugin ? false @@ -45,7 +45,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { inherit name src; format = "other"; @@ -55,7 +55,7 @@ pythonPackages.buildPythonApplication { libusb1 sane-backends dbus - net_snmp + net-snmp openssl ]; @@ -63,7 +63,7 @@ pythonPackages.buildPythonApplication { pkgconfig ]; - pythonPath = with pythonPackages; [ + pythonPath = with python2Packages; [ dbus pillow pygobject2 diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index d95eb85168e20..ab1794c12514e 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends +, cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils -, net_snmp, openssl, perl, nettools +, net-snmp, openssl, perl, nettools , bash, coreutils, utillinux , withQt5 ? true , withPlugin ? false @@ -47,7 +47,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { inherit name src; format = "other"; @@ -59,7 +59,7 @@ pythonPackages.buildPythonApplication { dbus file ghostscript - net_snmp + net-snmp openssl perl zlib @@ -69,7 +69,7 @@ pythonPackages.buildPythonApplication { pkgconfig ]; - pythonPath = with pythonPackages; [ + pythonPath = with python2Packages; [ dbus pillow pygobject2 diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 978fd9b9e0390..ecb74f39ab9a9 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends +, cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils -, net_snmp, openssl, perl, nettools +, net-snmp, openssl, perl, nettools , bash, coreutils, utillinux , withQt5 ? true , withPlugin ? false @@ -46,7 +46,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -pythonPackages.buildPythonApplication { +python3Packages.buildPythonApplication { inherit name src; format = "other"; @@ -58,7 +58,7 @@ pythonPackages.buildPythonApplication { dbus file ghostscript - net_snmp + net-snmp openssl perl zlib @@ -68,13 +68,14 @@ pythonPackages.buildPythonApplication { pkgconfig ]; - pythonPath = with pythonPackages; [ + pythonPath = with python3Packages; [ dbus pillow pygobject2 reportlab usbutils sip + dbus-python ] ++ stdenv.lib.optionals withQt5 [ pyqt5 enum-compat diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 1ed279d2998b4..8ca83c2c93dc3 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { homepage = https://pingus.seul.org/~grumbel/xboxdrv/; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; - maintainers = [ maintainers.fuuzetsu ]; + maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 228da68709478..38dc54ea9d7b1 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, unzip, zlib, SDL, readline, libGLU_combined, libX11 }: +, unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: with stdenv.lib; stdenv.mkDerivation rec{ @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88"; }; - buildInputs = [ unzip zlib SDL readline libGLU_combined libX11 ]; + buildInputs = [ unzip zlib SDL readline libGLU libGL libX11 ]; configureFlags = [ "--target=default" diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index a725d9c9b086b..7e6694b28d97a 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,5 +1,5 @@ { expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg -, libGLU_combined, openal, pkgconfig, sfml, stdenv, zlib +, libGLU, libGL, openal, pkgconfig, sfml, stdenv, zlib }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat ffmpeg fontconfig freetype libarchive libjpeg libGLU_combined openal sfml zlib + expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index e52cf7efc6b52..246dbb7dd3504 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,9 +1,9 @@ { callPackage, makeWrapper, gobject-introspection, cmake , python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk-pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.2.2"; + version = "3.2.3"; pkgName = "image-analyzer"; - pkgSha256 = "0by3nd5c413cvk3jmv3md6q0axbiidy061g9dhf37qzwgcakcx8j"; + pkgSha256 = "17yfjmf65s77214qassz6l01cjcni4cv06nzfsm7qrzw172fmci4"; }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix index dbf471d35d1dd..087b15cecd16e 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/pkgs/misc/emulators/cdemu/client.nix @@ -1,8 +1,8 @@ { callPackage, python3Packages, intltool, makeWrapper }: let pkg = import ./base.nix { - version = "3.2.1"; + version = "3.2.3"; pkgName = "cdemu-client"; - pkgSha256 = "1d8m24qvv62xcwafw5zs4yf39vs64kxl4idqcngd8yyjhrb2ykg5"; + pkgSha256 = "1bvc2m63fx03rbp3ihgl2n7k24lwg5ydwkmr84gsjfcxp46q10zq"; }; in callPackage pkg { buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix index a80327ce91c09..db6ed7ddb47ad 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/pkgs/misc/emulators/cdemu/daemon.nix @@ -1,8 +1,8 @@ { callPackage, glib, libao, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.2.2"; + version = "3.2.3"; pkgName = "cdemu-daemon"; - pkgSha256 = "0himyrhhfjsr4ff5aci7240bpm9x34h20pid412ci8fm16nk929b"; + pkgSha256 = "022xzgwmncswb9md71w3ly3mjkdfc93lbij2llp2jamq8grxjjxr"; }; in callPackage pkg { buildInputs = [ glib libao libmirage intltool ]; diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index e06853b8f7369..599531950a214 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -2,9 +2,9 @@ , python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk-pixbuf, librsvg }: let pkg = import ./base.nix { - version = "3.2.1"; + version = "3.2.3"; pkgName = "gcdemu"; - pkgSha256 = "0lmyvhbf57wcm8k2a33j2dhy4gblaiycy33q070gdrxi37xk7w5g"; + pkgSha256 = "19vy1awha8s7cfja3a6npaf3rfy3pl3cbsh4vd609q9jz4v4lyg4"; }; inherit (python3Packages) python pygobject3; in callPackage pkg { diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index 0ead78305cd03..cc3118ace151e 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -3,9 +3,9 @@ , pcre, utillinux, libselinux, libsepol }: let pkg = import ./base.nix { - version = "3.2.2"; + version = "3.2.3"; pkgName = "libmirage"; - pkgSha256 = "0gwrfia0fyhi0b3p2pfyyvrcfcb0qysfzgpdqsqjqbx4xaqx5wpi"; + pkgSha256 = "08mfvqyk3833ksfd47i4j3ppmrw5ry219km6h7lywdh9hm9x14yf"; }; in callPackage pkg { buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ]; diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 71beaf1254817..df25fb96eb1cd 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vhba"; - version = "20190410"; + version = "20190831"; src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2"; - sha256 = "1513hq130raxp9z5grj54cwfjfxj05apipxg425j0zicii59a60c"; + sha256 = "1ybbk6l06n0y11n5wnfmvdz0baizmq55l458ywimghdyz0n7g0ws"; }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 67fb3b4d24b89..d5d63cc269440 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -5,7 +5,7 @@ , tinyxml , agg, alsaLib, soundtouch, openal , desktop-file-utils -, gtk2, gtkglext, libglade, pangox_compat +, gtk2, gtkglext, libglade , libGLU, libpcap, SDL, zziplib }: with stdenv.lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch - openal desktop-file-utils gtk2 gtkglext libglade pangox_compat + openal desktop-file-utils gtk2 gtkglext libglade libGLU libpcap SDL zziplib tinyxml ]; configureFlags = [ diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 303c2f82d9ef5..cc49ef2aa1dc0 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib -, libGLU_combined , gettext, libpthreadstubs, libXrandr, libXext, readline +, libGLU, libGL , gettext, libpthreadstubs, libXrandr, libXext, readline , openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml , libpulseaudio ? null }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake bluez ffmpeg libao libGLU_combined gtk2 glib + buildInputs = [ cmake bluez ffmpeg libao libGLU libGL gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal libevdev libXdmcp portaudio libusb libpulseaudio libevdev libXdmcp portaudio libusb libpulseaudio diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index e96b2e07890e8..cec88918282e5 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake -, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext +, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , miniupnpc, enet, mbedtls, soundtouch, sfml @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-10879"; + version = "5.0-11109"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "c7fc9126aaf447a014af4aed195b17aa593dd49b"; - sha256 = "1pf4mxacxhrkvvh9j49ackm8hahl8x0ligmann1pafsb4lw0xbnj"; + rev = "93d7b3d15962a3393cf2971e14c4acf54d90cecd"; + sha256 = "1kkx3agdsc0qmf3yymlzq315nypm34qvq04qpjqycpfhmpx8gdnq"; }; enableParallelBuilding = true; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ - curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio + curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index e725049160854..5b770a6471ab5 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng, graphicsmagick }: +{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU, libGL, libpng, graphicsmagick }: stdenv.mkDerivation rec { name = "dosbox-0.74-3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ]; + buildInputs = [ SDL SDL_net SDL_sound libGLU libGL libpng ]; nativeBuildInputs = [ graphicsmagick ]; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index d8f5f1cbdb03f..668d18045445b 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen -, freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }: +, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive }: stdenv.mkDerivation { pname = "emulationstation"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU_combined SDL2 ]; + buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; buildPhase = "cmake . && make"; installPhase = '' diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 1cfa0db790fb7..81202008db19c 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU_combined, +{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }: with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { glib gtk3 libX11 - libGLU_combined + libGLU libGL openssl_1_0_2 ncurses5 SDL diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index eb7964cc017d5..704cef52e5e44 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, allegro, openal, libGLU_combined, zlib, hawknl, freeglut, libX11, +{stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11, libXxf86vm, libXcursor, libXpm }: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4"; }; - buildInputs = [ allegro openal libGLU_combined zlib hawknl freeglut libX11 + buildInputs = [ allegro openal libGLU libGL zlib hawknl freeglut libX11 libXxf86vm libXcursor libXpm ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 95a95bb17b14a..9f092f91e2efa 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, pkgconfig -, gettext, gtk2, SDL2, zlib, glib, openal, libGLU_combined, lua, freetype, libmpeg2, zip }: +, gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, lua, freetype, libmpeg2, zip }: with stdenv.lib; stdenv.mkDerivation rec { pname = "fs-uae"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; - sha256 = "0r69i6rh472lj4qwqfcfh17xmlw4x6mhqzr9hhpkbb4byyw6h592"; + sha256 = "1awakxs3rlbm0bxpi37cbavi5fpb89wszksyw62as4nz3qsdrpjf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU_combined lua freetype libmpeg2 zip ]; + buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU libGL lua freetype libmpeg2 zip ]; meta = { description = "An accurate, customizable Amiga Emulator"; diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/pkgs/misc/emulators/fuse-emulator/default.nix new file mode 100644 index 0000000000000..a3a379eb2cfd3 --- /dev/null +++ b/pkgs/misc/emulators/fuse-emulator/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, perl, pkgconfig, wrapGAppsHook +, SDL, bzip2, glib, gtk3, libgcrypt, libpng, libspectrum, libxml2, zlib +}: + +stdenv.mkDerivation rec { + pname = "fuse-emulator"; + version = "1.5.7"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/fuse-${version}.tar.gz"; + sha256 = "0kaynjr28w42n3iha60mgr7nxm49w8j0v49plyrc7ka24qzmiqph"; + }; + + nativeBuildInputs = [ perl pkgconfig wrapGAppsHook ]; + + buildInputs = [ SDL bzip2 glib gtk3 libgcrypt libpng libspectrum libxml2 zlib ]; + + configureFlags = [ "--enable-desktop-integration" ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = http://fuse-emulator.sourceforge.net/; + description = "ZX Spectrum emulator"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index da53b4f8c5573..4120ec7ba6aa1 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU_combined }: +{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ]; + buildInputs = [ gtk2 SDL nasm zlib libpng libGLU libGL ]; # Work around build failures on recent GTK. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 3cb0f787ce768..74e35379137ab 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "Atari ST/STE/TT/Falcon emulator"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index ad96ca36bc163..c1e64d26b4767 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -2,7 +2,7 @@ , p7zip, pkgconfig , libX11, libXv , udev -, libGLU_combined, SDL +, libGLU, libGL, SDL , libao, openal, libpulseaudio , gtk2, gtksourceview , runtimeShell }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp"; buildInputs = - [ p7zip pkgconfig libX11 libXv udev libGLU_combined + [ p7zip pkgconfig libX11 libXv udev libGLU libGL SDL libao openal libpulseaudio gtk2 gtksourceview ]; unpackPhase = '' diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index 499d7dd6c4a2c..d98232b10588b 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,9 +1,9 @@ -{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem +{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama }: let majorVersion = "0"; - minorVersion = "215"; + minorVersion = "216"; desktopItem = makeDesktopItem { name = "MAME"; @@ -12,6 +12,8 @@ let genericName = "MAME is a multi-purpose emulation framework"; categories = "System;Emulator;"; }; + + dest = "$out/opt/mame"; in mkDerivation { pname = "mame"; version = "${majorVersion}.${minorVersion}"; @@ -20,7 +22,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "1phz846p3zzgzrbfiq2vn79iqar2dbf7iv6wfkrp32sdkkvp7l3h"; + sha256 = "0dmmw08pxxznvadrc51zg27jc9fjh688355w8kxkmi7k8qa367r0"; }; hardeningDisable = [ "fortify" ]; @@ -28,22 +30,35 @@ in mkDerivation { makeFlags = [ "TOOLS=1" ]; + dontWrapQtApps = true; + buildInputs = [ SDL2 SDL2_ttf alsaLib qtbase libXinerama ]; - nativeBuildInputs = [ python pkgconfig which ]; + nativeBuildInputs = [ python pkgconfig which makeWrapper ]; - installPhase = '' - dest=$out/opt/mame + # by default MAME assumes that paths with stock resources + # are relative and that you run MAME changing to + # install directory, so we add absolute paths here + patches = [ ./emuopts.patch ]; - make -f dist.mak PTR64=${if stdenv.is64bit then "1" else "0"} - mkdir -p $dest - mv build/release/${if stdenv.is64bit then "x64" else "x32"}/Release/mame/* $dest + postPatch = '' + substituteInPlace src/emu/emuopts.cpp \ + --subst-var-by mame ${dest} + ''; + + installPhase = '' + make -f dist.mak PTR64=${stdenv.lib.optionalString stdenv.is64bit "1"} + mkdir -p ${dest} + mv build/release/*/Release/mame/* ${dest} mkdir -p $out/bin - find $dest -maxdepth 1 -executable -type f -exec mv -t $out/bin {} \; + find ${dest} -maxdepth 1 -executable -type f -exec mv -t $out/bin {} \; + install -Dm755 src/osd/sdl/taputil.sh $out/bin/taputil.sh mkdir -p $out/share/man/man{1,6} - mv $dest/docs/man/*.1 $out/share/man/man1 - mv $dest/docs/man/*.6 $out/share/man/man6 + mv ${dest}/docs/man/*.1 $out/share/man/man1 + mv ${dest}/docs/man/*.6 $out/share/man/man6 + + mv artwork plugins samples ${dest} mkdir -p $out/share ln -s ${desktopItem}/share/applications $out/share diff --git a/pkgs/misc/emulators/mame/emuopts.patch b/pkgs/misc/emulators/mame/emuopts.patch new file mode 100644 index 0000000000000..b85291f52f746 --- /dev/null +++ b/pkgs/misc/emulators/mame/emuopts.patch @@ -0,0 +1,29 @@ +diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp +index c42fcef848..d1bddae060 100644 +--- a/src/emu/emuopts.cpp ++++ b/src/emu/emuopts.cpp +@@ -36,16 +36,16 @@ const options_entry emu_options::s_option_entries[] = + { nullptr, nullptr, OPTION_HEADER, "CORE SEARCH PATH OPTIONS" }, + { OPTION_HOMEPATH, ".", OPTION_STRING, "path to base folder for plugin data (read/write)" }, + { OPTION_MEDIAPATH ";rp;biospath;bp", "roms", OPTION_STRING, "path to ROM sets and hard disk images" }, +- { OPTION_HASHPATH ";hash_directory;hash", "hash", OPTION_STRING, "path to software definition files" }, +- { OPTION_SAMPLEPATH ";sp", "samples", OPTION_STRING, "path to audio sample sets" }, +- { OPTION_ARTPATH, "artwork", OPTION_STRING, "path to artwork files" }, +- { OPTION_CTRLRPATH, "ctrlr", OPTION_STRING, "path to controller definitions" }, +- { OPTION_INIPATH, ".;ini;ini/presets", OPTION_STRING, "path to ini files" }, +- { OPTION_FONTPATH, ".", OPTION_STRING, "path to font files" }, ++ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mame@/hash", OPTION_STRING, "path to software definition files" }, ++ { OPTION_SAMPLEPATH ";sp", "samples;@mame@/samples", OPTION_STRING, "path to audio sample sets" }, ++ { OPTION_ARTPATH, "artwork;@mame@/artwork", OPTION_STRING, "path to artwork files" }, ++ { OPTION_CTRLRPATH, "ctrlr;@mame@/ctrlr", OPTION_STRING, "path to controller definitions" }, ++ { OPTION_INIPATH, ".;ini;ini/presets;@mame@/ini/presets", OPTION_STRING, "path to ini files" }, ++ { OPTION_FONTPATH, ".;@mame@", OPTION_STRING, "path to font files" }, + { OPTION_CHEATPATH, "cheat", OPTION_STRING, "path to cheat files" }, + { OPTION_CROSSHAIRPATH, "crosshair", OPTION_STRING, "path to crosshair files" }, +- { OPTION_PLUGINSPATH, "plugins", OPTION_STRING, "path to plugin files" }, +- { OPTION_LANGUAGEPATH, "language", OPTION_STRING, "path to UI translation files" }, ++ { OPTION_PLUGINSPATH, "plugins;@mame@/plugins", OPTION_STRING, "path to plugin files" }, ++ { OPTION_LANGUAGEPATH, "language;@mame@/language", OPTION_STRING, "path to UI translation files" }, + { OPTION_SWPATH, "software", OPTION_STRING, "path to loose software" }, + + // output directory options diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 74c456cfb1051..337d19804fc4a 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freeglut, libGLU_combined, libcdio, libjack2 +{ stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 , libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut - libGLU_combined + libGLU libGL libcdio libjack2 libsamplerate diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 4f02d0f147d4b..20c7c39312a5a 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3 -, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils +, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils , epoxy, gdk-pixbuf, gnome3, wrapGAppsHook }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { epoxy gtk3 gdk-pixbuf - libGLU_combined + libGLU libGL libarchive libao unzip diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 619938ba5c649..b976c1e8c27db 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,45 +1,69 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia -, glew, libzip, snappy, zlib, withGamepads ? true, SDL2 }: +{ SDL2 +, cmake +, fetchFromGitHub +, ffmpeg +, glew +, lib +, libzip +, mkDerivation +, pkgconfig +, python3 +, qtbase +, qtmultimedia +, snappy +, zlib +}: -assert withGamepads -> (SDL2 != null); -with stdenv.lib; - -stdenv.mkDerivation rec { +mkDerivation rec { pname = "ppsspp"; - version = "1.4.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0m4qkhx7q496sm7ibg2n7rm3npxzfr93iraxgndk0vhfk8vy8w75"; + sha256 = "17sym0vk72lzbh9a1501mhw98c78x1gq7k1fpy69nvvb119j37wa"; }; - patchPhase = '' - echo 'const char *PPSSPP_GIT_VERSION = "${src.rev}";' >> git-version.cpp - substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share + postPatch = '' + substituteInPlace git-version.cmake \ + --replace unknown ${src.rev} + substituteInPlace UI/NativeApp.cpp \ + --replace /usr/share $out/share ''; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qtbase qtmultimedia glew libzip snappy zlib ] - ++ optionals withGamepads [ SDL2 SDL2.dev ]; + nativeBuildInputs = [ cmake pkgconfig python3 ]; + + buildInputs = [ + SDL2 + ffmpeg + glew + libzip + qtbase + qtmultimedia + snappy + zlib + ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DUSING_QT_UI=ON" ]; + cmakeFlags = [ + "-DOpenGL_GL_PREFERENCE=GLVND" + "-DUSE_SYSTEM_FFMPEG=ON" + "-DUSE_SYSTEM_LIBZIP=ON" + "-DUSE_SYSTEM_SNAPPY=ON" + "-DUSING_QT_UI=ON" + ]; installPhase = '' - mkdir -p $out/bin $out/share/ppsspp - mv PPSSPPQt $out/bin/ppsspp + mkdir -p $out/share/ppsspp + install -Dm555 PPSSPPQt $out/bin/ppsspp mv assets $out/share/ppsspp ''; - enableParallelBuilding = true; - - meta = { - homepage = https://www.ppsspp.org/; + meta = with lib; { description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++"; + homepage = "https://www.ppsspp.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ fuuzetsu AndersonTorres ]; - platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; + maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/misc/emulators/resim/default.nix new file mode 100644 index 0000000000000..81acdf81f2ec8 --- /dev/null +++ b/pkgs/misc/emulators/resim/default.nix @@ -0,0 +1,18 @@ +{ fetchFromGitHub, stdenv, cmake, qt4 }: + +stdenv.mkDerivation { + name = "resim"; + src = fetchFromGitHub { + owner = "itszor"; + repo = "resim"; + rev = "cdc7808ceb7ba4ac00d0d08ca646b58615059150"; + sha256 = "1743lngqxd7ai4k6cd4d1cf9h60z2pnvr2iynfs1zlpcj3w1hx0c"; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt4 ]; + installPhase = '' + mkdir -pv $out/{lib,bin} + cp -v libresim/libarmsim.so $out/lib/libarmsim.so + cp -v vc4emul/vc4emul $out/bin/vc4emul + ''; +} diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index ced26333f4cd1..c8171f6c2337c 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch -, alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL +, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, libGL , ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost }: @@ -152,7 +152,7 @@ in with stdenv.lib.licenses; buildPhase = "make"; name = "beetle-pce-fast-${der.version}"; }; - + beetle-pcfx = (mkLibRetroCore rec { core = "mednafen-pcfx"; src = fetchRetro { @@ -197,7 +197,7 @@ in with stdenv.lib.licenses; name = "beetle-saturn-${der.version}"; meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; }; - + beetle-supergrafx = (mkLibRetroCore rec { core = "mednafen-supergrafx"; src = fetchRetro { @@ -276,7 +276,7 @@ in with stdenv.lib.licenses; }; description = "libretro wrapper for desmume NDS emulator"; license = gpl2; - extraBuildInputs = [ libpcap libGLU_combined xorg.libX11 ]; + extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; }).override { makefile = "desmume/src/frontend/libretro/Makefile.libretro"; configurePhase = "cd desmume/src/frontend/libretro"; @@ -292,7 +292,7 @@ in with stdenv.lib.licenses; }; description = "libretro wrapper for desmume NDS emulator from 2015"; license = gpl2; - extraBuildInputs = [ libpcap libGLU_combined xorg.libX11 ]; + extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; }).override { makefile = "desmume/Makefile.libretro"; configurePhase = "cd desmume"; @@ -311,7 +311,7 @@ in with stdenv.lib.licenses; broken = true; extraBuildInputs = [ - cmake curl libGLU_combined pcre pkgconfig sfml + cmake curl libGLU libGL pcre pkgconfig sfml gettext hidapi libevdev udev ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]); @@ -323,7 +323,7 @@ in with stdenv.lib.licenses; "-DENABLE_QT=OFF" "-DENABLE_LTO=OFF" "-DUSE_UPNP=OFF" - "-DUSE_DISCORD_PRESENCE=OFF" + "-DUSE_DISCORD_PRESENCE=OFF" ]; dontUseCmakeBuildDir = "yes"; buildPhase = "make"; @@ -380,7 +380,7 @@ in with stdenv.lib.licenses; }; description = "Flycast libretro port"; license = gpl2; - extraBuildInputs = [ libGLU_combined ]; + extraBuildInputs = [ libGL libGLU ]; }).override { makefile = "Makefile"; buildPhase = "make"; @@ -478,7 +478,7 @@ in with stdenv.lib.licenses; description = "Port of MAME to libretro"; license = gpl2Plus; - extraBuildInputs = [ alsaLib libGLU_combined portaudio python27 xorg.libX11 ]; + extraBuildInputs = [ alsaLib libGLU libGL portaudio python27 xorg.libX11 ]; }).override { postPatch = '' # Prevent the failure during the parallel building of: @@ -614,7 +614,7 @@ in with stdenv.lib.licenses; description = "Libretro port of Mupen64 Plus, GL only"; license = gpl2; - extraBuildInputs = [ libGLU_combined libpng nasm xorg.libX11 ]; + extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ]; }).override { makefile = "Makefile"; buildPhase = "make"; @@ -633,7 +633,7 @@ in with stdenv.lib.licenses; makefile = "libretro/Makefile"; buildPhase = "cd libretro && make"; }; - + o2em = (mkLibRetroCore rec { core = "o2em"; src = fetchRetro { @@ -647,7 +647,7 @@ in with stdenv.lib.licenses; makefile = "Makefile"; buildPhase = "make"; }; - + parallel-n64 = (mkLibRetroCore rec { core = "parallel-n64"; src = fetchRetro { @@ -658,7 +658,7 @@ in with stdenv.lib.licenses; description = "Parallel Mupen64plus rewrite for libretro."; license = gpl2; - extraBuildInputs = [ libGLU_combined libpng ]; + extraBuildInputs = [ libGLU libGL libpng ]; }).override { makefile = "Makefile"; buildPhase = "make"; @@ -677,7 +677,7 @@ in with stdenv.lib.licenses; configurePhase = "rm configure"; buildPhase = "make -f Makefile.libretro"; }; - + picodrive = (mkLibRetroCore rec { core = "picodrive"; src = fetchRetro { @@ -718,7 +718,7 @@ in with stdenv.lib.licenses; }; description = "ppsspp libretro port"; license = gpl2; - extraBuildInputs = [ cmake libGLU_combined ffmpeg python37 xorg.libX11 ]; + extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ]; }).override { cmakeFlags = "-DLIBRETRO=ON"; makefile = "Makefile"; @@ -778,7 +778,7 @@ in with stdenv.lib.licenses; }; description = "Libretro port of ScummVM"; license = gpl2; - extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU_combined SDL ]; + extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL SDL ]; }).override { makefile = "backends/platform/libretro/build/Makefile"; buildPhase = "cd backends/platform/libretro/build && make"; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 3b55c44d173eb..34e3961250cf6 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper -, ffmpeg, libGLU_combined, freetype, libxml2, python3 +, ffmpeg, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation , alsaLib ? null +, libdrm ? null , libpulseaudio ? null , libv4l ? null , libX11 ? null , libXdmcp ? null , libXext ? null , libXxf86vm ? null +, mesa ? null , SDL2 ? null , udev ? null , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null @@ -27,27 +29,29 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.7.8.4"; + version = "1.8.1"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph"; + sha256 = "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7"; rev = "v${version}"; }; nativeBuildInputs = [ pkgconfig ] ++ optional withVulkan [ makeWrapper ]; - buildInputs = [ ffmpeg freetype libxml2 libGLU_combined python3 SDL2 which ] + buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional withVulkan [ vulkan-loader ] ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] - ++ optionals stdenv.isLinux [ alsaLib libpulseaudio libv4l libX11 - libXdmcp libXext libXxf86vm udev ]; + ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 + libXdmcp libXext libXxf86vm mesa udev ]; enableParallelBuilding = true; + configureFlags = if stdenv.isLinux then [ "--enable-kms" ] else ""; + postInstall = optionalString withVulkan '' wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib '' + optionalString stdenv.targetPlatform.isDarwin '' diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix index 71ae168f1b232..08ebf8ea85444 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/misc/emulators/retroarch/wrapper.nix @@ -1,14 +1,8 @@ { stdenv, lib, makeWrapper, retroarch, cores }: -let - - p = builtins.parseDrvName retroarch.name; - -in - stdenv.mkDerivation { - name = "retroarch-" + p.version; - version = p.version; + pname = "retroarch"; + version = lib.getVersion retroarch; buildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index daa6814a411e1..e44b45dbb4bc4 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , ffmpeg , gettext -, libGLU_combined +, libGLU, libGL , openal , pkgconfig , SDL2 @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cairo ffmpeg gettext - libGLU_combined + libGLU libGL openal SDL2 sfml diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 7cf4faf55cd72..cb083c0aa0d81 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libXaw +{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; - buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU_combined + buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU libGL pkgconfig gtk2 SDL autoreconfHook libXaw ]; dontDisableStatic = true; configureFlags = [ "--enable-fullscreen --enable-gnomeui" ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 8252c96282d20..057615a79a14b 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 5264e66279f77..df979c68a47fe 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -5,7 +5,7 @@ with callPackage ./util.nix {}; let patch = (callPackage ./sources.nix {}).staging; build-inputs = pkgNames: extra: (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; -in assert (builtins.parseDrvName wineUnstable.name).version == patch.version; +in assert stdenv.lib.getVersion wineUnstable == patch.version; stdenv.lib.overrideDerivation wineUnstable (self: { buildInputs = build-inputs [ "perl" "utillinux" "autoconf" libtxc_dxtn_Name ] self.buildInputs; diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 1199f987bb6a9..2416ddd65b7ae 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined +{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL , wafHook }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ wafHook ]; - buildInputs = [ python wxGTK29 SDL libX11 libGLU_combined ]; + buildInputs = [ python wxGTK29 SDL libX11 libGLU libGL ]; preConfigure = '' tar xf ${mupen64plus.src} diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index ed8652d08f1b5..abceb752b2f8b 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU_combined +{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL , freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qtbase qt5.qtmultimedia libGLU_combined freeglut openal SDL2 ]; + buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ]; patches = [ ./linkage-rwx-linux-elf.patch diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 1ea8d7e68d3c0..55fe49895c9f6 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU_combined +{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU, libGL , makeDesktopItem }: let @@ -22,7 +22,7 @@ in stdenv.mkDerivation { sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v"; }; - buildInputs = [ nasm SDL zlib libpng ncurses libGLU_combined ]; + buildInputs = [ nasm SDL zlib libpng ncurses libGLU libGL ]; prePatch = '' for i in $(cat debian/patches/series); do diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index ac410a2299707..541fbea1dd406 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -10,8 +10,8 @@ assert cupsSupport -> cups != null; let version = "9.${ver_min}"; - ver_min = "27"; - sha512 = "00m8pfvvg4dzvrzk66myr8kid76x44sgqk84m9562g4viv9zbw759l8q9qg64mgvbajzn78zpqfgdlgz9nwgcdb1vpwc08gm12ssrsy"; + ver_min = "50"; + sha512 = "3p46kzn6kh7z4qqnqydmmvdlgzy5730z3yyvyxv6i4yb22mgihzrwqmhmvfn3b7lypwf6fdkkndarzv7ly3zndqpyvg89x436sms7iw"; fonts = stdenv.mkDerivation { name = "ghostscript-fonts"; @@ -48,22 +48,9 @@ stdenv.mkDerivation rec { ./urw-font-files.patch ./doc-no-ref.diff (fetchpatch { - name = "CVE-2019-10216.patch"; - url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=5b85ddd19a8420a1bd2d5529325be35d78e94234"; - sha256 = "165svml4knq1xlysfvj7vc07h68bhv3rgvl83xrhxsxdzs1ign31"; - }) - (fetchpatch { - name = "CVE-2019-14811.CVE-2019-14812.CVE-2019-14813.patch"; - url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=885444fcbe10dc42787ecb76686c8ee4dd33bf33"; - sha256 = "19928sr7xpx7iibk9gn127g0r1yv2lcfpwgk2ipzz4wgrs3f5j70"; - }) - (fetchpatch { - name = "CVE-2019-14817-partial.patch"; - url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=cd1b1cacadac2479e291efe611979bdc1b3bdb19"; - # patch doesn't apply cleanly to all files, but at least partially applying it fixes - # *most* of the problematic sites. - excludes = ["Resource/Init/pdf_font.ps"]; - sha256 = "0f8qgdqpv7bldc9akvjj10af2h2876cvnz4q3nvg4a00rk5i05wn"; + name = "CVE-2019-14869.patch"; + url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef"; + sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp"; }) ]; diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index e866a1937d69d..cfc0c3f7301ac 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook +{ stdenv, fetchgit, fetchpatch, autoreconfHook , pkgconfig, libtool, boost, SDL , glib, pango, gettext, curl, xorg , libpng, libjpeg, giflib, speex, atk @@ -6,7 +6,9 @@ # renderers , enableAGG ? true, agg ? null , enableCairo ? false, cairo ? null -, enableOpenGL ? false, libGLU_combined ? null +, enableOpenGL ? false +, libGLU ? null +, libGL ? null # GUI toolkits , enableGTK ? true, gtk2 ? null, gnome2 ? null @@ -45,7 +47,7 @@ in # renderers assert enableAGG -> available agg; assert enableCairo -> available cairo; -assert enableOpenGL -> available libGLU_combined; +assert enableOpenGL -> all available [ libGLU libGL ]; # GUI toolkits assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ]; @@ -57,7 +59,7 @@ assert enableFFmpeg -> available ffmpeg_2 ; # misc assert enableJemalloc -> available jemalloc; -assert enableHwAccel -> available libGLU_combined; +assert enableHwAccel -> all available [ libGLU libGL ]; assert enablePlugins -> all available [ xulrunner npapi_sdk ]; assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled"; @@ -85,14 +87,21 @@ stdenv.mkDerivation { libpng libjpeg giflib pango atk ] ++ optional enableAGG agg ++ optional enableCairo cairo - ++ optional enableOpenGL libGLU_combined ++ optional enableQt qt4 ++ optional enableFFmpeg ffmpeg_2 ++ optional enableJemalloc jemalloc - ++ optional enableHwAccel libGLU_combined + ++ optional enableHwAccel [ libGL libGLU ] + ++ optionals enableOpenGL [ libGL libGLU ] ++ optionals enablePlugins [ xulrunner npapi_sdk ] ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ]; + patches = [ + (fetchpatch { # fix compilation due to bad detection of libgif version: https://savannah.gnu.org/patch/index.php?9873 + url = "https://savannah.gnu.org/patch/download.php?file_id=47859"; + sha256 = "0aimayzgi5065gkcfcr8d5lkd9c0471q7dqmln42hjzq847n6d5y"; + }) + ]; + configureFlags = with stdenv.lib; [ "--with-boost-incl=${boost.dev}/include" "--with-boost-lib=${boost.out}/lib" diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index f246c41d96595..f6eaa553bb26e 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper -, fetchpatch +{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper , bash, libsamplerate, libsndfile, readline, eigen, celt , wafHook # Darwin Dependencies @@ -15,7 +14,7 @@ with stdenv.lib; let - inherit (python2Packages) python dbus-python; + inherit (python3Packages) python dbus-python; shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; @@ -28,13 +27,13 @@ let in stdenv.mkDerivation rec { name = "${prefix}jack2-${version}"; - version = "1.9.12"; + version = "1.9.14"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; rev = "v${version}"; - sha256 = "0ynpyn0l77m94b50g7ysl795nvam3ra65wx5zb46nxspgbf6wnkh"; + sha256 = "1prxg1l8wrxfp2mh7l4mvjvmml6816fciq1la88ylhwm1qnfvnax"; }; nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ]; @@ -49,11 +48,6 @@ stdenv.mkDerivation rec { --replace /bin/bash ${bash}/bin/bash ''; - patches = [ (fetchpatch { - url = "https://github.com/jackaudio/jack2/commit/d851fada460d42508a6f82b19867f63853062583.patch"; - sha256 = "1iwwxjzvgrj7dz3s8alzlhcgmcarjcbkrgvsmy6kafw21pyyw7hp"; - }) ]; - wafConfigureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" @@ -70,7 +64,7 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio connection kit, version 2 with jackdbus"; - homepage = http://jackaudio.org; + homepage = https://jackaudio.org; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index cb487677881ac..39c0d7d50c78e 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "0.125.0"; src = fetchurl { - url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; + url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "JACK audio connection kit"; - homepage = http://jackaudio.org; - license = "GPL"; + homepage = https://jackaudio.org; + license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.unix; }; } diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index ea2435c50ae13..49d86491aa014 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -4,18 +4,18 @@ let libsailing = fetchFromGitHub { owner = "sails-simulator"; repo = "libsailing"; - rev = "c24cddb717f81cd432868b8d41e04486c0a440fd"; - sha256 = "0mna0c9n8lvfdf4y1iigjy3dlks70hq6jik52zkik2yxvkqv949f"; + rev = "9b2863ff0c539cd23d91b0254032a7af9c840574"; + sha256 = "06rcxkwgms9sxqr1swnnc4jnvgs0iahm4cksd475yd1bp5p1gq6j"; }; in stdenv.mkDerivation rec { - version = "0.2.0"; + version = "0.3.0"; pname = "sailsd"; src = fetchFromGitHub { owner = "sails-simulator"; repo = "sailsd"; rev = version; - sha256 = "147cr4aw1kw4gv3bhn0cska855kmyah8m70vdw1q2lwz56lbf4mb"; + sha256 = "1s4nlffp683binbdxwwzbsci61kbjylbcr1jf44sv1h1r5d5js05"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index bfca574cd4976..6e5822b5a6fff 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.10"; + version = "1.12.1"; prebuilt_server = fetchurl { - url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar"; - sha256 = "144k25x6ha89l9p5a1dm6r3fqvgqszzwrhvkvk0r44vg0i71msyb"; + url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; + sha256 = "1sk6hbbnf4g6q58fspwlh8bn16j73j3i8hlcshqxzhfhl746krb3"; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "0hhncqcs49n9g8sgvwbyvkaq4b1dhrpn7qgnaj6grjcb0i27vzaq"; + sha256 = "16zi0d2jjm2nlrwkwvsxzfpgy45ami45wfh67wq7na2h2ywfmgcp"; }; # postPatch: @@ -40,12 +40,6 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg SDL2 ]; - # FIXME: remove on update to > 1.10 - patches = [(fetchpatch { - url = "https://github.com/Genymobile/scrcpy/commit/c05056343b56be65ae887f8b7ead61a8072622b9.diff"; - sha256 = "1xh24gr2g2i9rk0zyv19jx54hswrq12ssp227vxbhsbamin9ir5b"; - })]; - # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' echo -n > server/meson.build @@ -54,7 +48,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Doverride_server_path=${prebuilt_server}" ]; postInstall = '' mkdir -p "$out/share/scrcpy" - ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar" + ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server" # runtime dep on `adb` to push the server wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platform-tools}/bin" diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index b1c2ec5c3bda4..b36f8bf98def6 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl -, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU_combined +, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL , glee }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 libav lua5_1 curl libpng xorg.libXrender - flam3 libgtop boost tinyxml freeglut libGLU_combined glee + flam3 libgtop boost tinyxml freeglut libGLU libGL glee ]; preAutoreconf = '' diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index e3d3b109d1a9d..9763949cf9828 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -64,6 +64,12 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { homepage = https://github.com/the-cavalry/light-locker; description = "A simple session-locker for LightDM"; diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 7f6d99297ab16..467f762de86ca 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU_combined, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libGLU_combined xlibsWrapper imagemagick libtiff bzip2 ]; + buildInputs = [ libGLU libGL xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 771abf79c1dc2..c43a8acf8850a 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,11 +2,11 @@ , libXdmcp, libXt }: stdenv.mkDerivation rec { - name = "xlockmore-5.59"; + name = "xlockmore-5.61"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0lajc5a4lki33b9mzfsi74q4hbivbmhwysp7mib4ivnyxianhaid"; + sha256 = "012wsfcphahwwylyfk9c848nwj1v08hpnja2yfs0j8pnq7milnva"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 39706bb96edf0..1937874a49cbd 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 -, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU_combined, gtk2 +, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle , forceInstallAllHacks ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bc perl libjpeg libGLU_combined gtk2 libxml2 libglade pam + [ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXxf86misc intltool xorg.appres makeWrapper gle ]; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 0f09483a8571c..c415714f573cf 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libsndio.7.0.dylib $out/lib/libsndio.7.0.dylib for file in $out/bin/*; do install_name_tool -change libsndio.7.0.dylib $out/lib/libsndio.dylib $file done diff --git a/pkgs/misc/themes/adapta-kde/default.nix b/pkgs/misc/themes/adapta-kde/default.nix deleted file mode 100644 index a7624d2889bba..0000000000000 --- a/pkgs/misc/themes/adapta-kde/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "adapta-kde-theme"; - version = "20180512"; - - src = fetchFromGitHub { - owner = "PapirusDevelopmentTeam"; - repo = "adapta-kde"; - rev = version; - sha256 = "1lgpkylhzbayk892inql16sjyy9d3v126f9i1v7qgha1203rwcji"; - }; - - makeFlags = ["PREFIX=$(out)" ]; - - # Make this a fixed-output derivation - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - ouputHash = "0rxhk8sp81vb2mngqr7kn9vlqyliq9aqj2d25igcr01v5axbxbzb"; - - meta = { - description = "A port of the Adapta theme for Plasma"; - homepage = https://git.io/adapta-kde; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.tadfisher ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix deleted file mode 100644 index 02812b1f9397b..0000000000000 --- a/pkgs/misc/themes/adapta/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: - -stdenv.mkDerivation rec { - pname = "adapta-gtk-theme"; - version = "3.95.0.11"; - - src = fetchFromGitHub { - owner = "adapta-project"; - repo = "adapta-gtk-theme"; - rev = version; - sha256 = "19skrhp10xx07hbd0lr3d619vj2im35d8p9rmb4v4zacci804q04"; - }; - - preferLocalBuild = true; - - nativeBuildInputs = [ - autoreconfHook - pkgconfig - parallel - sassc - inkscape - libxml2 - glib.dev - gnome3.gnome-shell - ]; - - buildInputs = [ - gdk-pixbuf - librsvg - ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - postPatch = "patchShebangs ."; - - configureFlags = [ - "--disable-gtk_legacy" - "--disable-gtk_next" - "--disable-unity" - ]; - - meta = with stdenv.lib; { - description = "An adaptive GTK theme based on Material Design Guidelines"; - homepage = https://github.com/adapta-project/adapta-gtk-theme; - license = with licenses; [ gpl2 cc-by-sa-30 ]; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/misc/themes/adwaita-qt/default.nix deleted file mode 100644 index 9b979a11b93b2..0000000000000 --- a/pkgs/misc/themes/adwaita-qt/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase }: - -mkDerivation rec { - pname = "adwaita-qt"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "FedoraQt"; - repo = pname; - rev = version; - sha256 = "1jlh4l3sxiwglgx6h4aqi364gr4xipmn09bk88cp997r9sm8jcp9"; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - ]; - - postPatch = '' - # Fix plugin dir - substituteInPlace style/CMakeLists.txt \ - --replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles" - ''; - - meta = with lib; { - description = "A style to bend Qt applications to look like they belong into GNOME Shell"; - homepage = https://github.com/FedoraQt/adwaita-qt; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix deleted file mode 100644 index 870b348cc3206..0000000000000 --- a/pkgs/misc/themes/albatross/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "Albatross"; - version = "1.7.4"; - - src = fetchFromGitHub { - repo = "Albatross"; - owner = "shimmerproject"; - rev = "v${version}"; - sha256 = "0mq87n2hxy44nzr567av24n5nqjaljhi1afxrn3mpjqdbkq7lx88"; - }; - - dontBuild = true; - - installPhase = '' - install -dm 755 $out/share/themes/Albatross - cp -dr --no-preserve='ownership' {LICENSE.GPL,README,index.theme,gtk-2.0,gtk-3.0,metacity-1,xfwm4} $out/share/themes/Albatross/ - ''; - - meta = { - description = "A desktop Suite for Xfce"; - homepage = https://github.com/shimmerproject/Albatross; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/misc/themes/arc-kde/default.nix deleted file mode 100644 index decdbdfac2dcf..0000000000000 --- a/pkgs/misc/themes/arc-kde/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "arc-kde-theme"; - version = "2017-11-09"; - - src = fetchFromGitHub { - owner = "PapirusDevelopmentTeam"; - repo = "arc-kde"; - rev = "a0abe6fc5ebf74f9ae88b8a2035957cc16f706f5"; - sha256 = "1p6f4ny97096nb054lrgyjwikmvg0qlbcnsjag7m5dfbclfnvzkg"; - }; - - makeFlags = ["PREFIX=$(out)" ]; - - # Make this a fixed-output derivation - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - ouputHash = "2c2def57092a399aa1c450699cbb8639f47d751157b18db17"; - - meta = { - description = "A port of the arc theme for Plasma"; - homepage = https://git.io/arc-kde; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.nixy ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix deleted file mode 100644 index 7ffefb1d67f6c..0000000000000 --- a/pkgs/misc/themes/blackbird/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }: - -stdenv.mkDerivation rec { - pname = "Blackbird"; - version = "2017-12-13"; - - src = fetchFromGitHub { - repo = pname; - owner = "shimmerproject"; - rev = "a1c5674c0ec38b4cc8ba41d2c0e6187987ae7eb4"; - sha256 = "0xskcw36ci2ykra5gir5pkrawh2qkcv18p4fp2kxivssbd20d4jw"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - meta = { - description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; - homepage = https://github.com/shimmerproject/Blackbird; - license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; - }; -} diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/misc/themes/clearlooks-phenix/default.nix deleted file mode 100644 index 7c1eb54f92f5a..0000000000000 --- a/pkgs/misc/themes/clearlooks-phenix/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "7.0.1"; - pname = "clearlooks-phenix"; - - src = fetchurl { - url = "https://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz"; - sha256 = "1x2psfbhxc3bk3q795bafxv6p890yfsankfw64p44q4r1x0236ra"; - }; - - dontBuild = true; - installPhase = '' - mkdir -p $out/share/themes/Clearlooks-Phenix - cp -r . $out/share/themes/Clearlooks-Phenix/ - ''; - - preferLocalBuild = true; - - meta = with stdenv.lib; { - description = "GTK3 port of the Clearlooks theme"; - longDescription = '' - The Clearlooks-Phénix project aims at creating a GTK3 port of Clearlooks, - the default theme for Gnome 2. Style is also included for GTK2, Unity and - for Metacity, Openbox and Xfwm4 window managers. - ''; - homepage = https://github.com/jpfleury/clearlooks-phenix; - downloadPage = https://github.com/jpfleury/clearlooks-phenix/releases; - license = licenses.gpl3; - maintainers = [ maintainers.prikhi ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix deleted file mode 100644 index 74f0a54ccef3e..0000000000000 --- a/pkgs/misc/themes/e17gtk/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "e17gtk"; - version = "3.22.2"; - - src = fetchFromGitHub { - owner = "tsujan"; - repo = "E17gtk"; - rev = "V${version}"; - sha256 = "1qwj1hmdlk8sdqhkrh60p2xg4av1rl0lmipdg5j0i40318pmiml1"; - }; - - installPhase = '' - mkdir -p $out/share/{doc,themes}/E17gtk - cp -va index.theme gtk-2.0 gtk-3.0 metacity-1 $out/share/themes/E17gtk/ - cp -va README.md WORKAROUNDS screenshot.jpg $out/share/doc/E17gtk/ - ''; - - meta = { - description = "An Enlightenment-like GTK theme with sharp corners"; - homepage = https://github.com/tsujan/E17gtk; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; - }; -} diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix deleted file mode 100644 index f24524eb6b972..0000000000000 --- a/pkgs/misc/themes/equilux-theme/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: - -stdenv.mkDerivation rec { - pname = "equilux-theme"; - version = "20181029"; - - src = fetchFromGitHub { - owner = "ddnexus"; - repo = "equilux-theme"; - rev = "equilux-v${version}"; - sha256 = "0lv2yyxhnmnkwxp576wnb01id4fp734b5z5n0l67sg5z7vc2h8fc"; - }; - - nativeBuildInputs = [ glib libxml2 bc ]; - - buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - dontBuild = true; - - installPhase = '' - patchShebangs install.sh - sed -i install.sh \ - -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|" - mkdir -p $out/share/themes - ./install.sh --dest $out/share/themes - rm $out/share/themes/*/COPYING - ''; - - meta = with stdenv.lib; { - inherit (src.meta) homepage; - description = "A Material Design theme for GNOME/GTK based desktop environments"; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = [ maintainers.fpletz ]; - }; -} diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix deleted file mode 100644 index 200cc4bae051f..0000000000000 --- a/pkgs/misc/themes/gnome-breeze/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchgit }: - -stdenv.mkDerivation { - name = "gnome-breeze-20160526"; - src = fetchgit { - url = "https://github.com/dirruk1/gnome-breeze"; - sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm"; - rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221"; - }; - installPhase = '' - mkdir -p $out/share/themes - cp -r Breeze* $out/share/themes - ''; - - preferLocalBuild = true; - - meta = { - description = "A GTK theme built to match KDE's breeze theme"; - homepage = https://github.com/dirruk1/gnome-breeze; - license = stdenv.lib.licenses.lgpl2; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; - platforms = stdenv.lib.platforms.all; - hydraPlatforms = []; - }; -} diff --git a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix deleted file mode 100644 index 99ca221f5ba2d..0000000000000 --- a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: - -stdenv.mkDerivation { - name = "gtk-engine-bluecurve-1.0"; - - src = fetchurl { - url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2"; - sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - buildInputs = [ gtk2 ]; - - meta = { - description = "Original Bluecurve engine from Red Hat's artwork package"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; - }; -} diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix deleted file mode 100644 index 9acb7b25a0dd7..0000000000000 --- a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: - -stdenv.mkDerivation rec { - pname = "gtk-engine-murrine"; - version = "0.98.2"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 ]; - - meta = { - description = "A very flexible theme engine"; - homepage = "https://gitlab.gnome.org/Archive/murrine"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/misc/themes/gtk2/gtk-engines/default.nix deleted file mode 100644 index 2f56f6eb4c5c0..0000000000000 --- a/pkgs/misc/themes/gtk2/gtk-engines/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: - -stdenv.mkDerivation { - name = "gtk-engines-2.20.2"; - - src = fetchurl { - url = "ftp://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"; - sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 ]; - - meta = { - description = "Theme engines for GTK 2"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix deleted file mode 100644 index fac8c38eecaee..0000000000000 --- a/pkgs/misc/themes/kde2/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, mkDerivation -, cmake, extra-cmake-modules -, qtbase, kcoreaddons, kdecoration }: - -let - version = "2017-03-15"; -in mkDerivation rec { - pname = "kde2-decoration"; - inherit version; - - src = fetchFromGitHub { - owner = "repos-holder"; - repo = "kdecoration2-kde2"; - rev = "2a9cf18ac0646b3532d4db2dd28bd73c4c229783"; - sha256 = "0kilw6sd3blvm6gx9w4w5ivkjfxlv6wnyivw46pwwvhgxqymkbxk"; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - - buildInputs = [ qtbase kcoreaddons kdecoration ]; - - meta = with stdenv.lib; { - description = "KDE 2 window decoration ported to Plasma 5"; - homepage = src.meta.homepage; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; - }; -} diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/misc/themes/numix-solarized/default.nix deleted file mode 100644 index 4fd06fae61bc0..0000000000000 --- a/pkgs/misc/themes/numix-solarized/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2, - inkscape, optipng, gtk-engine-murrine -}: - -stdenv.mkDerivation rec { - version = "20170810"; - pname = "numix-solarized-gtk-theme"; - - src = fetchFromGitHub { - owner = "Ferdi265"; - repo = "numix-solarized-gtk-theme"; - rev = version; - sha256 = "0l4xvsiyg15kp6xwpvm3jckxyhr1lxd678lkhrcyf40n7rd4xinl"; - }; - - nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - postPatch = '' - patchShebangs . - substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out - substituteInPlace scripts/render-assets.sh \ - --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ - --replace /usr/bin/optipng ${optipng}/bin/optipng - ''; - - buildPhase = "true"; - - installPhase = '' - for theme in *.colors; do - make THEME="''${theme/.colors/}" install - done - ''; - - meta = with stdenv.lib; { - description = "Solarized versions of Numix GTK2 and GTK3 theme"; - longDescription = '' - This is a fork of the Numix GTK theme that replaces the colors of the theme - and icons to use the solarized theme with a solarized green accent color. - This theme supports both the dark and light theme, just as Numix proper. - ''; - homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme; - downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.offline ]; - }; -} diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/misc/themes/numix-sx/default.nix deleted file mode 100644 index 72e87e2e27401..0000000000000 --- a/pkgs/misc/themes/numix-sx/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: - -stdenv.mkDerivation { - version = "2017-04-24"; - pname = "numix-sx-gtk-theme"; - - src = fetchurl { - url = "https://dl.opendesktop.org/api/files/download/id/1493077417/Numix-SX.tar.xz"; - sha256 = "7e1983924b2d90e89eddb3da8f4c43dc1326fe138fd191c8212c7904dcd618b0"; - }; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - dontBuild = true; - - sourceRoot = "."; - - installPhase = '' - install -dm 755 "$out/share/themes/" - cp -dr --no-preserve='ownership' Numix-SX-{Dark,FullDark,Light} "$out/share/themes/" - ''; - - meta = { - description = "Gray variation of Numix theme"; - homepage = https://www.gnome-look.org/p/1117412/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.sauyon ]; - }; -} diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix deleted file mode 100644 index e01f8174e9ea3..0000000000000 --- a/pkgs/misc/themes/numix/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf -, gtk-engine-murrine -}: - -stdenv.mkDerivation rec { - version = "2.6.7"; - pname = "numix-gtk-theme"; - - src = fetchFromGitHub { - repo = "numix-gtk-theme"; - owner = "numixproject"; - rev = version; - sha256 = "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7"; - }; - - nativeBuildInputs = [ sass glib libxml2 gdk-pixbuf ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - postPatch = '' - substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out - patchShebangs . - ''; - - meta = { - description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)"; - homepage = https://numixproject.github.io; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.romildo ]; - }; -} diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix deleted file mode 100644 index 64ead2f75f4b6..0000000000000 --- a/pkgs/misc/themes/onestepback/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - pname = "onestepback"; - version = "0.991"; - - srcs = [ - (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; - sha256 = "1jfgcgzbb6ra9qs3zcp6ij0hfldzg3m0yjw6l6vf4kq1mdby1ghm"; - }) - (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-grey-brown-green-blue-v${version}.zip"; - sha256 = "0i006h1asbpfdzajws0dvk9acplvcympzgxq5v3n8hmizd6yyh77"; - }) - (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-green-brown-v${version}.zip"; - sha256 = "16p002lak6425gcskny4hzws8x9dgsm6j3a1r08y11rsz7d2hnmy"; - }) - ]; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/themes - cp -a OneStepBack* $out/share/themes/ - rm $out/share/themes/*/{LICENSE,README*} - ''; - - meta = with stdenv.lib; { - description = "Gtk theme inspired by the NextStep look"; - homepage = http://www.vide.memoire.free.fr/perso/OneStepBack; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/misc/themes/orion/default.nix deleted file mode 100644 index 9ba8cd368cf79..0000000000000 --- a/pkgs/misc/themes/orion/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchgit, gtk-engine-murrine }: - -stdenv.mkDerivation { - name = "orion-1.5"; - - src = fetchgit { - url = "https://github.com/shimmerproject/Orion.git"; - rev = "refs/tags/v1.5"; - sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89"; - }; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - installPhase = '' - mkdir -p $out/share/themes/orion - cp -r gtk-2.0 gtk-3.0 metacity-1 openbox-3 xfwm4 $out/share/themes/orion - ''; - - meta = { - homepage = https://github.com/shimmerproject/Orion; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/misc/themes/paper/default.nix deleted file mode 100644 index e7235a900cf9d..0000000000000 --- a/pkgs/misc/themes/paper/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }: - -stdenv.mkDerivation { - version = "2016-08-16"; - pname = "paper-gtk-theme"; - - src = fetchFromGitHub { - owner = "snwh"; - repo = "paper-gtk-theme"; - rev = "f75724fd76fd2e5681a367cca246a51f845320c3"; - sha256 = "0dqllzjk9ggnbh8vvy2c81p3wq6cj73r30hk7gqhrn8i91w8p896"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ gtk_engines ]; - - postPatch = '' - substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out - ''; - - preferLocalBuild = true; - - meta = with stdenv.lib; { - description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth"; - homepage = https://snwh.org/paper; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.simonvandel maintainers.romildo ]; - }; -} diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix deleted file mode 100644 index 0071e386e88c2..0000000000000 --- a/pkgs/misc/themes/qtcurve/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, mkDerivation -, gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies -, karchive, kconfig, kconfigwidgets, kio, frameworkintegration -, kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes -, libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies -}: - -let - version = "1.9"; -in mkDerivation { - pname = "qtcurve"; - inherit version; - src = fetchurl { - url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz"; - sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8"; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; - - buildInputs = [ - gtk2 - qtbase qtsvg qtx11extras - karchive kconfig kconfigwidgets kio kiconthemes kguiaddons ki18n - kwindowsystem kdelibs4support frameworkintegration - libpthreadstubs - pcre - libXdmcp libX11 libXau - ]; - - preConfigure = '' - for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt - do - substituteInPlace $i \ - --replace "{_Qt5_PLUGIN_INSTALL_DIR}" "{KDE_INSTALL_QTPLUGINDIR}" - done - substituteInPlace CMakeLists.txt \ - --replace \$\{GTK2_PREFIX\} $out - substituteInPlace gtk2/style/CMakeLists.txt \ - --replace \$\{GTK2_LIBDIR\} $out/lib - patchShebangs tools/gen-version.sh - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/QtCurve/qtcurve; - description = "Widget styles for Qt5/Plasma 5 and gtk2"; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - maintainers = [ maintainers.gnidorah ]; - }; -} diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix deleted file mode 100644 index 96843e8d78b46..0000000000000 --- a/pkgs/misc/themes/solarc/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, - gtk-engine-murrine, gtk3 -}: - -stdenv.mkDerivation { - pname = "solarc-gtk-theme"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "schemar"; - repo = "solarc-theme"; - rev = "d1eb117325b8e5085ecaf78df2eb2413423fc643"; - sha256 = "005b66whyxba3403yzykpnlkz0q4m154pxpb4jzcny3fggy9r70s"; - }; - - nativeBuildInputs = [ autoconf automake pkgconfig gtk3 ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine gtk3 ]; - - buildPhase = '' - ./autogen.sh --prefix=$out - ''; - - meta = with stdenv.lib; { - description = "Solarized version of the Arc theme"; - homepage = https://github.com/schemar/solarc-theme; - license = licenses.gpl3; - maintainers = [ maintainers.bricewge ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix deleted file mode 100644 index 81c681f537157..0000000000000 --- a/pkgs/misc/themes/vertex/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }: - -stdenv.mkDerivation rec { - pname = "theme-vertex"; - version = "20170128"; - - src = fetchFromGitHub { - owner = "horst3180"; - repo = "vertex-theme"; - rev = version; - sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - configureFlags = [ "--disable-unity" ]; - - postInstall = '' - mkdir -p $out/share/plank/themes - cp -r extra/*-Plank $out/share/plank/themes - - mkdir -p $out/share/doc/$pname/Chrome - cp -r extra/Chrome/*.crx $out/share/doc/$pname/Chrome - cp -r extra/Firefox $out/share/doc/$pname - cp AUTHORS README.md $out/share/doc/$pname/ - ''; - - meta = with stdenv.lib; { - inherit (src.meta) homepage; - description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ rycee romildo ]; - }; -} diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 5aeec7cf13b15..0d10b44ab1e12 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -25,7 +25,7 @@ let addonInfo ? null, preInstall ? "", postInstall ? "", - path ? (builtins.parseDrvName pluginName).name, + path ? lib.getName pluginName, dependencies ? [], ... }: @@ -95,8 +95,8 @@ in rec { pluginName = "ctrlw"; src = fetchgit { url = "https://github.com/eraserhd/tmux-ctrlw"; - rev = "2354b5d56828813d0f7a4b228ca74b6134c2695f"; - sha256 = "00hy1axmki8h2285mivsj923z327xkq89wfl2x4dxc71xjhdl216"; + rev = "b456977125c640cd587b786c6a79cb5c7b0f900d"; + sha256 = "1kv5pqfjczd6z7i9jf6j5xmcai50l9bn5p2p1w1l5fi6cj8cz1k1"; }; }; @@ -187,6 +187,19 @@ in rec { }; }; + plumb = mkDerivation { + pluginName = "plumb"; + src = fetchFromGitHub { + owner = "eraserhd"; + repo = "tmux-plumb"; + rev = "v0.1.1"; + sha256 = "1c6k4fdl0az9811r6k164mgd4w5la75xr6x7nabmy046xc0z5i2r"; + }; + postInstall = '' + sed -i -e 's,9 plumb,${pkgs.plan9port}/bin/9 plumb,' $target/scripts/plumb + ''; + }; + prefix-highlight = mkDerivation { pluginName = "prefix-highlight"; src = fetchgit { diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index ffe576c31d81a..8a07461bb2f10 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,37 +1,49 @@ -{ stdenv, lib, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, swig -, armTrustedFirmwareAllwinner +{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bc, bison, dtc, flex +, openssl, swig, armTrustedFirmwareAllwinner, armTrustedFirmwareRK3328 +, armTrustedFirmwareRK3399 , buildPackages }: let - buildUBoot = { version ? "2019.10" - , filesToInstall - , installDir ? "$out" - , defconfig - , extraConfig ? "" - , extraPatches ? [] - , extraMakeFlags ? [] - , extraMeta ? {} - , ... } @ args: - stdenv.mkDerivation ({ - + defaultVersion = "2019.10"; + defaultSrc = fetchurl { + url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; + sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd"; + }; + buildUBoot = { + version ? null + , src ? null + , filesToInstall + , installDir ? "$out" + , defconfig + , extraConfig ? "" + , extraPatches ? [] + , extraMakeFlags ? [] + , extraMeta ? {} + , ... } @ args: stdenv.mkDerivation ({ pname = "uboot-${defconfig}"; - inherit version; - src = fetchurl { - url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd"; - }; + version = if src == null then defaultVersion else version; + + src = if src == null then defaultSrc else src; patches = [ + # Submitted upstream: https://patchwork.ozlabs.org/patch/1203693/ (fetchpatch { url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch; sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8"; }) + # Submitted upstream: https://patchwork.ozlabs.org/patch/1203678/ + (fetchpatch { + name = "rockchip-allow-loading-larger-kernels.patch"; + url = "https://marc.info/?l=u-boot&m=157537843004298&q=raw"; + sha256 = "0l3l88cc9xkxkraql82pfgpx6nqn4dj7cvfaagh5pzfwkxyw0n3p"; + }) ] ++ extraPatches; postPatch = '' patchShebangs tools + patchShebangs arch/arm/mach-rockchip ''; nativeBuildInputs = [ @@ -90,15 +102,12 @@ in { inherit buildUBoot; ubootTools = buildUBoot { - defconfig = "allnoconfig"; + defconfig = "tools-only_defconfig"; installDir = "$out/bin"; hardeningDisable = []; dontStrip = false; extraMeta.platforms = lib.platforms.linux; extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ]; - postConfigure = '' - sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config - ''; filesToInstall = [ "tools/dumpimage" "tools/fdtgrep" @@ -251,6 +260,43 @@ in { filesToInstall = ["u-boot.bin"]; }; + ubootRock64 = let + rkbin = fetchFromGitHub { + owner = "ayufan-rock64"; + repo = "rkbin"; + rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; + sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; + }; + in buildUBoot { + extraMakeFlags = [ "all" "u-boot.itb" ]; + defconfig = "rock64-rk3328_defconfig"; + extraMeta = { + platforms = [ "aarch64-linux" ]; + license = lib.licenses.unfreeRedistributableFirmware; + }; + BL31="${armTrustedFirmwareRK3328}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img"]; + # Derive MAC address from cpuid + # Submitted upstream: https://patchwork.ozlabs.org/patch/1203686/ + extraConfig = '' + CONFIG_MISC_INIT_R=y + ''; + # Close to being blob free, but the U-Boot TPL causes random memory + # corruption + postBuild = '' + ./tools/mkimage -n rk3328 -T rksd -d ${rkbin}/rk33/rk3328_ddr_786MHz_v1.13.bin idbloader.img + cat spl/u-boot-spl.bin >> idbloader.img + ''; + }; + + ubootRockPro64 = buildUBoot { + extraMakeFlags = [ "all" "u-boot.itb" ]; + defconfig = "rockpro64-rk3399_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31="${armTrustedFirmwareRK3399}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img"]; + }; + ubootSheevaplug = buildUBoot { defconfig = "sheevaplug_defconfig"; extraMeta.platforms = ["armv5tel-linux"]; diff --git a/pkgs/misc/uboot/rock64-fdt-dtc-compatibility.patch b/pkgs/misc/uboot/rock64-fdt-dtc-compatibility.patch deleted file mode 100644 index 92725cac5b45e..0000000000000 --- a/pkgs/misc/uboot/rock64-fdt-dtc-compatibility.patch +++ /dev/null @@ -1,105 +0,0 @@ -From fbee2adffd39b03e10262b09779faef94c4d5a9d Mon Sep 17 00:00:00 2001 -From: Ben Wolsieffer <benwolsieffer@gmail.com> -Date: Thu, 18 Apr 2019 15:50:24 -0400 -Subject: [PATCH] fdt: make compatible with dtc >=1.4.6 - -Signed-off-by: Ben Wolsieffer <benwolsieffer@gmail.com> ---- - include/libfdt_env.h | 6 +++--- - lib/libfdt/fdt.h | 6 +++--- - lib/libfdt/libfdt.h | 6 +++--- - lib/libfdt/libfdt_internal.h | 6 +++--- - tools/dtoc/fdt.py | 2 +- - 5 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/include/libfdt_env.h b/include/libfdt_env.h -index 6c6845f76c..1fbcd0ef83 100644 ---- a/include/libfdt_env.h -+++ b/include/libfdt_env.h -@@ -6,8 +6,8 @@ - * SPDX-License-Identifier: LGPL-2.1+ - */ - --#ifndef _LIBFDT_ENV_H --#define _LIBFDT_ENV_H -+#ifndef LIBFDT_ENV_H -+#define LIBFDT_ENV_H - - #include "compiler.h" - #include "linux/types.h" -@@ -32,4 +32,4 @@ typedef __be64 fdt64_t; - /* adding a ramdisk needs 0x44 bytes in version 2008.10 */ - #define FDT_RAMDISK_OVERHEAD 0x80 - --#endif /* _LIBFDT_ENV_H */ -+#endif /* LIBFDT_ENV_H */ -diff --git a/lib/libfdt/fdt.h b/lib/libfdt/fdt.h -index 3134d78332..38cc182739 100644 ---- a/lib/libfdt/fdt.h -+++ b/lib/libfdt/fdt.h -@@ -1,5 +1,5 @@ --#ifndef _FDT_H --#define _FDT_H -+#ifndef FDT_H -+#define FDT_H - /* - * libfdt - Flat Device Tree manipulation - * Copyright (C) 2006 David Gibson, IBM Corporation. -@@ -64,4 +64,4 @@ struct fdt_property { - #define FDT_V16_SIZE FDT_V3_SIZE - #define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(fdt32_t)) - --#endif /* _FDT_H */ -+#endif /* FDT_H */ -diff --git a/lib/libfdt/libfdt.h b/lib/libfdt/libfdt.h -index cb533f4275..9345a59f05 100644 ---- a/lib/libfdt/libfdt.h -+++ b/lib/libfdt/libfdt.h -@@ -1,5 +1,5 @@ --#ifndef _LIBFDT_H --#define _LIBFDT_H -+#ifndef LIBFDT_H -+#define LIBFDT_H - /* - * libfdt - Flat Device Tree manipulation - * Copyright (C) 2006 David Gibson, IBM Corporation. -@@ -2189,4 +2189,4 @@ int fdt_device_is_available(const void *blob, int node); - int fdt_node_offset_by_phandle_node(const void *fdt, int node, uint32_t phandle); - #endif /* SWIG */ - --#endif /* _LIBFDT_H */ -+#endif /* LIBFDT_H */ -diff --git a/lib/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h -index 9a79fe85dd..8fdda7ee79 100644 ---- a/lib/libfdt/libfdt_internal.h -+++ b/lib/libfdt/libfdt_internal.h -@@ -1,5 +1,5 @@ --#ifndef _LIBFDT_INTERNAL_H --#define _LIBFDT_INTERNAL_H -+#ifndef LIBFDT_INTERNAL_H -+#define LIBFDT_INTERNAL_H - /* - * libfdt - Flat Device Tree manipulation - * Copyright (C) 2006 David Gibson, IBM Corporation. -@@ -47,4 +47,4 @@ static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int n) - - #define FDT_SW_MAGIC (~FDT_MAGIC) - --#endif /* _LIBFDT_INTERNAL_H */ -+#endif /* LIBFDT_INTERNAL_H */ -diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py -index dbc338653b..ac2191fb37 100644 ---- a/tools/dtoc/fdt.py -+++ b/tools/dtoc/fdt.py -@@ -360,7 +360,7 @@ class Fdt: - poffset = libfdt.fdt_first_property_offset(self._fdt, node._offset) - while poffset >= 0: - p = self._fdt_obj.get_property_by_offset(poffset) -- prop = Prop(node, poffset, p.name, p.value) -+ prop = Prop(node, poffset, p.name, p) - props_dict[prop.name] = prop - - poffset = libfdt.fdt_next_property_offset(self._fdt, poffset) --- -2.21.0 - diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix deleted file mode 100644 index 9dd43f5fe7e00..0000000000000 --- a/pkgs/misc/uboot/rock64.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, buildUBoot, fetchFromGitHub, armTrustedFirmwareRK3328 }: let - rkbin = fetchFromGitHub { - owner = "ayufan-rock64"; - repo = "rkbin"; - rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; - sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; - }; -in buildUBoot { - version = "2017.09"; - - src = fetchFromGitHub { - owner = "ayufan-rock64"; - repo = "linux-u-boot"; - rev = "56bd9582537a70c30387de3ce9038a56d2c77bfe"; - sha256 = "1m0k8ivzhmg9y4x0k7fz7y71pgblzxy81m6x32iivz5kjnxdnv4i"; - }; - - extraPatches = [ ./rock64-fdt-dtc-compatibility.patch ]; - - extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ]; - - # Close to being blob free, but the U-Boot TPL causes the kernel to hang after a few minutes - postBuild = '' - ./tools/mkimage -n rk3328 -T rksd -d ${rkbin}/rk33/rk3328_ddr_786MHz_v1.13.bin idbloader.img - cat spl/u-boot-spl.bin >> idbloader.img - dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc - ''; - - defconfig = "rock64-rk3328_defconfig"; - filesToInstall = [ "spl/u-boot-spl.bin" "tpl/u-boot-tpl.bin" "u-boot.itb" "idbloader.img"]; - - extraMeta = with lib; { - maintainers = [ maintainers.lopsided98 ]; - platforms = ["aarch64-linux"]; - # Because of the TPL blob - license = licenses.unfreeRedistributableFirmware; - }; -} diff --git a/pkgs/misc/uboot/rockpro64.nix b/pkgs/misc/uboot/rockpro64.nix deleted file mode 100644 index 436e1bcdf878a..0000000000000 --- a/pkgs/misc/uboot/rockpro64.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, buildUBoot, fetchFromGitHub }: let - rkbin = fetchFromGitHub { - owner = "ayufan-rock64"; - repo = "rkbin"; - rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; - sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; - }; -in buildUBoot { - version = "2017.09"; - - src = fetchFromGitHub { - owner = "ayufan-rock64"; - repo = "linux-u-boot"; - rev = "56bd9582537a70c30387de3ce9038a56d2c77bfe"; - sha256 = "1m0k8ivzhmg9y4x0k7fz7y71pgblzxy81m6x32iivz5kjnxdnv4i"; - }; - - extraPatches = [ ./rock64-fdt-dtc-compatibility.patch ]; - - # Upstream ATF hangs in SPL - extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.25.elf" "u-boot.itb" "all" ]; - - postBuild = '' - ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_v1.19.bin idbloader.img - cat spl/u-boot-spl.bin >> idbloader.img - dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc - ''; - - defconfig = "rockpro64-rk3399_defconfig"; - filesToInstall = [ "spl/u-boot-spl.bin" "u-boot.itb" "idbloader.img"]; - - extraMeta = with lib; { - maintainers = [ maintainers.lopsided98 ]; - platforms = ["aarch64-linux"]; - # Because of the TPL and ATF (BL31) blobs - license = licenses.unfreeRedistributableFirmware; - }; -} diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix index b797f49df9e01..4ca99b09af500 100644 --- a/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -18,7 +18,7 @@ rec { buildPhase ? "", preInstall ? "", postInstall ? "", - path ? (builtins.parseDrvName name).name, + path ? stdenv.lib.getName name, addonInfo ? null, ... }: diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e8e9702f96409..b83cc81451134 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -39,34 +39,34 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2019-08-04"; + version = "2019-12-08"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "4fc0a0a95a347b7b98715a78b6f41edd5aa084c5"; - sha256 = "15zzc1aqzflw36462ka5914cmfqckciqcgcff0kfmzglfcx7is6z"; + rev = "fbb55d9ef8829630ea8f12c112bebc69c7a15337"; + sha256 = "0fg43ggaxpnybc9ism4b5q7l0n6rdgh4vkpch80x89mwld287lqv"; }; }; alchemist-vim = buildVimPluginFrom2Nix { pname = "alchemist-vim"; - version = "2019-07-04"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "slashmili"; repo = "alchemist.vim"; - rev = "336b3f549cc6028db7bf8a43f725b93250f9cae1"; - sha256 = "19wzrydm1qciwagklhl7ln37ax69jfgzfw55k4cxbx7g972dg2s3"; + rev = "911eda990ef259d1f035061c5dfb2f44adb2697e"; + sha256 = "04lm3k6svq4y2a7kqq5phzyny93ynnjdmsv2s98pw6c4z5fq5y1m"; }; }; ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-10-29"; + version = "2019-12-03"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "2d9380d75c5c27a3241925d24ab3be8977a43207"; - sha256 = "1xn9c8j3z7344a1cczpccig1hg1kzq286ch60n22jrm6fq732znc"; + rev = "5f84325cd811ec179b7f3642652438c6a45b174d"; + sha256 = "0fdy4kvd7bg3xcls5g2xxml8hlwb80qvs9225dh2hqif0isbf4l2"; }; }; @@ -83,12 +83,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2019-09-27"; + version = "2019-12-07"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "ac2e4f55aedddd7f473aaaa4035062c3c489e8c3"; - sha256 = "0kgdm06g67y3pfzcd4wqdrc59klxchrim755ml1038hbnk39lilj"; + rev = "19e6ae0f2258953591d7c674abd7aca3ceb51374"; + sha256 = "0283nm92666idvwp0pzy6yzcfvrqy12nwn9zys1jbs34kk6srwa8"; }; }; @@ -149,12 +149,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2019-09-21"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "21f5c63f22fe70b0fae3ff0fb9e55c602e622ea7"; - sha256 = "1k7h8faz9qqyqzpkxxhsjsdqyah6amwk3rlhxygz9qg25mp558xf"; + rev = "b5037cbf87ee4b0beed91adb33c339122e58326f"; + sha256 = "1yxjdb2cmha6vqhmsv8vy80whs201wwwx0xmyp76mz9zkcsyljak"; }; }; @@ -204,23 +204,23 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2019-07-30"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "f8ba659ba6a094d000f355807efb71f7975d10f0"; - sha256 = "16np6mkmn7h4rx9471yqy4k89m6w9v1gz1cyphlwn90gzm8f97xz"; + rev = "6d6ac26c537b996819eda9f0cf8f303d10048c10"; + sha256 = "120bx0wskkpk2r05sv74430270lf3c5j1z02bd05i9747dbjcgq5"; }; }; camelcasemotion = buildVimPluginFrom2Nix { pname = "camelcasemotion"; - version = "2019-06-28"; + version = "2019-12-02"; src = fetchFromGitHub { owner = "bkad"; repo = "camelcasemotion"; - rev = "406368dea50303884aa321d2cdff714e010f951e"; - sha256 = "0a1grafg05cb9mpk69j2y433ifm27ksy29wzlxlm5798dmb473mw"; + rev = "de439d7c06cffd0839a29045a103fe4b44b15cdc"; + sha256 = "0yfsb0d9ly8abmc95nqcmr8r8ylif80zdjppib7g1qj1wapdhc69"; }; }; @@ -303,23 +303,23 @@ let coc-emmet = buildVimPluginFrom2Nix { pname = "coc-emmet"; - version = "2019-08-22"; + version = "2019-12-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-emmet"; - rev = "0fd6e93dcab3507240962a480b42e08e818d1fa9"; - sha256 = "196cvnynkm34sa90gznp81l2l3wl2sxfishqzwr8xxlk2cdcshxn"; + rev = "1e65237f65b94bd5f9376023f557a26c14c9d35a"; + sha256 = "16f3gdnprxw939zwdy7lzksj1qwlwfs174vk0nzf1d8yb04a7y2g"; }; }; coc-eslint = buildVimPluginFrom2Nix { pname = "coc-eslint"; - version = "2019-10-21"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-eslint"; - rev = "a84833d95ab641f0576dec5bf0ffde845055188a"; - sha256 = "1r3sy5bmnl4hbsb6ln47ahxqqbcfycca0zn6b2qnqrb64ynb30y1"; + rev = "ba55d386f296cc3ef3da4b14147dfb7c3ef18ecb"; + sha256 = "1jxw4h3vwbv6and90bwrgcp4cvd7af547x270lc2085nkna3hdk9"; }; }; @@ -336,12 +336,12 @@ let coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-10-29"; + version = "2019-12-16"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "0f395b22aee6f99ba3cfc07d3faaf13edcb1ca96"; - sha256 = "118nqx3k7frxvx0cz8w6k6sx905200aym2lqh0qajkg5m288vl75"; + rev = "2408fb2c163aef22857645b58537879562373fbb"; + sha256 = "1cffcrmz72cn9sd7yl5z4r9yqzavh9dd9pjhxyjy80g5f0ryxc93"; }; }; @@ -369,23 +369,23 @@ let coc-imselect = buildVimPluginFrom2Nix { pname = "coc-imselect"; - version = "2019-07-29"; + version = "2019-11-04"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-imselect"; - rev = "ae248e744ac3c092c6d957d3923595676666b0e2"; - sha256 = "11cnab1s9jkywbm3nv6wbaaafq2nxqp9g3yav6lc74bazkzflm8i"; + rev = "19d89413b3b00db8de6ccd7db619149f542f496c"; + sha256 = "12w36mkw6b1bxpw51h04xxg703zdwrnww0wh3j32x2bx3bycdla4"; }; }; coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2019-10-30"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "3195dd594389247e4bdb19d129e48846d9215f54"; - sha256 = "1k354jh521fjm2xz05x1653g31bgmx3s0bpsraj516172k605qfr"; + rev = "4be4a57ad8f888ef92974ccb6e685358498863f1"; + sha256 = "15175bphaiih5j63bigj5sblcyqjj68g3k81wn7dwgwdpglf1mwf"; }; }; @@ -402,23 +402,23 @@ let coc-json = buildVimPluginFrom2Nix { pname = "coc-json"; - version = "2019-10-26"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-json"; - rev = "82f2cbcbc9e29aec315357428cedee8614d15a70"; - sha256 = "0vp735ibzifpz7mi8mcm02a1pdarjn7ax6bsi54wxclr4kniqil7"; + rev = "13c8b482662f964af89e167a438f06493f347617"; + sha256 = "19sqv2bflr4aw8hkq9rh8r2b9llx4dbirp5755jbvd62bvizab2d"; }; }; coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-10-16"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "25cd38285df23766fa8c543c307f9ddf65120902"; - sha256 = "0smilk9mi6d4v1p03wqigvri8vk0k30fb8gqlqz5gpxdf3wwn90v"; + rev = "6dde4a564e33251d6745631fcf3168663cad7551"; + sha256 = "1w6cln4ac6df4ka7q4wkv303sh5bmgfzl7gck2v2n5fff7yhrqxq"; }; }; @@ -435,56 +435,56 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2019-09-10"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "26b1be159c2f24d74c6f175e91b6a8fbd3868e9a"; - sha256 = "16g2wz87l1pskn6ri71sdm1j5r4h8z1vjdg3ksqs6mz9x2vzy2zz"; + rev = "08ad1b1565960b41005bedbbd051f90c8edacc3c"; + sha256 = "0wfjs9hj11b0zfryfa2jnclgx4sfml9wvpjbwdqhhzz20ahc1jsh"; }; }; coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2019-10-06"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "198fff4227cbc2742ed6167c1f097826e867d66d"; - sha256 = "1ylwcr8l3bhgxb2zkqskkq97757di6vq7acxw6dd1hb5hk5a17kc"; + rev = "f2c5959b0e8a5658017c9dcb57f03d86c3a7c484"; + sha256 = "1c2vvjvji5wkmxlm5mi5q4px2x9fslkqsw4vii3kjc7cz2w4fnhk"; }; }; coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2019-08-20"; + version = "2019-11-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "65ff16f71ead209e83d34c639594a66df2e19c49"; - sha256 = "11bmf8rzdkgrmanyfmjckm2s3nby143lnra80q9bj2fs3dh9l5hd"; + rev = "714ae8de45ab756d5b65f0be0b616153220b9257"; + sha256 = "17gb0xbvczkqxzs2abknr460v0rcvgsi0m7pc4v0waggr690z53l"; }; }; coc-r-lsp = buildVimPluginFrom2Nix { pname = "coc-r-lsp"; - version = "2019-07-27"; + version = "2019-12-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-r-lsp"; - rev = "261e14c4d80c3302dda0d7b51c45637e3390fe76"; - sha256 = "1r4z8aiw8s66crrg9n26s93wpync7p6p3jwm32m8anvp1swkqp6b"; + rev = "a1b97e36c601975a8d730b6965f25592b1ecd1e7"; + sha256 = "04g1kbgm8p0asrsibmg4w6wj8i2xzwc70g7rkcs2bj3pakbkvws6"; }; }; coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2019-10-28"; + version = "2019-12-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "1e8610b2642232185b7e020651423d11001b7546"; - sha256 = "18d2pxmifyacg7gki99bja7gjs7ycprsm3p6p7snf3dx3g5r4pqq"; + rev = "c899418e8fae4a8c3eb15fee48513ae050b11d60"; + sha256 = "0sipvs8r8i239l2334k4qnhwpaijwd524q598rp4ma34ry42c2xl"; }; }; @@ -501,12 +501,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-10-24"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "1294af604d65b66bac4ff05e159dc0bd0adb8710"; - sha256 = "093q9gx7fkahyk082gkawgvakzimvhhxazxhrdvmzsqs07yjxjmc"; + rev = "3ffd09dad94f6f41dd03cf3cec2a6b92a7028702"; + sha256 = "1qrkgva9yjjbjyflwaqfk84ia2vd5956ikjkmjfhd3gd52kh7hlg"; }; }; @@ -534,12 +534,12 @@ let coc-tabnine = buildVimPluginFrom2Nix { pname = "coc-tabnine"; - version = "2019-09-12"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tabnine"; - rev = "cb787892b860a53fea65954b4afa32331ab17851"; - sha256 = "0c7hk8alggvz837w48fqiz3d01z56pxg2qss13qpp01kvvw12np6"; + rev = "f72b4f47109918cc6ad43b42ed566bec61feff8e"; + sha256 = "1jaj6qsascdpdyz0g8yvi7bcxf4jwcrb0766x4dsmfk9r7prxifl"; }; }; @@ -567,23 +567,23 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-10-06"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "a22270bede3ebab2f51c9a4bfd91305c5d5b7fcb"; - sha256 = "1nd2hk0zdgys7gzmfzkyzsxdcc2dbw573g7wxwxsa9fsk733fydf"; + rev = "1f76767ffb0c79a8917b122c8091dbcdf71aa824"; + sha256 = "0p6pkhq4y69ib408g2r3a20ycfh8yyr8a5jld9snc1jpb8vi0m1l"; }; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2019-10-12"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "b26cda8472205bf28522f06f16a39166a0b78d2a"; - sha256 = "0d8x4l5jk1na0a08xxq65drhcisxm5s8llsymiv9mgnqv3w43yyj"; + rev = "8c55c4b867cf2210810133fab6c9382a6f0a14e0"; + sha256 = "1da97d4s2qnysqk21qdm0sgxn03c2cg8vjsajccx538dwiq9f8lb"; }; }; @@ -611,23 +611,23 @@ let coc-yaml = buildVimPluginFrom2Nix { pname = "coc-yaml"; - version = "2019-06-20"; + version = "2019-11-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yaml"; - rev = "aca9aae69ecd7f0953ab3353361b4ce9f089dbd8"; - sha256 = "1f7d4hbily073pdf3cmmb2vfhb65nxljpin2dhlh57f0l1jiipdn"; + rev = "916db4bca79c85c68e175534f733b41a79fb06bd"; + sha256 = "016ix4jwq5c7zdvk9h2z64rwyzv39wxjr2675xrdv240f5zw0fmw"; }; }; coc-yank = buildVimPluginFrom2Nix { pname = "coc-yank"; - version = "2019-10-28"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yank"; - rev = "636c8a3ff0fb4a950b72c626bf2075c20f7c0086"; - sha256 = "1wz8vp558v3l1c4d3igz55iv673ypapjapyy9q3fcxya8b3qs09y"; + rev = "79c5a97c9b7122180b869f90f7f011934f3ae8f5"; + sha256 = "0dqz759aw0zlmgwrkv8ia45sdl27hb63ilawm9awzbl99w02psjf"; }; }; @@ -655,12 +655,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2019-08-02"; + version = "2019-12-01"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "02a22d27e1c4671db32b0ded1fa2bb861c16d14c"; - sha256 = "0aj9lnrd0v4296c8rwy4bp73dah0lx298yi6ybz3rma2gx9xss6c"; + rev = "9bdc2e1585419640129a48c646bbf8459f96951b"; + sha256 = "0iim0lhib6fiainyb48ibl2qzgv8cmn9yinmd1k6i2y5y26wlhfy"; fetchSubmodules = true; }; }; @@ -733,12 +733,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2019-06-04"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "f8d24584b01cc72e1a3bee640099a7d9bae98102"; - sha256 = "112spld65z56zbgd0zm2p1psc8g728pbd8gig0az1lnbxp3pl3jc"; + rev = "012cd2637d48aa33541078451d70d66930e03e0f"; + sha256 = "1gaqxhpzskcc28qma6vcjwig8v3q3a8sf7b2ckm14i7cb4c1lyh5"; }; }; @@ -777,34 +777,34 @@ let ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp-vim"; - version = "2019-09-30"; + version = "2019-11-07"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "6bca8770a04c099e8c6ec7c7ea58cf9a17c8e44d"; - sha256 = "1h0k9s5adpplrd5zga8078khdld02wxrwwg47q6n0sz5f40vjncp"; + rev = "44c8e24956d7dcfee3ee6083a0573fed31d136ed"; + sha256 = "0g1j4g2p48pwcvbj2p36122q71x1xybq5aqqyz40n16sjjrvcz02"; }; }; dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2019-09-24"; + version = "2019-12-03"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "f8486e58fb02351689ae247cebf28b5fee326c33"; - sha256 = "038zx5zn4da73ps5klixcwh64z6rivfp78l2lvaj5d1vjqh1ac83"; + rev = "ff468225ce2c8834b944ba6e040fe18a28a67cff"; + sha256 = "1h4yw71dj67q57d7iiw22silcmji5ibp4bj18kgm0gvwa53hy7hh"; }; }; defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2019-10-27"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "0a42be58745b2b0a19f6d59ca6238d1dfc96a07b"; - sha256 = "0hm3i66fni89khv8ik8xs36x5485yc2i0mn5fkhjl61ip417b13y"; + rev = "4dc152ac826a825b69741cc79681a257e24497dc"; + sha256 = "1j9hgz76x554wzdz9ss14c94pwp2fk7yplznhyxamndn9wcy8yiv"; }; }; @@ -843,34 +843,34 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-10-27"; + version = "2019-12-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "18ab1648891e360345e1d9f3b004fb2eabf69ee7"; - sha256 = "03pxdw9g2j0szvpncvxhwd2wx3v1fffx5il7ld3mkqm8ymi0b88l"; + rev = "35ceadf33e1248caead987fc83f01336b81d98fb"; + sha256 = "1bazm1n2hqgg13yp5gywzghq310qhkbfqg1v42lyvc0gax8dngzj"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-09-08"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "474b72a8541e529a1628084c277e6e0aa7f80fda"; - sha256 = "00kwij67csk9yp64r8lfrc9m0jm5mqckf4c9a3489azfjn8da097"; + rev = "856041638e98fc3bf4d4de5d90dee525f3dfa9a5"; + sha256 = "1y6kp56n26kabmp60nnyaw46yxv9nqv5bp15hzvfpwvzq7gvpm10"; }; }; deoplete-clang = buildVimPluginFrom2Nix { pname = "deoplete-clang"; - version = "2019-06-22"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-clang"; - rev = "30f17cb58b7838492fbe6b9d62b70b52c8ceedf7"; - sha256 = "0rdr8hxmlbf633ffr217l5vzqdxjxihp4vi2iq3k1491b0pwnzi0"; + rev = "2ea262e98edcb66e828f9077fcc844100320eb63"; + sha256 = "1wvk61f8ph2vpl6llzmir3qs3zwaw3lrphs16d1j7ljkdl3bk49k"; fetchSubmodules = true; }; }; @@ -899,24 +899,24 @@ let deoplete-go = buildVimPluginFrom2Nix { pname = "deoplete-go"; - version = "2019-07-04"; + version = "2019-12-21"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-go"; - rev = "fa73f06f2e62ca58093eb02edc6134f002f27df4"; - sha256 = "02d3h5mnvzqlhq17qadyzfh4570r7gpv0bimapff0nvbyjk4qgkc"; + rev = "bed0a49705caf350e4f1ac51172bb3021a723734"; + sha256 = "022n512rr4szw0jn10d056qc5kaykpkqjlgpnnlfq00i1ns7gpm6"; fetchSubmodules = true; }; }; deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-07-22"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "46121d9ca7688c148764d7ee488bb3572d1434c4"; - sha256 = "1hiw42dm12xyhmvg180mrbjv3bbbvrgl4p2abll0lv5l2zmsbf12"; + rev = "7990447a308c6c5839ada856f31a7dd3e34f20a4"; + sha256 = "1570k79ihz6kif85ichdgdnbipbdkqb5ks8izhqppb68lajyjvd2"; fetchSubmodules = true; }; }; @@ -932,14 +932,25 @@ let }; }; + deoplete-khard = buildVimPluginFrom2Nix { + pname = "deoplete-khard"; + version = "2019-09-02"; + src = fetchFromGitHub { + owner = "nicoe"; + repo = "deoplete-khard"; + rev = "27221723a3bb8e480ff8cbe7f4be9ff38c076bf7"; + sha256 = "0g7sysm5lb8fpgagfg4565fz4rn16djdc4m2213ryq1s3crx40gw"; + }; + }; + deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2019-09-20"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "335e8a03d5741aa42bd7ce64d79e31d7de570ab5"; - sha256 = "0jn4fn9vkxf3av6mdmzixz20l9ca8n2sql7j9mcmh06mn86949bs"; + rev = "ca4018c69aca115033f3e3b5408331e76ff64cd0"; + sha256 = "0k3vgikvjapqniz0cmnhjx4ds5dn4kscd443sf2x2nd6ppa6fd6j"; }; }; @@ -967,34 +978,34 @@ let deoplete-ternjs = buildVimPluginFrom2Nix { pname = "deoplete-ternjs"; - version = "2019-09-22"; + version = "2019-12-19"; src = fetchFromGitHub { owner = "carlitux"; repo = "deoplete-ternjs"; - rev = "307f9c3beb178026d122d9ab3825e4640dd1c29a"; - sha256 = "039qbcg9fanrs7dc52n987rhd0xdyvsmjdrfd1dcrr6ys990n64d"; + rev = "5405e84a44fc4ab5234c9a253ad4aa2b161e5897"; + sha256 = "0684f9ci0y4wihf04z9r8x55cir02al4wp911dz0zg678z8w0yha"; }; }; deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-10-27"; + version = "2019-12-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "ff09a7ab58e5271053c59825895d607316657023"; - sha256 = "183wx20p3mmbxwbdyd5z9gxzhfrgjjl2swymmdw00bw5ys7j5w0r"; + rev = "18681650e81e809cd56e1006cf92cd7f9108266b"; + sha256 = "0rlh97bdmiagrxs9gqjvrimpqcj9w0ys77l0kyxb111zcgcr8s9s"; }; }; dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2019-05-01"; + version = "2019-12-20"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "20d2fa23dddc11d694d62c957e4aa7287dba63d3"; - sha256 = "0718acz3qwrnjy1d76bar825dhbjj7mm5vrkgwxhyvdljx5w0hxs"; + rev = "016420bcae13eb13d47fd6717b0d5905e79d6dde"; + sha256 = "1j15nrv3cdcjxssspzw3zz77kmpkr5r4w00ili0br2a4wlr94id6"; }; }; @@ -1022,23 +1033,23 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2019-10-13"; + version = "2019-12-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "dcbeba8ce075e3b6afc0422bbb339ef953582347"; - sha256 = "1y07a42a976z5cvkkjg6sir0vi7xdmk97bzyc2qvpx16gvqby6a2"; + rev = "e20bff5f3ef4ea29b64f386fa1994281832863d0"; + sha256 = "15xsin3wv7gba0wd7766ylgl9k32xzk0crv3liqmxsn5kgggkcxa"; }; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2019-07-20"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "c718cefc51ccdaf7bd27c4c1ae2de55103434241"; - sha256 = "1sbpkv2q68s6qnm03jr1vazvdqqnrgiw53w4jn38dr8l9i2im199"; + rev = "53c56fcf358ca36b00b9cbf7dd70642c8922fdd0"; + sha256 = "1i0sk2s10ac5lagvn74m21lxsss1h4nfnn51lxnaflqbvlba4rln"; fetchSubmodules = true; }; }; @@ -1090,12 +1101,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-10-20"; + version = "2019-12-14"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "95ea5ae8b0f1766237438f28ecce56414ee6432a"; - sha256 = "1qn825py75cdh414h9gcdf41w7wv84y38m5h39p0w04qz4p585xc"; + rev = "55ef64a057025209c48905df06f725430e63542f"; + sha256 = "07qca1xmwaak45ccgv5vg69s3vwl1p5h9r2agh0aw30qw50jvkkw"; }; }; @@ -1201,34 +1212,45 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2019-07-04"; + version = "2019-12-22"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "359a80e3a34aacbd5257713b6a88aa085337166f"; - sha256 = "0a01g0gw59m57zizidvm9n89qh8lvj0aq4kyxy27i72ysclp3wsf"; + rev = "76669c3c1d675833f9d89f6496f16a7accc0f40e"; + sha256 = "0p5z9bljjfnp4kkpf9pb5zwv5l9xdk3aikpfxjj8scafl99k4m5r"; + }; + }; + + gen_tags-vim = buildVimPluginFrom2Nix { + pname = "gen_tags-vim"; + version = "2019-06-28"; + src = fetchFromGitHub { + owner = "jsfaint"; + repo = "gen_tags.vim"; + rev = "208cd0490547bc8f7615eea1b26e4635d2e60a96"; + sha256 = "00s1kxi1bsvz06z7x78kls0k6ncnbqdyz14fvdxxq82f6s1kdvdw"; }; }; gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2019-09-30"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "d09e3a3cf3b9c37b1cf0cd7e4952e24c46bfb9fe"; - sha256 = "0d0brqssq4qrx0l0yr668jvq5zk5pxqfkr8d8acbds8a48afz6zf"; + rev = "946aac94d5690e9ca1ca2db21a254fea56e45b2b"; + sha256 = "1q1rq1rxxq5hyglz90d7vd1m6az12lr2wz9aafn6zir68n3ak0lj"; }; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2019-10-13"; + version = "2019-12-14"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "3318e1f29fde78bd75b2863d6cae6e1035f814de"; - sha256 = "0nbmg9m6ydma7hx8kb2dgswv1ksy68iqcpsgj81782g0ksimdf8b"; + rev = "723054642faf15082bbad6a0d6db921918e5db61"; + sha256 = "0ln5y7jfd4m59ci39zffjmzi9bda0bck7mkxk0i5fyp4whp8jqdr"; }; }; @@ -1309,6 +1331,17 @@ let }; }; + gv-vim = buildVimPluginFrom2Nix { + pname = "gv-vim"; + version = "2019-12-09"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "gv.vim"; + rev = "a18f4465974dfbd53f1ea33bfbbcc8a32baf1b4b"; + sha256 = "1b4y39zqjggqw6sybmr73di3grhnk19xb5jvyckjb43rp8nxrr00"; + }; + }; + haskell-vim = buildVimPluginFrom2Nix { pname = "haskell-vim"; version = "2018-05-22"; @@ -1344,12 +1377,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2019-08-31"; + version = "2019-11-07"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "ddc3e4ea485771e4f0b939fd8259f3152eb1bd29"; - sha256 = "0128yxhafndllc383ncw4ka0r7q8mwvb3nx70f4plb6m3f07x8rm"; + rev = "dc4b4b5838d126c22c44229a3ee170f6ac79ba86"; + sha256 = "1hicambipbgwf22fax782gpfmcndcpikj3bpf8v91wd5fxm7ik74"; }; }; @@ -1410,12 +1443,12 @@ let intero-neovim = buildVimPluginFrom2Nix { pname = "intero-neovim"; - version = "2018-08-07"; + version = "2019-11-15"; src = fetchFromGitHub { owner = "parsonsmatt"; repo = "intero-neovim"; - rev = "9bb546e37adc1ffda28ff33922c506c15ed67b10"; - sha256 = "173kc8xrbmkhrc9ssaz6h5w1zisxsgz4bibihgj9bx60ibn4kaa7"; + rev = "4ce2d154379f8c95b3819512a9b67ead5204ffd0"; + sha256 = "1na61qb31z80973jfi7ziw2zv6y73rm0bpfb6iqxjppmg4iqgl3i"; }; }; @@ -1454,12 +1487,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-10-20"; + version = "2019-12-20"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "08f13af066fad3a60cf241b37ac1878b8cfafa46"; - sha256 = "0ghdbxmmw1s67vb4l4ap6n6dy69lpp8k1sln27abxhympi2fs2dg"; + rev = "55120b28e4f8aa1da6b5677ebd627a5f5557a9c7"; + sha256 = "1q4645ayqyi82j0pbak6i8r6pkq553yr67rd21x22rghwg6h37la"; fetchSubmodules = true; }; }; @@ -1497,6 +1530,17 @@ let }; }; + kotlin-vim = buildVimPluginFrom2Nix { + pname = "kotlin-vim"; + version = "2019-05-26"; + src = fetchFromGitHub { + owner = "udalov"; + repo = "kotlin-vim"; + rev = "b9fa728701a0aa0b9a2ffe92f10880348fc27a8f"; + sha256 = "1yqzxabhpc4jbdlzhsysp0vi1ayqg0vnpysvx4ynd9961q2fk3sz"; + }; + }; + lalrpop-vim = buildVimPluginFrom2Nix { pname = "lalrpop-vim"; version = "2017-11-22"; @@ -1576,23 +1620,23 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2019-05-23"; + version = "2019-11-26"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "f3240c3782a97720e9a344b5bd5f6808e156722b"; - sha256 = "1qyh58xxp6hh86bykk17934pgg72q7xfsngrhrrr3cxb8jpnmx7z"; + rev = "441b2d3827158c1c1781e797dd5953fa2b7ba63f"; + sha256 = "134lb5nnbkwlcgryd39n9dbqyqzadnfibk76m67pjk60sy4s64wk"; }; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-09-30"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "3c041e1e98c207f260f9c0b2f323e724adf1fb6d"; - sha256 = "063mvhip0pvnil2ip2nlwadn5g845k0v6r3p44zywlklgm5l62ss"; + rev = "12388bb5ce5f5a16dc55dc22b80d7a410410b479"; + sha256 = "1k7l8sq6jcl0a6yk68ch72w20rhwi26fhrp0yvvvim0krs0yr068"; }; }; @@ -1609,12 +1653,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-10-18"; + version = "2019-12-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "d7fd8d7a7465194e8eb67ce759c9fe392035f939"; - sha256 = "0dg0m5ff1gwqn8l4il2yykgmi71vjyp1z9dwil9jn74xk1zhwszp"; + rev = "6fb3ddd293cbd0614f6ed5e637a059c72de643f7"; + sha256 = "1c0dsxqj5f3i2i3k6q7m1b2xlxz9mizmchydw1mz7s3rd0vs06sq"; }; }; @@ -1651,6 +1695,17 @@ let }; }; + mattn-calendar-vim = buildVimPluginFrom2Nix { + pname = "mattn-calendar-vim"; + version = "2019-11-24"; + src = fetchFromGitHub { + owner = "mattn"; + repo = "calendar-vim"; + rev = "de499b9525490b10edbd28fb8f0c4e81c6a6f20c"; + sha256 = "0xvvkq9zckmv9pnzvxg71fblly8lksfi736brbcwcvnszqif4b69"; + }; + }; + mayansmoke = buildVimPluginFrom2Nix { pname = "mayansmoke"; version = "2010-10-18"; @@ -1675,12 +1730,12 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2019-07-22"; + version = "2019-12-03"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "53b6531769e43c7e3c9051e3a12ab31e3e06a422"; - sha256 = "1kf2gfcw0wmyib72na3j2dsw6q4qff1r9lvdbk7cm7iclhwylhma"; + rev = "a6ab1a4d17a295dae5446382a45c9ea3b2936f1e"; + sha256 = "1abxy7p0b6y2zvi7lmdhgkyl1ws281n3dsfk15lkg9j0sk51j06l"; }; }; @@ -1697,12 +1752,12 @@ let ncm2-jedi = buildVimPluginFrom2Nix { pname = "ncm2-jedi"; - version = "2019-06-07"; + version = "2019-11-19"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "86744a7641ce11e22d01778c310e5015f85ef412"; - sha256 = "16h17cqy76iwd9b3wsmmzjg6j465mjd5kjybmk6dilxmq07q24c9"; + rev = "b28bf6d054051cc1c7a6b148323d3adb9baa4ed5"; + sha256 = "07pq8akzvlb8hzksgxx1c50j09ia0xnszq1f83x75kqsjg5f6nhy"; }; }; @@ -1752,34 +1807,34 @@ let neco-look = buildVimPluginFrom2Nix { pname = "neco-look"; - version = "2018-11-09"; + version = "2019-11-19"; src = fetchFromGitHub { owner = "ujihisa"; repo = "neco-look"; - rev = "8c3951acb93b72dda4572859928ef7b372485596"; - sha256 = "1gd692yc1x3753rxg58hwc7nwmm4rjr03y1xaczy1qahq1bm9a40"; + rev = "4d7f1fd7e406c302fba2a1358017c5a76d0f9fc1"; + sha256 = "1brvzg15ni5j60wncpvxhs5k36wz83lhvfcnvja2l9yrngcgh6vr"; }; }; neco-syntax = buildVimPluginFrom2Nix { pname = "neco-syntax"; - version = "2017-10-01"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-syntax"; - rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3"; - sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip"; + rev = "6c3862ac82d2c917fa8b4126832de7d3a909f1fe"; + sha256 = "1kmzlz6c5bs7f4dxgrdn4azwh55k6ghhyzy8jjdgj0wsb309y92k"; }; }; neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2018-10-30"; + version = "2019-11-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "4c0203b44f8daa7e2f72e2514488d637e8a766a4"; - sha256 = "03v3h2ks6y9pl960lnvzxlfhnn6l2pcn6d6012znw2wqpralrjq2"; + rev = "5be295ef60f0e3234164ef822a7471389a7035c5"; + sha256 = "1y73hyb82vs3wcbv02k9n4krvmyn1yhp1mh88jslhcniql2nnj2a"; }; }; @@ -1796,23 +1851,23 @@ let neodark-vim = buildVimPluginFrom2Nix { pname = "neodark-vim"; - version = "2019-06-15"; + version = "2019-12-04"; src = fetchFromGitHub { owner = "KeitaNakamura"; repo = "neodark.vim"; - rev = "eeafb097ad5d9aa9db4ba43b8556306da9e3329f"; - sha256 = "0n34980wdvxrgymnb0xgdy01mv201643xijr9czi0pf1hvfsbd70"; + rev = "44919aa0bebfa60e93e653fdd2a81d1c75c2e721"; + sha256 = "1wz9ygfdg59jwi19l9njcxknf77azlx5nkf5q0ghk6zyv1mqwvc1"; }; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-10-07"; + version = "2019-12-01"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "ec512eb8d8d66fa15bb7f5df2f500d117aa3ee0d"; - sha256 = "0v2i0wwiyc5x9s3ff7qpddicf9i18hhmzffgkm0hfmnspln04vml"; + rev = "b4f7ad5ebb759f56c598527ab671aecace114ed5"; + sha256 = "0xq0vxq86am6xj4sxsnj131d54fds532pikabzsz2l8gnikb4b2r"; }; }; @@ -1829,12 +1884,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-10-19"; + version = "2019-12-20"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "75b50f8ab8dbf57c193cfe5f8ca4edd975ccd314"; - sha256 = "16c6zjqskfdcrdk08cxjpbc1kyixnbmzy7d4mz0xrkxh3bczqgff"; + rev = "212c0d8b05ee65b9be77675db147d05abd323a46"; + sha256 = "0fjmrnmnqjb1r4cxbrlxwpwbm7jgs47wx6pql565946adv5bckh2"; }; }; @@ -1851,23 +1906,23 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2019-08-11"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "f38f1732e4bb0643b3019b5b733a87f5f03ea348"; - sha256 = "1brzryd2sc44xpkz4w4s78a8vmwddvzkqgiyiaygp45k87q2yp24"; + rev = "7e300f1b986f46b217c26906ca4ee88629f18610"; + sha256 = "121zqdmpz2dmgsc6zzvrbjhbc3ik5hbj069wh33laxvj74gsar6k"; }; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2019-10-13"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "037b7a76f28d51c126de43fb88f01b592193c835"; - sha256 = "0n0i4iax3argmmzcwm22yrs9av71nqydza15c9ynlwkdd5gi2xvp"; + rev = "84057dd1dd28e1198d0b2777301ef6cafd8f2cef"; + sha256 = "164077vmqf4kcj0kn5c027faa4fjzfdbl1cz4j45dxpbak36hy6w"; }; }; @@ -1884,23 +1939,23 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2019-09-21"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "f6c22fda80455b52957b3fd11d94acc44db21250"; - sha256 = "1r1fx958qhbs8xq31wrp5jyfvqjrs611xywv7avpwy9991rh33xv"; + rev = "9f0e71200274fc7906df1284d18d43c127214c2c"; + sha256 = "0shg7a66w8l6g872fgpf59sialc8gs3nx9h1awgngy0kk0m17ilq"; }; }; neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2018-11-15"; + version = "2019-11-14"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "c177209678477d091ee4576e231c5b80b44514d0"; - sha256 = "069phpy1p8dindi6whddsb9x5zyw1adzsnv7br7q955hf6x9bxxj"; + rev = "53383395befafce802c902c21b54847074454491"; + sha256 = "064qi6zv2hrzn91pvr31b9zj2q0k9vbkk5csdhw5y52q26p1gakq"; }; }; @@ -1917,34 +1972,34 @@ let neoyank-vim = buildVimPluginFrom2Nix { pname = "neoyank-vim"; - version = "2019-03-27"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoyank.vim"; - rev = "6a41fd651c00b1ff6a6298cb2be088e8d27d3629"; - sha256 = "1p084xbycwkghfih41z1sc6nn2xi7471vj8zgc9jgw0qkxbmbcnn"; + rev = "1829c6e426f829edea46660d0db08d4488010fcd"; + sha256 = "1y6fvxqpj3rwf1fmjib177lqzh3z7syp7bccn79g1j8177m515w6"; }; }; nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-10-05"; + version = "2019-12-21"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "92082862364cf5ec3eec79a025bbc7bc5165e05f"; - sha256 = "0aqjc26l1m62jgj34difkkbbd0kam1sa6ldfwf2fbkxs3f5y63q8"; + rev = "ce590719f67ec031f75935bdbfe0c9616ea878b9"; + sha256 = "09q72ddypwh8mpg467nl6z16mvs29gxhwlmm3npn0817c6sf9dqb"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-10-22"; + version = "2019-12-16"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "fec3e57ad23e4c268d07181d6afb858925b647a1"; - sha256 = "1s5rmzl2rlqgxms5gi8gj6nnk18qqfsz6r40kk84cgqkf0ip13xv"; + rev = "1ab85e33bef8763a618c505ee5a0611519f81e5a"; + sha256 = "1fxbl06pqm1zay0lbg9q6qq21rbcbpmbn53kfw86qyqj71rayd01"; }; }; @@ -1972,12 +2027,12 @@ let nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2019-05-25"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "9f7ce848723f69e33792e5606091bbfd5739d253"; - sha256 = "1n6kdnll5jh92kfbwwm8544mpp7c2awqsaps91agqjd3nwa5x27x"; + rev = "f06189a4c054fe8c22e46aca4d451e03456f2283"; + sha256 = "0gk4zq0gz3nnwfkldswg9bjpk0gf6d6mgfzcgvj0pnlbja6ass81"; }; }; @@ -2014,6 +2069,17 @@ let }; }; + nvim-lsp = buildVimPluginFrom2Nix { + pname = "nvim-lsp"; + version = "2019-12-22"; + src = fetchFromGitHub { + owner = "neovim"; + repo = "nvim-lsp"; + rev = "842c4413c1e6585960db503080c8ac663dba9440"; + sha256 = "0nbbsq8y51c15wh29c3ia6lk6ahr8r281r5069x56v478n8p82h8"; + }; + }; + nvim-terminal-lua = buildVimPluginFrom2Nix { pname = "nvim-terminal-lua"; version = "2019-10-17"; @@ -2027,12 +2093,12 @@ let nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2019-10-13"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "81caad80107abb9c2f5159e02e2cd95876370bec"; - sha256 = "01x1jx7wxpjkv09l9wx1ygsjqrdvfy47pxqgjzmnx4x126ji9gw2"; + rev = "83c6f4e61aa73e2a53796ea6690fb7e5e64db50a"; + sha256 = "0yswx77gwxsac4aw2hkx0krjz4jh7pj5bgpvshynj5dlp34ip0m0"; }; }; @@ -2071,23 +2137,34 @@ let open-browser-vim = buildVimPluginFrom2Nix { pname = "open-browser-vim"; - version = "2018-11-29"; + version = "2019-11-14"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser.vim"; - rev = "b900ff9d39bb36891704bd0fe76737ee3a7ac2b9"; - sha256 = "1sws0pzm13cgl7mf6938xjmh23hk02agf23zfx5rdb4d2lcn4ir3"; + rev = "cd29e8c8db02cd7744728a8f77a829b967e5ff31"; + sha256 = "0n1q76bcavkh1smk3l78ai7jh7qzn3sbpqcxs3pjf5za5j4c5i48"; + }; + }; + + palenight-vim = buildVimPluginFrom2Nix { + pname = "palenight-vim"; + version = "2019-08-21"; + src = fetchFromGitHub { + owner = "drewtempelmeyer"; + repo = "palenight.vim"; + rev = "139f5b929a8be2530c7386a5b4610d4459941199"; + sha256 = "061iqgw9kzpsni9159bd8hllpkdmnrjbzpi9phy91l9klnja2cam"; }; }; papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2019-07-07"; + version = "2019-11-06"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "20f3b25cdd772d4483eb8ced453f94f93b6126e1"; - sha256 = "1yck7f48v9rz7wq2q2b372bv07qmpj562ncwfdiavsgy6wms3p4b"; + rev = "ddd09867ed4e020b3ba2eb47dc3ef365da5b0fed"; + sha256 = "1dhbnd99xs6l5alqhn9m1nynmr9sbvrqj2137l23ysisprl3rgmr"; }; }; @@ -2115,12 +2192,12 @@ let plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2019-10-17"; + version = "2019-11-06"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "08f69d9dfc314021eef8802f1acbce051bf7fda0"; - sha256 = "040ya0grhalylnaqrjgdlw0f7mfl87pz5y3f624gqq73pcf36skk"; + rev = "82ff416ce99cc9f69b1af54b8832eaf6cdbeaea6"; + sha256 = "1297h9jipfx2xw5dqh1286g2syv5c18g15644lqn11s62skqxd16"; }; }; @@ -2190,14 +2267,25 @@ let }; }; + quick-scope = buildVimPluginFrom2Nix { + pname = "quick-scope"; + version = "2019-04-22"; + src = fetchFromGitHub { + owner = "unblevable"; + repo = "quick-scope"; + rev = "994576d997a52b4c7828149e9f1325d1c4691ae2"; + sha256 = "0lr27vwv2bzva9s7f9d856vvls10icwli0kwj5v5f1q8y83fa4zd"; + }; + }; + quickfix-reflector-vim = buildVimPluginFrom2Nix { pname = "quickfix-reflector-vim"; - version = "2018-08-12"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "stefandtw"; repo = "quickfix-reflector.vim"; - rev = "c76b7a1f496864315eea3ff2a9d02a53128bad50"; - sha256 = "02vb7qkdprx3ksj4gwnj3j180kkdal8jky69dcjn8ivr0x8g26s8"; + rev = "8e9c05a110b80ab66fc8bc3d5fe9e6fa168aada6"; + sha256 = "1i8453z3s0xmbmbzk3kpxwvd42ar9v2m2gjqic9k7njpxw87czvs"; }; }; @@ -2258,12 +2346,12 @@ let readline-vim = buildVimPluginFrom2Nix { pname = "readline-vim"; - version = "2019-08-24"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "ryvnf"; repo = "readline.vim"; - rev = "40964933819e2a719e6e34adcf3e8b2210c5c6ce"; - sha256 = "1jc8lzl49nl7r3v1b7fk6zpiba41h51qsi2w4lhf8v6lnzbazii7"; + rev = "9711f3c7c1d295e775750d7421060d74ee1b56e3"; + sha256 = "0zvavhc8033isdn7gdfla5kwif40rkn9p4zmkvwy423dpb3432h2"; }; }; @@ -2335,12 +2423,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-10-20"; + version = "2019-12-21"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "97fdc4e4975515d8e8a5a82380dd85628d59a005"; - sha256 = "1ggnl9h0jqb3zf8n8vpvlizxb3fikmghwpj8d3xq3ny54wfjgx78"; + rev = "05f98470e55722aaf9b1a1ef1eb272f2d95e349d"; + sha256 = "0hg8jmbybhfaiiwzm4rh7m706mwvzkyk1vzg8jxq8653cbbjfzib"; }; }; @@ -2357,23 +2445,23 @@ let semshi = buildVimPluginFrom2Nix { pname = "semshi"; - version = "2019-10-01"; + version = "2019-12-01"; src = fetchFromGitHub { owner = "numirias"; repo = "semshi"; - rev = "b50f1bcc48bb944704c586b462a5e9d5cdf0d532"; - sha256 = "1f2wqqhnfyicx8dgna6lcsa3pl5bxbjqf261rz9phxw649rsa9a4"; + rev = "801d0c971d3d7291cf2fc22d74ac69155a71a279"; + sha256 = "0adq1qxlxd53ps5byjvqmzk266f3wbvqmw74dkx6vd41zqw38wfx"; }; }; seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256-vim"; - version = "2017-09-05"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "1475b7610663c68aa90b6e565997c8792ce0d222"; - sha256 = "03gqw14f5cirivcg1p06g500ns066yv5rd0z3zikvn4ql7n278dk"; + rev = "b68f4032c49b64065072b449dc0f0f1f30616d8d"; + sha256 = "0bxw0ks5gndzrgixa6xqhnf78b7n75w2jnc3s6bv75lz0fn0gypx"; }; }; @@ -2410,6 +2498,17 @@ let }; }; + smartpairs-vim = buildVimPluginFrom2Nix { + pname = "smartpairs-vim"; + version = "2018-01-01"; + src = fetchFromGitHub { + owner = "gorkunov"; + repo = "smartpairs.vim"; + rev = "dc754c29509b1a942552b3cfa348e4aae209322c"; + sha256 = "1pyynwz7wfbgccdxsyggzl0301qjj3wgyymah5spx8b3s42a6slj"; + }; + }; + sourcemap-vim = buildVimPluginFrom2Nix { pname = "sourcemap-vim"; version = "2012-09-19"; @@ -2476,6 +2575,17 @@ let }; }; + split-term-vim = buildVimPluginFrom2Nix { + pname = "split-term-vim"; + version = "2018-09-30"; + src = fetchFromGitHub { + owner = "vimlab"; + repo = "split-term.vim"; + rev = "a4e28cab77ad07fc8a0ebb62a982768c02eb287c"; + sha256 = "12vrmbq1r8d6sgyxjwi0s856n1v4vjhrf8wpwq6l4ydmk1bnvjkb"; + }; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch-vim"; version = "2014-09-21"; @@ -2511,23 +2621,23 @@ let swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2019-07-09"; + version = "2019-12-05"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "d3d66151598b5d6dda159524baa9c66b3d1bf5ad"; - sha256 = "0pq4nwdhnw3qzz3xaz9fpbf3p0l6vrmjkqj4lrfymafbmxc94j6w"; + rev = "245e5f7aae6f1bc96849a0a01a58cb81cf56e721"; + sha256 = "0hj7ln0qvfpb0pmvkzj21zd8a2zribdahwwl4rn1yn8skclcq149"; }; }; syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-10-23"; + version = "2019-11-20"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "28bb72adbe5c610bdc07407ddb83898919e4645c"; - sha256 = "1hhpd01vc9377fvqdh30pqack0i0sxxz2qdzz2i6x4snabga2zqj"; + rev = "39b35b23b952d620b8ec7cabb13110f586663837"; + sha256 = "1nc3019c969ms6m0hrj5k1kggcvsywn6j7kz0scdwzvfd6bcla6h"; }; }; @@ -2566,12 +2676,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2019-10-25"; + version = "2019-12-22"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "a0f51bd5a6514632bf3d2df1b001df27361892bd"; - sha256 = "1drhdyyalg2sjgckgw8s026q2ydd07vfxr3i6vyvp3irlf86sbdy"; + rev = "ce30e3f0d1d2ceaad44a2e3550738b6bc71628a1"; + sha256 = "1sx3jnb7zifjhrg27kfh0q7r038yy3qlyf778hrkfpcqfmrki992"; }; }; @@ -2588,12 +2698,12 @@ let targets-vim = buildVimPluginFrom2Nix { pname = "targets-vim"; - version = "2019-10-27"; + version = "2019-12-08"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "be309773998ca729213206950109a758be15b556"; - sha256 = "0ravnykqlhw09cz5yyjm6k4kbikx39jagmmpj87q31pgf1rzycmx"; + rev = "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d"; + sha256 = "192wq3x64x11nm2jhs4yrc627b0lh002dfnj72xrc7jak9vbdps9"; }; }; @@ -2630,6 +2740,17 @@ let }; }; + thesaurus_query-vim = buildVimPluginFrom2Nix { + pname = "thesaurus_query-vim"; + version = "2019-11-09"; + src = fetchFromGitHub { + owner = "ron89"; + repo = "thesaurus_query.vim"; + rev = "830a20ec77780ebfe8d2a7e8c740ca4abb079f89"; + sha256 = "0kfqpjwashwf084cbz6dmhirk42a4n8d1zj17i086by17nx7qn1g"; + }; + }; + thumbnail-vim = buildVimPluginFrom2Nix { pname = "thumbnail-vim"; version = "2017-04-24"; @@ -2654,12 +2775,12 @@ let tmux-complete-vim = buildVimPluginFrom2Nix { pname = "tmux-complete-vim"; - version = "2019-05-13"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "wellle"; repo = "tmux-complete.vim"; - rev = "897aaecdffd0133548ea7f8b5d76472236322ab6"; - sha256 = "0iazphx5708hwpzyys7mx7hilkrarh7g5251j18m1pg5smbbfjvr"; + rev = "7237d8d8d60af7916e3b546a9f4f396df95a1b21"; + sha256 = "05ypjahaf7gk4vjc8hhglmw7y8vyjxyhxq8sm0s3np05aw0gdbsc"; }; }; @@ -2677,12 +2798,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-10-09"; + version = "2019-11-15"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "6863fcdce850673b4468c43244d189ade3f99a8f"; - sha256 = "0sq5cmsng2lid3dlfhcyagpzsjw1abp43wl3clm3bc5f3944lx5r"; + rev = "393b3d0d55b951ad8d28f63f0e28c48e25ff48e4"; + sha256 = "1hwn530p6zcjhk2lcmiqgrahxmp9hkwbzjbz4vnqdf1j6w9aqrwp"; }; }; @@ -2710,23 +2831,23 @@ let typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; - version = "2019-06-23"; + version = "2019-12-19"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "5a319ea5504e18215d155576c78d1b7fb8e22c8f"; - sha256 = "1hz42blc1sshkms9ramdhzwnphqs26p83q8smw5y14blp1zdb628"; + rev = "616186fd8a04afa32bae8dc0b70ab7f9cdb427fd"; + sha256 = "0mq6yxq5ais47ib0ifvdl3qi4c4wz0jwzqsz5djb616xfnmp8ysx"; }; }; ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2019-10-20"; + version = "2019-12-19"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "8ff301c651d6df806c0f9305273a6c62a693bc48"; - sha256 = "0ckgwfchxxd5va9ils2d0518irlsjkc0pzncn357dfihh2mgg01s"; + rev = "c4bb89495a2af3ed41a510db9a2f589748643801"; + sha256 = "0xwcx35aj32h99l5gb8qb4xvddpcndim998p0vrirzj0mi08avlx"; }; }; @@ -2743,12 +2864,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2019-06-04"; + version = "2019-11-06"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "29f43f7b1be94dccfac461f4da0a34410408111f"; - sha256 = "1wr0gq008jzlaignlkr706z5cjrdb6cc16r621zvfjncm9a71pnw"; + rev = "49f79785e7fba0f40519a6b9074dcceb8626f7d5"; + sha256 = "1k2b4wh0244dx7zinag88wfcwl2x2042z0zsyv9b77w81h8qfdd1"; }; }; @@ -2763,6 +2884,17 @@ let }; }; + utl-vim = buildVimPluginFrom2Nix { + pname = "utl-vim"; + version = "2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "utl.vim"; + rev = "67a6506a7a8a3847d00d3af3e2ed9707460d5ce5"; + sha256 = "0ax68nmzlka9193n2h82qzvhzv4dv6lm7rg3b1vhj2pn1r6ci6p4"; + }; + }; + vader-vim = buildVimPluginFrom2Nix { pname = "vader-vim"; version = "2019-05-18"; @@ -2798,23 +2930,23 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-10-21"; + version = "2019-12-19"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "c8c0a9325407c487fd702eca39d987d67123c98b"; - sha256 = "054q6lk91x7dghvvzb51j7923bdy317iya5msv9as76nwzdrk5dp"; + rev = "a6f90e5691d8b80db024d8298b3fb461752e0248"; + sha256 = "1g19lgjlqcyvs5x120sv5iwnggjyfzyl1k9w4b39yhhfmqi1vvf9"; }; }; vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2019-10-01"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "3c7f939bbc99a30d1c5013bc9fa0fe967398c9ac"; - sha256 = "0i8i912lvs281n0wn4wvqykx0aj0f1ply6pd9pbk5k0whlgf6r1v"; + rev = "7e4da6e78002344d499af9b6d8d5d6fcd7c92125"; + sha256 = "1n35igng3a6d5y4nh5pyb09s6khgcwbr3v0lnh33qb51cv4cnjh4"; }; }; @@ -3029,34 +3161,34 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-10-25"; + version = "2019-12-19"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "a0e9b383c67174744ea2be6239f6c71eaa10434c"; - sha256 = "0vdpcgm7925gmr15zr0nb75b2449fgw78aqchc6qqa07n6n2zgrd"; + rev = "b93492b40b068d4bb3020c123295061aaba7c846"; + sha256 = "12nb31ca6w3wv7b5sq7msasm39mjcxd3ii8r94y18lhxz223dgzj"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2019-09-18"; + version = "2019-12-19"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "0d5c5c1e2995126e76606a628316c8e3f5efb37a"; - sha256 = "1xra1yiz03pap18hsq00053s42xf185ls9qydrkgpyjypqdnm5bg"; + rev = "945bc057d1e96c99834f1beee6c9f03f0d430b97"; + sha256 = "0v6q71hyd4pn46636xb9crlydjds05dvrq0idwjxb62146j83m32"; }; }; vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2019-09-29"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "1d5d169044ef71f687df0efcffd9a394528d7f47"; - sha256 = "07h1091fdjnhi45wql7yadsyln2861m4435wzr8zp5yj2b9k132a"; + rev = "0849bcb6523d17a753fcaff8d40cbeed2d09cf65"; + sha256 = "1z3x72aprp950chk754h0qpf5lxh2svzk39flks5fanxaggkpkng"; }; }; @@ -3095,12 +3227,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2019-10-09"; + version = "2019-12-04"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "a350538f8a5a8f08cf64a520d456282080c3968f"; - sha256 = "0abz5asjgawz7zx5gy7q5nnrkmzijwpn0ay93913l78dnsal0408"; + rev = "354abcd3d533ba07eebc510102870d85d4e2c466"; + sha256 = "1hngbjj12q5v73smyhsay4irp3q71cxyc60n97ybfik5mmm455nj"; }; }; @@ -3181,6 +3313,28 @@ let }; }; + vim-clojure-highlight = buildVimPluginFrom2Nix { + pname = "vim-clojure-highlight"; + version = "2015-07-05"; + src = fetchFromGitHub { + owner = "guns"; + repo = "vim-clojure-highlight"; + rev = "9ac6cb8fef04b2c243377adb671324a60952aee0"; + sha256 = "0fg3faj0fq7b8pqr0i33qdg2xfd5966lrjl1wkq6jcgvdqamhz0y"; + }; + }; + + vim-clojure-static = buildVimPluginFrom2Nix { + pname = "vim-clojure-static"; + version = "2017-10-23"; + src = fetchFromGitHub { + owner = "guns"; + repo = "vim-clojure-static"; + rev = "fae5710a0b79555fe3296145be4f85148266771a"; + sha256 = "0s98qrhv7xh7bvh8bm1vaxpw3n2mcxayay3k90ibgjrv1jpyvzx7"; + }; + }; + vim-closetag = buildVimPluginFrom2Nix { pname = "vim-closetag"; version = "2019-02-14"; @@ -3194,12 +3348,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2019-08-14"; + version = "2019-11-20"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "18f47c3ac563b60f71103b1e1d29b349ff9d8549"; - sha256 = "0z36jjj1bxb4xz9lyjrbv769797g3x475ncamflfj6yj72vvhfy4"; + rev = "dae6dd82a98eda68af83a1f725cc570ef3b1ae7d"; + sha256 = "0w2djjs29dgd5jcfglvgb4mb60vb1bj34mxzbx2sidp3lb15xn4y"; }; }; @@ -3260,23 +3414,23 @@ let vim-commentary = buildVimPluginFrom2Nix { pname = "vim-commentary"; - version = "2019-09-28"; + version = "2019-11-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "62b68aecec2de531bc3978bfb9c07d3b6759ce0e"; - sha256 = "1fbcdrrhn4l8266zr6rm0f3zbhpql9is6rx4rkim5wxcwmnpkr77"; + rev = "f8238d70f873969fb41bf6a6b07ca63a4c0b82b1"; + sha256 = "09d81q9na7pvvrmxxqy09ffdzsx5v5dikinb704c9wm4ys2bidr9"; }; }; vim-cpp-enhanced-highlight = buildVimPluginFrom2Nix { pname = "vim-cpp-enhanced-highlight"; - version = "2019-07-01"; + version = "2019-11-14"; src = fetchFromGitHub { owner = "octol"; repo = "vim-cpp-enhanced-highlight"; - rev = "da1d86aaf42bd4e52272b5a2f62b098c3986c048"; - sha256 = "02cz8av85pjxpl9ggiy0y0z3gnjvd6ng1pafzv0c64xharg9l5aq"; + rev = "27e0ffc215b81fa5aa87eca396acd4421d36c060"; + sha256 = "15nyd4yssswyi4brkch09rca0qh7p77li4xyrivmiapkr4a60vwb"; }; }; @@ -3326,12 +3480,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-10-26"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "72cb43727e3b87c99042e1f9dbae23b82c8ea59f"; - sha256 = "022ikmrva76whv4gnc1c33z6b1pxg2avpay9yac57l0gs4rhccv4"; + rev = "e3e6aa16bfce255e9bca3d117c11f18f36f5c1b3"; + sha256 = "1p7k20nfxm6jrrlx6dp9cm9bq8jkssh7fyr2y49wnwp652s191gm"; }; }; @@ -3359,23 +3513,23 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-10-19"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "79ffe5c6cf0a56d693659b6b98e92a82daf105f4"; - sha256 = "1s1rqc7ai5a7al4sqavsng7pa3hx8fxgdkq8ww119bwfx5p43v4z"; + rev = "9c12328df924ddb875ee1e5c9fc0f939b62d6a6c"; + sha256 = "1kpkwqrhix7whd00pcbanf3ij55x34cqc6qz3r2xshcmydk5vqxn"; }; }; vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-09-27"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "4bd1ecd7f38206ef26c37d7d142df58c4237d9dc"; - sha256 = "0wz8p8fm48dbpzd00h9qw0q2s3r7nm8qa5kcligcrzh1kv139026"; + rev = "1206e1474fc613caeb1ba56d36b71d7f9f7760ac"; + sha256 = "15mdn8s9isnscsaggkz552f8hi2yqq9wksymrxkihihv0nwwdgi6"; }; }; @@ -3390,6 +3544,17 @@ let }; }; + vim-docbk-snippets = buildVimPluginFrom2Nix { + pname = "vim-docbk-snippets"; + version = "2019-09-13"; + src = fetchFromGitHub { + owner = "jhradilek"; + repo = "vim-snippets"; + rev = "b8604893f46f6c570a55efff733f0371ac8a805d"; + sha256 = "1qz3azgzv9718s2a6h8xw5nrvs4j776csmzsn9chvykdpx8rwim1"; + }; + }; + vim-easy-align = buildVimPluginFrom2Nix { pname = "vim-easy-align"; version = "2019-04-29"; @@ -3447,23 +3612,34 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-09-06"; + version = "2019-11-03"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "e8d59d115c8153a7de9872b3c4419f2354c0f14b"; - sha256 = "1q6bk8rqsdwgbyckwdnq4kv6gy5wjqrhdm06sip5x53mnkhmpf5p"; + rev = "057ac39b5982a2decf52d48cffc405ff6a666ca5"; + sha256 = "1mzdjqh99cyixngy9y38fdgs2bzni4pgrk14y8f72vlc0di0fg5d"; + }; + }; + + vim-elm-syntax = buildVimPluginFrom2Nix { + pname = "vim-elm-syntax"; + version = "2019-11-28"; + src = fetchFromGitHub { + owner = "andys8"; + repo = "vim-elm-syntax"; + rev = "7ed55d9bc2c0cfd023d7cc6541634bcbf36430b5"; + sha256 = "1kq7qcw9l41q646a2ilwy94lj1qz9as14aqfmzkbi938yij18zpx"; }; }; vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2019-10-26"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "a35d8ffe59e1ff7408bce67ce3301d3b04c7f7b6"; - sha256 = "03if3ckai0ppgv1f5mxpbfvc7ns13k0m4f923k98hinnm04qbr9v"; + rev = "75efe06ccc63b7cd50b193b99cce83e3ad3e60cb"; + sha256 = "0yjsk6amlbgdbp95h8fp4x1hf9gmrfgrvz9gizyh08xdrb7pbpdw"; }; }; @@ -3513,12 +3689,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-09-01"; + version = "2019-12-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "ea9fa306a731a105511cc5faecbaf7d58c94dfcf"; - sha256 = "1l1wzgr4ly25yablz299pfrgl47ys51hljhhzcfdivvkrrzjpdd5"; + rev = "63d7209ff4f17d4bdc30f3478986b5bd44a47a3e"; + sha256 = "1n0p70w0qmbxffchxsmklraxqrzg1q6bwnp4qhy0xjcz89p3fzx5"; }; }; @@ -3535,12 +3711,12 @@ let vim-flagship = buildVimPluginFrom2Nix { pname = "vim-flagship"; - version = "2018-08-15"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-flagship"; - rev = "66abd2fc519f4339ec751874279c14da7833dd99"; - sha256 = "0ijfa076a5jr6gi11j2zcgh5c7kj0vlwipzk1myjc1a77pss7nlg"; + rev = "e522bd0ffb0e329f695ead7d4288a6245ff22410"; + sha256 = "0vqkdzd7b204kbinn12jk306kc9bn2f0yaifj49swd0g8hv6dk4b"; }; }; @@ -3601,12 +3777,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-10-27"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "f6acae50ea4d8ec1bb1497cb886d80298b54831b"; - sha256 = "04k9bmqzlrx9pvkjs51znbbrqxy416k6jl7ffdp892hacgvr8cnj"; + rev = "b68b6d4329d9bee58a521e0ff8c6adbbc53915b4"; + sha256 = "1lrx2vk6bj10sy297mby4fqjrn09s7ghq2xjbp8z2ajww4pcxp05"; }; }; @@ -3645,12 +3821,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-10-24"; + version = "2019-12-03"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "af20a9fcfff9b5277fc8482e802c4dec291ea589"; - sha256 = "0jakfv1b1kc8mq1izj7bzd83d55z38igl7xl1c7n1vb9m2dy0nn3"; + rev = "1c53af9a0d3b622af5a62d69ddfc141c841a28c1"; + sha256 = "0269cjkcx4arq7phyqv80ziafg5p1in5ci7207svixbfdg5hlmfs"; }; }; @@ -3667,23 +3843,23 @@ let vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2017-10-15"; + version = "2019-11-01"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "697eca9784ffac39308e1fd45e0300582c3d060b"; - sha256 = "0qj00wgshx0pm6w1p682kc6s4xnzshnwx0sr65b24g1m495ck4q4"; + rev = "fbdb226318e3e1747b29f31ad07c0cce07e9f22a"; + sha256 = "076fny258ynamnd1mnknmp1zlafvvxpx7p28985mms84k65ihvy5"; }; }; vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-10-29"; + version = "2019-12-18"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "bbbf77153a319a52798a3c8f4a0235470cf35196"; - sha256 = "1271079cipiida8kmh1d33x4z0lzs85izkr0pdxfhm0y51g2h55k"; + rev = "b1b9a1b0d4e9b2408b29ed566135f56ec27629b9"; + sha256 = "1m4ldfc7k5ds8z4bjl8dpx63dx7d4b75ifkpjxz8l9rq6ix8i4y8"; }; }; @@ -3700,12 +3876,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-10-09"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "8b783474b64fa01b813f9c4a24f240c7c3378726"; - sha256 = "1mrqdg0hq4gvzng959dk6hbgh19sxzgg959i6k39c7phdd1f1fm9"; + rev = "dde6a660c7dd4e02b331da238ea477770073aca2"; + sha256 = "0c411yg2s6wb8141lqpgasg7iwgvfwy88z6l0c0gccmk8knypxhm"; }; }; @@ -3865,12 +4041,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2019-08-04"; + version = "2019-11-21"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "0c37ddf0dfbe069b9f2cf1d4a341efe7b373f133"; - sha256 = "11zjm9a6x57s5rs080p1gcj86l01765ayn3k9yx6mx8d48n8zr3k"; + rev = "4929d19cc8483d9d9872cb3669915e6a8cc381a2"; + sha256 = "1rbhnmqrw8gdpf60lx4akhadz3q80fykal1a9c4mnn5nrqymv9va"; }; }; @@ -3953,23 +4129,23 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2019-09-16"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "24e7908bae33df5851f7085f5ec3af0ca81f060c"; - sha256 = "1bqrhkxk6f5ha7xlkgqrp96a1pfk9258x5b4iz3kbk2gqp6mcrmb"; + rev = "dc7951895a98c49c39622f65cdd7b39374c348bc"; + sha256 = "1d8xiiwfg5wz57jyy7ahbi2bl5sjkhkpkqm2qbhsn7cd9vk36sxy"; }; }; vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2019-08-14"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "b6c8c8419240bdd29b5eb51a47d488fd390deed5"; - sha256 = "0p56av0zmig4rpsq4w4armnccyd713xdm5lwrck3cip55c39382f"; + rev = "2e4a8c485cdf601bb2f2761ea68c09750a0b82e0"; + sha256 = "1zvqpk8qvkhglfdi6ma7ads54w0i8v8vy4k3gcrrjydmwwa2v34l"; }; }; @@ -4042,12 +4218,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-10-16"; + version = "2019-12-21"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "8f8c9edba37310d17e59a625b177ec6a37c07035"; - sha256 = "1hk3003ypiw62vra8vdjx2gzrv23b642w1nhq0zvgmh6yv8l33nz"; + rev = "838cfce82df8cf99df5e3a200ad23f6c0f027550"; + sha256 = "0305q9vf454h3hzkax5lpwzfwr9d573kqpsrlfsny69wgkrkvcax"; }; }; @@ -4108,12 +4284,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2019-10-30"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "66718caab97f13d25813f91b8352c9ac75b3771e"; - sha256 = "0ia9r212019d8jqrbs3nrn36mpc09gc81gf4dnv3hksn6knpdr8b"; + rev = "fba44d7bab381b2107f9c6db0322282910e98267"; + sha256 = "1scv9zscvywr40rw6z1v4vsgq8j8mfvp1hxs6ana22wbm0qdwkrf"; }; }; @@ -4130,12 +4306,12 @@ let vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; - version = "2016-02-11"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-liquid"; - rev = "209f77c9550a90b0b88492c93852195c171f6ebd"; - sha256 = "1ghspgjr6r0csmqacmsmkvrqvfgplx033yb3qwzddby991fpvfaa"; + rev = "9ebc192daec70e620c22d574b5a1c1e16f89a48c"; + sha256 = "0cvcjiii5wv55n695284k520rrwi0l4gqpyiqnrpnhmsaqks0n0f"; }; }; @@ -4163,12 +4339,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-10-29"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "d6bb42bf75bd5dfd28b1f3216749475f940abc5b"; - sha256 = "0d68cajna2q92ikpyzbhbia6wq6v5n4pnz7zcw8bp4zayj5rv48c"; + rev = "0fd38b8a93ab16d380aed8467a5059e5b3932a2e"; + sha256 = "06jz7f5npwm2iknpfmzz5x8lw5377hzc5kpg6n5p2icjwzaha6mz"; }; }; @@ -4216,6 +4392,17 @@ let }; }; + vim-metamath = buildVimPluginFrom2Nix { + pname = "vim-metamath"; + version = "2017-02-10"; + src = fetchFromGitHub { + owner = "david-a-wheeler"; + repo = "vim-metamath"; + rev = "50aff63608256909159f1b8fc3f09ba61b2bb9bd"; + sha256 = "0gwqafhr18wv9ygq47cxwi0k4gj1xll4z8s61w9l9vwaiy5znssh"; + }; + }; + vim-misc = buildVimPluginFrom2Nix { pname = "vim-misc"; version = "2015-05-21"; @@ -4238,25 +4425,36 @@ let }; }; + vim-move = buildVimPluginFrom2Nix { + pname = "vim-move"; + version = "2019-11-23"; + src = fetchFromGitHub { + owner = "matze"; + repo = "vim-move"; + rev = "58049562efb0e6e077416d897b760c4dc9bb25c4"; + sha256 = "18pnk6ri73a6dq86zh510wy1s0z1dwnsyay7lxrgirjgh3s9nhhq"; + }; + }; + vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2019-09-30"; + version = "2019-12-07"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "3a512e21a9c91cb61103734b8bb5dc776c1a3146"; - sha256 = "1dh26qwsky12fhc8v9d6x841nhgbdnp2xgsrlnqak7cyiwmwp41g"; + rev = "137b7e5c671b4b376b2df7492c4023ac6e1439da"; + sha256 = "1pv19ylhifd32p8jb8rvbd8l5wik7349q4m4f8a8qycab2ba5xhv"; }; }; vim-multiple-cursors = buildVimPluginFrom2Nix { pname = "vim-multiple-cursors"; - version = "2019-07-11"; + version = "2019-11-09"; src = fetchFromGitHub { owner = "terryma"; repo = "vim-multiple-cursors"; - rev = "2609c9b054b562b6bf46936f3e80a25042c5d572"; - sha256 = "1vd7rcns8r52vaaamfz5p23vmrz6j2b3z3yqjlc46s4pmzxdvpgh"; + rev = "6ab4dc7dd012e23adee74ef4596ad3e9659a20c7"; + sha256 = "149cg1fwsrd1swvd0ivn1p8j8gpj3gk08mx6dim4fkshknwxs5l0"; }; }; @@ -4317,12 +4515,12 @@ let vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; - version = "2019-05-31"; + version = "2019-11-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "60f0ef80fd74b8c58fd0cc7a55b81846e06c04f3"; - sha256 = "0gbb4ici66965v449bm5gn3cyyjw81n5z4db9cfy9aca2rdapjha"; + rev = "c44d3c432243d39469046f4e25d38a690e49c755"; + sha256 = "0bvml6jcjd986ggx63sf9w4h852ivnshw6ilf6x2grfhnvsdgcgs"; }; }; @@ -4372,12 +4570,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2019-10-12"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "5099025d0b632a5e56fa457f826153cd37c48d3c"; - sha256 = "145x60yxzxga92ix4pp0rac5r9r61jgqr8s0l991zz30jxcv1qy2"; + rev = "c6cd668ed13af85d8292b524f827e729bf70ea0f"; + sha256 = "1239c0yc51jyp5shwpx2j7kbsb63qj6zp3k2lirppy8c2lls4nsv"; }; }; @@ -4394,12 +4592,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-10-28"; + version = "2019-12-18"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "4f1d28c7c10376b8f03ea89e31be71419549fbb9"; - sha256 = "1wc7fcamblpjym4vs38spdlpj58r0lm33c1fxzbrl107yj4902w3"; + rev = "b29871936f064be43ea9774cdf6980677830288c"; + sha256 = "0i20dlcnaf84fnsip9bfqz2clqgsq2vrzjxwq2mc1pj8pfvgr8r3"; }; }; @@ -4416,12 +4614,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2019-06-25"; + version = "2019-11-14"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "6710d46c8b772f77248f30d650c83f90c68f37ab"; - sha256 = "1dir9h6s63lr10ffaxlpjar0xfmmjr3nhhgijsaa0vgnghc00r7x"; + rev = "98a3051566690fcd779f540e9d4a81ccad667bd5"; + sha256 = "0bvrkflryzb43xg5s9kiksk7nslgrqpybasz4grjv6lnmzis7x97"; }; }; @@ -4449,45 +4647,45 @@ let vim-pathogen = buildVimPluginFrom2Nix { pname = "vim-pathogen"; - version = "2018-12-13"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-pathogen"; - rev = "e9fb0914dba5bdfe2feaa364dda2e9495c5620a2"; - sha256 = "1hqfmk6xpkldhs8n5hmnvx0qn955fnzf19pp2gh4c2kvrq1y6sm8"; + rev = "a553410f1bdb9000fbc764069f3a5ec3454a02bc"; + sha256 = "1klnfqdb1v5zba8rm1ldga6wjhywgx870svyd4z2j3hqlrrvdfrb"; }; }; vim-peekaboo = buildVimPluginFrom2Nix { pname = "vim-peekaboo"; - version = "2019-08-11"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-peekaboo"; - rev = "9d3c7f39a6771496fac5f730ae7574bc57da21b4"; - sha256 = "0r61r0s01nn4n153k60dlhr3l0sfj0gcx4y5ry7cvixl85b6y505"; + rev = "cc4469c204099c73dd7534531fa8ba271f704831"; + sha256 = "11lgf60v2kj772d9azkfddypwidcgfps5mvnhmp4gg0fmfx12h99"; }; }; vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2019-08-30"; + version = "2019-12-13"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-pencil"; - rev = "4e0f08de173fcde5f3cb93da2c8129b1588e469a"; - sha256 = "1vhqcd0gls9bys1anjlfyx4mh3rfkc076g6j9h1r4j09zn0bw1qn"; + rev = "09458527601fdb2fbd174317bdddfb34e4c64e79"; + sha256 = "09b30cxlwbr9l07ya05is9q2y9vzbzhcc656nvjjzf968l496xr2"; }; }; vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-10-21"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "eee50c55bf691bf6bf04c981c1d1cfed3ffc4588"; - sha256 = "12awz68lzckh4c2ffhp3gv45f123bsb9jghv5g8ypzrj3ch6im0c"; + rev = "359ce90b9b37442974fd3ccd9279493d85efb3af"; + sha256 = "1dbdnyfzhfgn70jgcd0a079b76s4gdv9ykslmfiaiv7bvlmhs08s"; }; }; @@ -4504,12 +4702,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-10-16"; + version = "2019-12-12"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "31c55b85a03d96252bba14d64911cc78a20369a1"; - sha256 = "0f6kywmk7id6yglqf59qrfb1swrw3f7b7pxqj4zr0q6xmjq233n0"; + rev = "cea0d08a062478503814e51aa21c6486a0dd1b21"; + sha256 = "05vhwgq2kj3safjhnv0rl4fhcfszba02mbwnyrlq4ayyiyv3n7cc"; }; }; @@ -4526,12 +4724,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-08-22"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "b1a826329c0891416f2357bf77a43ac49b441e6d"; - sha256 = "0za2hnsg888nl3ddhawll053j64sgqhiqpxciqi05j50bz34cs8n"; + rev = "17a8b2078a9ca1410d2080419e1cb9c9bb2e4492"; + sha256 = "1vf3jdcfiq27k9mdwlvsm2hn1xgxr79ckq3jqq00avj50bpdzs1z"; }; }; @@ -4548,12 +4746,12 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2017-10-20"; + version = "2019-12-06"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "0b2509f210f5dc73001fdcfe8fd7ac354b363388"; - sha256 = "0fkqd9xnr0310pmi5hjxfwh9x6b75z6q1w8qp1alm4qcv425q9rm"; + rev = "d11593b4a65551cc3391d36b088cc87a59c62da6"; + sha256 = "08d9mp6ig3vkvmynm6qfvb18hc128wwssffkwdd9xnqkr7c3dmlv"; }; }; @@ -4570,12 +4768,12 @@ let vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2018-07-22"; + version = "2019-12-20"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a"; - sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc"; + rev = "b04de1dadb7dfe372d22f7529a001af1b5e19f4f"; + sha256 = "1pxl70l0g4i8cbnpjhb9pyjhz982flkrng07y9xwzbdl2jx42i8s"; }; }; @@ -4592,34 +4790,34 @@ let vim-racer = buildVimPluginFrom2Nix { pname = "vim-racer"; - version = "2019-07-30"; + version = "2019-12-18"; src = fetchFromGitHub { owner = "racer-rust"; repo = "vim-racer"; - rev = "539e38c6ec0f747a9116452fe9ebd062222b89a3"; - sha256 = "19kfhm32mspwvnvfl96hzl67h9jcmzwwl92c37rw38pqpnm1sy1l"; + rev = "4ed62b09b84b8212382d5c3b03278b6eb9ddc08b"; + sha256 = "06kii2p5czan1m92s5p992c137n9ijvgbjj1miqy86am2p48a40k"; }; }; vim-repeat = buildVimPluginFrom2Nix { pname = "vim-repeat"; - version = "2019-07-29"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-repeat"; - rev = "ae361bea990e27d5beade3a8d9fa22e25cec3100"; - sha256 = "0myqas20r81gfvfrph4ww38db1nz32qlph7syr6ym8zl7c1fcjd4"; + rev = "c947ad2b6a16983724a0153bdf7f66d7a80a32ca"; + sha256 = "00hhbqcx21j0738ad5xh92lsykpa0qxhdy1s7wnwc8d3jndmyjwb"; }; }; vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2019-09-02"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "75ad917e4978b4620c3b0eff1722880d2d53a9f4"; - sha256 = "1qxlaqbfliv2w4r7bw04h3m19g8f89v9070f59k9zbz3gv8g3hzv"; + rev = "5130596a65330a4e8523d3ac1582f6c31ea6bc63"; + sha256 = "1hpyxcmwrjxhkgkb0w2qpg8gh9bgiqwddyj4zx8hy2g8qnx7z5yj"; }; }; @@ -4636,23 +4834,34 @@ let vim-rsi = buildVimPluginFrom2Nix { pname = "vim-rsi"; - version = "2019-03-15"; + version = "2019-11-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rsi"; - rev = "8b7abe2d470b7fffac6562818468e14594735564"; - sha256 = "1fvswbqd51gs4qhcabnz3zdmmlhcijs3pnbp3f2zgfi7lqvjc6s5"; + rev = "ad8ba6beae8e82339479104b914214a868c9f1fe"; + sha256 = "1ycjwnbs6rks78yxh0k0ywpvic0663mv7kydy3kjpa4f5bnkgbvc"; }; }; vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2019-09-05"; + version = "2019-12-08"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "1c70532339889b7794a52b956f389b4f9ab9b3eb"; - sha256 = "1rj06j71f08b1may9pm27xf6k19bcw3jq3jbwndd975qram7zcr0"; + rev = "81f64ec3f33165159017f782bc8a1ce9f97348b4"; + sha256 = "0dja73g2mhbwnb29yqcwamwh77k8l3qqbmn25w9pa2mlnfkp9jy8"; + }; + }; + + vim-salve = buildVimPluginFrom2Nix { + pname = "vim-salve"; + version = "2019-11-13"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-salve"; + rev = "876104d364420a7a11a2d97729dd4ab0a2f8a72e"; + sha256 = "1hj0qg182jv3cwg85rg4z0f8f8hr409is71z7sxhnhjq9fn1h6xj"; }; }; @@ -4691,23 +4900,45 @@ let vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2019-07-07"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "71195d60792fbfcd30edb25fdfc89eadf3e400a5"; - sha256 = "084vz719af6vhlrgzv0bvl9qg53p1mz1942lqj1pfc3p99w22v47"; + rev = "76f62675a1814abcfbacb296f60dbb2d9d2b2f5f"; + sha256 = "05fmzd368d0mn141a1awhybl19bgls5j8czmyyvygx5pawjl3s6f"; }; }; vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-10-18"; + version = "2019-11-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "4a7159a30061b26aec9ac367823094e7fd0f6a5b"; - sha256 = "08qlxa22kfqv4r2vdl8gfzayxir4cw78p8acah6dq3svksk2b2ib"; + rev = "2d9f34c09f548ed4df213389caa2882bfe56db58"; + sha256 = "153i3kh44ri046va3qdrbvvsv7gy25fsd9pc2yhrg23lvj169zfp"; + }; + }; + + vim-sexp = buildVimPluginFrom2Nix { + pname = "vim-sexp"; + version = "2017-05-15"; + src = fetchFromGitHub { + owner = "guns"; + repo = "vim-sexp"; + rev = "12292941903d9ac8151513189d2007e1ccfc95f0"; + sha256 = "1mfqbmrbqgnsc34pmcsrc0c5zvgxhhnw4hx4g5wbssfk1ddyx6y0"; + }; + }; + + vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix { + pname = "vim-sexp-mappings-for-regular-people"; + version = "2019-11-13"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-sexp-mappings-for-regular-people"; + rev = "f10bfacf2a20c719a3e0b6b5dfbfb2662f48b19e"; + sha256 = "08z1a5f0k2aafk7ris2w3xf0s2jcsi94bd1wh8idr4fxljjs77qb"; }; }; @@ -4724,34 +4955,45 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-10-22"; + version = "2019-12-07"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "ad755bb72953d02d01046b606962db727766d096"; - sha256 = "1l46ar2v1000l44dwbybzy60nqw76hiczdfh370n3sr5vpp4ynda"; + rev = "56db16f8d3825c4d066c2faf05315c2b208cd5f5"; + sha256 = "0alargsa6sxdxha6jshax7ff6jy8svzc9yxvsh83f8301zx9vmra"; + }; + }; + + vim-slash = buildVimPluginFrom2Nix { + pname = "vim-slash"; + version = "2019-08-28"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-slash"; + rev = "31aee09b7ea8893a18fa34f65e63e364fc998444"; + sha256 = "0ifdd3yqbk8hdvdmr4k44967lyvjnv9ig3r2145wn1lab797sbl4"; }; }; vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2018-08-19"; + version = "2019-11-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "7a104e34c10c6f3581c6e98da7834d765d0b067c"; - sha256 = "0i147vhrrkarir36ysyaic42d22hk38cnpaqzqck7b2zdwnqrvbv"; + rev = "ea3f065f23cd0592062b8226c8fef08b6af3b459"; + sha256 = "17w4m6zg1izcs75isy1jdzycgdr1ml1f5wqf1bjq80qgy3f28znp"; }; }; vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2019-07-28"; + version = "2019-12-20"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "dc8ca22cef3f87999d926e18e2e230145e013838"; - sha256 = "0pafvfhf3xbdqyy7v5y8h2j47k4y1zmscp7rans6vd5rq68k8fwf"; + rev = "cf896c1f4f37a9feb15d657dfd120aeeb6215ad8"; + sha256 = "19caali0yy1cy4hk9y9z21nzp0kj916551h0p0x7nmzxiiakp9nn"; }; }; @@ -4768,12 +5010,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2019-08-21"; + version = "2019-11-06"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "27cc3ce0fd19f0414024a81ee1eee6b17f155122"; - sha256 = "162gvzm7f0dsgv52ixd79ggzxddgpmrxqsqa41nv72mw61s0pmax"; + rev = "24e6c3f4cd6004e2b44e4022dee0260aba6132aa"; + sha256 = "000i2x36b8l5vc1li0f4jazs06nch9pca95yqr4w4m5hgjpzs5qs"; }; }; @@ -4790,12 +5032,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-10-24"; + version = "2019-12-19"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "0e5c36c4fec8ae2abe0ce334dbc58c82b094705a"; - sha256 = "0gyqf9hgwzld1i02vwkzmb2cr7if5h8w0mras1x1wqvwf468x1jn"; + rev = "180d239935a2cb496c7b702d9fbe38f05fe3dea2"; + sha256 = "0gz8yk87c0v0vaamy2nz7flrklzb00867nm7vcmyfpamha4wkib4"; }; }; @@ -4834,34 +5076,34 @@ let vim-speeddating = buildVimPluginFrom2Nix { pname = "vim-speeddating"; - version = "2019-02-27"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-speeddating"; - rev = "ce2f1aae9f2be128b4ca322a8e797be3ae40c30b"; - sha256 = "1fcvwq5iixh31fm9sfmlz4m765z1vx2a2mi8bgh64g2v6095lm5x"; + rev = "fe98cfaa7ea9c4b838d42a6830437c919eb55b4e"; + sha256 = "02875qswrmanr7b798ymlc7w60055q0av0qj3fh7fvpqhsqpg52k"; }; }; vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-10-27"; + version = "2019-12-07"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "bba214f6b39d782c15f2d97fbc98fd0d18ace909"; - sha256 = "0cmqklc553wqxs72qnwqsp1nchsxi46kfyz01zr5bdxzjg4afyis"; + rev = "05122f08c6a553992f7b0a9ad88016a89f51548a"; + sha256 = "09kg1zf5lmwlksqz11scnjazg5d862fjip48qakjbabf66f23svs"; }; }; vim-stylish-haskell = buildVimPluginFrom2Nix { pname = "vim-stylish-haskell"; - version = "2018-08-31"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "nbouscal"; repo = "vim-stylish-haskell"; - rev = "0df8a2dd397f232a9ee0e56bc57071ccf29e21bf"; - sha256 = "05f2ms2c914ycxjjd7csga89mpsk3wzyhi56vikg3nd7a8z54gzw"; + rev = "ef12ab024cb3928ae57ce7c4fa519c4751afef99"; + sha256 = "0ysz68v4c2i4kxchsvxgkpj5kb0jbm5x06ri1ns9cmk5gj01pmd6"; }; }; @@ -4876,14 +5118,25 @@ let }; }; + vim-subversive = buildVimPluginFrom2Nix { + pname = "vim-subversive"; + version = "2019-07-28"; + src = fetchFromGitHub { + owner = "svermeulen"; + repo = "vim-subversive"; + rev = "5837cb38f656f120e7a04ae73f749303d78b9191"; + sha256 = "0n04mxdq80xkjgi75n1c2gg2s6am5kns8rj7pz6dvvlqr4vxyrjf"; + }; + }; + vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2019-07-22"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "fab8621670f71637e9960003af28365129b1dfd0"; - sha256 = "0lkc0isv1cqv34qfia9mjvnp1nzz0qqy3k47z8r3xzb7dxgymkw8"; + rev = "f51a26d3710629d031806305b6c8727189cd1935"; + sha256 = "0aqrqn35xdiy80y7skxfsh3m33n6cdxw6lzz6aspfgzwllx2f0kr"; }; }; @@ -4911,12 +5164,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2019-09-28"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "126897a6fbcbf24523737502524208f75f255b88"; - sha256 = "1cdnggcl8vkz74l5k1yl2y3yg1zawvg1zj2nlqrk3c5qm9qzhkzq"; + rev = "0af25d72ebc0271648c8f91c0ce5c59174d2761b"; + sha256 = "1wqfc8bilknz1j1spk3iag99hmz5f1w87v95rb3cyp46ymrf9dcv"; }; }; @@ -4933,34 +5186,34 @@ let vim-tbone = buildVimPluginFrom2Nix { pname = "vim-tbone"; - version = "2019-04-12"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-tbone"; - rev = "b7f41b10db9ed5e5854fc5fe3a619bc05f2d541a"; - sha256 = "152mklqnqipzz2wwzj0i6s3fm75903flr1dff98nyw4khhm84pn2"; + rev = "82b0118772a87b659a6af49b26b0c4817ec7eccf"; + sha256 = "0pbj4v6zhlpcxm10jcq50jf2rpqiyp2x0zpxa50s6y6gm834v9wc"; }; }; vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-10-07"; + version = "2019-12-16"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "ffdf2dc17aaef733164a7079f95dd74f6cda9241"; - sha256 = "1y4v2hn44rjyfh18ninzyb37xxc47fl20wzhnvs5gnnhjfsyfbqj"; + rev = "bff65bf59401ef7d165637aedafe72f212ddf4c7"; + sha256 = "1jgzir5qn9v0ws6yb6d0hc3p859gy81x22wkqk58w55xxmfxd7am"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-10-22"; + version = "2019-12-07"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "18619b98d8fc16c6d23ccbefc5e9ce335c499d42"; - sha256 = "0aja7qfv3mcg7skagrd73xj9hncv35a9l554sjmm072wbi682p5l"; + rev = "e9e824cf3f22fa1cddabb7ef739f2481436c3924"; + sha256 = "0nl1b3zzw3w413lmdl4fhm8ia079hr1rz1kpx7sf0i86lx1c0dcv"; }; }; @@ -5054,23 +5307,23 @@ let vim-tmux-focus-events = buildVimPluginFrom2Nix { pname = "vim-tmux-focus-events"; - version = "2019-04-19"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; - rev = "0f89b1ada151e22882a5a47a1ee2b6d6135bc5c1"; - sha256 = "0rx1615wlsl62y62l217vgjd5vjfzf3zjwq43fflpc6bixikqc6j"; + rev = "e80960715c09aef8ab9204848ed1683805a93a33"; + sha256 = "0ds6qw2i1r67jhxh9ff36al45bafsmbxxdc127l6iy2vl5wj0d3d"; }; }; vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2019-01-29"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42"; - sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv"; + rev = "8fdf78292bb3aed1c9de880be7e03efdbf23d306"; + sha256 = "0y92na4dcfcsj5zbs3m7y6csl3sd46a9968id78cdn9cgg8iwzac"; }; }; @@ -5098,12 +5351,12 @@ let vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2017-09-23"; + version = "2019-12-09"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; - sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; + rev = "6b7cdecff252474fe560d32c6f05641f3c5952c7"; + sha256 = "0arv1hmlw7c1rlkc00hzjyg48pg8g4cc9q9l2hy8kpmsl037akm3"; }; }; @@ -5131,23 +5384,23 @@ let vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2019-08-07"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "ab7082c0e89df594a5ba111e18af17b3377d216d"; - sha256 = "1gvzjihkxnc84kd7sdh26kmm0rqi19xmwiisfqhf307yqyqa6lkj"; + rev = "08e66532bffed445c949ae0a0501940c000553ed"; + sha256 = "0sm5rv6z0s80l9c39hijhnfggvgmi24ac6d9a1k58pzjz6i9w2vr"; }; }; vim-vinegar = buildVimPluginFrom2Nix { pname = "vim-vinegar"; - version = "2019-05-13"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-vinegar"; - rev = "09ac84c4d152a944caa341e913220087211c72ef"; - sha256 = "18ki85s1l4f0q40k26jvcdcbq6a73x870dnxkw20ji3pfwdaa5v3"; + rev = "fcce70f1403ba4101668a4c960c577bddbd00f06"; + sha256 = "0zxqdyla40xcp0ps362b85bqwl3mp4zfmfdggl0gwvgd5m949yk0"; }; }; @@ -5164,12 +5417,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-10-23"; + version = "2019-12-18"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "55fb6a5fe58292e5c2c76a52a3c5143ed6198604"; - sha256 = "1k81cnn685xyqxhng6vndnvd7770dj3smdlfqjns4dm69bs76md9"; + rev = "d332d08365bc735f60904a4207d650f191598378"; + sha256 = "0g5lawg641ma216v53ivhbkzpmdqhcmgybb5kh1rz6s991j51ziy"; }; }; @@ -5197,12 +5450,12 @@ let vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2019-07-27"; + version = "2019-12-05"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "29d14cca6593a4809a31cfc3565a366d87426daf"; - sha256 = "1b47fv3jm37yhbg2mwc7kmlsl54dapb4sw9isf1h3mbmgxnvi5p9"; + rev = "dfc57db34d641315ddf1880b27573dfa07a41872"; + sha256 = "05fhnw4jdi6wbf14zrmq6gvb7pqxhvmy65kij2zzf0nwyb8l1c09"; }; }; @@ -5219,12 +5472,12 @@ let vim-wordy = buildVimPluginFrom2Nix { pname = "vim-wordy"; - version = "2019-08-29"; + version = "2019-11-22"; src = fetchFromGitHub { owner = "reedes"; repo = "vim-wordy"; - rev = "87a77cb293ed1193c01e0f93c4dd70cddde76b08"; - sha256 = "19wvm1al41ys429rb2agb7d3xfv1kh2287r8sgiy1f6whjn236z6"; + rev = "f0391713fa83771d64b065868331ef4754d861ed"; + sha256 = "0v5cl3rrg2vrdb2al67hbh730rw8m2zvhb1vippv64k65mknkgp5"; }; }; @@ -5241,12 +5494,12 @@ let vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2019-03-28"; + version = "2019-12-14"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "3c968fd4fd83d3631dec4c0caf289c85917d8ca9"; - sha256 = "17ncq06al2pzqxpx45bmh4b66d48y3kklxcd1f80jfsp9hh5v0vm"; + rev = "b9839555f70d319b4e21fc7bc9b559d91cf1260a"; + sha256 = "1ql8yv8rxpr9j9phf4jddqs1j81vcb9gpp0p3fmy6f8nf4b26nvw"; }; }; @@ -5283,6 +5536,28 @@ let }; }; + vimagit = buildVimPluginFrom2Nix { + pname = "vimagit"; + version = "2019-07-24"; + src = fetchFromGitHub { + owner = "jreybert"; + repo = "vimagit"; + rev = "94762b1356ebdcb8ec486a86f45e69ef77a69465"; + sha256 = "1p8izqdkx8g1aqmq9a2qm506bs4mvc4xdbzkh2k5xprm5vc14z0s"; + }; + }; + + vimelette = buildVimPluginFrom2Nix { + pname = "vimelette"; + version = "2019-05-02"; + src = fetchFromGitHub { + owner = "gotcha"; + repo = "vimelette"; + rev = "662f47fe0da2625dc743532832fa39f490388fa7"; + sha256 = "094xyqba64dndgr5gfcqp6hy3siw90niyrrwz0avs924abss6adg"; + }; + }; + vimfiler-vim = buildVimPluginFrom2Nix { pname = "vimfiler-vim"; version = "2019-07-30"; @@ -5294,6 +5569,17 @@ let }; }; + VimOrganizer = buildVimPluginFrom2Nix { + pname = "VimOrganizer"; + version = "2014-04-10"; + src = fetchFromGitHub { + owner = "hsitz"; + repo = "VimOrganizer"; + rev = "cab0baf635eb9470e62d57d42f2d470180b06c8d"; + sha256 = "0qncr00xn7lj1i469fzjaaghhqrlyg5s2wj4v6625dhg98y0irix"; + }; + }; + vimoutliner = buildVimPluginFrom2Nix { pname = "vimoutliner"; version = "2018-07-04"; @@ -5318,12 +5604,12 @@ let vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc-vim"; - version = "2019-07-08"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "0328ac6096ac57d647bed1ee59c8b616b3ba2858"; - sha256 = "1apg6zjpqagj8m7rai64awp2n4s77grjlyr56hdk09bh9678wg31"; + rev = "89065f62883edb10a99aa1b1640d6d411907316b"; + sha256 = "0699kf269rsyabl49m4n7vsi5bbxk129wq6ml3ykhy9g9m2b8a3k"; }; }; @@ -5340,12 +5626,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-10-25"; + version = "2019-12-15"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "f6a84aec49d9577fab7486b72a6830b61ee093b0"; - sha256 = "01aiasbysm0y23aid5v5r8avn70bc458gz3j8zbaq6c53bc1h3q0"; + rev = "7c08bf73aa15bc794c79b1e8750df3c18066c6fb"; + sha256 = "130x4nwp2wci67nf7v73r4b7xgmfgs18ls1ckyrsq54k16016dbz"; }; }; @@ -5395,23 +5681,23 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2019-05-22"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "c5c412fae2f72a07dff24ba8652c6d5e13924167"; - sha256 = "08rx1xb0mn6krfj3q8vrzlvzzh2dljjddn3wbkjvamihblnjbf7v"; + rev = "f0dd97bd4076c9a1410786c3e5baba7bd3028b05"; + sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735"; }; }; webapi-vim = buildVimPluginFrom2Nix { pname = "webapi-vim"; - version = "2019-07-11"; + version = "2019-11-18"; src = fetchFromGitHub { owner = "mattn"; repo = "webapi-vim"; - rev = "4d1e59c4fe01dec9d3008704dd06977a7bc3b0f2"; - sha256 = "15k9h4nhsiwasv8l4mq6m8mw989pmpdfsinv9bdwh41q1pmkv551"; + rev = "10b8e926d85a3ab689c2966a3df1139bcb4e197f"; + sha256 = "1hbm2mgsncqdjjfgabgncr4ji90mjsa3z0cx7813vdf113v41x26"; }; }; @@ -5483,24 +5769,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-10-17"; + version = "2019-11-30"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "7ea1a4da5ab0d3ae73ea6af80b7252ae960e126f"; - sha256 = "0vhgmwycmscd7v10nzcb8q7wqx4g2lrc9jb6zgd9dnkd8dzhmz3h"; + rev = "e9d8813c02b8bdb81b63aeb576b9eaadf0dd4445"; + sha256 = "1x5950ca4nmsf1129sjd12kcncpv8jf4x80s0y3gwwgr3p7x1m22"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-10-26"; + version = "2019-12-18"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "3620fb550d6dd790376b18ed730dbc0f53239b35"; - sha256 = "1wd2cx37b3567rzjiydn4n7mrr0n5av8227as74fd1blnwbdik7f"; + rev = "9e2ab00bd54cf41787079bcc22e8d67ce9b27ec2"; + sha256 = "0fnir9hlpmh4k8cg79lcir51aydrsfnwn9w9nnxa4yi8qnvc0pgs"; fetchSubmodules = true; }; }; @@ -5540,12 +5826,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-09-26"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "08ba9f9354698c3ab85bf84b8390ce909d3bc221"; - sha256 = "1m44hm7jgv1v5z88mi5ha0p1lrffxx2h0p25vxq12zd2x834vghf"; + rev = "65f71de21c31a0b7f7b09a62f865d1b61f9f71ed"; + sha256 = "0y0rfpsggl1a1h89zjzgpnx3vj244gmr3qwblsclh3hzf0sdav5r"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 4d127c20e31a7..a885dc163a18a 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -14,6 +14,9 @@ # coc-go dependency , go +# deoplete-khard dependency +, khard + # vim-go denpencies , asmfmt, delve, errcheck, godef, golint , gomodifytags, gotags, gotools, go-motion @@ -49,16 +52,16 @@ self: super: { }; LanguageClient-neovim = let - version = "0.1.154"; + version = "0.1.155"; LanguageClient-neovim-src = fetchurl { url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; - sha256 = "03sp643nihj9p2s9cx2dcazhz68s30qx7igqprgsmr1040rhg2py"; + sha256 = "0v9n450iwgvm1d4qwv742bjam3p747cvyrkapkgxy7n1ar8rz50i"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "1bvbls2l1xa0s3k11crvd98il4i20z5sn0hqmsc1b915k03qq4zj"; + cargoSha256 = "139sj1aq0kr4r4qzhgcn2hb4dyvp5wxjz7bxbm0bbh9bv2pr98jq"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. @@ -80,17 +83,6 @@ self: super: { ''; }; - # do not auto-update this one, as the name clashes with vim-snippets - vim-docbk-snippets = buildVimPluginFrom2Nix { - pname = "vim-docbk-snippets"; - version = "2017-11-02"; - src = fetchgit { - url = "https://github.com/jhradilek/vim-snippets"; - rev = "69cce66defdf131958f152ea7a7b26c21ca9d009"; - sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc"; - }; - }; - clang_complete = super.clang_complete.overrideAttrs(old: { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). @@ -123,14 +115,15 @@ self: super: { }); # Only official releases contains the required index.js file + # NB: Make sure you pick a rev from the release branch! coc-nvim = buildVimPluginFrom2Nix rec { pname = "coc-nvim"; - version = "0.0.74"; + version = "2019-11-30"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "v${version}"; - sha256 = "1s4nib2mnhagd0ymx254vf7l1iijwrh2xdqn3bdm4f1jnip81r10"; + rev = "42a45c639e2c43f9f1795c3804787c6a686781c0"; + sha256 = "0bny7s7scbls01jkvrwcd516py09lp0vkr65p1ik4282blyxyy6s"; }; }; @@ -184,6 +177,17 @@ self: super: { ''; }); + deoplete-khard = super.deoplete-khard.overrideAttrs(old: { + dependencies = [ self.deoplete-nvim ]; + passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ]; + meta = { + description = "Address-completion for khard via deoplete"; + homepage = "https://github.com/nicoe/deoplete-khard"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ jorsn ]; + }; + }); + ensime-vim = super.ensime-vim.overrideAttrs(old: { passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ]; @@ -390,6 +394,10 @@ self: super: { ''; }); + vim-metamath = super.vim-metamath.overrideAttrs(old: { + preInstall = "cd vim"; + }); + vim-snipmate = super.vim-snipmate.overrideAttrs(old: { dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); @@ -437,8 +445,8 @@ self: super: { youcompleteme = super.youcompleteme.overrideAttrs(old: { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ - --replace "'ycm_python_interpreter_path', '''" \ - "'ycm_python_interpreter_path', '${python3}/bin/python'" + --replace "'ycm_path_to_python_interpreter', '''" \ + "'ycm_path_to_python_interpreter', '${python3}/bin/python3'" rm -r third_party/ycmd ln -s ${ycmd}/lib/ycmd third_party diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index 8a8e20da8d7ee..0ef93ac569ab0 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -8,6 +8,7 @@ # linted: # $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py +import argparse import functools import json import os @@ -20,15 +21,53 @@ import xml.etree.ElementTree as ET from datetime import datetime from multiprocessing.dummy import Pool from pathlib import Path -from typing import Dict, List, Optional, Tuple, Union, Any +from typing import Dict, List, Optional, Tuple, Union, Any, Callable from urllib.parse import urljoin, urlparse from tempfile import NamedTemporaryFile -ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" -ATOM_LINK = "{http://www.w3.org/2005/Atom}link" -ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" +ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" # " vim gets confused here +ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # " +ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " ROOT = Path(__file__).parent +DEFAULT_IN = ROOT.joinpath("vim-plugin-names") +DEFAULT_OUT = ROOT.joinpath("generated.nix") + +import time +from functools import wraps + + +def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): + """Retry calling the decorated function using an exponential backoff. + + http://www.saltycrane.com/blog/2009/11/trying-out-retry-decorator-python/ + original from: http://wiki.python.org/moin/PythonDecoratorLibrary#Retry + (BSD licensed) + + :param ExceptionToCheck: the exception on which to retry + :param tries: number of times to try (not retry) before giving up + :param delay: initial delay between retries in seconds + :param backoff: backoff multiplier e.g. value of 2 will double the delay + each retry + """ + + def deco_retry(f: Callable) -> Callable: + @wraps(f) + def f_retry(*args: Any, **kwargs: Any) -> Any: + mtries, mdelay = tries, delay + while mtries > 1: + try: + return f(*args, **kwargs) + except ExceptionToCheck as e: + print(f"{str(e)}, Retrying in {mdelay} seconds...") + time.sleep(mdelay) + mtries -= 1 + mdelay *= backoff + return f(*args, **kwargs) + + return f_retry # true decorator + + return deco_retry class Repo: @@ -42,9 +81,12 @@ class Repo: def __repr__(self) -> str: return f"Repo({self.owner}, {self.name})" + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def has_submodules(self) -> bool: try: - urllib.request.urlopen(self.url("blob/master/.gitmodules")).close() + urllib.request.urlopen( + self.url("blob/master/.gitmodules"), timeout=10 + ).close() except urllib.error.HTTPError as e: if e.code == 404: return False @@ -52,8 +94,9 @@ class Repo: raise return True + @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> Tuple[str, datetime]: - with urllib.request.urlopen(self.url("commits/master.atom")) as req: + with urllib.request.urlopen(self.url("commits/master.atom"), timeout=10) as req: xml = req.read() root = ET.fromstring(xml) latest_entry = root.find(ATOM_ENTRY) @@ -66,7 +109,7 @@ class Repo: updated_tag is not None and updated_tag.text is not None ), f"No updated tag found feed entry {xml}" updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ") - return Path(url.path).name, updated + return Path(str(url.path)).name, updated def prefetch_git(self, ref: str) -> str: data = subprocess.check_output( @@ -154,13 +197,13 @@ def get_current_plugins() -> List[Plugin]: return plugins -def prefetch_plugin(user: str, repo_name: str, cache: "Cache") -> Plugin: +def prefetch_plugin(user: str, repo_name: str, alias: str, cache: "Cache") -> Plugin: repo = Repo(user, repo_name) commit, date = repo.latest_commit() has_submodules = repo.has_submodules() cached_plugin = cache[commit] if cached_plugin is not None: - cached_plugin.name = repo_name + cached_plugin.name = alias or repo_name cached_plugin.date = date return cached_plugin @@ -170,7 +213,7 @@ def prefetch_plugin(user: str, repo_name: str, cache: "Cache") -> Plugin: else: sha256 = repo.prefetch_github(commit) - return Plugin(repo_name, commit, has_submodules, sha256, date=date) + return Plugin(alias or repo_name, commit, has_submodules, sha256, date=date) def print_download_error(plugin: str, ex: Exception): @@ -207,18 +250,26 @@ def check_results( sys.exit(1) -def load_plugin_spec() -> List[Tuple[str, str]]: - plugin_file = ROOT.joinpath("vim-plugin-names") +def parse_plugin_line(line: str) -> Tuple[str, str, Optional[str]]: + name, repo = line.split("/") + try: + repo, alias = repo.split(" as ") + return (name, repo, alias.strip()) + except ValueError: + # no alias defined + return (name, repo.strip(), None) + + +def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, Optional[str]]]: plugins = [] with open(plugin_file) as f: for line in f: - spec = line.strip() - parts = spec.split("/") - if len(parts) != 2: - msg = f"Invalid repository {spec}, must be in the format owner/repo" + plugin = parse_plugin_line(line) + if not plugin[0]: + msg = f"Invalid repository {line}, must be in the format owner/repo[ as alias]" print(msg, file=sys.stderr) sys.exit(1) - plugins.append((parts[0], parts[1])) + plugins.append(plugin) return plugins @@ -276,12 +327,12 @@ class Cache: def prefetch( - args: Tuple[str, str], cache: Cache + args: Tuple[str, str, str], cache: Cache ) -> Tuple[str, str, Union[Exception, Plugin]]: - assert len(args) == 2 - owner, repo = args + assert len(args) == 3 + owner, repo, alias = args try: - plugin = prefetch_plugin(owner, repo, cache) + plugin = prefetch_plugin(owner, repo, alias, cache) cache[plugin.commit] = plugin return (owner, repo, plugin) except Exception as e: @@ -293,10 +344,10 @@ header = ( ) -def generate_nix(plugins: List[Tuple[str, str, Plugin]]): +def generate_nix(plugins: List[Tuple[str, str, Plugin]], outfile: str): sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) - with open(ROOT.joinpath("generated.nix"), "w+") as f: + with open(outfile, "w+") as f: f.write(header) f.write( """ @@ -326,15 +377,44 @@ let }}; """ ) - f.write(""" + f.write( + """ }); in lib.fix' (lib.extends overrides packages) -""") - print("updated generated.nix") +""" + ) + print(f"updated {outfile}") + + +def parse_args(): + parser = argparse.ArgumentParser( + description=( + "Updates nix derivations for vim plugins" + f"By default from {DEFAULT_IN} to {DEFAULT_OUT}" + ) + ) + parser.add_argument( + "--input-names", + "-i", + dest="input_file", + default=DEFAULT_IN, + help="A list of plugins in the form owner/repo", + ) + parser.add_argument( + "--out", + "-o", + dest="outfile", + default=DEFAULT_OUT, + help="Filename to save generated nix code", + ) + + return parser.parse_args() def main() -> None: - plugin_names = load_plugin_spec() + + args = parse_args() + plugin_names = load_plugin_spec(args.input_file) current_plugins = get_current_plugins() cache = Cache(current_plugins) @@ -342,7 +422,7 @@ def main() -> None: try: # synchronous variant for debugging - # results = map(prefetch_with_cache, plugins) + # results = list(map(prefetch_with_cache, plugin_names)) pool = Pool(processes=30) results = pool.map(prefetch_with_cache, plugin_names) finally: @@ -350,7 +430,7 @@ def main() -> None: plugins = check_results(results) - generate_nix(plugins) + generate_nix(plugins, args.outfile) if __name__ == "__main__": diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 350ed619be65e..c0768f0285114 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -12,11 +12,12 @@ amiorin/ctrlp-z andreshazard/vim-logreview andsild/peskcolor.vim andviro/flake8-vim +andys8/vim-elm-syntax ap/vim-css-color arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 -ayu-theme/ayu-vim autozimu/LanguageClient-neovim +ayu-theme/ayu-vim bazelbuild/vim-bazel bbchung/clighter8 benmills/vimux @@ -57,6 +58,7 @@ dag/vim-fish dannyob/quickfixstatus darfink/starsearch.vim dart-lang/dart-vim-plugin +david-a-wheeler/vim-metamath davidhalter/jedi-vim dcharbon/vim-flatbuffers deoplete-plugins/deoplete-dictionary @@ -68,6 +70,7 @@ digitaltoad/vim-jade direnv/direnv.vim dleonard0/pony-vim-syntax dracula/vim +drewtempelmeyer/palenight.vim drmingdrmer/xptemplate dylanaraps/wal.vim eagletmt/ghcmod-vim @@ -104,7 +107,12 @@ godlygeek/tabular google/vim-codefmt google/vim-jsonnet google/vim-maktaba +gorkunov/smartpairs.vim +gotcha/vimelette gregsexton/gitv +guns/vim-clojure-highlight +guns/vim-clojure-static +guns/vim-sexp guns/xterm-color-table.vim hashivim/vim-terraform haya14busa/incsearch-easymotion.vim @@ -117,6 +125,7 @@ HerringtonDarkholme/yats.vim honza/vim-snippets hotwatermorning/auto-git-diff hsanson/vim-android +hsitz/VimOrganizer ianks/vim-tsx icymind/NeoSolarized idris-hackers/idris-vim @@ -139,6 +148,7 @@ jeffkreeftmeijer/neovim-sensible jelera/vim-javascript-syntax jgdavey/tslime.vim jhradilek/vim-docbk +jhradilek/vim-snippets as vim-docbk-snippets jiangmiao/auto-pairs jistr/vim-nerdtree-tabs jlanzarotta/bufexplorer @@ -148,11 +158,14 @@ jonsmithers/vim-html-template-literals joonty/vim-xdebug josa42/coc-go jpalardy/vim-slime +jreybert/vimagit +jsfaint/gen_tags.vim JuliaEditorSupport/deoplete-julia JuliaEditorSupport/julia-vim Julian/vim-textobj-variable-segment junegunn/fzf.vim junegunn/goyo.vim +junegunn/gv.vim junegunn/limelight.vim junegunn/seoul256.vim junegunn/vader.vim @@ -160,6 +173,7 @@ junegunn/vim-easy-align junegunn/vim-github-dashboard junegunn/vim-peekaboo junegunn/vim-plug +junegunn/vim-slash justincampbell/vim-eighties justinmk/vim-dirvish justinmk/vim-sneak @@ -226,9 +240,11 @@ MarcWeber/vim-addon-toggle-buffer MarcWeber/vim-addon-xdebug markonm/traces.vim martinda/Jenkinsfile-vim-syntax +mattn/calendar-vim as mattn-calendar-vim mattn/emmet-vim mattn/gist-vim mattn/webapi-vim +matze/vim-move maximbaz/lightline-ale MaxMEllon/vim-jsx-pretty mbbill/undotree @@ -300,8 +316,10 @@ neomake/neomake neovimhaskell/haskell-vim neovimhaskell/nvim-hs.vim neovim/nvimdev.nvim +neovim/nvim-lsp neutaaaaan/iosvkem nfnty/vim-nftables +nicoe/deoplete-khard nixprime/cpsm NLKNguyen/papercolor-theme noc7c9/vim-iced-coffee-script @@ -344,6 +362,7 @@ rhysd/vim-grammarous rhysd/vim-operator-surround Rip-Rip/clang_complete rodjek/vim-puppet +ron89/thesaurus_query.vim roxma/nvim-cm-racer roxma/nvim-completion-manager roxma/nvim-yarp @@ -389,6 +408,7 @@ slashmili/alchemist.vim sonph/onehalf stefandtw/quickfix-reflector.vim stephpy/vim-yaml +svermeulen/vim-subversive t9md/vim-choosewin t9md/vim-smalls takac/vim-hardtime @@ -429,8 +449,10 @@ tpope/vim-projectionist tpope/vim-repeat tpope/vim-rhubarb tpope/vim-rsi +tpope/vim-salve tpope/vim-scriptease tpope/vim-sensible +tpope/vim-sexp-mappings-for-regular-people tpope/vim-sleuth tpope/vim-speeddating tpope/vim-surround @@ -447,11 +469,14 @@ tyru/caw.vim tyru/open-browser-github.vim tyru/open-browser.vim uarun/vim-protobuf +udalov/kotlin-vim ujihisa/neco-look +unblevable/quick-scope valloric/youcompleteme vhda/verilog_systemverilog.vim vim-airline/vim-airline vim-airline/vim-airline-themes +vimlab/split-term.vim vimoutliner/vimoutliner vim-pandoc/vim-pandoc vim-pandoc/vim-pandoc-after @@ -479,6 +504,7 @@ vim-scripts/ReplaceWithRegister vim-scripts/ShowMultiBase vim-scripts/tabmerge vim-scripts/taglist.vim +vim-scripts/utl.vim vim-scripts/wombat256.vim vim-scripts/YankRing.vim vim-utils/vim-husk diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index e33a32ffa3efb..22e97cd4d8801 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -64,7 +64,7 @@ in mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "8.2.0"; + version = "8.2.0"; sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2"; }; meta = with stdenv.lib; { @@ -84,12 +84,63 @@ in }; }; + ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-docker"; + publisher = "ms-azuretools"; + version = "0.8.1"; + sha256 = "0n59whmcrx8946xix6skvc50f2vsc85ckvn8cs06w9mqmymm1q0s"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-kubernetes-tools"; + publisher = "ms-kubernetes-tools"; + version = "1.0.6"; + sha256 = "12a4phl1pddsajy3n0ld6rp607iy0pif6pqrs6ljbg2x97fyra28"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + ms-vscode.Go = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Go"; + publisher = "ms-vscode"; + version = "0.11.7"; + sha256 = "1l6jjdfivw1pn9y4d4i7zf80ls1k1b0ap1d828ah57ad3bgmyqfi"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + ms-vscode.cpptools = callPackage ./cpptools {}; + ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {}; + ms-python.python = callPackage ./python { extractNuGet = callPackage ./python/extract-nuget.nix { }; }; + redhat.vscode-yaml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-yaml"; + publisher = "redhat"; + version = "0.5.3"; + sha256 = "03swlsp906rqlrx6jf3ibh7pk36sm0zdr8jfy6sr3w5lqjg27gka"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "fish-vscode"; @@ -106,8 +157,8 @@ in mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.3.0"; - sha256 = "18z24w7smjjnv945f8qyy6dl95xckyqa6gg3gijfcigvq5sgyawc"; + version = "1.11.3"; + sha256 = "1smzsgcrkhghbnpy51gp28kh74l7y4s2m8pfxabb4ffb751254j0"; }; meta = { license = stdenv.lib.licenses.mit; diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix new file mode 100644 index 0000000000000..fe053dd7ea3d6 --- /dev/null +++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, vscode-utils +, useLocalExtensions ? false}: +# Note that useLocalExtensions requires that vscode-server is not running +# on host. If it is, you'll need to remove ~/.vscode-server, +# and redo the install by running "Connect to host" on client + +let + inherit (vscode-utils) buildVscodeMarketplaceExtension; + + # patch runs on remote machine hence use of which + # links to local node if version is 12 + patch = '' + f="/home/''$USER/.vscode-server/bin/''$COMMIT_ID/node" + localNodePath=''$(which node) + if [ -x "''$localNodePath" ]; then + localNodeVersion=''$(node -v) + if [ "\''${localNodeVersion:1:2}" = "12" ]; then + echo PATCH: replacing ''$f with ''$localNodePath + rm ''$f + ln -s ''$localNodePath ''$f + fi + fi + ${stdenv.lib.optionalString useLocalExtensions '' + # Use local extensions + if [ -d ~/.vscode/extensions ]; then + if ! test -L "~/.vscode-server/extensions"; then + mkdir -p ~/.vscode-server + ln -s ~/.vscode/extensions ~/.vscode-server/ + fi + fi + ''} + ''; +in + buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-ssh"; + publisher = "ms-vscode-remote"; + version = "0.48.0"; + sha256 = "04q53gljqh5snkrdf5l69g0ahn1s5z35a4ipfcbf1rsjjmm85a19"; + }; + + postPatch = '' + substituteInPlace "out/extension.js" \ + --replace "# install extensions" '${patch}' + ''; + + meta = with stdenv.lib; { + description ="Use any remote machine with a SSH server as your development environment."; + license = licenses.unfree; + maintainers = with maintainers; [ + tbenst + ]; + }; + } |