diff options
Diffstat (limited to 'nixpkgs/pkgs/misc')
36 files changed, 811 insertions, 437 deletions
diff --git a/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix index 6bfaa2a2f274..73e2a96d0cde 100644 --- a/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix +++ b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPackages }: +{ stdenv, fetchFromGitHub, pkgsCross, buildPackages }: let buildArmTrustedFirmware = { filesToInstall @@ -6,7 +6,7 @@ let , platform , extraMakeFlags ? [] , extraMeta ? {} - , version ? "1.5" + , version ? "2.0" , ... } @ args: stdenv.mkDerivation (rec { @@ -17,11 +17,14 @@ let owner = "ARM-software"; repo = "arm-trusted-firmware"; rev = "refs/tags/v${version}"; - sha256 = "1gm0bn2llzfzz9bfsz11fhwxj5lxvyrq7bc13fjj033nljzxn7k8"; + sha256 = "087pkwa6slxff0aiz3v42gww007nww97bl1p96fvvs7rr1y14gjx"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; + # For Cortex-M0 firmware in RK3399 + nativeBuildInputs = [ pkgsCross.arm-embedded.stdenv.cc ]; + makeFlags = [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" "PLAT=${platform}" @@ -83,4 +86,11 @@ in rec { extraMeta.platforms = ["aarch64-linux"]; filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; }; + + armTrustedFirmwareRK3399 = buildArmTrustedFirmware rec { + extraMakeFlags = [ "bl31" ]; + platform = "rk3399"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; + }; } diff --git a/nixpkgs/pkgs/misc/cups/cups-clean-dirty.patch b/nixpkgs/pkgs/misc/cups/cups-clean-dirty.patch deleted file mode 100644 index 0bdc8198e8fb..000000000000 --- a/nixpkgs/pkgs/misc/cups/cups-clean-dirty.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scheduler/main.c b/scheduler/main.c -index 8925c8373..acf031684 100644 ---- a/scheduler/main.c -+++ b/scheduler/main.c -@@ -893,7 +893,7 @@ main(int argc, /* I - Number of command-line args */ - * Write dirty config/state files... - */ - -- if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0) -+ if (DirtyCleanTime && current_time >= DirtyCleanTime) - cupsdCleanDirty(); - - #ifdef __APPLE__ diff --git a/nixpkgs/pkgs/misc/cups/default.nix b/nixpkgs/pkgs/misc/cups/default.nix index 227886e126fc..f691444c1afb 100644 --- a/nixpkgs/pkgs/misc/cups/default.nix +++ b/nixpkgs/pkgs/misc/cups/default.nix @@ -10,27 +10,21 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "cups-${version}"; - version = "2.2.6"; + + # After 2.2.6, CUPS requires headers only available in macOS 10.12+ + version = if stdenv.isDarwin then "2.2.6" else "2.2.10"; passthru = { inherit version; }; src = fetchurl { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"; + sha256 = if version == "2.2.6" + then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20" + else "1fq52aw1mini3ld2czv5gg37wbbvh4n7yc7wzzxvbs3zpfrv5j3p"; }; outputs = [ "out" "lib" "dev" "man" ]; - patches = [ - (fetchpatch { - name = "cups"; # weird name to avoid change (for now) - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch" - + "?h=packages/cups&id=41fefa22ac518"; - sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5"; - }) - ./cups-clean-dirty.patch - ]; - postPatch = '' substituteInPlace cups/testfile.c \ --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin' diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index 9aa127dd6305..17040498acc0 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -3,11 +3,11 @@ mfcl8690cdwlpr, perl, stdenv}: stdenv.mkDerivation rec { name = "mfcl8690cdwcupswrapper-${version}"; - version = "1.3.0-0"; + version = "1.4.0-0"; src = fetchurl { url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb"; - sha256 = "16nnh3hd5yv0m4191wja9fvxxzngzfccfj2rfhcswbakajyk5ywn"; + sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 3b6ae73c70d1..a521b3ea0218 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -3,11 +3,11 @@ makeWrapper, perl, pkgs, stdenv, which }: stdenv.mkDerivation rec { name = "mfcl8690cdwlpr-${version}"; - version = "1.2.0-0"; + version = "1.3.0-0"; src = fetchurl { url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb"; - sha256 = "02k43nh51pn4lf7gaid9yhil0a3ikpy4krw7dhgphmm5pap907sx"; + sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/nixpkgs/pkgs/misc/cups/filters.nix b/nixpkgs/pkgs/misc/cups/filters.nix index 9eeadda73fc8..348b7c6550e2 100644 --- a/nixpkgs/pkgs/misc/cups/filters.nix +++ b/nixpkgs/pkgs/misc/cups/filters.nix @@ -2,7 +2,6 @@ , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript , mupdf -, fetchpatch }: let @@ -10,23 +9,13 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.20.4"; + version = "1.21.6"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k"; + sha256 = "0k0x9p40bahq44189vy9zai2ia9i91h26chrddr0m9agzsy5s3k3"; }; - patches = [ - # This patch fixes cups-filters when compiled with poppler-0.67.0. - # Issue: https://github.com/OpenPrinting/cups-filters/pull/50 - # PR: https://github.com/OpenPrinting/cups-filters/pull/51 - (fetchpatch { - url = "https://github.com/OpenPrinting/cups-filters/commit/219de01c61f3b1ec146abf142d0dfc8c560cc58e.patch"; - sha256 = "0f0lql3rbm2g8mxrpigfyi8fb4i2g4av20g417jzdilp60jq0ny8"; - }) - ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ diff --git a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix index 643977d829db..3892c37a1d5b 100644 --- a/nixpkgs/pkgs/misc/drivers/epkowa/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epkowa/default.nix @@ -88,6 +88,46 @@ let plugins = { meta = common_meta // { description = "iscan esci f720 plugin for "+passthru.hw; }; }; + s80 = stdenv.mkDerivation rec { + pname = "iscan-gt-s80-bundle"; + version = "1.0.1"; + esciPluginVersion = "0.2.1-1"; + esdipPluginVersion = "1.0.0-5"; + + buildInputs = [ patchelf ]; + src = fetchurl { + url = "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"; + sha256 = "14j11znx5ga2ykpyg6kjg7lbrddyr9pwxrsa82dmdishd1j7zji9"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-${esciPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv + ${rpm}/bin/rpm2cpio iscan-plugin-esdip-${esdipPluginVersion}.ltdl7.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mkdir $out/share/esci + ''; + preFixup = '' + rpath=${gcc.cc.lib}/lib/ + patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s80.so + patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s50.so + patchelf --set-rpath $rpath $out/lib/iscan/esdip + patchelf --set-rpath $rpath $out/lib/iscan/libesdtr.so.0 + patchelf --set-rpath $rpath $out/lib/iscan/libesdtr2.so.0 + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" + $registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" + $registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" + $registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" + ''; + hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85"; + }; + + meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; }; + }; }; in diff --git a/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix new file mode 100644 index 000000000000..15a7ba3cd3c4 --- /dev/null +++ b/nixpkgs/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix @@ -0,0 +1,98 @@ +{ + autoreconfHook, cups, gzip, libjpeg, rpmextract, + fetchurl, lib, stdenv +}: + +let + srcdirs = { + filter = "epson-inkjet-printer-filter-1.0.0"; + driver = "epson-inkjet-printer-workforce-635-nx625-series-1.0.1"; + }; +in stdenv.mkDerivation rec { + name = "epson-inkjet-printer-workforce-635-nx625-series"; + version = "1.0.1"; + + src = fetchurl { + url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/${name}-${version}-1lsb3.2.src.rpm"; + sha256 = "19nb2h0y9rvv6rg7j262f8sqap9kjvz8kmisxnjg1w0v19zb9zf2"; + }; + sourceRoot = srcdirs.filter; + + nativeBuildInputs = [ autoreconfHook gzip rpmextract ]; + buildInputs = [ cups libjpeg ]; + + unpackPhase = '' + rpmextract "$src" + for i in ${lib.concatStringsSep " " (builtins.attrValues srcdirs)}; do + tar xvf "$i".tar.gz + done + ''; + + preConfigure = '' + chmod u+x configure + ''; + + installPhase = + let + filterdir = "$out/cups/lib/filter"; + docdir = "$out/share/doc"; + ppddir = "$out/share/cups/model/${name}"; + libdir = + if stdenv.system == "x86_64-linux" then "lib64" + else if stdenv.system == "i686_linux" then "lib" + else throw "other platforms than i686_linux and x86_64-linux are not yet supported"; + in '' + mkdir -p "$out" "${docdir}" "${filterdir}" "${ppddir}" + cp src/epson_inkjet_printer_filter "${filterdir}" + + cd ../${srcdirs.driver} + for ppd in ppds/*; do + substituteInPlace "$ppd" --replace '/opt/${name}' "$out" + gzip -c "$ppd" > "${ppddir}/''${ppd#*/}" + done + cp COPYING.EPSON README "${docdir}" + cp -r resource watermark ${libdir} "$out" + ''; + + meta = { + description = "Proprietary CUPS drivers for Epson inkjet printers"; + longDescription = '' + This software is a filter program used with Common UNIX Printing + System (CUPS) from the Linux. This can supply the high quality print + with Seiko Epson Color Ink Jet Printers. + + This printer driver is supporting the following printers. + + WorkForce 60 + WorkForce 625 + WorkForce 630 + WorkForce 633 + WorkForce 635 + WorkForce T42WD + Epson Stylus NX625 + Epson Stylus SX525WD + Epson Stylus SX620FW + Epson Stylus TX560WD + Epson Stylus Office B42WD + Epson Stylus Office BX525WD + Epson Stylus Office BX625FWD + Epson Stylus Office TX620FWD + Epson ME OFFICE 82WD + Epson ME OFFICE 85ND + Epson ME OFFICE 900WD + Epson ME OFFICE 960FWD + + License: LGPL and SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT + + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.${name} ]; + }; + ''; + downloadPage = https://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16857&DSCCHK=4334d3487503d7f916ccf5d58071b05b7687294f; + license = with lib.licenses; [ lgpl21 epson ]; + maintainers = [ lib.maintainers.jorsn ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix b/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix index c0f471c8e201..764e60ac13ba 100644 --- a/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix +++ b/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.6"; + version = "0.4.6.1"; src = fetchFromGitHub { owner = "kozec"; repo = pname; rev = "v${version}"; - sha256 = "0527igjgc5jf60ldsrc4xv3k8gw2480pmqyp6nv5xcrm5j0ah4q5"; + sha256 = "1kcqsnrlwl4s94j6ahgkz3w4sy9hsr95y624zab6g10w0fl5sqrc"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index 68176ff427e3..b720bf142d4a 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,13 +20,13 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2018-09-24"; + version = "2018-12-25"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "97b1a9bb2a0c29f0f68963483156d5285e1fb1d5"; - sha256 = "0dwc4l7a7r1f65gh1rhxa854xsknrgp62rr3a0y67lk3xf5y38d7"; + rev = "ca2a2c98f252d21dc609d26f4264a43ed091b8fe"; + sha256 = "0903hp7fkh08ggjx8zrsvwhh1x8bprv3lh2d8yci09al1cqqj5cb"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix index 9a99c6ddb6f9..a3177b07f08b 100644 --- a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix +++ b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdsk-${version}"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; - sha256 = "1fdypk6gjkb4i2ghnbn3va50y69pdym51jx3iz9jns4636z4sfqd"; + sha256 = "1r0y07qd3zixi53vql5yqakvv77qm86s6qjwypk9ckggrp5r3w60"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/misc/emulators/wine/base.nix b/nixpkgs/pkgs/misc/emulators/wine/base.nix index 94cf4a774569..2b9d048f77e6 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/base.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/base.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optionals stdenv.isLinux (with pkgs.xorg; [ libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext ]) - ++ [ pkgs.xorg.libX11 ])); + ++ [ pkgs.xorg.libX11 pkgs.perl ])); # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in diff --git a/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/nixpkgs/pkgs/misc/emulators/wine/sources.nix index 8b80dd838aea..2fcb38c0a1eb 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.0-rc2"; + version = "4.0-rc5"; url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz"; - sha256 = "0apqavsk1y56b6c4zkjpi014xwgn6gjg6pzjx94qy4nfr1gz63n4"; + sha256 = "0nx5ahahfnmimd2b7zh2wx36b877vad10i2kr2zib9m9b2w8wyfd"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1vqvy44h9rwfx32pad831kdyhazn68s8r14w8765ly42rixc6dgj"; + sha256 = "0smp6ngs77vk1yg0saavhhn7kmi9ri8y8gc3vcgg837ycwg5i5qb"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/misc/frescobaldi/default.nix b/nixpkgs/pkgs/misc/frescobaldi/default.nix index af4c54d9d0d8..2b38ed57c285 100644 --- a/nixpkgs/pkgs/misc/frescobaldi/default.nix +++ b/nixpkgs/pkgs/misc/frescobaldi/default.nix @@ -11,7 +11,10 @@ python3Packages.buildPythonApplication rec { sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd"; }; - propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly poppler-qt5 ]; + propagatedBuildInputs = with python3Packages; [ + lilypond pygame python-ly sip + pyqt5_with_qtwebkit (poppler-qt5.override { pyqt5 = pyqt5_with_qtwebkit; }) + ]; # no tests in shipped with upstream doCheck = false; diff --git a/nixpkgs/pkgs/misc/gnuk/generic.nix b/nixpkgs/pkgs/misc/gnuk/generic.nix index 80a4518f3f70..e592b945a408 100644 --- a/nixpkgs/pkgs/misc/gnuk/generic.nix +++ b/nixpkgs/pkgs/misc/gnuk/generic.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation { homepage = http://www.fsij.org/pages/gnuk; description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; - maintainers = with maintainers; [ wkennington ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/misc/jackaudio/default.nix b/nixpkgs/pkgs/misc/jackaudio/default.nix index d264b7f3279b..a47c20184442 100644 --- a/nixpkgs/pkgs/misc/jackaudio/default.nix +++ b/nixpkgs/pkgs/misc/jackaudio/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { homepage = http://jackaudio.org; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ goibhniu wkennington ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/nixpkgs/pkgs/misc/jackaudio/jack1.nix b/nixpkgs/pkgs/misc/jackaudio/jack1.nix index 2e349cf691c9..8c9838ccec53 100644 --- a/nixpkgs/pkgs/misc/jackaudio/jack1.nix +++ b/nixpkgs/pkgs/misc/jackaudio/jack1.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; - + configureFlags = [ (stdenv.lib.enableFeature (optLibffado != null) "firewire") ]; @@ -29,12 +29,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; propagatedBuildInputs = [ optLibuuid ]; - + meta = with stdenv.lib; { description = "JACK audio connection kit"; homepage = http://jackaudio.org; license = "GPL"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/nixpkgs/pkgs/misc/libcardiacarrest/default.nix b/nixpkgs/pkgs/misc/libcardiacarrest/default.nix index 1a07878b3302..7f355bc81560 100644 --- a/nixpkgs/pkgs/misc/libcardiacarrest/default.nix +++ b/nixpkgs/pkgs/misc/libcardiacarrest/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libcardiacarrest-${version}"; - version = "12.1-7"; # <PA API version>-<version> + version = "12.2.8"; # <PA API version>.<version> src = fetchFromGitHub { owner = "oxij"; repo = "libcardiacarrest"; - rev = "d44288d9a24d6b7793fb36a4c9a548b6b55375ec"; - sha256 = "0j3l5s6r9hgpy5y7q7kx0rkh05rk0bgfdvzbmadqps720lqjs4xm"; + rev = "d89639f5b2d298cf74af26880f5ebf50e645166d"; + sha256 = "0vrigwcw3g8zknqyznv6y3437ahn1w00gv3d303smmygr0p8bd94"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/misc/rkdeveloptool/default.nix b/nixpkgs/pkgs/misc/rkdeveloptool/default.nix new file mode 100644 index 000000000000..e877629bcb03 --- /dev/null +++ b/nixpkgs/pkgs/misc/rkdeveloptool/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1 }: + +stdenv.mkDerivation { + pname = "rkdeveloptool"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "rockchip-linux"; + repo = "rkdeveloptool"; + rev = "081d237ad5bf8f03170c9d60bd94ceefa0352aaf"; + sha256 = "05hh7j3xgb8l1k1v2lis3nvlc0gp87ihzg6jci7m5lkkm5qgv3ji"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libusb1 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/rockchip-linux/rkdeveloptool; + description = "A tool from Rockchip to communicate with Rockusb devices"; + license = licenses.gpl2; + maintainers = [ maintainers.lopsided98 ]; + }; +} diff --git a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix new file mode 100644 index 000000000000..26143a5ef442 --- /dev/null +++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -0,0 +1,39 @@ +{ + stdenv, makeWrapper, fetchFromGitHub, substituteAll, + imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh +}: + +stdenv.mkDerivation rec { + name = "betterlockscreen-${version}"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "pavanjadhaw"; + repo = "betterlockscreen"; + rev = version; + sha256 = "0jc8ifb69shmd0avx6vny4m1w5dfxkkf5vnm7qcrmc8yflb0s3z6"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ ./replace-i3lock.patch ]; + + installPhase = + let + PATH = + stdenv.lib.makeBinPath + [imagemagick i3lock-color xdpyinfo xrandr bc feh]; + in '' + mkdir -p $out/bin + cp betterlockscreen $out/bin/betterlockscreen + wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${PATH}" + ''; + + meta = with stdenv.lib; { + description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed."; + homepage = https://github.com/pavanjadhaw/betterlockscreen; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ eyjhb ]; + }; +} diff --git a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch new file mode 100644 index 000000000000..3bbbfcfd613d --- /dev/null +++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch @@ -0,0 +1,12 @@ +--- a/betterlockscreen ++++ b/betterlockscreen +@@ -76,7 +76,7 @@ prelock() { + lock() { + #$1 image path + +- i3lock \ ++ i3lock-color \ + -t -i "$1" \ + --timepos='x+110:h-70' \ + --datepos='x+43:h-45' \ + diff --git a/nixpkgs/pkgs/misc/screensavers/slock/default.nix b/nixpkgs/pkgs/misc/screensavers/slock/default.nix index 5e658abff47d..f5e8b60cea06 100644 --- a/nixpkgs/pkgs/misc/screensavers/slock/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/slock/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, writeText -, xproto, libX11, libXext, libXrandr +, xorgproto, libX11, libXext, libXrandr # default header can be obtained from # https://git.suckless.org/slock/tree/config.def.h , conf ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; - buildInputs = [ xproto libX11 libXext libXrandr ]; + buildInputs = [ xorgproto libX11 libXext libXrandr ]; installFlags = "DESTDIR=\${out} PREFIX="; diff --git a/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix b/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix index cce4b351c577..257b943c9e76 100644 --- a/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/xautolock/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xlibsWrapper -, imake, gccmakedep, libXScrnSaver, scrnsaverproto }: +, imake, gccmakedep, libXScrnSaver, xorgproto }: stdenv.mkDerivation rec { name = "xautolock-2.2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; installTargets = "install install.man"; nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ xlibsWrapper libXScrnSaver scrnsaverproto ]; + buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ]; meta = with stdenv.lib; { description = "A program that launches a given program when your X session has been idle for a given time."; homepage = http://www.ibiblio.org/pub/linux/X11/screensavers; diff --git a/nixpkgs/pkgs/misc/seafile-shared/default.nix b/nixpkgs/pkgs/misc/seafile-shared/default.nix index 4f47485e2ef6..a75c6c1ec76d 100644 --- a/nixpkgs/pkgs/misc/seafile-shared/default.nix +++ b/nixpkgs/pkgs/misc/seafile-shared/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: stdenv.mkDerivation rec { - version = "6.2.9"; + version = "6.2.11"; name = "seafile-shared-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "03hdpajhpmdxf1fdpvz2j82smqcmhvpvx2dxyaprqjg8j7b4qbj9"; + sha256 = "16d4m5n5zhip13l6pv951lm081pnwxpiqcm7j4gxqm1ian48m787"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; diff --git a/nixpkgs/pkgs/misc/themes/nordic/default.nix b/nixpkgs/pkgs/misc/themes/nordic/default.nix deleted file mode 100644 index ac24e35c66f7..000000000000 --- a/nixpkgs/pkgs/misc/themes/nordic/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: - -stdenv.mkDerivation rec { - name = "nordic-${version}"; - version = "1.3.0"; - - srcs = [ - (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz"; - sha256 = "04axs2yldppcx159nwj70g4cyw0hbbzk5250677i9ny8b0w3gr9x"; - }) - (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz"; - sha256 = "1h0690cijaipidb5if2bxhvvkrx5src3akyxvfywxg4bf8x7jxs5"; - }) - ]; - - sourceRoot = "."; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - installPhase = '' - mkdir -p $out/share/themes - cp -a Nordic* $out/share/themes - rm $out/share/themes/*/{LICENSE,README.md} - ''; - - meta = with stdenv.lib; { - description = "Dark Gtk theme created using the awesome Nord color pallete"; - homepage = https://github.com/EliverLara/Nordic; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/nixpkgs/pkgs/misc/themes/tetra/default.nix b/nixpkgs/pkgs/misc/themes/tetra/default.nix index 0d2ddb95166d..9e5e246880a2 100644 --- a/nixpkgs/pkgs/misc/themes/tetra/default.nix +++ b/nixpkgs/pkgs/misc/themes/tetra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tetra-gtk-theme-${version}"; - version = "0.2.0"; + version = "201902"; src = fetchFromGitHub { owner = "hrdwrrsk"; repo = "tetra-gtk-theme"; rev = version; - sha256 = "1lzkmswv3ml2zj80z067j1hj1cvpdcl86jllahqx3jwnmr0a4fhd"; + sha256 = "0xvp85mzgh5msr3s6wl9xagz2xxqmy3s9jndbmwh1cc79fycggqv"; }; preBuild = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme."; + description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme"; homepage = https://github.com/hrdwrrsk/tetra-gtk-theme; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; diff --git a/nixpkgs/pkgs/misc/uboot/default.nix b/nixpkgs/pkgs/misc/uboot/default.nix index ac77df8d7cd2..084cb33a7a21 100644 --- a/nixpkgs/pkgs/misc/uboot/default.nix +++ b/nixpkgs/pkgs/misc/uboot/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig +{ stdenv, lib, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, swig , armTrustedFirmwareAllwinner , buildPackages }: let - buildUBoot = { filesToInstall + buildUBoot = { version ? "2018.09" + , filesToInstall , installDir ? "$out" , defconfig + , extraConfig ? "" , extraPatches ? [] , extraMakeFlags ? [] , extraMeta ? {} , ... } @ args: stdenv.mkDerivation (rec { - name = "uboot-${defconfig}-${version}"; - version = "2018.09"; + pname = "uboot-${defconfig}"; + inherit version; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; @@ -23,10 +25,6 @@ let patches = [ (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-07.patch; - sha256 = "096zqrlr8m9lxjma0iv7y6x78qswfs3q1w2irjkbmcvniz1azbs8"; - }) - (fetchpatch { url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch; sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8"; }) @@ -36,7 +34,15 @@ let patchShebangs tools ''; - nativeBuildInputs = [ bc bison dtc flex openssl python2 swig ]; + nativeBuildInputs = [ + bc + bison + dtc + flex + openssl + (buildPackages.python2.withPackages (p: [ p.libfdt ])) + swig + ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; hardeningDisable = [ "all" ]; @@ -46,11 +52,15 @@ let "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] ++ extraMakeFlags; + passAsFile = [ "extraConfig" ]; + configurePhase = '' runHook preConfigure make ${defconfig} + cat $extraConfigPath >> .config + runHook postConfigure ''; @@ -58,7 +68,7 @@ let runHook preInstall mkdir -p ${installDir} - cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir} + cp ${lib.concatStringsSep " " filesToInstall} ${installDir} runHook postInstall ''; @@ -68,7 +78,7 @@ let dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://www.denx.de/wiki/U-Boot/; description = "Boot loader for embedded systems"; license = licenses.gpl2; @@ -84,7 +94,7 @@ in rec { installDir = "$out/bin"; hardeningDisable = []; dontStrip = false; - extraMeta.platforms = stdenv.lib.platforms.linux; + 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 @@ -238,10 +248,8 @@ in rec { extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-with-nand-spl.imx"]; buildFlags = "u-boot-with-nand-spl.imx"; - postConfigure = '' - cat >> .config << EOF + extraConfig = '' CONFIG_CMD_SETEXPR=y - EOF ''; # sata init; load sata 0 $loadaddr u-boot-with-nand-spl.imx # sf probe; sf update $loadaddr 0 80000 diff --git a/nixpkgs/pkgs/misc/uboot/rock64.nix b/nixpkgs/pkgs/misc/uboot/rock64.nix index 623c6015534a..af8d044387a4 100644 --- a/nixpkgs/pkgs/misc/uboot/rock64.nix +++ b/nixpkgs/pkgs/misc/uboot/rock64.nix @@ -2,25 +2,24 @@ rkbin = fetchFromGitHub { owner = "ayufan-rock64"; repo = "rkbin"; - rev = "d8b90685b3d93c358936babdd854f1018bc6d35e"; - sha256 = "0wrh3xa968sdp0j9n692jnv3071ymab719zc56vllba0aaabiaxr"; + rev = "af17d09dee19b41f4f01e1722eaf6911fb296245"; + sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; }; in buildUBoot rec { - name = "uboot-${defconfig}-${version}"; - version = "2018.01"; + version = "2017.09"; src = fetchFromGitHub { owner = "ayufan-rock64"; repo = "linux-u-boot"; - rev = "19e31fac0dee3c4f6b2ea4371e4321f79db0f495"; - sha256 = "1vmv7q9yafsc0zivd0qdfmf930dvhzkf4a3j6apxxgx9g10wgwrg"; + rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c"; + sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75"; }; extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ]; - # So close to being blob free... But U-Boot TPL causes the kernel to hang + # 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.06.bin idbloader.img + ./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 ''; diff --git a/nixpkgs/pkgs/misc/uboot/rockpro64.nix b/nixpkgs/pkgs/misc/uboot/rockpro64.nix new file mode 100644 index 000000000000..d8802e6d5f55 --- /dev/null +++ b/nixpkgs/pkgs/misc/uboot/rockpro64.nix @@ -0,0 +1,36 @@ +{ lib, buildUBoot, fetchFromGitHub }: let + rkbin = fetchFromGitHub { + owner = "ayufan-rock64"; + repo = "rkbin"; + rev = "af17d09dee19b41f4f01e1722eaf6911fb296245"; + sha256 = "189f7h6wj2yrcc5ga103jnyysykf9j3j9p1vcy7791bxwxqxnggf"; + }; +in buildUBoot rec { + version = "2017.09"; + + src = fetchFromGitHub { + owner = "ayufan-rock64"; + repo = "linux-u-boot"; + rev = "d646df03ace3bd191e24361944ce1c7ef3c8744c"; + sha256 = "0gclcd034qfhfbabrdqmky08i0hlwmn63n0zg6mndplms5qpcx75"; + }; + + # Upstream ATF hangs in SPL + extraMakeFlags = [ "BL31=${rkbin}/rk33/rk3399_bl31_v1.17.elf" "u-boot.itb" "all" ]; + + postBuild = '' + ./tools/mkimage -n rk3399 -T rksd -d ${rkbin}/rk33/rk3399_ddr_933MHz_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 = "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/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix b/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix index 2646b55de96c..b797f49df9e0 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -36,7 +36,13 @@ rec { # build help tags if [ -d "$target/doc" ]; then - ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -c "helptags $1/doc" +quit! || echo "docs to build failed" + echo "Building help tags" + if ! ${vim}/bin/vim -N -u NONE -i NONE -n -E -s -V1 -c "helptags $target/doc" +quit!; then + echo "Failed to build help tags!" + exit 1 + fi + else + echo "No docs available" fi if [ -n "$addonInfo" ]; then diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 5ac1793070b1..3ea855bfae6a 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -3,7 +3,6 @@ let packages = ( self: - { a-vim = buildVimPluginFrom2Nix { pname = "a-vim"; @@ -40,12 +39,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2018-11-10"; + version = "2019-01-23"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "4fefe386a8a85161ace928e2f0e0ab4fe8581505"; - sha256 = "1i61wvrpn15qs206rnq9bbwgv6wxf76p5j79v2fabh06lyw4dn3q"; + rev = "06efbd079a7dfc0a8b079aed4509e17113cc0977"; + sha256 = "06i9m2xbdsp704d71zv6jcbbn7ibp3fy3wn823azkjcnk317n73i"; }; }; @@ -62,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2018-12-20"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "73ca1e71918a0b50b7bbcbed91857c3618ad93cc"; - sha256 = "0q2wmpprr6mva6k7d8280cpf8ia6g7fbzw309fb0291y7241v5j1"; + rev = "4d426bf2873c6e1cd2c71e478c756903307628d3"; + sha256 = "044nzg672rmbamvzmc41i6klgs7qwdv1a3gl2l18cbli8jr4q8c2"; }; }; @@ -82,6 +81,17 @@ let }; }; + ansible-vim = buildVimPluginFrom2Nix { + pname = "ansible-vim"; + version = "2019-01-30"; + src = fetchFromGitHub { + owner = "pearofducks"; + repo = "ansible-vim"; + rev = "dec377ddffd6616aa156029a5f065496582f697b"; + sha256 = "1rmji65skhnf1658f67kaxbhfiwcc7yf91n96ni74djsp26mqfzm"; + }; + }; + argtextobj-vim = buildVimPluginFrom2Nix { pname = "argtextobj-vim"; version = "2010-10-18"; @@ -95,12 +105,12 @@ let auto-pairs = buildVimPluginFrom2Nix { pname = "auto-pairs"; - version = "2018-09-23"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "jiangmiao"; repo = "auto-pairs"; - rev = "9086ce897a616d78baf69ddb07ad557c5ceb1d7c"; - sha256 = "02ds4i7aiq1a68qwz2gnmiigp25hi8qa9d4zcfazc3bgh855bx0l"; + rev = "40ba005829450406e92ec6277d4308ab532dd256"; + sha256 = "0pxrsmrcnci2k3crmj6ldb0faiai5f9ic1ywx513v148cl4vh8h1"; }; }; @@ -117,12 +127,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2018-12-16"; + version = "2019-01-12"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "680930f34bf5d4007dbaee66aba2dd688cbb3098"; - sha256 = "0jk4fm2ivf6r91yra7ddyxfbh2swf315zvmrm5ym605xcsiwv0nw"; + rev = "24df42761d3653aa8ea2c6f88938c8016b3d11df"; + sha256 = "03kmmy4na9cxnaf6z34pf9i91sgncxh06xwqmvhg5v8541dsglyq"; }; }; @@ -148,14 +158,25 @@ let }; }; + bufexplorer = buildVimPluginFrom2Nix { + pname = "bufexplorer"; + version = "2018-12-10"; + src = fetchFromGitHub { + owner = "jlanzarotta"; + repo = "bufexplorer"; + rev = "be69e397e502803db7d7f0a0e0491282ab2197a5"; + sha256 = "0brhbkj34yxyq5gvjkqakq0m9zwa981rv6ksca07qhw3nzpxhlkd"; + }; + }; + calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2018-11-02"; + version = "2019-01-18"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "8f6c29be2a20af974ff907876a4b6ba9581c346f"; - sha256 = "14rvav878ya0a0j5jic9zap5r5ccwdhg26rypjnn8rqnkra2f99a"; + rev = "5954cef560ea19e077b1811a4bcbe831a33e2499"; + sha256 = "0gz55ql0dqmg3cd0y46adkj3s61ar6j1w17n7643y0rd7mndcnqa"; }; }; @@ -305,12 +326,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2018-10-04"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "7aa17f00a6cc96b9c9c364c6786c24f97c04605b"; - sha256 = "06mdnpfch0rfhwdwqp4dhg7qx1gwsmkd6dlsd1ypc44r7wdjk38d"; + rev = "ea2685eb1c522dc7ea51ca0a1f215d4107d9978d"; + sha256 = "1kzavi4ja0ivw4jiqm2cyhb018x0npshr912jdkjwihklcrz26vb"; }; }; @@ -349,12 +370,12 @@ let ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp-vim"; - version = "2018-11-22"; + version = "2019-01-28"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "e953ee7a80dc96cd00c20ed6fe82e0e817d977ff"; - sha256 = "1qnh4w9wb0r7lf5sw37kq29rq887hihga3cxw766mk8rwb2ad3kv"; + rev = "879c40da6b7c65fa01f17a083efee6cdc8bf9d09"; + sha256 = "10bzxd99swqq8hmjp7yza2majkqsgza3yqjg9mncm2draka90mz1"; }; }; @@ -382,12 +403,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2018-12-24"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f20cd55d249712dd4d5ab7c2b9d8b7f0005c6290"; - sha256 = "0g31p4n1hvl0vxn7gczbkfs6bvfhabmyfggcc5sfsd27chf49q43"; + rev = "334fce21f798a3c4c7b33a37b107df28069e2bd7"; + sha256 = "01nbbsp62jqff7pm85lbi3kmwgq83cpm87p3bn8nbb7iw8ivkiva"; }; }; @@ -428,12 +449,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2018-12-24"; + version = "2019-01-27"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-jedi"; - rev = "73c11875fbfaabf6c0b455596cb3f9dfe5d86595"; - sha256 = "0xaa56d4scihzz2cwg9zqkv36jwpivnska936z9wq0fpr253yzxc"; + rev = "5b273e7ec3832748f0231d7f5a38150ae2bcfd30"; + sha256 = "09bsrpd86lwfak4sljzxslznkwx6qbb0jddvgvigsm7vpxa2x9ih"; fetchSubmodules = true; }; }; @@ -462,23 +483,23 @@ let deoplete-ternjs = buildVimPluginFrom2Nix { pname = "deoplete-ternjs"; - version = "2018-11-29"; + version = "2019-01-03"; src = fetchFromGitHub { owner = "carlitux"; repo = "deoplete-ternjs"; - rev = "ebdc48ecd29f8cae0659e5cdd2c30bd869839ca8"; - sha256 = "19zlgnavlqqq4rqwa1j1wglg921xdjhy8c71wfgh5492gmm1vr5x"; + rev = "185b01109fac17ad7e56ce542df6d689e94f65a6"; + sha256 = "1a78yk2d9navbmlk2y45qygv3las5xlhfvnw9l3mkijsira1v8ib"; }; }; deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2018-12-26"; + version = "2019-02-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "ec014e3a8d53b7bbc8a3906013975157d09936a1"; - sha256 = "06z2d552jf7vhmk0dh8my38bmrnfrzqggbs2dyzvqlx3hxrwm14h"; + rev = "1d577d43feae8eae88176c7909e7891297acc8de"; + sha256 = "1hbwz2mkxzq213bpgvrnpf784f193s9bk479nhysrv6704dpqb4v"; }; }; @@ -540,12 +561,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2018-11-29"; + version = "2019-01-28"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "e6fb10d22a9bd2a02c386c81486a065e71c6a92d"; - sha256 = "0fadqgvirmdl1acb39v05q2sw24fc40w4bcj05f4maj4lqbxkwqv"; + rev = "19f2821b7b457a2db7f7e4c25ade0b947b560fb0"; + sha256 = "1brf5r1sprnqbp7hszk9ygz4l2mk7493l5zsl60y1rx2yhfw78c9"; fetchSubmodules = true; }; }; @@ -574,23 +595,23 @@ let fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2018-09-24"; + version = "2019-01-13"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "cdd44dcf54dd6900e9699e957ba4b203d3021d1d"; - sha256 = "1a7x026cjd6nc9l0gx3cvfvhwalxj8d4361yvy6krpjaha4yk43j"; + rev = "6de79db47e6990c075ea0d05442a5cd4b6a650f2"; + sha256 = "1blsy9xfklviflnh2psn9xgnh1v9x4nnibfibmzsa0parpyczsfb"; }; }; ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2018-12-25"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "890a01f85a5ac50ad16f151aacd828b31cbe6889"; - sha256 = "0882mxa5n1cbvq4vzxnv2d5id3lxbv23anjrilbnkklgk1i5fq47"; + rev = "023b441f7aab72166ab5436ff5b6d1500be472b1"; + sha256 = "1a10l1fkgwpi8dm1wfsbllpcb3dnj1p6lg3xp2l5qg10bsjng1lk"; }; }; @@ -630,12 +651,12 @@ let fugitive-gitlab-vim = buildVimPluginFrom2Nix { pname = "fugitive-gitlab-vim"; - version = "2018-07-04"; + version = "2019-01-05"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838"; - sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d"; + rev = "43a13dbbc9aae85338877329ed28c9e4d8488db1"; + sha256 = "1in6r6p5mbcdpgpvmsl6k5nm1nhp4wfxs3wfy2vhswhw1c7ja1dd"; }; }; @@ -674,12 +695,12 @@ let gitv = buildVimPluginFrom2Nix { pname = "gitv"; - version = "2018-11-24"; + version = "2019-01-04"; src = fetchFromGitHub { owner = "gregsexton"; repo = "gitv"; - rev = "38daefcbb4375f79396c81860f077264fe9a3ae4"; - sha256 = "19v1v1wb1shh50if1jgiqy4bvja1lv6zy1fald3c48zl9303x8gq"; + rev = "e9486c2da297634dde7bc591b87fb8c0779b7789"; + sha256 = "1gs98c3s744fn4kxnkk1knh6lxykvryjk7gmyi149kvc0sklfwqh"; }; }; @@ -751,12 +772,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2018-10-17"; + version = "2019-01-04"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "0a18b0fbfdcdace35ee7ff4397ab6932d6dae1da"; - sha256 = "1p5x8kzxs491c2naxqhmqwdk85p3b6qr1aini746qm9ks5afhcgn"; + rev = "8b5ca0059c0f5f0bf0f78d7c5fbd3e83b7a5d5b6"; + sha256 = "1522psnakmcsm781lpnq09i3ylrg0lj8kx3nb7xm4wi6m100zzlk"; }; }; @@ -828,12 +849,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2018-12-03"; + version = "2019-01-25"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "7f4f2db260e3e693c8b9fc91498f9299c99148c2"; - sha256 = "0rykw5nbk6xxgifav30fmnzwfhbi4mc1qp84p8gc1lv2pajncx31"; + rev = "f36749776d78eee1c7e19ed18380bd66180453de"; + sha256 = "1r16fyi1grbqi9a8z7pg87msh3621cspvapqdi9zmfzjj9gvz2cv"; fetchSubmodules = true; }; }; @@ -851,12 +872,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2018-12-11"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "b81e1486d0a46b52e73763ee6e6ea1f28a3573d1"; - sha256 = "0lgjib5rni8rqiv3qkfxj204j6ccqrsnp7d7nij5bhqli3d2hryi"; + rev = "84104d0d55db347be045927e71cf9b0a88e72c2f"; + sha256 = "1bbpi9ndapp14qvbk7qr2xzih0sg6i7rx4sadf3zryasjaxxbfv4"; }; }; @@ -884,12 +905,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2018-12-12"; + version = "2019-01-18"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "1ef44bfa50320347004be77f836e97dc4f54982e"; - sha256 = "0xycmnd811si6c2sxwrw88law9wp5n6akxkqv0211iq9m8k72cp4"; + rev = "83ae633be323a7fb5baf77e493232cf3358d02bf"; + sha256 = "1y0iwz3wwcds4b2cll893l17i14ih5dwq1njxjbq9sd0694dadz7"; }; }; @@ -950,67 +971,67 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2018-12-27"; + version = "2019-01-27"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "3b2749be3bb039ce0df34bca2eea4d6cdfe95caa"; - sha256 = "152fyvkksqkzkcrr2lj9w26v46b0n9pzia10adbka0jx9ppnsv0k"; + rev = "5bd16749b1f8aeb04ddde191c46fa9be237f2eea"; + sha256 = "0nwf32y09lgiz20019ja72ah3bz5h48ama50lpbh6rl5miq4b5nk"; }; }; ncm2-bufword = buildVimPluginFrom2Nix { pname = "ncm2-bufword"; - version = "2018-12-06"; + version = "2019-01-19"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-bufword"; - rev = "183843100999d021e5d52c09c61faa6c64ac6e2f"; - sha256 = "11ma0wfzxjd0mv1ykxjwqk9ixlr6grpkk1md85flqqdngnyif6di"; + rev = "1d42750114e47a31286268880affcd66c6ae48d5"; + sha256 = "14q76n5c70wvi48wm1alyckba71rp5300i35091ga197nkgphyaz"; }; }; ncm2-jedi = buildVimPluginFrom2Nix { pname = "ncm2-jedi"; - version = "2018-07-18"; + version = "2019-01-21"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "0418d5ca8d4fe6996500eb04517a946f7de83d34"; - sha256 = "1rbwxsycrn3nis9mj08k70hb174z7cw9p610r6nd8lv4zk1h341z"; + rev = "0003b012ff2ded5a606e3329f92be69865a7d301"; + sha256 = "137j30ddpy3ns6c8lwynycqp8ikrvckmxkmwb18c9zbxi9szaabj"; }; }; ncm2-path = buildVimPluginFrom2Nix { pname = "ncm2-path"; - version = "2018-09-12"; + version = "2019-01-11"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-path"; - rev = "d17deaceb3bc4da415cff25262762c99cdd34116"; - sha256 = "16pbln1k6jw5yc79g7g736kf4m7hn6kdlsphml7dla7xnnzd2az3"; + rev = "7315d39b6f55b87721fe0cbe5ebe64f2adff19d4"; + sha256 = "1ijmlk5n7pr27a9hf7b5761vg9hhx0qqzvb73r2f4xdjdx5g3d8k"; }; }; ncm2-tmux = buildVimPluginFrom2Nix { pname = "ncm2-tmux"; - version = "2018-12-06"; + version = "2019-01-11"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-tmux"; - rev = "196131f285f05966bdd1126d6bd0c912d01b92c5"; - sha256 = "0i9j9yn7ayisl3rwawjic7g3a07cg2541zh3jangjd9wz271l69r"; + rev = "17fa16ac1211af3d8e671f1591939d6f37bdd3bd"; + sha256 = "1g99vbrdz06i36gpa95crwixj61my7c9miy7mbpfbiy4zykf2wl2"; }; }; ncm2-ultisnips = buildVimPluginFrom2Nix { pname = "ncm2-ultisnips"; - version = "2018-08-01"; + version = "2019-01-26"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-ultisnips"; - rev = "15432d7933cfb855599442a67d6f39ddb706c737"; - sha256 = "0ixajh08fd5dgdz4h1sdxgiaind1nksk1d4lwyb6n4ijf672pms2"; + rev = "a7462f3b7036dce045a472d8ec9d8fb9fb090212"; + sha256 = "0f3qp33s5nh9nha9cgxggcmh7c1a5yrwvyyrszlh0x8nrzm1v1ma"; }; }; @@ -1082,12 +1103,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2018-12-21"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "fec5be9e3ee10d8311fb78944fdaa8547480f3d9"; - sha256 = "0wzw59pw22gqd9db6j1yvyz5l2xvrcw3gwjcg03pys9ynwd0vcjs"; + rev = "e57ec7889bfb4371c5a4241183204d0bd1f8aea8"; + sha256 = "0ynln0wn0kg5s6n3v31bijwkr0cghv5jzlkawaj4ihxnx44lf839"; }; }; @@ -1104,12 +1125,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2018-12-27"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "27eef4e95ca18c6b4c01a779b49446b4ddcbe314"; - sha256 = "038a8ja5rwm6cx804vqzp85gklyfw3gc7d79snc94g8jj6ply6w5"; + rev = "5fc1f982a5172705038e0a65adf587d9e43c160e"; + sha256 = "1r8mfn95s9kmswbkqsk03n2y2zzi8msqfkl9nzy2l9af9hvf9gwr"; }; }; @@ -1126,23 +1147,34 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2018-09-30"; + version = "2019-01-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "ec928a971f32150119f0ab73d289ea82e2740ae0"; - sha256 = "1ff8a9z1f3f39y3cqxj33kls4mf5ax1pwxcxhfcxprj48vqwpr7p"; + rev = "0389e5b358b1b26189a17726f5eb22df80c293b6"; + sha256 = "0mniaagczmhwk8jkvk4iqy0i00m64jjbvsk3y4kdb0g0slxazrll"; }; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2018-12-03"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "45b6a8688cc743f3855b866ff47b0f0e9481bf8d"; - sha256 = "02h6gqg1nmkg3c9k5ar77khqa9raxx3wlbf421q3w3k7fsmn31dv"; + rev = "c9b41fe9b8cca4b6a11cc0cbe71eecb94fa8a30f"; + sha256 = "1dn09s5jyi0k521llbi4qg5kpmza55i6bxxfvaizkdzdcimnmwxq"; + }; + }; + + neoterm = buildVimPluginFrom2Nix { + pname = "neoterm"; + version = "2019-01-29"; + src = fetchFromGitHub { + owner = "kassio"; + repo = "neoterm"; + rev = "372401281a45eb1389de523440ed38df2c059515"; + sha256 = "1487fbz7hbslr7n7kj3v49476rzzmc3l294gkhgf90ymyv1s8phn"; }; }; @@ -1170,34 +1202,34 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2018-12-26"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "371e4d0e099abb86a3016fefd1efae28a4e13856"; - sha256 = "0rdfjkd85w1d22mnfxy4ly35d7vi7q09i32hypxnhk7120hjmzdg"; + rev = "3427b2f4ef5f28c9886b7fed54eb9b1cd417fbdf"; + sha256 = "1mfb34z37bl5rqs5q0jmgjqmiqkjl7fw7plik8qfnwgbaspxhfv3"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2018-12-12"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "72c3656799289d4635520c28e17f737066ce19d6"; - sha256 = "1dy77vjj2prn0cl2k3cf7bd240nvh95m6h6lpv0zshjzjap7m1fx"; + rev = "8cc154d4b0cf28f73815050b9782e6ac5a4d733d"; + sha256 = "0cfasf1g4xns1pasriy14k16w6v2j7cb2zbxh62d6cra0jra70i0"; }; }; nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2018-11-15"; + version = "2019-01-09"; src = fetchFromGitHub { owner = "albfan"; repo = "nerdtree-git-plugin"; - rev = "8931d911fac1b5958ef084accee43c03a8c72485"; - sha256 = "1yv465afdf9wm65q335mx816wxmg1zzwj4gls2hsbxqymzm3l6br"; + rev = "95e20577cd442ad6256aff9bb2e9c80db05c13f0"; + sha256 = "15i66mxvygs6xa2jvk7bqdagxx1lcvynmyb9g75whgbv7is80qn7"; }; }; @@ -1258,12 +1290,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2018-10-21"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "9c2afdf4254cb6029c8b57f69b5018ba15c3ad9f"; - sha256 = "0qvf3zjw1c9b7am4imqip5xgdn92rx1dph2q4fi1jwxd23d9jd5d"; + rev = "5d489606484decb862d4c943d845595be3fe7a0f"; + sha256 = "1qsr470h772xvfxs8bfimb58g77015n0h0ggqjsr3hmm43qj8mal"; }; }; @@ -1379,12 +1411,12 @@ let rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2018-07-31"; + version = "2019-01-16"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "d7bb89e6a6fae25765ee16020ea7a85d43bd6e41"; - sha256 = "0zh2x1bm0sq00gq6350kckjl1fhwqdxl3b8d3k9lb1736xggd1p8"; + rev = "85d262156fd3c0556b91c88e2b72f93d7d00b729"; + sha256 = "0bws1fyw7lqc4frx6wn0k19nxbnjqw6wygdp0p6fixkr7rggy1p2"; }; }; @@ -1423,12 +1455,12 @@ let Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2018-10-22"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "28195f7d1047515438c43a3ae8ac39648376412b"; - sha256 = "03jd3jzq0b1djym448vyg0bvrkfrhk86djkbkyzajrsfj46ygs8q"; + rev = "493d80ef7a4f16926d10b8c3923cf69c5209fe34"; + sha256 = "0nqs98g6lq45yrrlwgxckkgq90n73s7nibih2906s0zvsr1x95s8"; }; }; @@ -1489,12 +1521,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2018-12-23"; + version = "2019-01-11"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "c6312525ce948e603aec827fba8842a5dea92a9c"; - sha256 = "11ki4zfnnizvdpymddxb7l1qmx1090xn5hiwhxifsrlg1c0dn3dp"; + rev = "12f549f9e4939bca53c8a87e6921a36fb143af9a"; + sha256 = "0mdjxqyw03rv6kis5b070afaihnbx1rj4mk3y3cx6qvs6qvbqsai"; }; }; @@ -1533,12 +1565,12 @@ let Spacegray-vim = buildVimPluginFrom2Nix { pname = "Spacegray-vim"; - version = "2018-12-25"; + version = "2018-12-27"; src = fetchFromGitHub { owner = "ajh17"; repo = "Spacegray.vim"; - rev = "5dfdefbe083666bf7f3fe2d6cdff650efaa5e1f7"; - sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9"; + rev = "63c9e2f75a084ba1fc136973d5d6e1f00fffad88"; + sha256 = "0djjabb2qp5d0sszdy1pacw4j4h9r03208pzxn5kwg6i660gajak"; }; }; @@ -1586,6 +1618,17 @@ let }; }; + sved = buildVimPluginFrom2Nix { + pname = "sved"; + version = "2019-01-25"; + src = fetchFromGitHub { + owner = "peder2tm"; + repo = "sved"; + rev = "3362db72447e8ac812c7299c15ecfc9f41341713"; + sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx"; + }; + }; + swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; version = "2018-09-12"; @@ -1599,12 +1642,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2018-11-24"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "0d25f4fb4203e600a28e776847d4beca254d3f84"; - sha256 = "1c3icnpbl7wrgqs67dc1pl7942za01mhsl7fwrcb0njwqkhmkamp"; + rev = "7274363a7267bf168ec21a50375102d602fd1232"; + sha256 = "0x6jn1hqxjlhhsykqqrlx910x53xcrwd3qa1jx0a9yighws9b01i"; }; }; @@ -1665,12 +1708,12 @@ let targets-vim = buildVimPluginFrom2Nix { pname = "targets-vim"; - version = "2018-12-21"; + version = "2019-01-08"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "55c9c40e47af660677725b68fcfe7e88d9985889"; - sha256 = "0jywlb5yxkyxn6vrdd3vd7q522llr2jplcl9yf97v89x3kmwpbqy"; + rev = "d6466f6f281f920e178637882a2e6e4f40c3acc2"; + sha256 = "04fzg94y37hm917klzz2k0j26wacnf0848nwa8br9b9vx5a6ixnv"; }; }; @@ -1687,12 +1730,12 @@ let tern_for_vim = buildVimPluginFrom2Nix { pname = "tern_for_vim"; - version = "2017-11-27"; + version = "2019-01-23"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern_for_vim"; - rev = "3cffc28f280fc599d3f997b1c8c00ddc78d8fc21"; - sha256 = "0idzkc65lw9zg4xq60w2nnvdgbdhngqccqwh1bzkvkzlmr7s43cl"; + rev = "994ffbe783da36d67786b6c66a4bf784c5eab300"; + sha256 = "0vpi5lqlyf6kcc0ha8hf3ch2h8v3awidgpwbrv9f3bqvyg4yhdcd"; }; }; @@ -1709,23 +1752,23 @@ let tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; - version = "2018-04-08"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "tomtom"; repo = "tlib_vim"; - rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b"; - sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx"; + rev = "857858deae98c31c766446bd54f73e636691eecb"; + sha256 = "04b8m6hzh8rgdy5h3n39mi9fqm38x8r7zn76h3inm2mw85h86jla"; }; }; traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2018-12-25"; + version = "2019-01-21"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "7fd6019cd817842ec45836c2cec575e3c21fedca"; - sha256 = "19pdpipng98s7kypkflfaxkhcskrppyb6714xf7y86adi1d2vly1"; + rev = "10e9915a38e9d1714ee8ab482411dc2a796609ae"; + sha256 = "0j4fdjf9yc31ra8h908i69zgwpv718g66ifmr38l7gq5rcvgl0vw"; }; }; @@ -1742,12 +1785,12 @@ let tsuquyomi = buildVimPluginFrom2Nix { pname = "tsuquyomi"; - version = "2018-12-26"; + version = "2019-01-16"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "fd47e1ac75ee3a09e13a3b7a8f609907c2b6b542"; - sha256 = "09rivi64z7lhkan7hd7kdg2r1p3l2iplyc9vs1l6dqk3cp9i5rh0"; + rev = "db073bb2dc872d29e26da355b5f49269aab6b0d0"; + sha256 = "113fgcpw8r2cfy5d7n0mxmr9jfyxhy4pgdl6jifz25ximryv3i4z"; }; }; @@ -1775,23 +1818,23 @@ let undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2018-10-15"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "9172c17f6d07405f14707ff273e3ca9f35aa9e42"; - sha256 = "12z9y7lljhq3gsxpn1ivyf2cvasc0br3fdkdhnrz305zxib97r5q"; + rev = "db0223fc6857c160b2394489094355feb20318f2"; + sha256 = "0ncqwn0gdz23gp9avdqkd8l0z6zc87m0xmi63b0axarp1lfazr56"; }; }; unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2018-12-14"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "f08df66abda88a83f0436e0bd1ffa05009a9645a"; - sha256 = "15mrmawxa1gwhirb11w10lw1prl3sjr6xy7xgsfjja2fzz5wm1jy"; + rev = "b55994a18b19499f8de19cf7ea48670113a45e4f"; + sha256 = "1mcspmnd7qvscf1zxn0i7gzb4yxa5xcpg7piyvssx9nbb8w57jr1"; }; }; @@ -1808,12 +1851,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2018-12-22"; + version = "2019-01-11"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "88b2e4086966a36beebd146b67f83e19079142c9"; - sha256 = "14l1vkja1179b10ikg7i39z4vi5zm1c5call54sa5jb5c68fjbvr"; + rev = "a70e2c06b220c1a66244d113665baf0bdc9677ee"; + sha256 = "01nph2lpvci1538c65a94jjnillaasiab85m4fq8nvqsfbn10d40"; }; }; @@ -1885,23 +1928,23 @@ let vim-addon-errorformats = buildVimPluginFrom2Nix { pname = "vim-addon-errorformats"; - version = "2014-11-05"; + version = "2019-01-14"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-errorformats"; - rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; + rev = "691fb923df24edb9bdff4af997b1e7b21a9865cf"; + sha256 = "00ys9aip9lcjkngz4s7gsvv0am151h0rircqqsyk8dj5q4mgq0v5"; }; }; vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { pname = "vim-addon-goto-thing-at-cursor"; - version = "2012-01-10"; + version = "2018-12-28"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-goto-thing-at-cursor"; - rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; - sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; + rev = "53cab03c46649d123bb481cd6793179ef255fc55"; + sha256 = "069j1m75fnkhqyyww2z21dnkg613k97145vgga4dkh2a0fakrs4q"; }; }; @@ -2039,12 +2082,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2018-12-18"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "72888d87ea57761f21c9f67cd0c0faa5904795eb"; - sha256 = "0k3c6p3xy6514n1n347ci4q9xjm9wwqirpdysam6f7r39crgmfhd"; + rev = "40786883051429053d22ad0da4e04b52e900aaba"; + sha256 = "09igzw2wg2m55bq9l343wgxdgjmhjg62sz3fr2wjgmr5ji4kpkn4"; }; }; @@ -2105,23 +2148,23 @@ let vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2018-01-11"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3"; - sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy"; + rev = "9a555405baaccc3fa4cad2fc6c627eb43f3be939"; + sha256 = "15kzi9b30l6xhz71r376w3vgml7g4vpi046ff9fvl1i6vi4ny78f"; }; }; vim-better-whitespace = buildVimPluginFrom2Nix { pname = "vim-better-whitespace"; - version = "2018-06-11"; + version = "2019-01-25"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "70a38fa9683e8cd0635264dd1b69c6ccbee4e3e7"; - sha256 = "1w16mrvydbvj9msi8p4ym1vasjx6kr4yd8jdhndz0pr3qasn2ix9"; + rev = "f5726c4bbe84a762d5ec62d57af439138a36af76"; + sha256 = "0mk15jv0vsqvww0jk3469755lb4hhjmxqkbk7byvxch63ai8jlsy"; }; }; @@ -2160,12 +2203,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2018-12-15"; + version = "2018-12-29"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "2147649088e977852c168a2173f13e0e04d555ed"; - sha256 = "17kc9zwj3flj32riqsknwik5b5fr042yr3qn7w9wqk0m2vdid4mv"; + rev = "54d1eacb2e96f6862894bff53a48846b6470e870"; + sha256 = "1j88my182dwlvwrnfpkdgda4qgam28l7hdmmfgjh6h745ax0mghg"; }; }; @@ -2270,12 +2313,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2018-06-21"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26"; - sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg"; + rev = "7cbdd2b68ff9bc6d4da74e9872b12adf32b1bc2f"; + sha256 = "00g6cy2ly26fmzjdjga987k2apkkhpy1jkndj6d1hg35kwv7bihv"; }; }; @@ -2303,12 +2346,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2018-10-31"; + version = "2019-01-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "d4b8940fd1cd77fc6d300f003b18745a584295b2"; - sha256 = "06g0xc55z9jpa5rl8c5af5apb8b2agahsxxzayl2vn763v9p1n6b"; + rev = "a795955b64a2eb15c1f05ae1434a89cc8ca16611"; + sha256 = "1lgfin1lwabw0ajmx1q6v8vf1c6v03sd82ssy1jw1rqxp4izdqh9"; }; }; @@ -2380,12 +2423,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2018-12-12"; + version = "2018-12-31"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "7e65a353ea332c79c348ac0d4487cb19529759cd"; - sha256 = "1vgg348m95q0l67fz6wfzp6aamj7aq16dq17xx7n6qdz7nys0q1f"; + rev = "e2be90dd910db0890edcfb08c0837e9da8e37439"; + sha256 = "0r5fj6jl53adkllx9alpmah6f1qqkhy589n0l9sphsadr6rx8hr1"; }; }; @@ -2446,12 +2489,12 @@ let vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2018-09-21"; + version = "2019-01-10"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "d50b3715ef386e4d998ff85dad6392110536478d"; - sha256 = "135374sr4ymyslc9j8qgf4qbhijc3lm8jl9mhhzq1k0ndsz4w3k3"; + rev = "c6b43f88e4cbce052843e8cbd9593cc7753208fe"; + sha256 = "0z4c2n8b9vi19qqdmljyms173dmkiarlf4yxx1ix1wvqmnpcr6zf"; }; }; @@ -2468,23 +2511,23 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2018-12-26"; + version = "2019-02-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a1f9596d2d884e74358bc5017a73f37e34f7b04c"; - sha256 = "07am7ca8klnnq6iyp5lbqaas9lgz005rpvndcca7r5w0h45dpncw"; + rev = "ed07f9a503e53ec3ca4d5e255acb078675f2ff0e"; + sha256 = "0ykzawd9axa68109mwl3c7177si8sxy6b5x0xwf4z80c1xnc8czx"; }; }; vim-ghost = buildVimPluginFrom2Nix { pname = "vim-ghost"; - version = "2018-12-12"; + version = "2019-01-05"; src = fetchFromGitHub { owner = "raghur"; repo = "vim-ghost"; - rev = "26209657da7ea040c635b36331793a04694f4921"; - sha256 = "16gg487mxqw58s5np2a9a1kjy6kp5f0fmk60d444ymbjblv6gaix"; + rev = "156f393d9c45a5c9dd16f9316a9ad125da67c449"; + sha256 = "0b21yamsfrljk3mfjql0gzsv5mv24qwbs551hxqsapgmrv7j2acg"; }; }; @@ -2512,12 +2555,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2018-12-15"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "1d422b9f98194e38bc56e54192c9bc66d95c21f1"; - sha256 = "1xv4brbhpxx23q2wklxxclzj9n1fi34m2rj0syf7ggp9fy7y50dk"; + rev = "fd834e48eed21cc3c3ab66779a2296a16f41cbca"; + sha256 = "1q8263cxa7ic3bijl0zlz14pxa8mqww1isb6a9gpwmlmxrfwhl7x"; }; }; @@ -2534,12 +2577,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2018-12-24"; + version = "2019-01-14"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "23409acfa8b6e4a324730108d01826f0910a8973"; - sha256 = "1ddbcwag8x26sim4aplslgmcjv8vr9smanh5939m4a1sw7lcg2xv"; + rev = "a61545f09cad6df2e7a4918cbd6981811f612ae9"; + sha256 = "0kkh32hpkg225a2y21k1hda5vadc6c3phwaqn85icr3kcbbwwy9s"; }; }; @@ -2556,12 +2599,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2018-12-22"; + version = "2019-01-22"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "9b62e6bdd9de9fe027363bbde68e9e32d937cfa0"; - sha256 = "15j65qcnyfdkzyyv7504anaic891v5kvnqszcz37y5j15zjs5c02"; + rev = "32c002c239d1838636bd3787012dc319dc4c96ee"; + sha256 = "044h66b33ri3z5dsnz2pbwx362p7nzfhfqhd8jckxrpzlnc803ly"; }; }; @@ -2732,12 +2775,12 @@ let vim-jade = buildVimPluginFrom2Nix { pname = "vim-jade"; - version = "2018-09-10"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "digitaltoad"; repo = "vim-jade"; - rev = "3f341b48e46a84891e19d449a5e336bcfc5a57a0"; - sha256 = "15gpb1a9d80gz8nzgl0w6wpnlxnrxd4qra2xj56jmmywsabkvqxk"; + rev = "0b4f42ac1ae491adac2b99b81eddd2bfd79337ee"; + sha256 = "0xr54p19fr8z6ywaw2mlmw0c92dlc7xjsnif19bafjxrlz3l0aq9"; }; }; @@ -2754,12 +2797,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2018-12-25"; + version = "2019-01-22"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "0d96e7344eafc0d2ce6888e629668629d6a11f70"; - sha256 = "18l0s90y3k7cbl1ql6nyhk13nbc97ll3zkzkvln9r189ckj7q1w7"; + rev = "2ac13090e96d28e3bec2141625f9007723010091"; + sha256 = "04kbkjph57yz78wfv6w8zhrh7c1x6j9fpxfmnysm9nnn4539zdl8"; }; }; @@ -2787,12 +2830,12 @@ let vim-jsbeautify = buildVimPluginFrom2Nix { pname = "vim-jsbeautify"; - version = "2018-10-23"; + version = "2019-01-21"; src = fetchFromGitHub { owner = "maksimr"; repo = "vim-jsbeautify"; - rev = "7c586568716263e27449d9b3f2475636bcd1f4dc"; - sha256 = "1v1fcf1gm9p70l5nl9ba3xzdavx0jmz2v7x25v996dnfihaf494v"; + rev = "a0ccb51b4e05fefd06a868df8a7e0b64ac5ec4ce"; + sha256 = "0739vga8mh53ljl0w48vw467r6fzarqrwxz2wr3k8dm58kpq86xr"; fetchSubmodules = true; }; }; @@ -2832,12 +2875,12 @@ let vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2017-06-13"; + version = "2019-01-18"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "102b68348eff0d639ce88c5094dab0fdbe4f7c55"; - sha256 = "1d0mjjyissjvl80wgmn7z1gsjs3fhk0vnmx84l9q7g04ql4l9pja"; + rev = "c05db65464e26aef281d4c1e0006d0504f2f76d7"; + sha256 = "0kq44q1ays0wwlfb3yqrfji3bfxpvbsrpzpp9dcf84836p0fpr1j"; }; }; @@ -2907,25 +2950,36 @@ let }; }; + vim-lsc = buildVimPluginFrom2Nix { + pname = "vim-lsc"; + version = "2019-01-28"; + src = fetchFromGitHub { + owner = "natebosch"; + repo = "vim-lsc"; + rev = "20a3545fb0b6551349ecd55c8fd0402bcebc3ab5"; + sha256 = "1p0fkbg64fp1i4i0aq0bjg3pkf5xc99449nv7l7csf5ql93y17dx"; + }; + }; + vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2018-12-13"; + version = "2019-01-24"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "99470333a54ff3c45406f6e99333b7771f864d42"; - sha256 = "0l16ix2p89w6r9da5biv6mzg8g1ajjkmnh085f0601yml5vdzlda"; + rev = "ec7a094e602babc2e0d43dc5fa5411e46e3bd70c"; + sha256 = "1377wqzrsvwvmzb91a6fm5ma2hnnlas0wgia5bk62a8f1rsgyfgc"; }; }; vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2018-10-24"; + version = "2019-01-17"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "52ee2eb68a706972a1840ca036035033046568d6"; - sha256 = "1w186rbnhk1y6sqqrwvgfs4xigf2c1f1xhjlhvmmb174cp5c84v2"; + rev = "be5e60fa2d85fec3b585411844846678a775a5d3"; + sha256 = "14v7igb0h8bn7kidnx547m9nm2b1ymfxr6n9yfw0lmk7pzwa603i"; }; }; @@ -3105,6 +3159,17 @@ let }; }; + vim-parinfer = buildVimPluginFrom2Nix { + pname = "vim-parinfer"; + version = "2018-08-31"; + src = fetchFromGitHub { + owner = "bhurlow"; + repo = "vim-parinfer"; + rev = "d599e41dd1b9034059524af8156dcbebe68d96d2"; + sha256 = "0h4zw1yfnrbb3w5brcsy2l43jk7569dhslpkahczqxj6wr6hsxcc"; + }; + }; + vim-pathogen = buildVimPluginFrom2Nix { pname = "vim-pathogen"; version = "2018-12-13"; @@ -3272,12 +3337,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2018-12-11"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "0e57d862250bb4ce56e30e2c4e10781b8b1776ac"; - sha256 = "18z6170nm1vz4hh52qgiqhj9p7ak3d363rxh0q9si4hc6w56agzx"; + rev = "4f640daecbb1d0b4f6c02675bfc0fa958102f5be"; + sha256 = "1rja2kc3i364d7bfq8d1z5yck6sjzyjxrciv5cb4ww1v6njp4ay5"; }; }; @@ -3294,12 +3359,12 @@ let vim-scala = buildVimPluginFrom2Nix { pname = "vim-scala"; - version = "2017-11-10"; + version = "2019-01-21"; src = fetchFromGitHub { owner = "derekwyatt"; repo = "vim-scala"; - rev = "0b909e24f31d94552eafae610da0f31040c08f2b"; - sha256 = "1lqqapimgjr7k4imr26ap0lgx6k4qjl5gmgb1knvh5kz100bsjl5"; + rev = "971ac9ab3fe945105ef88587cfe5273fa2c8e988"; + sha256 = "0n28k3c2jyb4af0ql2sm3ngkcyvd4684c95j5yfvs7jjsvjibqcb"; }; }; @@ -3349,12 +3414,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2018-12-20"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "ea6db3c7df7671584df0a37a2436a919332d0b7c"; - sha256 = "0876ik4a4kxa22fwcgm9b2swnc6ngmiakhy4h0brxgmci8h0r9m2"; + rev = "768f52319212b6e2964e4f11d1baf7092066d504"; + sha256 = "14b9s7plj9h55n1ddqvjy13mfciviq2ngmjs3x22vrpwgsga2zik"; }; }; @@ -3369,6 +3434,17 @@ let }; }; + vim-slime = buildVimPluginFrom2Nix { + pname = "vim-slime"; + version = "2019-01-29"; + src = fetchFromGitHub { + owner = "jpalardy"; + repo = "vim-slime"; + rev = "8717c21b270cfd7396de54a256c7be3a30e70cc1"; + sha256 = "01yl8pl59yksdz9z6ry70m441w847cjwx92z0qf3ipv5038dsngs"; + }; + }; + vim-smalls = buildVimPluginFrom2Nix { pname = "vim-smalls"; version = "2015-05-02"; @@ -3382,23 +3458,23 @@ let vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2017-04-20"; + version = "2019-01-11"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; - sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; + rev = "17ac70ef00982b7b4865e2ff0efc34a4a5b59cab"; + sha256 = "1agfxwl3n8kz4zwqmsirwr1zzafi069xinv10q79jkczayfpcfq0"; }; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2018-12-14"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "a6090b9bffeec418ee7deaa31f90c4a8fd3b1170"; - sha256 = "1f0jnsdn0zavpz5727683442c22mjgcnj1j5dkhaysrkdzn4qc64"; + rev = "075e97b6b6c1f981a15f7a887d7c006141fccbfc"; + sha256 = "19hifbhdg2hp7b719vjrpkk0zndmswp1px2r94blvyd82gn21y42"; }; }; @@ -3437,12 +3513,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2018-12-16"; + version = "2019-01-30"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "9c26c7e8dcee2e580f137610ccde1af40a19d2bb"; - sha256 = "01km6gka0k06kppk9q3c5c1a2jlg5ibid37dv6575kfkibhri3yn"; + rev = "69e835d1f779140f7c0a27f6fd30ae4d1f9dac77"; + sha256 = "0s4938xrmn6ivm4dvkhpqc5gdx42hk2m206fkhayxagvwnxsfiwb"; }; }; @@ -3459,12 +3535,12 @@ let vim-stylishask = buildVimPluginFrom2Nix { pname = "vim-stylishask"; - version = "2018-07-05"; + version = "2019-01-14"; src = fetchFromGitHub { owner = "alx741"; repo = "vim-stylishask"; - rev = "62608c70af8fafbbc9712238dafd2c5a433ed179"; - sha256 = "12vj2kf82kvmd6smimgnz9yy97n7bvrji063ig3wlicxwmz62fdr"; + rev = "cf7ca48708da6d1b18d98fa158f9571af05f6043"; + sha256 = "0wnjl74cf26p138nndj827149psddqins5wicqdzxi2lxijgxhny"; }; }; @@ -3492,12 +3568,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2018-10-21"; + version = "2019-01-21"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "130e835ff73ae16c5827fe37f1d1b09456c5f7dc"; - sha256 = "1dlyszky76z8kj6vy4sfn5zkjdi12hwfn29g8adds04zbaxi61gg"; + rev = "ad9229c93702e52fdb07ce2b5ca45f7124aa9b98"; + sha256 = "0ks917mx1kbnhvp623s854vvi5xc1ip4qvcdi45nfbx0qvqn6dk7"; }; }; @@ -3525,23 +3601,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2018-12-25"; + version = "2019-01-23"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "259481e063e79392c25f293f8459462f942dd6f9"; - sha256 = "0w3kwjd5ywnjkkc3cn765ra8mqqmxvk328b0d14b9hndyhs6v8gi"; + rev = "dde8e028ccba76bd199c46b0bb64c520cc874731"; + sha256 = "183zxr40nczqacr7s41v5n2a1hx57r8ihadvpp65j6m2kjq19amn"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2018-12-24"; + version = "2019-02-04"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "fceb803bcde722b8a678251defb34f456affb3e3"; - sha256 = "0g750rrxcgxvimxcpcz9xkjgsdbwnqc3wjvw056ghyy6mvsvq0wj"; + rev = "ae44000a0e556a6b4c95d75b6ad39ffc1dd5f066"; + sha256 = "02h1y59wzb7kxyqr2405y72sq0bf6yn16vw2qxfnbp7shdhxr2sa"; }; }; @@ -3569,12 +3645,12 @@ let vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2018-11-03"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "9f7d1588b04644d8a1671d2325fefbb4f772e466"; - sha256 = "08nxa5v56zmsjbx0zld1i9nwydxmb3r6qmxb9hgnvzg4aylmbxlc"; + rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42"; + sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv"; }; }; @@ -3613,12 +3689,12 @@ let vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2018-12-20"; + version = "2019-01-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "9da253e92ca8444be9f67a5b0086c9213b8772e9"; - sha256 = "0s5jvc618nncsc4dzgr30nf2xfm71jpdsxq90gnxm1730fyln8f3"; + rev = "5694455d72229e73ff333bfe5196cc7193dca5e7"; + sha256 = "1fsz9bg0rrp35rs7qwgqzm0wnnd22pckmc2f792kkpcfmmpg5lay"; }; }; @@ -3745,12 +3821,12 @@ let vimpreviewpandoc = buildVimPluginFrom2Nix { pname = "vimpreviewpandoc"; - version = "2018-11-05"; + version = "2019-02-02"; src = fetchFromGitHub { owner = "tex"; repo = "vimpreviewpandoc"; - rev = "61d34f27b6d47da6523b682e32a155f65867d46e"; - sha256 = "08hszn4mjp64b1qcfc868cyrrylil2257sjzs19w61p10l6j6skm"; + rev = "90e39ff676c78bc6f3dde2a76b56fe86aa38d39c"; + sha256 = "0xaaq565wfd2bx64wm1cy0k18jrm6l9snwkvmgbp7p10zjxnqfhs"; }; }; @@ -3778,12 +3854,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2018-12-25"; + version = "2019-02-01"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "0746f21c2311acfec7c7c23bd122ea4eb3eacb4b"; - sha256 = "0hga30q6b6v6mdzbqbqr6j6i7fdg4i0igpi2gwvx70a2x68d7ybk"; + rev = "97b02bb024b23501302f50c068e89b058faace6b"; + sha256 = "1yd6xl7a2gbazgr6fs9n00b9msz1w7szl42h0pn80nmgp0pmjmcp"; }; }; @@ -3800,12 +3876,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2018-10-12"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "7ffc295094debc3d521cecf267d736cc8562c20e"; - sha256 = "0gl2d7xqzisinsgxpcwkkpryva8pklca9x860bqsirajr8mcdbpc"; + rev = "417490f30b3aaec600c19cfa59018cf2368dd87b"; + sha256 = "12mkk48kgjd7ijz81drmd4fimd9881r4nhhffckqqkv0r0mvg8x8"; }; }; @@ -3833,12 +3909,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2018-06-04"; + version = "2019-01-04"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "fb6ce53632f93c31cad66398636bfb383ad64d52"; - sha256 = "1f0rpaff7q9xswc1p5pmwzmhb70s4q148dj2apg98d4qywa9j8ah"; + rev = "64ac52e606a17f7ccf0e185d8e39f78043b34be0"; + sha256 = "1ji7c61lbz9sv62kq9digb6v6nvmw53bl23gcwc5131nz7sf2gpv"; }; }; @@ -3910,24 +3986,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2018-12-15"; + version = "2019-01-15"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "e95d5895988a5f7c5c130ea6697a7cc73f5e4ad9"; - sha256 = "1f1q6invygwig58kwmw7acd8cz0asxlvs7achnyij00w9cyyly82"; + rev = "c743a40069420366b9896fb62347519d8443f94d"; + sha256 = "04k017dy5kp1lwgbzjmqymnpifbj1lhsw67rffycw59ya2p5gsf2"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2018-12-23"; + version = "2019-01-28"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "7997fc5536e8220ed2798c5522a1eb4421577fa2"; - sha256 = "1662js5dpspmrak92zwy8751qfd1pkp5q7xgw2m6c76ccvv88c5p"; + rev = "c25e449f4e72667aca3d18d8bfccd7b289b2e9a1"; + sha256 = "0zfrlql7q7rdalfh7iglqkrwvbl8642plm816kc4907mixq4hikg"; fetchSubmodules = true; }; }; @@ -3967,12 +4043,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2018-12-12"; + version = "2019-01-31"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "c24d058fef53601b1381d80243bffcb356815e31"; - sha256 = "1nsji87vbz5rpl25rysy4np7zdwyqzv6qh8g15pvll0jqmsd5z0v"; + rev = "09e0bceb7be1488318df9441a5499f1dde644e72"; + sha256 = "1g1s0176s3cz0ynyrx5a3r0jnbmqgln318v7hw5qvgalf3k99c5c"; }; }; @@ -3986,6 +4062,6 @@ let sha256 = "04pv7mmlz9ccgzfg8sycqxplaxpbyh7pmhwcw47b2xwnazjz49d6"; }; }; -}); +}); in lib.fix' (lib.extends overrides packages) diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 307681111ac2..c9785b66fbb4 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -1,9 +1,10 @@ { lib, stdenv , python, cmake, vim, ruby , which, fetchgit, llvmPackages, rustPlatform -, xkb_switch, fzf, skim +, xkb-switch, fzf, skim , python3, boost, icu, ncurses , ycmd, rake +, gobject-introspection, glib, wrapGAppsHook , substituteAll , languagetool , Cocoa, CoreFoundation, CoreServices @@ -19,18 +20,21 @@ self: super: { vim2nix = buildVimPluginFrom2Nix { - name = "vim2nix"; + pname = "vim2nix"; + version = "1.0"; src = ./vim2nix; dependencies = with super; [ vim-addon-manager ]; }; fzfWrapper = buildVimPluginFrom2Nix { - name = fzf.name; + pname = "fzf"; + version = fzf.version; src = fzf.src; }; skim = buildVimPluginFrom2Nix { - name = skim.name; + pname = "skim"; + version = skim.version; src = skim.vim; }; @@ -54,7 +58,8 @@ self: super: { ''; }; in buildVimPluginFrom2Nix { - name = "LanguageClient-neovim-2018-09-07"; + pname = "LanguageClient-neovim"; + version = "2018-09-07"; src = LanguageClient-neovim-src; propogatedBuildInputs = [ LanguageClient-neovim-bin ]; @@ -67,7 +72,8 @@ self: super: { # do not auto-update this one, as the name clashes with vim-snippets vim-docbk-snippets = buildVimPluginFrom2Nix { - name = "vim-docbk-snippets-2017-11-02"; + pname = "vim-docbk-snippets"; + version = "2017-11-02"; src = fetchgit { url = "https://github.com/jhradilek/vim-snippets"; rev = "69cce66defdf131958f152ea7a7b26c21ca9d009"; @@ -167,6 +173,35 @@ self: super: { dependencies = with super; [ ultisnips ]; }); + sved = let + # we put the script in its own derivation to benefit the magic of wrapGAppsHook + svedbackend = stdenv.mkDerivation { + name = "svedbackend-${super.sved.name}"; + inherit (super.sved) src; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ + gobject-introspection + glib + (python3.withPackages(ps: with ps; [ pygobject3 pynvim dbus-python ])) + ]; + preferLocalBuild = true; + installPhase = '' + install -Dt $out/bin ftplugin/evinceSync.py + ''; + }; + in + super.sved.overrideAttrs(old: { + preferLocalBuild = true; + postPatch = '' + rm ftplugin/evinceSync.py + ln -s ${svedbackend}/bin/evinceSync.py ftplugin/evinceSync.py + ''; + meta = { + description = "synctex support between vim/neovim and evince"; + }; + }); + + vimshell-vim = super.vimshell-vim.overrideAttrs(old: { dependencies = with super; [ vimproc-vim ]; }); @@ -308,9 +343,9 @@ self: super: { vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: { patchPhase = '' substituteInPlace plugin/xkbswitch.vim \ - --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so + --replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so ''; - buildInputs = [ xkb_switch ]; + buildInputs = [ xkb-switch ]; }); vim-yapf = super.vim-yapf.overrideAttrs(old: { diff --git a/nixpkgs/pkgs/misc/vim-plugins/update.py b/nixpkgs/pkgs/misc/vim-plugins/update.py index 1062241a0cb6..d3412822fdf3 100755 --- a/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -296,8 +296,10 @@ def generate_nix(plugins: List[Tuple[str, str, Plugin]]): f.write(header) f.write( """ -{ buildVimPluginFrom2Nix, fetchFromGitHub }: +{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: +let + packages = ( self: {""" ) for owner, repo, plugin in sorted_plugins: @@ -320,7 +322,10 @@ def generate_nix(plugins: List[Tuple[str, str, Plugin]]): }}; """ ) - f.write("}") + f.write(""" +}); +in lib.fix' (lib.extends overrides packages) +""") print("updated generated.nix") diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 0fa61a82e3ec..101ac0a21121 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -16,6 +16,7 @@ bazelbuild/vim-bazel bbchung/clighter8 benekastah/neomake benmills/vimux +bhurlow/vim-parinfer bitc/vim-hdevtools bling/vim-bufferline bronson/vim-trailing-whitespace @@ -109,9 +110,11 @@ jgdavey/tslime.vim jhradilek/vim-docbk jiangmiao/auto-pairs jistr/vim-nerdtree-tabs +jlanzarotta/bufexplorer jnurmine/zenburn jonbri/vim-colorstepper joonty/vim-xdebug +jpalardy/vim-slime JuliaEditorSupport/deoplete-julia JuliaEditorSupport/julia-vim junegunn/fzf.vim @@ -129,6 +132,7 @@ kana/vim-niceblock kana/vim-operator-replace kana/vim-operator-user kana/vim-tabpagecd +kassio/neoterm kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/swift.vim @@ -192,6 +196,7 @@ mkasa/lushtags morhetz/gruvbox motus/pig.vim mpickering/hlint-refactor-vim +natebosch/vim-lsc nathanaelkane/vim-indent-guides navicore/vissort.vim nbouscal/vim-stylish-haskell @@ -216,6 +221,8 @@ osyo-manga/vim-textobj-multiblock osyo-manga/vim-watchdogs pangloss/vim-javascript parsonsmatt/intero-neovim +pearofducks/ansible-vim +peder2tm/sved peterhoeg/vim-qml phanviet/vim-monokai-pro plasticboy/vim-markdown diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix index 1d305cd5349f..2a758aa98433 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,5 +1,7 @@ -{stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin -, nix-prefetch-hg, nix-prefetch-git }: +{ stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin +, nix-prefetch-hg, nix-prefetch-git +, fetchFromGitHub +}: /* @@ -150,28 +152,29 @@ vim_with_plugins can be installed like any other application within Nix. let inherit (stdenv) lib; - # transitive closure of plugin dependencies - transitiveClosure = knownPlugins: plugin: + # make sure a plugin is a derivation and its dependencies are derivations. If + # plugin already is a derivation, this is a no-op. If it is a string, it is + # looked up in knownPlugins. + pluginToDrv = knownPlugins: plugin: let - # vam puts out a list of strings as the dependency list, we need to be able to deal with that. - # Because of that, "plugin" may be a string or a derivation. If it is a string, it is resolved - # using `knownPlugins`. Otherwise `knownPlugins` can be null. - knownPlugins' = if knownPlugins == null then vimPlugins else knownPlugins; - pluginDrv = if builtins.isString plugin then knownPlugins'.${plugin} else plugin; + drv = + if builtins.isString plugin then + # make sure `pname` is set to that we are able to convert the derivation + # back to a string. + ( knownPlugins.${plugin} // { pname = plugin; }) + else + plugin; in - [ pluginDrv ] ++ ( - lib.unique (builtins.concatLists (map (transitiveClosure knownPlugins) pluginDrv.dependencies or [])) - ); - - findDependenciesRecursively = knownPlugins: plugins: lib.concatMap (transitiveClosure knownPlugins) plugins; + # make sure all the dependencies of the plugin are also derivations + drv // { dependencies = map (pluginToDrv knownPlugins) (drv.dependencies or []); }; - attrnamesToPlugins = { knownPlugins, names }: - map (name: if builtins.isString name then knownPlugins.${name} else name) knownPlugins; - - pluginToAttrname = plugin: - plugin.pname; + # transitive closure of plugin dependencies (plugin needs to be a derivation) + transitiveClosure = plugin: + [ plugin ] ++ ( + lib.unique (builtins.concatLists (map transitiveClosure plugin.dependencies or [])) + ); - pluginsToAttrnames = plugins: map pluginToAttrname plugins; + findDependenciesRecursively = plugins: lib.concatMap transitiveClosure plugins; vamDictToNames = x: if builtins.isString x then [x] @@ -195,7 +198,7 @@ let (let knownPlugins = pathogen.knownPlugins or vimPlugins; - plugins = findDependenciesRecursively knownPlugins pathogen.pluginNames; + plugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); pluginsEnv = buildEnv { name = "pathogen-plugin-env"; @@ -240,7 +243,10 @@ let (let knownPlugins = vam.knownPlugins or vimPlugins; - plugins = findDependenciesRecursively knownPlugins (lib.concatMap vamDictToNames vam.pluginDictionaries); + # plugins specified by the user + specifiedPlugins = map (pluginToDrv knownPlugins) (lib.concatMap vamDictToNames vam.pluginDictionaries); + # plugins with dependencies + plugins = findDependenciesRecursively specifiedPlugins; # Vim almost reads JSON, so eventually JSON support should be added to Nix # TODO: proper quoting @@ -298,8 +304,8 @@ let # opposed to older implementations that have to maintain backwards # compatibility). Therefore we don't need to deal with "knownPlugins" # and can simply pass `null`. - depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively null opt); - startWithDeps = findDependenciesRecursively null start; + depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); + startWithDeps = findDependenciesRecursively start; in ["mkdir -p $out/pack/${packageName}/start"] # To avoid confusion, even dependencies of optional plugins are added @@ -407,6 +413,7 @@ rec { inherit (import ./build-vim-plugin.nix { inherit stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix; + # used to figure out which python dependencies etc. neovim needs requiredPlugins = { packages ? {}, givenKnownPlugins ? null, @@ -420,11 +427,11 @@ rec { if vam != null && vam ? knownPlugins then vam.knownPlugins else if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else vimPlugins; - pathogenNames = findDependenciesRecursively knownPlugins pathogen.pluginNames; - vamNames = findDependenciesRecursively knownPlugins (lib.concatMap vamDictToNames vam.pluginDictionaries); - names = (lib.optionals (pathogen != null) pathogenNames) ++ - (lib.optionals (vam != null) vamNames); - nonNativePlugins = map (name: knownPlugins.${name}) names ++ (lib.optionals (plug != null) plug.plugins); + pathogenPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); + vamPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) (lib.concatMap vamDictToNames vam.pluginDictionaries)); + nonNativePlugins = (lib.optionals (pathogen != null) pathogenPlugins) + ++ (lib.optionals (vam != null) vamPlugins) + ++ (lib.optionals (plug != null) plug.plugins); nativePluginsConfigs = lib.attrsets.attrValues packages; nativePlugins = lib.concatMap ({start?[], opt?[], knownPlugins?vimPlugins}: start++opt) nativePluginsConfigs; in @@ -451,4 +458,40 @@ rec { name = "vim-with-vim-addon-nix"; vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; }; + + # only neovim makes use of `requiredPlugins`, test this here + test_nvim_with_vim_nix_using_pathogen = neovim.override { + configure.pathogen.pluginNames = [ "vim-nix" ]; + }; + + # regression test for https://github.com/NixOS/nixpkgs/issues/53112 + # The user may have specified their own plugins which may not be formatted + # exactly as the generated ones. In particular, they may not have the `pname` + # attribute. + test_vim_with_custom_plugin = vim_configurable.customize { + name = "vim_with_custom_plugin"; + vimrcConfig.vam.knownPlugins = + vimPlugins // ({ + "vim-trailing-whitespace" = buildVimPluginFrom2Nix { + name = "vim-trailing-whitespace"; + src = fetchFromGitHub { + owner = "bronson"; + repo = "vim-trailing-whitespace"; + rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; + sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; + }; + # make sure string dependencies are handled + dependencies = [ "vim-nix" ]; + }; + }); + vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; + }; + + # system remote plugin manifest should be generated, deoplete should be usable + # without the user having to do `UpdateRemotePlugins`. To test, launch neovim + # and do `:call deoplete#enable()`. It will print an error if the remote + # plugin is not registered. + test_nvim_with_remote_plugin = neovim.override { + configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; + }; } diff --git a/nixpkgs/pkgs/misc/xosd/default.nix b/nixpkgs/pkgs/misc/xosd/default.nix index 8f8c58ecc4ac..c8cda8482bf1 100644 --- a/nixpkgs/pkgs/misc/xosd/default.nix +++ b/nixpkgs/pkgs/misc/xosd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, libXt, xextproto, xproto }: +{ stdenv, fetchurl, libX11, libXext, libXt, xorgproto }: stdenv.mkDerivation rec { name = "xosd-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "025m7ha89q29swkc7s38knnbn8ysl24g2h5s7imfxflm91psj7sg"; }; - buildInputs = [ libX11 libXext libXt xextproto xproto ]; + buildInputs = [ libX11 libXext libXt xorgproto ]; meta = with stdenv.lib; { description = "Displays text on your screen"; |