diff options
Diffstat (limited to 'pkgs/misc')
83 files changed, 3052 insertions, 1680 deletions
diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 343dbecb22c0..58e50a50f0f9 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib }: +{ stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib +, tracingSupport ? true, logToStderr ? true }: + +let oz = x: if x then "1" else "0"; in stdenv.mkDerivation rec { name = "apulse-${version}"; - version = "0.1.11"; + version = "0.1.11.1"; src = fetchFromGitHub { owner = "i-rinat"; repo = "apulse"; - rev = "v${version}"; - sha256 = "16l278q0czca2794fj388ql6qn1zrw24a0p6k7bayrrf5h32fdzd"; + rev = "602b3a02b4b459d4652a3a0a836fab6f892d4080"; + sha256 = "0yk9vgb4aws8xnkhdhgpxp5c0rri8yq61yxk85j99j8ax806i3r8"; }; enableParallelBuilding = true; @@ -17,6 +20,11 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib glib ]; + cmakeFlags = [ + "-DWITH_TRACE=${oz tracingSupport}" + "-DLOG_TO_STDERR=${oz logToStderr}" + ]; + meta = with stdenv.lib; { description = "PulseAudio emulation for ALSA"; homepage = https://github.com/i-rinat/apulse; diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix index 255fca842a73..142b72784578 100644 --- a/pkgs/misc/apulse/pressureaudio.nix +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -60,22 +60,22 @@ stdenv.mkDerivation { ''; meta = apulse.meta // { - description = "libpulseaudio without any sound daemons over pure ALSA"; + description = "libpulse without any sound daemons over pure ALSA"; longDescription = '' - apulse (${apulse.meta.homepage}) implements most of libpulseaudio + apulse (${apulse.meta.homepage}) implements most of libpulse API over pure ALSA in 5% LOC of the original PulseAudio. But apulse is made to be used as a wrapper that substitutes its replacement libs into LD_LIBRARY_PATH. The problem with that is - that you still have to link against the original libpulseaudio. + that you still have to link against the original libpulse. pressureaudio (http://git.r-36.net/pressureaudio/) wraps apulse - with everything you need to replace libpulseaudio completely. + with everything you need to replace libpulse completely. This derivation is a reimplementation of pressureaudio in pure nix. - You can simply override libpulseaudio with this and most + You can simply override libpulse with this and most packages would just work. ''; }; diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix new file mode 100644 index 000000000000..868d60d6d322 --- /dev/null +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchFromGitHub, buildPackages }: + +let + buildArmTrustedFirmware = { filesToInstall + , installDir ? "$out" + , platform + , extraMakeFlags ? [] + , extraMeta ? {} + , ... } @ args: + stdenv.mkDerivation (rec { + + name = "arm-trusted-firmware-${platform}-${version}"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "ARM-software"; + repo = "arm-trusted-firmware"; + rev = "refs/tags/v${version}"; + sha256 = "1gm0bn2llzfzz9bfsz11fhwxj5lxvyrq7bc13fjj033nljzxn7k8"; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + makeFlags = [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + "PLAT=${platform}" + ] ++ extraMakeFlags; + + installPhase = '' + runHook preInstall + + mkdir -p ${installDir} + cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir} + + runHook postInstall + ''; + + hardeningDisable = [ "all" ]; + dontStrip = true; + + # Fatal error: can't create build/sun50iw1p1/release/bl31/sunxi_clocks.o: No such file or directory + enableParallelBuilding = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ARM-software/arm-trusted-firmware; + description = "A reference implementation of secure world software for ARMv8-A"; + license = licenses.bsd3; + maintainers = [ maintainers.lopsided98 ]; + } // extraMeta; + } // builtins.removeAttrs args [ "extraMeta" ]); + +in rec { + inherit buildArmTrustedFirmware; + + armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { + version = "1.0"; + src = fetchFromGitHub { + owner = "apritzel"; + repo = "arm-trusted-firmware"; + # Branch: `allwinner` + rev = "91f2402d941036a0db092d5375d0535c270b9121"; + sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys"; + }; + platform = "sun50iw1p1"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["build/${platform}/release/bl31.bin"]; + }; + + armTrustedFirmwareQemu = buildArmTrustedFirmware rec { + platform = "qemu"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ + "build/${platform}/release/bl1.bin" + "build/${platform}/release/bl2.bin" + "build/${platform}/release/bl31.bin" + ]; + }; + + armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec { + extraMakeFlags = [ "bl31" ]; + platform = "rk3328"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; + }; +} diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index bb98d7ab9cc9..a112dcdec975 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -6,11 +6,11 @@ let nodeEnv = import ./../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages-generated.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix new file mode 100644 index 000000000000..36c8825d27a8 --- /dev/null +++ b/pkgs/misc/calaos/installer/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qmake, qttools, qtbase }: + +stdenv.mkDerivation rec { + name = "calaos_installer-3.1"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "calaos"; + repo = "calaos_installer"; + rev = "v${version}"; + sha256 = "0g8igj5sax5vjqzrpbil7i6329708lqqwvg5mwiqd0zzzha9sawd"; + }; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase ]; + + qmakeFlags = [ "REVISION=${version}" ]; + + installPhase = '' + mkdir -p $out/bin + cp -a calaos_installer $out/bin + ''; + + meta = with stdenv.lib; { + description = "Calaos Installer, a tool to create calaos configuration"; + homepage = https://www.calaos.fr/; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ tiramiseb ]; + }; +} diff --git a/pkgs/misc/cups/cups-clean-dirty.patch b/pkgs/misc/cups/cups-clean-dirty.patch new file mode 100644 index 000000000000..0bdc8198e8fb --- /dev/null +++ b/pkgs/misc/cups/cups-clean-dirty.patch @@ -0,0 +1,13 @@ +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/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index db344b32d218..feeb73a27e90 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -22,9 +22,12 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups"; + 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 ]; nativeBuildInputs = [ pkgconfig removeReferencesTo ]; @@ -40,7 +43,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" - "--with-rundir=/run" "--enable-raw-printing" "--enable-threads" ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix new file mode 100644 index 000000000000..7a6d6c3861df --- /dev/null +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, cmake, zlib, cups, ghostscript }: + +stdenv.mkDerivation rec { + + name = "brlaser"; + + src = fetchFromGitHub { + owner = "pdewacht"; + repo = "brlaser"; + rev = "a52149823373e11f918d9e6a56eda7242935c99b"; + sha256 = "12d8g0aispdj2virf6vrvb0vx6d6ardjg3qyav75shsm1f94ids6"; + }; + + buildInputs = [ cmake zlib cups ]; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DCUPS_SERVER_BIN=$out/lib/cups/ -DCUPS_DATA_DIR=$out/share/cups/" + ''; + + meta = with stdenv.lib; { + description = "A CUPS driver for Brother laser printers"; + longDescription = + '' + Although most Brother printers support a standard printer language such as PCL or PostScript, not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help. + + This driver is known to work with these printers: + + Brother DCP-1510 + Brother DCP-7030 + Brother DCP-7040 + Brother DCP-7055 + Brother DCP-7055W + Brother DCP-7065DN + Brother HL-L2300D + Brother MFC-7360N + ''; + homepage = https://github.com/pdewacht/brlaser; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ StijnDW ]; + }; +} diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix new file mode 100644 index 000000000000..6f27985bdbfc --- /dev/null +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -0,0 +1,73 @@ +{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, patchelf}: + +let + version = "3.0.1-1"; +cupsdeb = fetchurl { + url = "http://download.brother.com/welcome/dlf100421/hl1110cupswrapper-${version}.i386.deb"; + sha256 = "a87880f4ece764a724411b5b24d15d1b912f6ffc6ecbfd9fac4cd5eda13d2eb7"; +}; +srcdir = "hl1110cupswrapper-GPL_src-${version}"; +cupssrc = fetchurl { + url = "http://download.brother.com/welcome/dlf100422/${srcdir}.tar.gz"; + sha256 = "be1dce6a4608cb253b0b382db30bf5885da46b010e8eb595b15c435e2487761c"; +}; +lprdeb = fetchurl { + url = "http://download.brother.com/welcome/dlf100419/hl1110lpr-${version}.i386.deb"; + sha256 = "5af241782a0d500d7f47e06ea43d61127f4019b5b1c6e68b4c1cb4521a742c22"; +}; + in +stdenv.mkDerivation { + name = "cups-brother-hl1110"; + + srcs = [ lprdeb cupssrc cupsdeb ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + unpackPhase = '' + tar -xvf ${cupssrc} + ''; + buildPhase = '' + gcc -Wall ${srcdir}/brcupsconfig/brcupsconfig.c -o brcupsconfig4 + ''; + installPhase = '' + # install lpr + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \ + --replace /opt "$out/opt" \ + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/HL1110/lpd/psconvert2 + + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/brprintconflsr3 + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/rawtobr3 + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter + + wrapProgram $out/opt/brother/Printers/HL1110/lpd/psconvert2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + wrapProgram $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + + dpkg-deb -x ${cupsdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 --replace /opt "$out/opt" + + mkdir -p $out/lib/cups/filter + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 $out/lib/cups/filter/brother_lpdwrapper_HL1110 + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brother-HL1110-cups-en.ppd $out/lib/cups/filter/brother-HL1110-cups-en.ppd + cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/ + ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 + + wrapProgram $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + ''; + + meta = { + homepage = http://www.brother.com/; + description = "Brother HL1110 printer driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl1110_us_eu_as&os=128#SelectLanguageType-561_0_1"; + }; +} diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix new file mode 100644 index 000000000000..cda4ed6304d2 --- /dev/null +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, makeWrapper +, cups +, dpkg +, a2ps, ghostscript, gnugrep, gnused, coreutils, file, perl, which +}: + +stdenv.mkDerivation rec { + name = "hll2390dw-cups-${version}"; + version = "4.0.0-1"; + + src = fetchurl { + # The i386 part is a lie. There are x86, x86_64 and armv7l drivers. + # Though this builds only supports x86_64 for now. + url = "http://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb"; + sha256 = "0w8rxh1sa5amxr87qmzs4m2p06b1b36wn2q127mg427sbkh1rwni"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + + unpackPhase = "true"; + + installPhase = '' + dpkg-deb -x $src $out + + substituteInPlace $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ + --replace /opt "$out/opt" \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out\"; #" \ + --replace "PRINTER =~" "PRINTER = \"HLL2390DW\"; #" + + # FIXME : Allow i686 and armv7l variations to be setup instead. + _PLAT=x86_64 + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 $out/opt/brother/Printers/HLL2390DW/lpd/brprintconflsr3 + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 $out/opt/brother/Printers/HLL2390DW/lpd/rawtobr3 + + for f in \ + $out/opt/brother/Printers/HLL2390DW/cupswrapper/lpdwrapper \ + $out/opt/brother/Printers/HLL2390DW/cupswrapper/paperconfigml2 \ + ; do + #substituteInPlace $f \ + wrapProgram $f \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils ghostscript gnugrep gnused + ]} + done + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter $out/lib/cups/filter/brother_lpdwrapper_HLL2390DW + + mkdir -p $out/share/cups/model + ln -s $out/opt/brother/Printers/HLL2390DW/cupswrapper/brother-HLL2390DW-cups-en.ppd $out/share/cups/model/ + + wrapProgram $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } + ''; + + meta = with stdenv.lib; { + homepage = http://www.brother.com/; + description = "Brother HL-L2390DW combined print driver"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128; + maintainers = [ maintainers.samueldr ]; + }; +} + diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix new file mode 100644 index 000000000000..073bd4ccbbfc --- /dev/null +++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, fetchzip, cups, autoPatchelfHook + + # Can either be "EU" or "Global"; it's unclear what the difference is + , region ? "Global", qt4 +}: + +let + platform = + if stdenv.system == "x86_64-linux" then "64bit" + else if stdenv.system == "i686-linux" then "32bit" + else throw "Unsupported system: ${stdenv.system}"; + debPlatform = + if platform == "64bit" then "amd64" + else "i386"; + debRegion = if region == "EU" then "EU." else ""; +in +stdenv.mkDerivation rec { + name = "cups-kyodialog3-${version}"; + version = "8.1601"; + + dontStrip = true; + + src = fetchzip { + url = "https://usa.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/us/en/Kyocera_Linux_PPD_Ver_${version}.tar.gz"; + sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal"; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ cups qt4 ]; + + installPhase = '' + mkdir -p $out + cd $out + + # unpack the debian archive + ar p ${src}/KyoceraLinuxPackages/${region}/${platform}/kyodialog3.en${debRegion}_0.5-0_${debPlatform}.deb data.tar.gz | tar -xz + rm -Rf KyoceraLinuxPackages + + # strip $out/usr + mv usr/* . + rmdir usr + + # allow cups to find the ppd files + mkdir -p share/cups/model + mv share/ppd/kyocera share/cups/model/Kyocera + rmdir share/ppd + + # prepend $out to all references in ppd and desktop files + find -name "*.ppd" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; + find -name "*.desktop" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \; + ''; + + meta = with lib; { + description = "CUPS drivers for several Kyocera printers"; + homepage = "https://www.kyoceradocumentsolutions.com"; + license = licenses.unfree; + maintainers = [ maintainers.steveej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index f80f2ddf03e0..2195cf7d2a39 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.20.0"; + version = "1.20.3"; src = fetchurl { url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "0g6npicm1cwmxqi6ymfvf9wkplp4z2rzvjjl9v4yfvqdjq85gxnp"; + sha256 = "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -56,12 +56,12 @@ in stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + doCheck = false; # fails 4 out of 6 tests meta = { homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ layus ]; }; } diff --git a/pkgs/misc/documentation-highlighter/LICENSE b/pkgs/misc/documentation-highlighter/LICENSE new file mode 100644 index 000000000000..422deb7350fe --- /dev/null +++ b/pkgs/misc/documentation-highlighter/LICENSE @@ -0,0 +1,24 @@ +Copyright (c) 2006, Ivan Sagalaev +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of highlight.js nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/pkgs/misc/documentation-highlighter/README.md b/pkgs/misc/documentation-highlighter/README.md new file mode 100644 index 000000000000..f4baa3c8e001 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/README.md @@ -0,0 +1,152 @@ +This file was generated with pkgs/misc/documentation-highlighter/update.sh + +# Highlight.js + +[](https://travis-ci.org/isagalaev/highlight.js) + +Highlight.js is a syntax highlighter written in JavaScript. It works in +the browser as well as on the server. It works with pretty much any +markup, doesn’t depend on any framework and has automatic language +detection. + +## Getting Started + +The bare minimum for using highlight.js on a web page is linking to the +library along with one of the styles and calling +[`initHighlightingOnLoad`][1]: + +```html +<link rel="stylesheet" href="/path/to/styles/default.css"> +<script src="/path/to/highlight.pack.js"></script> +<script>hljs.initHighlightingOnLoad();</script> +``` + +This will find and highlight code inside of `<pre><code>` tags; it tries +to detect the language automatically. If automatic detection doesn’t +work for you, you can specify the language in the `class` attribute: + +```html +<pre><code class="html">...</code></pre> +``` + +The list of supported language classes is available in the [class +reference][2]. Classes can also be prefixed with either `language-` or +`lang-`. + +To disable highlighting altogether use the `nohighlight` class: + +```html +<pre><code class="nohighlight">...</code></pre> +``` + +## Custom Initialization + +When you need a bit more control over the initialization of +highlight.js, you can use the [`highlightBlock`][3] and [`configure`][4] +functions. This allows you to control *what* to highlight and *when*. + +Here’s an equivalent way to calling [`initHighlightingOnLoad`][1] using +jQuery: + +```javascript +$(document).ready(function() { + $('pre code').each(function(i, block) { + hljs.highlightBlock(block); + }); +}); +``` + +You can use any tags instead of `<pre><code>` to mark up your code. If +you don't use a container that preserve line breaks you will need to +configure highlight.js to use the `<br>` tag: + +```javascript +hljs.configure({useBR: true}); + +$('div.code').each(function(i, block) { + hljs.highlightBlock(block); +}); +``` + +For other options refer to the documentation for [`configure`][4]. + + +## Web Workers + +You can run highlighting inside a web worker to avoid freezing the browser +window while dealing with very big chunks of code. + +In your main script: + +```javascript +addEventListener('load', function() { + var code = document.querySelector('#code'); + var worker = new Worker('worker.js'); + worker.onmessage = function(event) { code.innerHTML = event.data; } + worker.postMessage(code.textContent); +}) +``` + +In worker.js: + +```javascript +onmessage = function(event) { + importScripts('<path>/highlight.pack.js'); + var result = self.hljs.highlightAuto(event.data); + postMessage(result.value); +} +``` + + +## Getting the Library + +You can get highlight.js as a hosted, or custom-build, browser script or +as a server module. Right out of the box the browser script supports +both AMD and CommonJS, so if you wish you can use RequireJS or +Browserify without having to build from source. The server module also +works perfectly fine with Browserify, but there is the option to use a +build specific to browsers rather than something meant for a server. +Head over to the [download page][5] for all the options. + +**Don't link to GitHub directly.** The library is not supposed to work straight +from the source, it requires building. If none of the pre-packaged options +work for you refer to the [building documentation][6]. + +**The CDN-hosted package doesn't have all the languages.** Otherwise it'd be +too big. If you don't see the language you need in the ["Common" section][5], +it can be added manually: + +```html +<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/languages/go.min.js"></script> +``` + +**On Almond.** You need to use the optimizer to give the module a name. For +example: + +``` +r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js +``` + + +## License + +Highlight.js is released under the BSD License. See [LICENSE][7] file +for details. + +## Links + +The official site for the library is at <https://highlightjs.org/>. + +Further in-depth documentation for the API and other topics is at +<http://highlightjs.readthedocs.io/>. + +Authors and contributors are listed in the [AUTHORS.en.txt][8] file. + +[1]: http://highlightjs.readthedocs.io/en/latest/api.html#inithighlightingonload +[2]: http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html +[3]: http://highlightjs.readthedocs.io/en/latest/api.html#highlightblock-block +[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options +[5]: https://highlightjs.org/download/ +[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html +[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE +[8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.en.txt diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix new file mode 100644 index 000000000000..a9fbcc178bb8 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -0,0 +1,12 @@ +{ stdenv, runCommand }: +runCommand "documentation-highlighter" { + meta = { + description = "Highlight.js sources for the Nix Ecosystem's documentation."; + homepage = https://highlightjs.org; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.grahamc ]; + }; +} '' + cp -r ${./.} $out +'' diff --git a/pkgs/misc/documentation-highlighter/highlight.pack.js b/pkgs/misc/documentation-highlighter/highlight.pack.js new file mode 100644 index 000000000000..f909702367ec --- /dev/null +++ b/pkgs/misc/documentation-highlighter/highlight.pack.js @@ -0,0 +1,2 @@ +/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */ +!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',""")+'"'}s+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function u(e){s+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"<br>":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("nix",function(e){var r={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},t={cN:"subst",b:/\$\{/,e:/}/,k:r},i={b:/[a-zA-Z0-9-_]+(\s*=)/,rB:!0,r:0,c:[{cN:"attr",b:/\S+/}]},s={cN:"string",c:[t],v:[{b:"''",e:"''"},{b:'"',e:'"'}]},a=[e.NM,e.HCM,e.CBCM,s,i];return t.c=a,{aliases:["nixos"],k:r,c:a}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}}); \ No newline at end of file diff --git a/pkgs/misc/documentation-highlighter/loader.js b/pkgs/misc/documentation-highlighter/loader.js new file mode 100644 index 000000000000..4ad7dbf24b51 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/loader.js @@ -0,0 +1,7 @@ +/* This file is NOT part of highlight.js */ +document.onreadystatechange = function () { + var listings = document.querySelectorAll('.programlisting, .screen'); + for (i = 0; i < listings.length; ++i) { + hljs.highlightBlock(listings[i]); + } +} diff --git a/pkgs/misc/documentation-highlighter/mono-blue.css b/pkgs/misc/documentation-highlighter/mono-blue.css new file mode 100644 index 000000000000..884c97c7673f --- /dev/null +++ b/pkgs/misc/documentation-highlighter/mono-blue.css @@ -0,0 +1,59 @@ +/* + Five-color theme from a single blue hue. +*/ +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + background: #eaeef3; +} + +.hljs { + color: #00193a; +} + +.hljs-keyword, +.hljs-selector-tag, +.hljs-title, +.hljs-section, +.hljs-doctag, +.hljs-name, +.hljs-strong { + font-weight: bold; +} + +.hljs-comment { + color: #738191; +} + +.hljs-string, +.hljs-title, +.hljs-section, +.hljs-built_in, +.hljs-literal, +.hljs-type, +.hljs-addition, +.hljs-tag, +.hljs-quote, +.hljs-name, +.hljs-selector-id, +.hljs-selector-class { + color: #0048ab; +} + +.hljs-meta, +.hljs-subst, +.hljs-symbol, +.hljs-regexp, +.hljs-attribute, +.hljs-deletion, +.hljs-variable, +.hljs-template-variable, +.hljs-link, +.hljs-bullet { + color: #4c81c9; +} + +.hljs-emphasis { + font-style: italic; +} diff --git a/pkgs/misc/documentation-highlighter/update.sh b/pkgs/misc/documentation-highlighter/update.sh new file mode 100755 index 000000000000..3b77af4af416 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl -p unzip + +set -eu +set -o pipefail + +root=$(pwd) + +if [ ! -f "./update.sh" ]; then + echo "Please run this script from within pkgs/misc/documentation-highlighter/!" + exit 1 +fi + +scratch=$(mktemp -d -t tmp.XXXXXXXXXX) +function finish { + rm -rf "$scratch" +} +trap finish EXIT + + +mkdir $scratch/src +cd $scratch/src + +token=$(curl https://highlightjs.org/download/ -c "$scratch/jar" \ + | grep csrf \ + | cut -d"'" -f6) + +curl --header "Referer: https://highlightjs.org/download/"\ + -b "$scratch/jar" \ + --data "csrfmiddlewaretoken=$token&nix.js=on&bash.js=on" \ + https://highlightjs.org/download/ > $scratch/out.zip + +unzip "$scratch/out.zip" +out="$root/" +mkdir -p "$out" +cp ./{highlight.pack.js,LICENSE,styles/mono-blue.css} "$out" + +( + echo "This file was generated with pkgs/misc/documentation-highlighter/update.sh" + echo "" + cat README.md +) > "$out/README.md" diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index ac3e96e26589..021852f3505c 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, rpm, cpio, zlib }: -assert stdenv.system == "x86_64-linux"; - /* usage: (sorry, its still impure but works!) impure directory: @@ -23,7 +21,7 @@ sed -n 's/^ServerBin //p' $(sed -n 's/respawn.*-c \(.*''\) -F.*''/\1/p' /etc/eve then. I've tried that. TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how to check ink levels etc - + */ stdenv.mkDerivation { @@ -56,13 +54,13 @@ stdenv.mkDerivation { patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath $p done - + mkdir $out/lib ln -s $out/cups/lib $out/lib/cups ''; meta = { description = "Some additional CUPS drivers including Canon drivers"; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 3a46414512cf..7c8750905d9c 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "gutenprint-5.2.13"; + name = "gutenprint-5.2.14"; src = fetchurl { url = "mirror://sourceforge/gimp-print/${name}.tar.bz2"; - sha256 = "0hi7s0y59306p4kp06sankfa57k2805khbknkvl9d036hdfp9afr"; + sha256 = "1293x19gw1b742id7c7bz5giv3vlxaqpmbdz2g0n99wny5k0ggs5"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index f8f8d16d142d..91be6cf743a4 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -11,16 +11,16 @@ let name = "hplip-${version}"; - version = "3.17.10"; + version = "3.18.3"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0v27hg856b5z2rilczcbfgz8ksxn0n810g1glac3mxkj8qbl8wqg"; + sha256 = "0x5xs86v18w46rxz5whc15bl4fb7p4km6xqjpwzclp83nl7rl01y"; }; plugin = fetchurl { - url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "07am3dnl0ipgfswz5wndprryljh9rqbfhq7mm4d4yyj3bdnnzlig"; + url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; + sha256 = "11nc3cifhd2h2c7p0dr2jjzrg3fd5j43ih1wy0m186l6wcgdjssw"; }; hplipState = substituteAll { @@ -57,6 +57,7 @@ pythonPackages.buildPythonApplication { dbus net_snmp openssl + zlib ]; nativeBuildInputs = [ @@ -69,6 +70,7 @@ pythonPackages.buildPythonApplication { pygobject2 reportlab usbutils + sip ] ++ stdenv.lib.optionals withQt5 [ pyqt5 ]; @@ -97,7 +99,7 @@ pythonPackages.buildPythonApplication { --with-mimedir=$out/etc/cups --enable-policykit --disable-qt4 - ${stdenv.lib.optionals withQt5 "--enable-qt5"} + ${stdenv.lib.optionalString withQt5 "--enable-qt5"} " export makeFlags=" @@ -182,7 +184,7 @@ pythonPackages.buildPythonApplication { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; - homepage = http://hplipopensource.com/; + homepage = https://developers.hp.com/hp-linux-imaging-and-printing; license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 93e8ffbc3ca8..d4ed749ca9cc 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "kozec"; repo = pname; rev = "v${version}"; - sha256 = "0zal8sl3j17gqmynig8jhqrhj7zfqql8vci4whn19gymchwjalzi"; + sha256 = "19i9z5cjjgi3a94hrz5g3a6m4vj71p1gs6mhklc6dq8ydwsadwzz"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index 5928d53d5422..c0c3b40f6b65 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib, mesa }: +{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index db1de37da962..453114e3b7a0 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://citra-emu.org/; description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games."; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index e2bac5d3884c..5d4e22fefae3 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib -, pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline +, pcre, gettext, libpthreadstubs, libXrandr, libXext, libXxf86vm, libXinerama, libSM, readline , openal, libXdmcp, portaudio, libusb, libevdev , libpulseaudio ? null , curl @@ -20,12 +20,12 @@ assert dolphin-wxgui || dolphin-qtgui; assert !(dolphin-wxgui && dolphin-qtgui); stdenv.mkDerivation rec { - name = "dolphin-emu-20171218"; + name = "dolphin-emu-20180430"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "438e8b64a4b080370c7a65ed23af52838a4e7aaa"; - sha256 = "0rrd0g1vg9jk1p4wdr6w2z34cabb7pgmpwfcl2a372ark3vi4ysc"; + rev = "ad098283c023b0f5f0d314c646bc5d5756c35e3d"; + sha256 = "17fv3vz0nc5jax1bbl4wny1kzsshbbhms82dxd8rzcwwvd2ad1g7"; }; cmakeFlags = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre - gettext libpthreadstubs libXrandr libXext libSM readline openal + gettext libpthreadstubs libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp portaudio libusb libpulseaudio libpng hidapi ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ] ++ stdenv.lib.optionals stdenv.isLinux [ bluez libevdev ] diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 16cb7af3d600..9dec1ecacae0 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; - homepage = http://emulationstation.org; + homepage = https://emulationstation.org; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index e367d6a14984..2f11384d845a 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "epsxe-${version}"; version = "2.0.5"; - src = with stdenv.lib; let + src = let version2 = concatStrings (splitString "." version); platform = "linux" + (optionalString stdenv.is64bit "_x64"); in fetchurl { diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 6ba5290fa424..6d462c0e3797 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fs-uae-${version}"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { - url = "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; - sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2"; + url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; + sha256 = "19ccb3gbpjwwazqc9pyin3jicjl27m2gyvy5bb5zysq0mxpzassj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix new file mode 100644 index 000000000000..bdc372c7ca23 --- /dev/null +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -0,0 +1,78 @@ +{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123 }: + +let + libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk_pixbuf pango libXinerama ]; + +in stdenv.mkDerivation rec { + name = "kega-fusion-${version}"; + version = "3.63x"; + + src = fetchurl { + url = "http://www.carpeludum.com/download/Fusion363x.tar.gz"; + sha256 = "14s6czy20h5khyy7q95hd7k77v17ssafv9l6lafkiysvj2nmw94g"; + }; + + plugins = fetchurl { + url = "http://www.carpeludum.com/download/PluginsLinux.tar.gz"; + sha256 = "0d623cvh6n5ijj3wb64g93mxx2xbichsn7hj7brbb0ndw5cs70qj"; + }; + + runner = writeText "kega-fusion" '' + #!${stdenv.shell} -ex + + kega_libdir="@out@/lib/kega-fusion" + kega_localdir="$HOME/.Kega Fusion" + + # create local plugins directory if not present + mkdir -p "$kega_localdir/Plugins" + + # create links for every included plugin + if [ $(ls -1A $kega_libdir/plugins | wc -l) -gt 0 ]; then + for i in $kega_libdir/plugins/*; do + if [ ! -e "$kega_localdir/Plugins/$(basename "$i")" ]; then + ln -sf "$i" "$kega_localdir/Plugins/" + fi + done + fi + + # copy configuration file if not present + if ! [ -f "$kega_localdir/Fusion.ini" ]; then + cat > "$kega_localdir/Fusion.ini" <<EOF + ALSADeviceName=default + libmpg123path=${lib.getLib mpg123}/lib/libmpg123.so.0 + EOF + else + sed -i 's,^\(libmpg123path=\).*,\1${lib.getLib mpg123}/lib/libmpg123.so.0,' "$kega_localdir/Fusion.ini" + fi + + # here we go! + exec "$kega_libdir/Fusion" "$@" + ''; + + dontStrip = true; + dontPatchELF = true; + + nativeBuildInputs = [ upx ]; + + installPhase = '' + upx -d Fusion + install -Dm755 Fusion "$out/lib/kega-fusion/Fusion" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}" "$out/lib/kega-fusion/Fusion" + + tar -xaf $plugins + mkdir -p "$out/lib/kega-fusion/plugins" + cp -r Plugins/*.rpi "$out/lib/kega-fusion/plugins" + + mkdir -p "$out/bin" + substitute "$runner" "$out/bin/kega-fusion" --subst-var out + chmod +x "$out/bin/kega-fusion" + ''; + + meta = with stdenv.lib; { + description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; + homepage = http://www.carpeludum.com/kega-fusion/; + maintainers = with maintainers; [ abbradar ]; + license = licenses.unfreeRedistributable; + platforms = [ "i686-linux" ]; + }; +} diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 673e4c3ed087..2e28fd297ec0 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -2,8 +2,6 @@ , makeWrapper, perl, pkgconfig, portaudio, SDL2, soundtouch, stdenv , wxGTK30, zlib }: -assert stdenv.isi686; - stdenv.mkDerivation rec { name = "pcsx2-${version}"; version = "1.4.0"; diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index c402dd444289..5af3042bde4d 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Playstation 1 emulator"; - homepage = http://pcsxr.codeplex.com/; + homepage = https://pcsxr.codeplex.com/; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix new file mode 100644 index 000000000000..2e47cead8ec2 --- /dev/null +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchurl, qmake, qttools, pkgconfig +, minizip, zlib +, qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns +, rsync, SDL2, xwininfo +, utillinux +, xorg +}: + +stdenv.mkDerivation rec { + name = "qmc2-${version}"; + version = "0.195"; + + src = fetchurl { + url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${name}.tar.gz"; + sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns"; + }; + + preBuild = '' + patchShebangs scripts + ''; + + nativeBuildInputs = [ qttools pkgconfig ]; + buildInputs = [ minizip qtbase qtsvg qtmultimedia qtwebkit + qttranslations qtxmlpatterns rsync SDL2 + xwininfo zlib utillinux xorg.libxcb ]; + + makeFlags = [ "DESTDIR=$(out)" + "PREFIX=/" + "DATADIR=/share/" + "SYSCONFDIR=/etc" ]; + + meta = with stdenv.lib; { + description = "A Qt frontend for MAME/MESS"; + homepage = https://qmc2.batcom-it.net; + license = licenses.gpl2; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index e898a5804b06..c834f6c9047d 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -12,11 +12,20 @@ , udev ? null , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null , withVulkan ? stdenv.isLinux, vulkan-loader ? null +, targetPlatform, fetchurl }: with stdenv.lib; -stdenv.mkDerivation rec { +let + + # ibtool is closed source so we have to download the blob + osx-MainMenu = fetchurl { + url = "https://github.com/matthewbauer/RetroArch/raw/b146a9ac6b2b516652a7bf05a9db5a804eab323d/pkg/apple/OSX/en.lproj/MainMenu.nib"; + sha256 = "13k1l628wy0rp6wxrpwr4g1m9c997d0q8ks50f8zhmh40l5j2sp8"; + }; + +in stdenv.mkDerivation rec { name = "retroarch-bare-${version}"; version = "1.7.1"; @@ -39,8 +48,31 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = optional withVulkan '' + postInstall = optionalString withVulkan '' wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib + '' + optionalString targetPlatform.isDarwin '' + EXECUTABLE_NAME=RetroArch + PRODUCT_NAME=RetroArch + MACOSX_DEPLOYMENT_TARGET=10.5 + app=$out/Applications/$PRODUCT_NAME.app + + install -D pkg/apple/OSX/Info.plist $app/Contents/Info.plist + echo "APPL????" > $app/Contents/PkgInfo + mkdir -p $app/Contents/MacOS + ln -s $out/bin/retroarch $app/Contents/MacOS/$EXECUTABLE_NAME + + # Hack to fill in Info.plist template w/o using xcode + sed -i -e 's,''${EXECUTABLE_NAME}'",$EXECUTABLE_NAME," \ + -e 's,''${MACOSX_DEPLOYMENT_TARGET}'",$MACOSX_DEPLOYMENT_TARGET," \ + -e 's,''${PRODUCT_NAME}'",$PRODUCT_NAME," \ + -e 's,''${PRODUCT_NAME:rfc1034identifier}'",$PRODUCT_NAME," \ + $app/Contents/Info.plist + + install -D ${osx-MainMenu} \ + $app/Contents/Resources/en.lproj/MainMenu.nib + install -D pkg/apple/OSX/en.lproj/InfoPlist.strings \ + $app/Contents/Resources/en.lproj/InfoPlist.strings + install -D media/retroarch.icns $app/Contents/Resources/retroarch.icns ''; preFixup = "rm $out/bin/retroarch-cg2glsl"; diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix index 58d41699854c..71b26b4af6ff 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/misc/emulators/retroarch/wrapper.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation { ln -s -t $out ${retroarch}/share + if [ -d ${retroarch}/Applications ]; then + ln -s -t $out ${retroarch}/Applications + fi + makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch \ --suffix-each LD_LIBRARY_PATH ':' "$cores" \ --add-flags "-L $out/lib/ --menu" \ diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index a147c986674e..e06460994150 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -6,7 +6,6 @@ buildScript ? null, configureFlags ? "" }: -assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; with import ./util.nix { inherit lib; }; @@ -36,10 +35,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional odbcSupport pkgs.unixODBC ++ lib.optional netapiSupport pkgs.samba4 ++ lib.optional cursesSupport pkgs.ncurses - ++ lib.optional vaSupport pkgs.libva-full + ++ lib.optional vaSupport pkgs.libva ++ lib.optional pcapSupport pkgs.libpcap ++ lib.optional v4lSupport pkgs.libv4l - ++ lib.optional saneSupport pkgs.saneBackends + ++ lib.optional saneSupport pkgs.sane-backends ++ lib.optional gsmSupport pkgs.gsm ++ lib.optional gphoto2Support pkgs.libgphoto2 ++ lib.optional ldapSupport pkgs.openldap @@ -48,12 +47,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev + ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ 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.libGL.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ] ++ (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext ]))); @@ -83,7 +83,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { # Add capability to ignore known failing tests # and enable doCheck doCheck = false; - + postInstall = let links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}"; in '' @@ -100,9 +100,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { fi done ''; - + enableParallelBuilding = true; + # https://bugs.winehq.org/show_bug.cgi?id=43530 + # https://github.com/NixOS/nixpkgs/issues/31989 + hardeningDisable = [ "bindnow" ]; + passthru = { inherit pkgArches; }; meta = { inherit version platforms; diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh index cf6cc59a6dac..1aad9fe20c78 100644 --- a/pkgs/misc/emulators/wine/builder-wow.sh +++ b/pkgs/misc/emulators/wine/builder-wow.sh @@ -26,7 +26,7 @@ buildPhase # checkPhase eval "$preInstall" -cd $TMP/wine64 && make install cd $TMP/wine-wow && make install +cd $TMP/wine64 && make install eval "$postInstall" fixupPhase diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 928e692df6b4..ca67ca836ba0 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -40,7 +40,9 @@ pulseaudioSupport ? false, udevSupport ? false, xineramaSupport ? false, - xmlSupport ? false }: + xmlSupport ? false, + vulkanSupport ? false, +}: let wine-build = build: release: lib.getAttr build (callPackage ./packages.nix { @@ -51,17 +53,14 @@ let wine-build = build: release: netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport - openglSupport gstreamerSupport udevSupport; + openglSupport gstreamerSupport udevSupport vulkanSupport; }; }); in if wineRelease == "staging" then - let wineUnstable = wine-build wineBuild "unstable"; in - # wine staging is not yet at 3.0, using unstable - # FIXME update winestaging sources - wineUnstable - # callPackage ./staging.nix { - # inherit libtxc_dxtn_Name wineUnstable; - # } + callPackage ./staging.nix { + inherit libtxc_dxtn_Name; + wineUnstable = wine-build wineBuild "unstable"; + } else wine-build wineBuild wineRelease diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 5950310a73f7..817241fbe0fe 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,18 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.3"; + version = "3.7"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "0cx31jsll7mxd9r7v0vpahajqwb6da6cpwybv06l5ydkgfrbv505"; + sha256 = "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - # FIXME update winestaging sources, when 3.3 is released - # FIXME then revert the staging derivation in ./default.nix - sha256 = "0000000000000000000000000000000000000000000000000000000000000000"; + sha256 = "0kam73jqhah7bzji5csxxhhfdp6byhzpcph6xnzjqz2aic5xk7xi"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -64,5 +62,4 @@ in rec { repo = "winetricks"; rev = version; }; - } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index f5f8d6a5f107..76606edf53c3 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + doCheck = false; # requires "bashate" + postInstall = '' sed -i \ -e '2i PATH="${pathAdd}:$PATH"' \ diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index aaa932c0a1c4..1aae47e603b5 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -1,7 +1,5 @@ {stdenv, fetchurl}: -assert stdenv.system == "i686-linux"; - stdenv.mkDerivation { name = "folding-at-home-6.02"; @@ -22,7 +20,7 @@ stdenv.mkDerivation { # be considered a gcroot. installPhase = '' BINFILES="fah6 mpiexec"; - for a in $BINFILES; do + for a in $BINFILES; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $a done mkdir -p $out/bin @@ -33,5 +31,6 @@ stdenv.mkDerivation { homepage = http://folding.stanford.edu/; description = "Folding@home distributed computing client"; license = stdenv.lib.licenses.unfree; + platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 84272992f2bb..af4c54d9d0d8 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, pythonPackages, lilypond}: +{ lib, fetchFromGitHub, python3Packages, lilypond }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "frescobaldi-${version}"; - version = "2.0.16"; + version = "3.0.0"; - src = fetchurl { - url = "https://github.com/wbsoft/frescobaldi/releases/download/" - + "v2.0.16/${name}.tar.gz"; - sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q"; + src = fetchFromGitHub { + owner = "wbsoft"; + repo = "frescobaldi"; + rev = "v${version}"; + sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd"; }; - propagatedBuildInputs = with pythonPackages; [ lilypond - pyqt4 poppler-qt4 pygame ]; + propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly poppler-qt5 ]; - patches = [ ./setup.cfg.patch ./python-path.patch ]; + # no tests in shipped with upstream + doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://frescobaldi.org/; description = ''Frescobaldi is a LilyPond sheet music text editor''; longDescription = '' @@ -31,7 +32,7 @@ pythonPackages.buildPythonApplication rec { fonts and keyboard shortcuts ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.sepi ]; + maintainers = with maintainers; [ sepi ma27 ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/frescobaldi/python-path.patch b/pkgs/misc/frescobaldi/python-path.patch deleted file mode 100644 index 6c54d9f208ec..000000000000 --- a/pkgs/misc/frescobaldi/python-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u frescobaldi-2.0.16.old/frescobaldi frescobaldi-2.0.16/frescobaldi ---- frescobaldi-2.0.16/frescobaldi 2014-10-24 11:29:28.705687224 +0200 -+++ frescobaldi-2.0.16.new/frescobaldi 2014-10-24 11:31:08.086444793 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - import sys - import frescobaldi_app.main - import app -Common subdirectories: frescobaldi-2.0.16/frescobaldi_app and frescobaldi-2.0.16.new/frescobaldi_app -Common subdirectories: frescobaldi-2.0.16/macosx and frescobaldi-2.0.16.new/macosx diff --git a/pkgs/misc/frescobaldi/setup.cfg.patch b/pkgs/misc/frescobaldi/setup.cfg.patch deleted file mode 100644 index 502cdd61966d..000000000000 --- a/pkgs/misc/frescobaldi/setup.cfg.patch +++ /dev/null @@ -1,13 +0,0 @@ -Common subdirectories: frescobaldi-2.0.16.old/build and frescobaldi-2.0.16/build -Common subdirectories: frescobaldi-2.0.16.old/frescobaldi_app and frescobaldi-2.0.16/frescobaldi_app -Common subdirectories: frescobaldi-2.0.16.old/macosx and frescobaldi-2.0.16/macosx -diff -u frescobaldi-2.0.16.old/setup.cfg frescobaldi-2.0.16/setup.cfg ---- frescobaldi-2.0.16.old/setup.cfg 2012-02-05 07:08:24.000000000 +0100 -+++ frescobaldi-2.0.16/setup.cfg 2014-10-24 15:08:48.141335620 +0200 -@@ -1,6 +1,2 @@ --[bdist_wininst] --bitmap=frescobaldi-wininst.bmp --install-script=frescobaldi-wininst.py -- - [sdist] - force-manifest=1 diff --git a/pkgs/misc/jackaudio/clang.patch b/pkgs/misc/jackaudio/clang.patch deleted file mode 100644 index 131f8c4c04dd..000000000000 --- a/pkgs/misc/jackaudio/clang.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tests/test.cpp b/tests/test.cpp -index 8a8a811..31e8459 100644 ---- a/tests/test.cpp -+++ b/tests/test.cpp -@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg) - jack_nframes_t delta_time = cur_time - last_time; - - Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); -- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { -+ if (delta_time > 0 && (jack_nframes_t)fabs(delta_time - cur_buffer_size) > tolerance) { - printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance); - } - -@@ -1064,7 +1064,7 @@ int main (int argc, char *argv[]) - } - jack_sleep(1 * 1000); - cur_buffer_size = jack_get_buffer_size(client1); -- if (abs((old_buffer_size * factor) - cur_buffer_size) > 5) { // Tolerance needed for dummy driver... -+ if (fabs((old_buffer_size * factor) - cur_buffer_size) > 5) { // Tolerance needed for dummy driver... - printf("!!! ERROR !!! Buffer size has not been changed !\n"); - printf("!!! Maybe jack was compiled without the '--enable-resize' flag...\n"); - } else { diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 0ed0246a8813..52b0abc48a7a 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ]; # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet. - patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-cf.patch ]; prePatch = '' substituteInPlace svnversion_regenerate.sh \ diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 43d23dd525ae..848215ae17af 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "jack1-${version}"; - version = "0.124.1"; + version = "0.125.0"; src = fetchurl { url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; - sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb"; + sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; configureFlags = '' diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix new file mode 100644 index 000000000000..186fcb263cae --- /dev/null +++ b/pkgs/misc/libcardiacarrest/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, pkgconfig, glib, libpulseaudio }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "libcardiacarrest-${version}"; + version = "11.0-6"; # <PA API version>-<version> + + src = fetchFromGitHub { + owner = "oxij"; + repo = "libcardiacarrest"; + rev = "1220b37b3de75238fedee1a66ca703fe1c8c71c3"; + sha256 = "0fkfiixjybac3rwcd26621hh5dw4f5gnmm230cr4g8fl0i2ikmrz"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ glib ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + moveToOutput $out/include $dev + moveToOutput $out/lib/pkgconfig $dev + moveToOutput $out/lib/cmake $dev + ''; + + meta = src.meta // { + description = "A trivial implementation of libpulse PulseAudio library API"; + longDescription = '' + libcardiacarrest is a trivial implementation of libpulse + PulseAudio library API that unconditionally (but gracefully) + fails to connect to the PulseAudio daemon and does nothing else. + + apulse and pressureaudio (which uses apulse internally) are an + inspiration for this but unlike those two projects + libcardiacarrest is not an emulation layer, all it does is it + gracefully fails to provide the requested PulseAudio service + hoping the application would try something else (e.g. ALSA or + JACK). + ''; + license = libpulseaudio.meta.license; # "same as PA headers" + maintainers = [ maintainers.oxij ]; # also the author + }; + +} diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix index ba2a8b2448ef..94d5449100db 100644 --- a/pkgs/misc/logging/beats/5.x.nix +++ b/pkgs/misc/logging/beats/5.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0ri2l8pyl1fnx0zypliwprkk1wkaxz8ywkgz8h2f08v7h1zgq1m6"; + sha256 = "00g90i58c6gnyzszsx7y75vn1350hrkzrsb50xx700jqg9ii8yin"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 2883604491c6..ce911ae40d5e 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "05ay6hdc1jgi6b00bd998zc39ca8jhnk7i6m3mw70s0baqv1scik"; + sha256 = "194z3j9zwlbc6j97iy1m1cl0xqks3ws2bjp2xrgy8cwpi7fclaw2"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix index b605b9715d48..e724869b235c 100644 --- a/pkgs/misc/riscv-pk/default.nix +++ b/pkgs/misc/riscv-pk/default.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation { description = "RISC-V Proxy Kernel and Bootloader."; homepage = https://github.com/riscv/riscv-pk; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.riscv; maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 7cb3e68dec86..5fff7b8f0ea3 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "i3lock-pixeled-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/Ma27/i3lock-pixeled/archive/${version}.tar.gz"; - sha256 = "046qbx4qvcc66h53h4mm9pyjj9gjc6dzy38a0f0jc5a84xbivh7k"; + sha256 = "0vlynm833fk1mmdnkcgh4hwqmfypn22zskhysm110k39zvikif0h"; }; propagatedBuildInputs = with pkgs; [ diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index c2486b7ebe4b..f38851d6fa0c 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -16,20 +16,17 @@ stdenv.mkDerivation rec { name = "${basename}-${version}"; basename = "light-locker"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "the-cavalry"; repo = basename; rev = "v${version}"; - sha256 = "0ygkp5vgkx2nfhfql6j2jsfay394gda23ir3sx4f72j4agsirjvj"; + sha256 = "1zsafc10bmliknf12h3mgy7f73lvgph0q0wkaqp42iagmw11yaj8"; }; - # Patch so that systemd is "found" when configuring. - patches = [ ./systemd.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which xfce.xfce4_dev_tools glib systemd + buildInputs = [ which xfce.xfce4-dev-tools glib systemd libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ]; preConfigure = '' diff --git a/pkgs/misc/screensavers/light-locker/systemd.patch b/pkgs/misc/screensavers/light-locker/systemd.patch deleted file mode 100644 index 9cba8b9c0d2f..000000000000 --- a/pkgs/misc/screensavers/light-locker/systemd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac.in b/configure.ac.in -index f7d5f5d..341bc83 100644 ---- a/configure.ac.in -+++ b/configure.ac.in -@@ -424,7 +424,7 @@ AC_ARG_WITH(systemd, - [with_systemd=$withval], [with_systemd=auto]) - - PKG_CHECK_MODULES(SYSTEMD, -- [libsystemd-login], -+ [libsystemd], - [have_systemd=yes], [have_systemd=no]) - - if test "x$with_systemd" = "xauto" ; then diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 8539db5e0027..6e4ae16e9c82 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/pipeseroni/pipes.sh; description = "Animated pipes terminal screensaver"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 6b310236de42..82ce4c20df8e 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, writeText , xproto, libX11, libXext, libXrandr # default header can be obtained from -# http://git.suckless.org/slock/tree/config.def.h +# https://git.suckless.org/slock/tree/config.def.h , conf ? null }: with stdenv.lib; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "slock-1.4"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://tools.suckless.org/slock; + homepage = https://tools.suckless.org/slock; description = "Simple X display locker"; longDescription = '' Simple X display locker. This is the simplest X screen locker. diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 8035e7da37db..d93d982924d1 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.38"; + version = "5.39"; name = "xscreensaver-${version}"; src = fetchurl { url = "https://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "1f58h5rgjbxr4hh40m6zkpkzbzg68l7nqzjwal0b17yysafbmsf6"; + sha256 = "09i47h4hdgwxyqgrsnshl4l5dv5mrsp37h705cc22lwby601ikj8"; }; buildInputs = diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 537576ca63b6..f1ab822c6f4a 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.calrama ]; + maintainers = [ ]; }; } diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 981c01e2b4a7..7c082cbbbb0f 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -1,4 +1,4 @@ -args: with args; { +{ stdenv, lib, glibcLocales, unzip, hasktags, ctags } : { # optional srcDir annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags || x ? meta && x.meta ? sourceWithTags ); @@ -59,8 +59,8 @@ args: with args; { # without this creating tag files for lifted-base fails export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 - ${if args.stdenv.isLinux then "export LOCALE_ARCHIVE=${args.pkgs.glibcLocales}/lib/locale/locale-archive;" else ""} - + ${if stdenv.isLinux then "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;" else ""} + ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags . mv tags \$TAG_FILE }"; diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix new file mode 100644 index 000000000000..ec8ef076c2fc --- /dev/null +++ b/pkgs/misc/stabber/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat +, libmicrohttpd +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "stabber-unstable-${version}"; + version = "2016-11-09"; + + src = fetchFromGitHub { + owner = "boothj5"; + repo = "stabber"; + rev = "ed75087e4483233eb2cc5472dbd85ddfb7a1d4d4"; + sha256 = "1l6cibggi9rx6d26j1g92r1m8zm1g899f6z7n4pfqp84mrfqgz0p"; + }; + + preAutoreconf = '' + mkdir m4 + ''; + + buildInputs = [ autoreconfHook pkgconfig glib expat libmicrohttpd ]; + + meta = { + description = "Stubbed XMPP Server"; + homepage = https://github.com/boothj5/stabber; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ hschaeidt ]; + }; +} diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 7eee7ca3121a..c8e7d860bcfc 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.0.1"; + version = "3.93.1.14"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "0l662l66ja8dsakcgwg6ab69lkl0va0r5h74dr6yjdsy0q4h2m7h"; + sha256 = "11iviw9gj4jwp6v32a3y1n6hq8m9pf14drfqxhp3dnygylvxxdr2"; }; preferLocalBuild = true; diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 26c371716427..1221c6606872 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "greybird"; - version = "3.22.6"; + version = "3.22.7"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "${pname}"; rev = "v${version}"; - sha256 = "16rifkyy8l4v03rx85j7m6rfdal99l1xdmghysh95r6lx4y6r01i"; + sha256 = "118k0bb780h54i2vn5my5r6vbkk134899xwp4aigw5a289xzryvb"; }; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix new file mode 100644 index 000000000000..9870b3fefebb --- /dev/null +++ b/pkgs/misc/themes/jade1/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "theme-jade1-${version}"; + version = "3.2"; + + src = fetchFromGitHub { + owner = "madmaxms"; + repo = "theme-jade-1"; + rev = "v${version}"; + sha256 = "0lf8cawn2s2x1b9af0cznhqzx3dsr8h18srcwjz7af3y5daxf311"; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + mkdir -p $out/share/themes + cp -a Jade-1 $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "A fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications"; + homepage = https://github.com/madmaxms/theme-jade-1; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix index 58001183bd9e..4b6d364a8569 100644 --- a/pkgs/misc/themes/materia-theme/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }: +{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }: stdenv.mkDerivation rec { name = "materia-theme-${version}"; - version = "20180110"; + version = "20180321"; src = fetchFromGitHub { owner = "nana-4"; repo = "materia-theme"; rev = "v${version}"; - sha256 = "1knfcc4bqibshbk5s4461brzw780gj7c1i42b168c6jw9p6br6bf"; + sha256 = "1nj9ylg9g74smd2kdyzlamdw9cg0f3jz77vn5898drjyscw5qpp6"; }; - nativeBuildInputs = [ gnome3.glib libxml2 ]; + nativeBuildInputs = [ gnome3.glib libxml2 bc ]; - buildInputs = [ gnome3.gnome-themes-standard gdk_pixbuf librsvg ]; + buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -22,14 +22,16 @@ stdenv.mkDerivation rec { installPhase = '' patchShebangs install.sh sed -i install.sh \ - -e "s|^gnomever=.*$|gnomever=${gnome3.version}|" \ - -e "s|/usr||" - destdir="$out" ./install.sh + -e "s|if .*which gnome-shell.*;|if true;|" \ + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|" + mkdir -p $out/share/themes + # name is used internally by the package installation script + name= ./install.sh --dest $out/share/themes rm $out/share/themes/*/COPYING ''; meta = with stdenv.lib; { - description = "A Material Design theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)"; + description = "A Material Design theme for GNOME/GTK+ based desktop environments"; homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix b/pkgs/misc/themes/numix-solarized/default.nix index 4ede14d3bb39..3c81e4308ca9 100644 --- a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix +++ b/pkgs/misc/themes/numix-solarized/default.nix @@ -1,26 +1,40 @@ -{ stdenv, fetchFromGitHub, sass, glib, gdk_pixbuf }: +{ stdenv, fetchFromGitHub, python3, sass, glib, gdk_pixbuf, libxml2, + inkscape, optipng, gtk-engine-murrine +}: stdenv.mkDerivation rec { - version = "20160919"; + version = "20170810"; name = "numix-solarized-gtk-theme-${version}"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "numix-solarized-gtk-theme"; rev = version; - sha256 = "0243w918ycmf9vnkzfvwnrxz9zc6xxk7167h8ywxj901pqy59kad"; + sha256 = "0l4xvsiyg15kp6xwpvm3jckxyhr1lxd678lkhrcyf40n7rd4xinl"; }; + nativeBuildInputs = [ python3 sass glib gdk_pixbuf libxml2 inkscape optipng ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + postPatch = '' - substituteInPlace Makefile --replace \ - 'INSTALL_DIR=$(DESTDIR)/usr/share/themes' "INSTALL_DIR=$out/share/themes" 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 ''; - buildInputs = [sass glib gdk_pixbuf]; + buildPhase = "true"; + + installPhase = '' + for theme in *.colors; do + make THEME="''${theme/.colors/}" install + done + ''; meta = with stdenv.lib; { - description = "GTK3.20-compatible version of bitterologist's Numix Solarized from deviantart"; + 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. @@ -29,7 +43,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme; downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases; license = licenses.gpl3; - maintainers = [ maintainers.offline ]; platforms = platforms.linux; + maintainers = [ maintainers.offline ]; }; } diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix new file mode 100644 index 000000000000..41f29f34be88 --- /dev/null +++ b/pkgs/misc/themes/obsidian2/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "theme-obsidian2-${version}"; + version = "2.5"; + + src = fetchFromGitHub { + owner = "madmaxms"; + repo = "theme-obsidian-2"; + rev = "v${version}"; + sha256 = "12jya1gzmhpfh602vbf51vi69fmis7sanvx278h3skm03a7civlv"; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + mkdir -p $out/share/themes + cp -a Obsidian-2 $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "Gnome theme, based upon Adwaita-Maia dark skin"; + homepage = https://github.com/madmaxms/theme-obsidian-2; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix new file mode 100644 index 000000000000..609e027d9eba --- /dev/null +++ b/pkgs/misc/themes/onestepback/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + version = "0.98"; + +in fetchzip { + name = "onestepback-${version}"; + + url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; + + postFetch = '' + mkdir -p $out/share/themes + unzip $downloadedFile -x OneStepBack/LICENSE -d $out/share/themes + ''; + + sha256 = "0sjacvx7020lzc89r5310w83wclw96gzzczy3mss54ldkgmnd0mr"; + + meta = with stdenv.lib; { + description = "Gtk theme inspired by the NextStep look"; + homepage = https://www.opendesktop.org/p/1013663/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/misc/themes/plano/default.nix index 64d4e807e425..2d10ff7c607d 100644 --- a/pkgs/misc/themes/plano/default.nix +++ b/pkgs/misc/themes/plano/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "plano-theme-${version}"; - version = "3.24-3"; + version = "3.28-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "plano-theme"; rev = "v${version}"; - sha256 = "079gj3kgsim01r7yb9dcxvrci3my1y0zkn86igdlspxcnjzmxkq0"; + sha256 = "1862nx7c8786vfa0qdg4aqa13whsk3j5n93v9m91wpccv19n0ryn"; }; buildInputs = [ gdk_pixbuf gtk_engines ]; diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix index dbdc4632dc70..35c8e58b0ae9 100644 --- a/pkgs/misc/themes/zuki/default.nix +++ b/pkgs/misc/themes/zuki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zuki-themes-${version}"; - version = "3.26-1"; + version = "3.28-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "zuki-themes"; rev = "v${version}"; - sha256 = "17p75h1i3hbpshhhliliq0mm88amvfnxq8659vabqd17ccgzwzns"; + sha256 = "1if39k8vgk4cpshl625vdf8lz6jgicgybd5nilycj66sf1k5jgb9"; }; buildInputs = [ gdk_pixbuf gtk_engines ]; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix new file mode 100644 index 000000000000..b29565d01ecb --- /dev/null +++ b/pkgs/misc/tmux-plugins/default.nix @@ -0,0 +1,224 @@ +{ fetchgit, stdenv, pkgs }: + +let + rtpPath = "share/tmux-plugins"; + + addRtp = path: pluginName: attrs: derivation: + derivation // { rtp = "${derivation}/${path}/${builtins.replaceStrings ["-"] ["_"] pluginName}.tmux"; } // { + overrideAttrs = f: buildTmuxPlugin (attrs // f attrs); + }; + + buildTmuxPlugin = a@{ + pluginName, + namePrefix ? "tmuxplugin-", + src, + unpackPhase ? "", + configurePhase ? "", + buildPhase ? "", + addonInfo ? null, + preInstall ? "", + postInstall ? "", + path ? (builtins.parseDrvName pluginName).name, + dependencies ? [], + ... + }: + addRtp "${rtpPath}/${path}" pluginName a (stdenv.mkDerivation (a // { + name = namePrefix + pluginName; + + inherit pluginName unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; + + installPhase = '' + runHook preInstall + + target=$out/${rtpPath}/${path} + mkdir -p $out/${rtpPath} + cp -r . $target + if [ -n "$addonInfo" ]; then + echo "$addonInfo" > $target/addon-info.json + fi + + runHook postInstall + ''; + + dependencies = [ pkgs.bash ] ++ dependencies; + })); + + buildTmuxPluginFrom2Nix = a: buildTmuxPlugin ({ + buildPhase = ":"; + configurePhase =":"; + } // a); + +in rec { + + battery = buildTmuxPluginFrom2Nix { + pluginName = "battery"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-battery"; + rev = "09be78c35ee84f858f724442b94ad045ade23eb0"; + sha256 = "0gm6qiay0k5b3yzrabfmh4inyh9r6rfhja2l3r4cixcvc8sgvh8l"; + }; + }; + + continuum = buildTmuxPluginFrom2Nix { + pluginName = "continuum"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-continuum"; + rev = "90f4a00c41de094864dd4e29231253bcd80d4409"; + sha256 = "1hviqz62mnq5h4vgcy9bl5004q18yz5b90bnih0ibsna877x3nbc"; + }; + dependencies = [ resurrect ]; + }; + + copycat = buildTmuxPluginFrom2Nix { + pluginName = "copycat"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-copycat"; + rev = "6f9b9cd2d93872cef60e3ea7f7ae89598569ed25"; + sha256 = "12dgn5wnzrhd6sqa64w875ld3lrrny8xvdq6b6lzxyain9q49mrf"; + }; + }; + + cpu = buildTmuxPluginFrom2Nix { + pluginName = "cpu"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-cpu"; + rev = "12f7a74e25bf59701456e2c0d98b39bb19ec7039"; + sha256 = "0qxn8ngg297980lj6w8ih2m8m8bxxdbcz5hsjmlia92h5rdkm5kl"; + }; + }; + + fpp = buildTmuxPluginFrom2Nix { + pluginName = "fpp"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-fpp"; + rev = "ca125d5a9c80bb156ac114ac3f3d5951a795c80e"; + sha256 = "1b89s6mfzifi7s5iwf22w7niddpq28w48nmqqy00dv38z4yga5ws"; + }; + postInstall = '' + sed -i -e 's|fpp |${pkgs.fpp}/bin/fpp |g' $target/fpp.tmux + ''; + dependencies = [ pkgs.fpp ]; + }; + + logging = buildTmuxPluginFrom2Nix { + pluginName = "logging"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-logging"; + rev = "b2706119cd587230beae02980d3d7fa2d5afebe9"; + sha256 = "1w1ymscfbz87lypaxgjdva1rg7jw2jyf7nnfgyngghw9m1l2xk2c"; + }; + }; + + net-speed = buildTmuxPluginFrom2Nix { + pluginName = "net-speed"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-net-speed"; + rev = "536d2bdd053a3bdfcc5cf7680c0dba76127c95ca"; + sha256 = "1bly5f40dgiym378jkfwm7qag9xl6qvziqiqnj65yblqd5py325z"; + }; + }; + + maildir-counter = buildTmuxPluginFrom2Nix { + pluginName = "maildir-counter"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-maildir-counter"; + rev = "9415f0207e71e37cbd870c9443426dbea6da78b9"; + sha256 = "0dwvqhiv9bjwr01hsi5c57n55jyv5ha5m5q1aqgglf4wyhbnfms4"; + }; + }; + + online-status = buildTmuxPluginFrom2Nix { + pluginName = "online-status"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-online-status"; + rev = "ea86704ced8a20f4a431116aa43f57edcf5a6312"; + sha256 = "1hy3vg8v2sir865ylpm2r4ip1zgd4wlrf24jbwh16m23qdcvc19r"; + }; + }; + + open = buildTmuxPluginFrom2Nix { + pluginName = "open"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-open"; + rev = "f99d3189c445188eae5fa9bfeabc95df16deca92"; + sha256 = "13q3zd5jv7akkjjwhgimmfylrvalxdn54fnpfb14g6xam6h8808m"; + }; + }; + + pain-control = buildTmuxPluginFrom2Nix { + pluginName = "pain-control"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-pain-control"; + rev = "731667692da46d51a6a9dffb4c43384a5d68ff28"; + sha256 = "1ihpl5wgjmhfgcrasgnydd7vpsar865sx2whra19gpfm4bglmdzl"; + }; + }; + + prefix-highlight = buildTmuxPluginFrom2Nix { + pluginName = "prefix-highlight"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-prefix-highlight"; + rev = "34f7125ae46e5123bedad03e08027332d1186186"; + sha256 = "16z8sm8pifg1m9lmv0z50fb0ws9mk5zqs7a1ddl2bfwkqi7yc0c0"; + }; + }; + + resurrect = buildTmuxPluginFrom2Nix { + pluginName = "resurrect"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-resurrect"; + rev = "7c77c70483b818d331e46c4cf64c716ded09a152"; + sha256 = "08gjxwdmfy16xpgi87rp9dj5338imqsy392pixf7xcnr05413ap1"; + }; + }; + + sensible = buildTmuxPluginFrom2Nix { + pluginName = "sensible"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-sensible"; + rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5"; + sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx"; + }; + }; + + sessionist = buildTmuxPluginFrom2Nix { + pluginName = "sessionist"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-sessionist"; + rev = "09ec86be38eae98ffc27bd0dde605ed10ae0dc89"; + sha256 = "030q2mmj8akbc26jnqn8n7fckg1025p0ildx4wr401b6p1snnlw4"; + }; + }; + + sidebar = buildTmuxPluginFrom2Nix { + pluginName = "sidebar"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-sidebar"; + rev = "23014524cab53f8d36373983500fe05a527a444d"; + sha256 = "1w363587isdip1r81h0vkp5163lpa83lvasg8l04h43sbip2y6i8"; + }; + }; + + urlview = buildTmuxPluginFrom2Nix { + pluginName = "urlview"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-urlview"; + rev = "b84c876cffdd22990b4ab51247e795cbd7813d53"; + sha256 = "1jp4jq57cn116b3i34v6yy69izd8s6mp2ijr260cw86g0470k0fn"; + }; + postInstall = '' + sed -i -e '14,20{s|urlview|${pkgs.urlview}/bin/urlview|g}' $target/urlview.tmux + ''; + dependencies = [ pkgs.urlview ]; + }; + + yank = buildTmuxPluginFrom2Nix { + pluginName = "yank"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-yank"; + rev = "feb9611b7d1c323ca54cd8a5111a53e3e8265b59"; + sha256 = "1ywbm09jfh6cm2m6gracmdc3pp5p2dwraalbhfaafqaydjr22qc3"; + }; + }; + +} diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix new file mode 100644 index 000000000000..623c6015534a --- /dev/null +++ b/pkgs/misc/uboot/rock64.nix @@ -0,0 +1,37 @@ +{ lib, buildUBoot, fetchFromGitHub, armTrustedFirmwareRK3328 }: let + rkbin = fetchFromGitHub { + owner = "ayufan-rock64"; + repo = "rkbin"; + rev = "d8b90685b3d93c358936babdd854f1018bc6d35e"; + sha256 = "0wrh3xa968sdp0j9n692jnv3071ymab719zc56vllba0aaabiaxr"; + }; +in buildUBoot rec { + name = "uboot-${defconfig}-${version}"; + version = "2018.01"; + + src = fetchFromGitHub { + owner = "ayufan-rock64"; + repo = "linux-u-boot"; + rev = "19e31fac0dee3c4f6b2ea4371e4321f79db0f495"; + sha256 = "1vmv7q9yafsc0zivd0qdfmf930dvhzkf4a3j6apxxgx9g10wgwrg"; + }; + + extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ]; + + # So close to being blob free... But U-Boot TPL causes the kernel to hang + postBuild = '' + ./tools/mkimage -n rk3328 -T rksd -d ${rkbin}/rk33/rk3328_ddr_786MHz_v1.06.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/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 78aed2aa833c..163a1a986760 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,8 +1,8 @@ # TODO check that no license information gets lost -{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip -, which, fetchgit, llvmPackages +{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby +, which, fetchgit, llvmPackages, rustPlatform , xkb_switch, rustracerd, fzf, skim -, python3, boost, icu +, python3, boost, icu, ncurses , ycmd, makeWrapper, rake , pythonPackages, python3Packages , substituteAll @@ -20,8 +20,10 @@ in # TL;DR # Add your plugin to ./vim-plugin-names -# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix </dev/null"` -# Copy the generated expression(s) into this file. +# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +'w result' +qall"` +# Note: pluginnames2nix will fetch any plugins in the file; to speed up the process, +# update ./vim-plugin-names to contain only plugins which need generation +# Copy the generated expression(s) into this file from the ./result file. # If plugin is complicated then make changes to ./vim2nix/additional-nix-code # This attrs contains two sections: @@ -52,39 +54,51 @@ rec { # Update with vimUtils.vimPlugins.pluginnames2Nix command # aliasess - "sourcemap.vim" = sourcemap; - Colour_Sampler_Pack = Colour-Sampler-Pack; - Gundo = gundo-vim; # backwards compat, added 2015-10-03 - YouCompleteMe = youcompleteme; airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 + bats = bats-vim; calendar = calendar-vim; coffee-script = vim-coffee-script; coffeeScript = coffee-script; # backwards compat, added 2014-10-18 - colors-solarized = Solarized; + Solarized = vim-colors-solarized; + solarized = vim-colors-solarized; + colors-solarized = vim-colors-solarized; + caw = caw-vim; colorsamplerpack = Colour_Sampler_Pack; + Colour_Sampler_Pack = Colour-Sampler-Pack; command_T = command-t; # backwards compat, added 2014-10-18 + commentary = vim-commentary; committia = committia-vim-git; concealedyank = concealedyank-vim; context-filetype = context_filetype-vim; + Cosco = cosco-vim; css_color_5056 = vim-css-color; + CSApprox = csapprox; + csv = csv-vim; ctrlp = ctrlp-vim; cute-python = vim-cute-python-git; denite = denite-nvim; easy-align = vim-easy-align; + easygit = vim-easygit; easymotion = vim-easymotion; echodoc = echodoc-vim; eighties = vim-eighties; - ghc-mod-vim = ghcmod; - gist-vim = Gist; + extradite = vim-extradite; + fugitive = vim-fugitive; + ghc-mod-vim = ghcmod-vim; + ghcmod = ghcmod-vim; + goyo = goyo-vim; + Gist = gist-vim; gitgutter = vim-gitgutter; gundo = gundo-vim; + Gundo = gundo-vim; # backwards compat, added 2015-10-03 haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 haskellConcealPlus = vim-haskellConcealPlus; haskellconceal = vim-haskellconceal; hier = vim-hier; hlint-refactor = hlint-refactor-vim; - hoogle = Hoogle; + hoogle = vim-hoogle; + Hoogle = vim-hoogle; ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; mayansmoke = mayansmoke-git; @@ -95,35 +109,57 @@ rec { neomru = neomru-vim; neosnippet = neosnippet-vim; neoyank = neoyank-vim-git; - nerdcommenter = The_NERD_Commenter; - nerdtree = The_NERD_tree; + The_NERD_Commenter = nerdcommenter; + The_NERD_tree = nerdtree; open-browser = open-browser-vim; + pathogen = vim-pathogen; peskcolor = peskcolor-vim-git; polyglot = vim-polyglot; + prettyprint = vim-prettyprint; quickrun = vim-quickrun; + rainbow_parentheses = rainbow_parentheses-vim; repeat = vim-repeat; + riv = riv-vim; rhubarb = vim-rhubarb; + sensible = vim-sensible; signature = vim-signature; + snipmate = vim-snipmate; + sourcemap = sourcemap-vim; + "sourcemap.vim" = sourcemap-vim; + surround = vim-surround; + sleuth = vim-sleuth; + solidity = vim-solidity; stylish-haskell = vim-stylish-haskell; stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 - supertab = Supertab; - syntastic = Syntastic; + Supertab = supertab; + Syntastic = syntastic; + SyntaxRange = vim-SyntaxRange; + table-mode = vim-table-mode; + taglist = taglist-vim; tabpagebuffer = tabpagebuffer-vim; - tabular = Tabular; - tagbar = Tagbar; + tabpagecd = vim-tabpagecd; + Tabular = tabular; + Tagbar = tagbar; thumbnail = thumbnail-vim; + tlib = tlib_vim; tmux-navigator = vim-tmux-navigator; tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = tslime-vim; unite = unite-vim; + UltiSnips = ultisnips; vim-grepper = vim-grepper-git; vim-test = vim-test-git; vimproc = vimproc-vim; vimshell = vimshell-vim; + vinegar = vim-vinegar; watchdogs = vim-watchdogs; - webapi-vim = WebAPI; + WebAPI = webapi-vim; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 - yankring = YankRing; + yankring = YankRing-vim; + Yankring = YankRing-vim; + YouCompleteMe = youcompleteme; + xterm-color-table = xterm-color-table-vim; + zeavim = zeavim-vim; # do not auto-update this one, as the name clashes with vim-snippets vim-docbk-snippets = buildVimPluginFrom2Nix { @@ -148,396 +184,416 @@ rec { dependencies = []; }; - # --- generated packages bellow this line --- + LanguageClient-neovim = let + LanguageClient-neovim-src = fetchgit { + url = "https://github.com/autozimu/LanguageClient-neovim"; + rev = "fbc46862af7fa254f74f1108149fd0669c46f1ad"; + sha256 = "1wrrmikriyw8an8hn7240igcaca9a0ykh1j0dfy45kslxkmqkk3r"; + }; + LanguageClient-neovim-bin = rustPlatform.buildRustPackage { + name = "LanguageClient-neovim-bin"; + src = LanguageClient-neovim-src; - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CSApprox-2013-07-26"; - src = fetchgit { - url = "git://github.com/godlygeek/csapprox"; - rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; - sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; + cargoSha256 = "0c2sklpvab63a1f1mhcq9abq5m2srkj52ypq7dq44g8ngn2a05ka"; }; + in buildVimPluginFrom2Nix { + name = "LanguageClient-neovim-2018-03-06"; + src = LanguageClient-neovim-src; + dependencies = []; + propogatedBuildInputs = [ LanguageClient-neovim-bin ]; + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/plugin/LanguageClient.vim \ + --replace "let l:command = [s:root . '/bin/languageclient']" "let l:command = ['${LanguageClient-neovim-bin}/bin/languageclient']" + ''; }; - CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2017-03-15"; + # --- generated packages bellow this line --- + + vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-auto-save-2017-11-08"; src = fetchgit { - url = "git://github.com/chrisbra/CheckAttach"; - rev = "b583efd45e03902438a55299623390a0f9253513"; - sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34"; + url = "https://github.com/907th/vim-auto-save"; + rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; + sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; }; dependencies = []; }; - Cosco = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Cosco-2017-07-26"; + vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-autoformat-2018-03-02"; src = fetchgit { - url = "git://github.com/lfilho/cosco.vim"; - rev = "4a2a080415860196c936a32679d9032f41ba21e4"; - sha256 = "0gljxy6shr7kmm8vvj6rm4c0lr0ydbny9lrsp64c3d4d0b2wnmig"; + url = "https://github.com/Chiel92/vim-autoformat"; + rev = "e63b4e957ad034494b1495d4b4ac1a18503cba79"; + sha256 = "1p64q9a7wqppy1zj70xki86zs5wwxbf9x0wdd4fsg0w741ga9wdf"; }; dependencies = []; }; - Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2016-10-10"; + ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-py-matcher-2017-11-01"; src = fetchgit { - url = "git://github.com/mattn/gist-vim"; - rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; - sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; + url = "https://github.com/FelikZ/ctrlp-py-matcher"; + rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; + sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; }; dependencies = []; }; - Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Hoogle-2017-11-04"; + ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-cmatcher-2015-10-15"; src = fetchgit { - url = "git://github.com/Twinside/vim-hoogle"; - rev = "14256fa4f482bb40f55311a6d8037103549c7844"; - sha256 = "1dhfy9s6q11cb424x595anj17sgsqywdyrcw3ynmk3949iiwaqhb"; + url = "https://github.com/JazzCore/ctrlp-cmatcher"; + rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; + sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; }; dependencies = []; - + buildInputs = [ python ]; + buildPhase = '' + patchShebangs . + ./install.sh + ''; }; - Solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Solarized-2011-05-09"; + julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "julia-vim-2018-03-27"; src = fetchgit { - url = "git://github.com/altercation/vim-colors-solarized"; - rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; + url = "https://github.com/JuliaEditorSupport/julia-vim"; + rev = "4593c8b1ffe20022677e524487c8554d96cf8f84"; + sha256 = "0yrdzkxyg6cg2i4bd6bqbq0w63hssh3nd0f0qnfl7v5pkq9yba4w"; }; dependencies = []; }; - Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2017-11-14"; + zeavim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "zeavim-vim-2018-03-22"; src = fetchgit { - url = "git://github.com/ervandew/supertab"; - rev = "40fe711e088e2ab346738233dd5adbb1be355172"; - sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; + url = "https://github.com/KabbAmine/zeavim.vim"; + rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa"; + sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj"; }; dependencies = []; }; - Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2018-01-12"; + vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-nix-2018-04-24"; src = fetchgit { - url = "git://github.com/scrooloose/syntastic"; - rev = "937d77d1f3ba8de08ad275e052e38d0e680a175b"; - sha256 = "10qrq1fs53srp4inxmcm8zq5kjdl56hh1lwh2jhda9mfwrbhg3fp"; + url = "https://github.com/LnL7/vim-nix"; + rev = "dae3d30a145f1d0e50658dafd88f95cd4b5e323d"; + sha256 = "1x3gaiz2wbqykzhk0zj0krjp81m5rxhk80pcg96f4gyqp7hxrx78"; }; dependencies = []; }; - SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "SyntaxRange-2017-07-03"; + vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-actions-2018-01-18"; src = fetchgit { - url = "git://github.com/inkarkat/vim-SyntaxRange"; - rev = "213cfda0a0f11505665dbfe1e58c803f498761a6"; - sha256 = "1dg9n3zll3a79lv96kdlxxs141binb8w79zdisj7djxc5y2k48qs"; + url = "https://github.com/MarcWeber/vim-addon-actions"; + rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; + sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - Tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tabular-2016-05-04"; + vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-async-2017-03-20"; src = fetchgit { - url = "git://github.com/godlygeek/tabular"; - rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; - sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz"; + url = "https://github.com/MarcWeber/vim-addon-async"; + rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; + sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; }; - dependencies = []; + dependencies = ["vim-addon-signs"]; }; - Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2017-12-03"; + vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-background-cmd-2015-12-11"; src = fetchgit { - url = "git://github.com/majutsushi/tagbar"; - rev = "c004652797185121bbf264138d57eb2a0199b6db"; - sha256 = "0aj319iz3g9b1xs8g2k7ikjhjy6y94i0hyk0a9km7swglairld06"; + url = "https://github.com/MarcWeber/vim-addon-background-cmd"; + rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; + sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils"]; }; - The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2017-11-07"; + vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-commenting-2013-06-10"; src = fetchgit { - url = "git://github.com/scrooloose/nerdcommenter"; - rev = "fd61bc71f64c8accf86f06c633fd19b205efa85b"; - sha256 = "07196j5bp3k4ckapyrp3366h0nyvqq5r26hqqihgfa62s1n8rjsl"; + url = "https://github.com/MarcWeber/vim-addon-commenting"; + rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; + sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; }; dependencies = []; }; - The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2017-12-06"; + vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-completion-2015-02-10"; src = fetchgit { - url = "git://github.com/scrooloose/nerdtree"; - rev = "8cbea5109e8c7ed682da25bb488267d781db0bd4"; - sha256 = "0n4shpdl33yghkqk0vllrmmb74dflf39liyclkbpqmcymx9rw2qj"; + url = "https://github.com/MarcWeber/vim-addon-completion"; + rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; + sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; }; - dependencies = []; + dependencies = ["tlib"]; }; - UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2017-06-30"; + vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-errorformats-2014-11-05"; src = fetchgit { - url = "git://github.com/SirVer/ultisnips"; - rev = "423f264e753cec260b4f14455126e6db7ba429af"; - sha256 = "19g3k0nqzizv39rxwgkca9n2gsd19z2wwsmicr0zcgnf50nhkznh"; + url = "https://github.com/MarcWeber/vim-addon-errorformats"; + rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; + sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; }; dependencies = []; }; - VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner-2017-08-02"; + vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-goto-thing-at-cursor-2012-01-11"; src = fetchgit { - url = "git://github.com/vimoutliner/vimoutliner"; - rev = "c13141d604959d84225c3a53dc4b0ef5ae8b2bfe"; - sha256 = "1bg45cnpvnk2k7r6l2n3sz0cw2lhrglphak10yp11yqf4q1rxl7x"; + url = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; + rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; + sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; }; - dependencies = []; + dependencies = ["tlib"]; }; - WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2017-04-26"; + vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-local-vimrc-2015-03-19"; src = fetchgit { - url = "git://github.com/mattn/webapi-vim"; - rev = "e76f2da9a8f292a999a95ae688534f76c2dca9bd"; - sha256 = "02970g7blj478vid88gayba39rdcm9236nigkrijapyf5rd24zhh"; + url = "https://github.com/MarcWeber/vim-addon-local-vimrc"; + rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; + sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; }; dependencies = []; }; - YankRing = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "YankRing"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=23487"; - name = "yankring_190.zip"; - sha256 = "0nnxpsfjp2p9jvs3y5ynnd5s56snz9927zdp9bgmay2jgxfmp0si"; + vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-manager-2017-05-07"; + src = fetchgit { + url = "https://github.com/MarcWeber/vim-addon-manager"; + rev = "2434225ae48e608c2b6ac86c8da1c62209da746f"; + sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb"; }; - buildInputs = [ unzip ]; dependencies = []; - meta = { - homepage = "http://www.vim.org/scripts/script.php?script_id=1234"; + buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; + }; + + vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-mru-2013-08-08"; + src = fetchgit { + url = "https://github.com/MarcWeber/vim-addon-mru"; + rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; + sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; }; + dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; - sourceRoot = "."; }; - caw = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "caw-2018-01-01"; + vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-mw-utils-2018-03-09"; src = fetchgit { - url = "git://github.com/tyru/caw.vim"; - rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42"; - sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari"; + url = "https://github.com/MarcWeber/vim-addon-mw-utils"; + rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2"; + sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f"; }; dependencies = []; }; - clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clang_complete-2017-09-25"; + vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-nix-2017-09-11"; src = fetchgit { - url = "git://github.com/Rip-Rip/clang_complete"; - rev = "fb8f4f25ab808bc83bc7c704f23171cb6b020737"; - sha256 = "0y80ds4l5gqqdm56ymkgsfpizpx96kzrr0ivx29q7ahd4ry847xa"; + url = "https://github.com/MarcWeber/vim-addon-nix"; + rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; + sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; }; - dependencies = []; - # 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++). - # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). - # The linked ruby code shows generates the required '.clang_complete' for cmake based projects - # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - # as an alternative you can execute the following command: - # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile') - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ - --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" - ''; + dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; + }; - commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary-2017-10-09"; + vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-other-2014-07-15"; src = fetchgit { - url = "git://github.com/tpope/vim-commentary"; - rev = "89f43af18692d22ed999c3097e449f12fdd8b299"; - sha256 = "0nqm4s00c607r58fz29n67r2z5p5r9qayl5y1chy8bcrl59m17a2"; + url = "https://github.com/MarcWeber/vim-addon-other"; + rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; + sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6"; }; - dependencies = []; + dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; }; - csv = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csv-2018-01-03"; + vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-php-manual-2015-01-01"; src = fetchgit { - url = "git://github.com/chrisbra/csv.vim"; - rev = "a50b977fa25a854e7d099198bfa65e2dc680898b"; - sha256 = "02a6289rbjw8r0l668ala5abfr2rls3slrnk4yrsfc6ka550zj9y"; + url = "https://github.com/MarcWeber/vim-addon-php-manual"; + rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; + sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; }; dependencies = []; }; - ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-cmatcher-2015-10-15"; + vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-signs-2013-04-19"; src = fetchgit { - url = "git://github.com/JazzCore/ctrlp-cmatcher"; - rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; - sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; + url = "https://github.com/MarcWeber/vim-addon-signs"; + rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; + sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; }; dependencies = []; - buildInputs = [ python ]; - buildPhase = '' - patchShebangs . - ./install.sh - ''; + }; - ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2017-11-01"; + vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-sql-2017-02-11"; src = fetchgit { - url = "git://github.com/FelikZ/ctrlp-py-matcher"; - rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; - sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; + url = "https://github.com/MarcWeber/vim-addon-sql"; + rev = "048a139af36829fce670c8ff80d3aad927557ee6"; + sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; }; - dependencies = []; + dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; }; - ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-z-2015-10-17"; + vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-syntax-checker-2017-06-26"; src = fetchgit { - url = "git://github.com/amiorin/ctrlp-z"; - rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; - sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; + url = "https://github.com/MarcWeber/vim-addon-syntax-checker"; + rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; + sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "easygit-2017-08-11"; + vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-toggle-buffer-2012-01-13"; src = fetchgit { - url = "git://github.com/chemzqm/vim-easygit"; - rev = "8f66da54da627395309548efee6d8705b7f50768"; - sha256 = "013jl330k9yjcvzzqhwz93adm4349gkl3q1c55m1zfkg3afmvnwd"; + url = "https://github.com/MarcWeber/vim-addon-toggle-buffer"; + rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; + sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "extradite-2015-09-22"; + vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-xdebug-2014-08-29"; src = fetchgit { - url = "git://github.com/int3/vim-extradite"; - rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; - sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; + url = "https://github.com/MarcWeber/vim-addon-xdebug"; + rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; + sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; }; - dependencies = []; + dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; }; - fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2017-12-16"; + tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tsuquyomi-2018-03-23"; src = fetchgit { - url = "git://github.com/tpope/vim-fugitive"; - rev = "f3ccb0c12ee4985b8808f83059830a24cc92821c"; - sha256 = "1ry67wi5dci4jy54jyf3lsf0yq13a42z9w5qh39rwv5w9wiab2fb"; + url = "https://github.com/Quramy/tsuquyomi"; + rev = "94f10d312134fc59b53b2e821d3315320f694cf0"; + sha256 = "1f084y9vv8rkb2d0ig6lc40sbdchpfc68fkxlvaky4jk1l1l89ay"; }; dependencies = []; }; - ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2016-06-19"; + clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "clang_complete-2018-01-18"; src = fetchgit { - url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; - sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; + url = "https://github.com/Rip-Rip/clang_complete"; + rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275"; + sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p"; }; dependencies = []; - + # 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++). + # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). + # The linked ruby code shows generates the required '.clang_complete' for cmake based projects + # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 + # as an alternative you can execute the following command: + # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile') + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ + --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" + ''; }; - vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-auto-save-2017-11-08"; + riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "riv-vim-2018-01-21"; src = fetchgit { - url = "https://github.com/907th/vim-auto-save"; - rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; - sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; + url = "https://github.com/Rykka/riv.vim"; + rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09"; + sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j"; }; dependencies = []; }; - vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2017-12-06"; + deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-nvim-2018-04-16"; src = fetchgit { - url = "https://github.com/Chiel92/vim-autoformat"; - rev = "27f0e48a9b60ab8a45178d6104fa819a99ead2ee"; - sha256 = "0na5qwgpafnxz7lbscs9y0ffbd01b1ab2q1kqrr78a3gqz37ga0s"; + url = "https://github.com/Shougo/deoplete.nvim"; + rev = "0d48792663437d81bdfa195c676d5c37ef10c89a"; + sha256 = "1zqrxxi7ci1mp5ml7nayj3crzpqgdl09q20wilp68kf2mvll28xi"; }; dependencies = []; }; - vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-02-25"; + ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ultisnips-2018-04-16"; src = fetchgit { - url = "https://github.com/LnL7/vim-nix"; - rev = "36c5feb514930e8fb8e2f4567d6b0d9e806fc2eb"; - sha256 = "1v0vm0h5j6zzwhm5gw3xcmckswma3a5kxyli34i8hy14yli0ff3d"; + url = "https://github.com/SirVer/ultisnips"; + rev = "905e5249246169b6db2bb060e0a2b06eac1890e6"; + sha256 = "025b2f4gs04qb6wnxa0yclwm5jysdj6q10i2zkbiclvblfbxxv19"; }; dependencies = []; }; - tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2017-11-10"; + vim-hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-hoogle-2018-03-04"; src = fetchgit { - url = "https://github.com/Quramy/tsuquyomi"; - rev = "8a647de888e1d823718f717d47678a97b5012196"; - sha256 = "0zvcr15g6m17736a7nwr9aa7c3sd25ad39v7dban0jiz6asd7nn1"; + url = "https://github.com/Twinside/vim-hoogle"; + rev = "871d104c92e33cb238506f2805f1652561978cc8"; + sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; }; dependencies = []; }; - deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-01-14"; + vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gitgutter-2018-04-11"; src = fetchgit { - url = "https://github.com/Shougo/deoplete.nvim"; - rev = "b164eb8c36ddbb8835434e013358de29b9c8f1f2"; - sha256 = "0k3zmpdlg4y4f0y3pgfcqmglrrs1iagw8iaaz131nyswz0m2pf6x"; + url = "https://github.com/airblade/vim-gitgutter"; + rev = "5481318fc1b97e7c04eab5496ec45c63335d6bc1"; + sha256 = "1jwqxkaqvkmdqi9k9nx25xz28av374a70izs0534hx12crgg8g3w"; }; dependencies = []; }; Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2017-11-22"; + name = "Spacegray-vim-2018-04-07"; src = fetchgit { url = "https://github.com/ajh17/Spacegray.vim"; - rev = "9a952cee86397ce28aef890209ccee2397d9a32e"; - sha256 = "0ddxkmqcjns0vznqcwji835kkn8pps93kyksx34b57ssr1qq28d1"; + rev = "255a6086aa5af07e38e441964623029a39fa17c1"; + sha256 = "0pfwmazcmsz9wdjmbw6hjcvbsd9j99jrjxw81xy1s6vqxmlhi8gj"; }; dependencies = []; @@ -554,12 +610,45 @@ rec { }; + vim-colors-solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-colors-solarized-2011-05-09"; + src = fetchgit { + url = "https://github.com/altercation/vim-colors-solarized"; + rev = "528a59f26d12278698bb946f8fb82a63711eec21"; + sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; + }; + dependencies = []; + + }; + vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-closetag-2017-11-01"; + name = "vim-closetag-2018-03-09"; src = fetchgit { url = "https://github.com/alvan/vim-closetag"; - rev = "277e21d04c417112da6ecd3485373c6d3ff93b90"; - sha256 = "1wx9qqas0gd301pn9zabbl4b9v41i1hwbnd8fyy8kxxf0cbpdwaf"; + rev = "aa14c2c1e7da4112e46ef6b287cacdd7af96da6f"; + sha256 = "058z8dzqki3idv7r5654xd91wplhhnsa2l533rszmkzji3hj2why"; + }; + dependencies = []; + + }; + + ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-z-2015-10-17"; + src = fetchgit { + url = "https://github.com/amiorin/ctrlp-z"; + rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; + sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; + }; + dependencies = []; + + }; + + vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-logreview-2017-07-08"; + src = fetchgit { + url = "https://github.com/andreshazard/vim-logreview"; + rev = "b7b66ab338e904127d796af49235b8c29742f18f"; + sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; }; dependencies = []; @@ -588,22 +677,11 @@ rec { }; vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2017-11-03"; + name = "vim-css-color-2018-03-06"; src = fetchgit { url = "https://github.com/ap/vim-css-color"; - rev = "fcf5829daa7817994fb856dbaa905e6fd8beb50c"; - sha256 = "1a617ji11395zimqjgpcq2qciyjzq5ixm85vc8rkj8jda0qgm91c"; - }; - dependencies = []; - - }; - - LanguageClient-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "LanguageClient-neovim-2017-12-05"; - src = fetchgit { - url = "https://github.com/autozimu/LanguageClient-neovim"; - rev = "eac16849eb5cb5592cf043fa222282a7082f257b"; - sha256 = "07j7zm8xbvsanr9ghwxaw88m0kfr0ih262g299n5rr972s93wpg6"; + rev = "afaacf50e65b7d30b170e70ee13c1518dce1e032"; + sha256 = "1ck8qv3wfmc7rdddzd7zh2dsnb0rx69grmc0laz7n1358xg0i4vx"; }; dependencies = []; @@ -621,11 +699,11 @@ rec { }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2017-11-30"; + name = "clighter8-2018-04-15"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "909f2162a3dfa3d4089533e42af01b4411ef6a78"; - sha256 = "0hi1v8ww4yzwpdr25zzdr4ccwvs5d3pa02gj5y6qfc5ddz1krdml"; + rev = "6d325abd043fd1bc31bea821f751996541bfc944"; + sha256 = "1kmk6q1hca97052dif1m3ygcr9zrnc3i2lrvkzlmsqb159mgfsgq"; }; dependencies = []; preFixup = '' @@ -635,11 +713,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2017-12-06"; + name = "neomake-2018-04-17"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "22bcbd560820d387b61ae285b1d1a74f338e3e13"; - sha256 = "1hp99fpbvi72m51m2ivn4rg64awlr9zqkvhjh99rl7ax8y0zw8ap"; + rev = "df72c7a2f1bdcc08b5dbcd86f165fe7cd5eb6e1f"; + sha256 = "1vlc0irqkl27dyh52wci36fcj80a67fcb9q9cpcbr94lwh4l7l26"; }; dependencies = []; @@ -668,33 +746,33 @@ rec { }; vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-toml-2017-12-10"; + name = "vim-toml-2018-03-06"; src = fetchgit { url = "https://github.com/cespare/vim-toml"; - rev = "b531aac0d45aaa373070c4cc30d7ead91960f5a7"; - sha256 = "14g3zvyfvhilr5ka3jhja4jxjn99957sk6hlv13yfkg349f57dvg"; + rev = "624f02475080ea26d9430b8d31d7c3199b0ec939"; + sha256 = "0frjdv50rhd3awrddq25x4l22ca15i5587pgcmvwxz92y52484lx"; }; dependencies = []; }; denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-extra-2017-11-03"; + name = "denite-extra-2018-03-18"; src = fetchgit { url = "https://github.com/chemzqm/denite-extra"; - rev = "2cea3e857b51fcde425339adeec12854e6cecbb6"; - sha256 = "1qa0ajs6vix0vvm1z7rhxq9bfx4aggq97gxghrxpvsc059c7w9wv"; + rev = "c48443ba1a27375b8a3c04b7b0a5b2c96c7ff62b"; + sha256 = "142s6c4af7h0jrnyl0smflg2wmkwsvhvly04rci3p54x59w7xdc5"; }; dependencies = []; }; denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-git-2017-11-02"; + name = "denite-git-2018-03-20"; src = fetchgit { url = "https://github.com/chemzqm/denite-git"; - rev = "d40026c9b2c0e53ecdd3883d26260f19c74c7dfe"; - sha256 = "0c9602pj67hqfkyvanz5gw1s6vlf8q7s9r55g4dws5aakvjbqc0g"; + rev = "d1feb1470f667a5086ae45136642cefa5fc74810"; + sha256 = "001mwa6691a46lv9m9w8gb2syxgsny6ifv4l80f1chb7hjkblkhh"; }; dependencies = []; @@ -711,12 +789,56 @@ rec { }; + sourcemap-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "sourcemap-vim-2012-09-19"; + src = fetchgit { + url = "https://github.com/chikatoike/sourcemap.vim"; + rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; + sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; + }; + dependencies = []; + + }; + + CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "CheckAttach-2017-03-15"; + src = fetchgit { + url = "https://github.com/chrisbra/CheckAttach"; + rev = "b583efd45e03902438a55299623390a0f9253513"; + sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34"; + }; + dependencies = []; + + }; + + csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "csv-vim-2018-04-15"; + src = fetchgit { + url = "https://github.com/chrisbra/csv.vim"; + rev = "5ca39450e6d40265086d929ff82ca2c9566fdc68"; + sha256 = "0i6j6c6027vpdcjq6znmkbdbbsdgwqb89jswkyhyx7ff3lwmzryq"; + }; + dependencies = []; + + }; + + sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "sparkup-2012-06-10"; + src = fetchgit { + url = "https://github.com/chrisgeo/sparkup"; + rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; + sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; + }; + dependencies = []; + + }; + vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sort-motion-2017-10-03"; + name = "vim-sort-motion-2018-03-05"; src = fetchgit { url = "https://github.com/christoomey/vim-sort-motion"; - rev = "7384f20d829b4abde28ced40975f0beb319dce27"; - sha256 = "1x4hxa7dijb5g7vmrbgs2zi8aiqc759ljmh8qqwk6lafc016plnj"; + rev = "b4455cea401c86d189e84c4dda55f18d8a4a67d4"; + sha256 = "0cav0l152qy8fvhwpcdr7lddf0jnjkjw6hnjrmmpvikxj7rq2yik"; }; dependencies = []; @@ -734,33 +856,55 @@ rec { }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2017-03-31"; + name = "spacevim-2018-03-29"; src = fetchgit { url = "https://github.com/ctjhoa/spacevim"; - rev = "f4cd52c1746021bb3278c6a085e8d07f1c1a9258"; - sha256 = "0y146z0w1cbqwzw84k479a5hxs1phg1s11fqfvszn8928fsm8c4d"; + rev = "30142a518ba77feb22791b5cb2387d88b70c58f2"; + sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2017-08-30"; + name = "ctrlp-vim-2018-04-10"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "bde7a2950adaa82e894d7bdf69e3e7383e40d229"; - sha256 = "19q3cfs3rd3q1xfhyz55r1c3750nrjvwz7jxnhqqn751zgimnsyl"; + rev = "4b9e7cac612902a25498cca49f13475fe1a821a4"; + sha256 = "1wa2kxiwipnxwd19gyv6grgqn0ms6zdxsj2xg80whkk3namlgg7m"; + }; + dependencies = []; + + }; + + vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim2hs-2014-04-16"; + src = fetchgit { + url = "https://github.com/dag/vim2hs"; + rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; + sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; + }; + dependencies = []; + + }; + + quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "quickfixstatus-2011-09-02"; + src = fetchgit { + url = "https://github.com/dannyob/quickfixstatus"; + rev = "fd3875b914fc51bbefefa8c4995588c088163053"; + sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; }; dependencies = []; }; agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2017-11-21"; + name = "agda-vim-2018-03-16"; src = fetchgit { url = "https://github.com/derekelkins/agda-vim"; - rev = "13e3b24aeb8677205ff43a79c6c7e090a602b31a"; - sha256 = "17vp11x1w9bibl5ibsvhw5m5ma2r8pzddshgxdvfg22wprx0kcp0"; + rev = "911a9695f550b47e4dedbe8a3dd1b6a9a745fe52"; + sha256 = "1bmi3d39hllrsnsy37dxhziffvs9qzns631gd9psk6xgcchkan7n"; }; dependencies = []; @@ -777,6 +921,17 @@ rec { }; + vim-table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-table-mode-2018-03-22"; + src = fetchgit { + url = "https://github.com/dhruvasagar/vim-table-mode"; + rev = "e646bee5c45201b52f8f879eddf84b5c2e360e98"; + sha256 = "1kaszrik5mqrvavl0lzfy9i0r3b2vf1jmjxp23azy0jfanflrxwa"; + }; + dependencies = []; + + }; + vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jade-2017-04-07"; src = fetchgit { @@ -800,11 +955,11 @@ rec { }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2017-05-24"; + name = "vim-2018-04-13"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "6a5bf34193927c70b6c21dcbe1c130d2ab0951d6"; - sha256 = "1mmqrc52k133ddpxcs0mxjph4n4b856r5wbs17bgcpk95cfbspb1"; + rev = "7668d800a20c1f180bb49655d98378f2605ad616"; + sha256 = "07xcqickvw22yx5b91blvb463jn5dpn3drzf8y0nmpz08kfs4qfc"; }; dependencies = []; @@ -821,6 +976,17 @@ rec { }; + ghcmod-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ghcmod-vim-2016-06-19"; + src = fetchgit { + url = "https://github.com/eagletmt/ghcmod-vim"; + rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; + sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; + }; + dependencies = []; + + }; + neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neco-ghc-2017-08-17"; src = fetchgit { @@ -866,11 +1032,11 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2018-02-01"; + name = "vim-elixir-2018-04-16"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "8ca41c1f02208dd5ca68c7bcb6c71b3b92f46af6"; - sha256 = "0dp9cqflbwc3h1hzgn9fyaxhcn6q9bclgfy9kkgywp8zk5kwzb7p"; + rev = "36e54e1cf965d92f251ead359207d4a7b04cfdf2"; + sha256 = "0y296falc5l6k52vpw1f0bwzxgdbdjiljjg394s472228mnb2r3p"; }; dependencies = []; @@ -899,11 +1065,11 @@ rec { }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2018-01-04"; + name = "vim-localvimrc-2018-04-05"; src = fetchgit { url = "https://github.com/embear/vim-localvimrc"; - rev = "b915ce29c619fb367ed41d4c95d57eaaaed31b39"; - sha256 = "13bc3davmw2pms663yniiha8bayzy1m08xjhyrnlqqb2dz77m5gy"; + rev = "736f9712dd2eb8a7a3ae15d61611db9b5a66c648"; + sha256 = "09r8hvvm8fdr5rlrgfwnhjkk967dfmis8vgi3d45c9svhsybhkja"; }; dependencies = []; @@ -931,6 +1097,17 @@ rec { pythonDependencies = with pythonPackages; [ sexpdata websocket_client ]; }; + supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "supertab-2017-11-14"; + src = fetchgit { + url = "https://github.com/ervandew/supertab"; + rev = "40fe711e088e2ab346738233dd5adbb1be355172"; + sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; + }; + dependencies = []; + + }; + YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "YUNOcommit-vim-2014-11-26"; src = fetchgit { @@ -943,11 +1120,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2017-12-06"; + name = "vim-go-2018-04-11"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "7f4673573d67aacec0ac35d37eb3123abe4fcf70"; - sha256 = "074097m1xd7j97zkkhrkfnj8d4ndms20gp8zas2vha1h48yy5a70"; + rev = "7491209072ed4aa746e6fe7894f976ecd251801e"; + sha256 = "1a7fy8n9h383776jixlwxl8y3h8h5mixi0bcv4lv61x0g3xxh8gx"; }; dependencies = []; @@ -976,11 +1153,55 @@ rec { }; psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2017-10-24"; + name = "psc-ide-vim-2018-03-11"; src = fetchgit { url = "https://github.com/frigoeu/psc-ide-vim"; - rev = "23bf302de91181d409fb988ce372ab703b119bc5"; - sha256 = "1yjnc6173zdxbcbszrv7184rk5jax6d187c1klsm8b6lx4j1jv4d"; + rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f"; + sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g"; + }; + dependencies = []; + + }; + + vim-snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-snipmate-2017-04-20"; + src = fetchgit { + url = "https://github.com/garbas/vim-snipmate"; + rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; + sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + + }; + + vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vundle-2018-02-02"; + src = fetchgit { + url = "https://github.com/gmarik/vundle"; + rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; + sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; + }; + dependencies = []; + + }; + + csapprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "csapprox-2013-07-26"; + src = fetchgit { + url = "https://github.com/godlygeek/csapprox"; + rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; + sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; + }; + dependencies = []; + + }; + + tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tabular-2016-05-04"; + src = fetchgit { + url = "https://github.com/godlygeek/tabular"; + rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; + sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz"; }; dependencies = []; @@ -998,22 +1219,55 @@ rec { }; vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsonnet-2017-04-06"; + name = "vim-jsonnet-2018-04-10"; src = fetchgit { url = "https://github.com/google/vim-jsonnet"; - rev = "2637e273713322befc476760809d46500e6088f3"; - sha256 = "0fxmqasznb3ra49r4j3fmksik7narnd3b6j1j4najp4l61x27ip2"; + rev = "1425166887329363381194adc457b02b663b1354"; + sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j"; + }; + dependencies = []; + + }; + + vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-maktaba-2018-04-09"; + src = fetchgit { + url = "https://github.com/google/vim-maktaba"; + rev = "77a4dcecd7d65ae2bf362bd7d9055d2806a8edf3"; + sha256 = "0fvspd6q0dj9bqnv8xavfx7xwmg5g68r1kksfv54bbzckkhkw28w"; + }; + dependencies = []; + + }; + + gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "gitv-2017-11-26"; + src = fetchgit { + url = "https://github.com/gregsexton/gitv"; + rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35"; + sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w"; + }; + dependencies = ["fugitive"]; + + }; + + xterm-color-table-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "xterm-color-table-vim-2013-12-31"; + src = fetchgit { + url = "https://github.com/guns/xterm-color-table.vim"; + rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; + sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; }; dependencies = []; }; vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsdoc-2017-02-11"; + name = "vim-jsdoc-2017-12-18"; src = fetchgit { url = "https://github.com/heavenshell/vim-jsdoc"; - rev = "cd8f084c3b4bd198620d45a007cee6b009b57b35"; - sha256 = "0a2d9jwxjws8l7y89yn7xl07r5yh7r7987a8hfalvz12qmdmff1j"; + rev = "a164cb4c14b9063e82b6ccba96b4bc8b3a6d8f73"; + sha256 = "0f4hj2vd4l4rprizkg64q6dmm86f5yc9gk554a6f4kpagw2w9y76"; }; dependencies = []; @@ -1030,6 +1284,17 @@ rec { }; + vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-snippets-2018-04-16"; + src = fetchgit { + url = "https://github.com/honza/vim-snippets"; + rev = "d081fa5117acdd972bd0a3ec1c0424e79ef6121e"; + sha256 = "0wrm5f15lf6hlyv9ca2a8jil14647acicsmaq34nr11gd375bvvc"; + }; + dependencies = []; + + }; + idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "idris-vim-2017-12-04"; src = fetchgit { @@ -1041,23 +1306,45 @@ rec { }; + vim-SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-SyntaxRange-2018-03-09"; + src = fetchgit { + url = "https://github.com/inkarkat/vim-SyntaxRange"; + rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; + sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; + }; + dependencies = []; + + }; + + vim-extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-extradite-2015-09-22"; + src = fetchgit { + url = "https://github.com/int3/vim-extradite"; + rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; + sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; + }; + dependencies = []; + + }; + calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2017-07-08"; + name = "calendar-vim-2018-03-12"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim"; - rev = "6d6be26b2ad1870658525e2a42046429c845516c"; - sha256 = "0g4k7vn3r8y0ss0nl6apxgpkdi7ixi87a9g5xr66n70lxyn7m9pz"; + rev = "1aee272cc37670b4f96c5d75975ae8af3bd8809e"; + sha256 = "1mr7yb07aycpc9famb0kq71sb4xyw87zgnkn0gk9i96pcjaab5fs"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2017-12-05"; + name = "lightline-vim-2018-04-14"; src = fetchgit { url = "https://github.com/itchyny/lightline.vim"; - rev = "b19faca129f7921766c0a32a7c378dc89a61e590"; - sha256 = "1sif7wspivpakm4nlhsq1v93s6s18q5kx8s5zqq97chhv626l8c7"; + rev = "e54d2ae512c9c081bfff9303cb22ffa94ed48ba3"; + sha256 = "042sfdwj46yv0bmf0cm5vm24j197isc3asdj4ymxzh5d6jy2i5qb"; }; dependencies = []; @@ -1074,6 +1361,17 @@ rec { }; + vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-cursorword-2017-10-19"; + src = fetchgit { + url = "https://github.com/itchyny/vim-cursorword"; + rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; + sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; + }; + dependencies = []; + + }; + vim-gitbranch = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-gitbranch-2017-05-28"; src = fetchgit { @@ -1097,11 +1395,11 @@ rec { }; vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-test-git-2018-01-16"; + name = "vim-test-git-2018-04-16"; src = fetchgit { url = "https://github.com/janko-m/vim-test.git"; - rev = "731ad6942f9449d2ed22f6d9ccc8d1ce613b1f19"; - sha256 = "14xwsc23zmkfl6ydvqiqf7l0gn5nxqdm62rvgiky5j5ii9iqj3hr"; + rev = "61dbd5621bcf0fe74c1008083d7f103f041fc7c7"; + sha256 = "0r5nxspznniviy0j89pmvksgvyzrzvx1qivabbcds7i62vqrxyw0"; }; dependencies = []; @@ -1218,11 +1516,22 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-01-09"; + name = "fzf-vim-2018-04-17"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "c0a5fee7071ed89602b9b59fb67e83d6cd23addc"; - sha256 = "0biqq9g116zziv9k0axgn8wasgwb57fwaxwjj8vsajrmq5phdl4z"; + rev = "bbda33b402d92d43c75827bd54ee1932cf03a7b6"; + sha256 = "02f16kdgs1ahsja84ls1zpjidcg1yx1bhpp39fd7zqqvzw16mf1q"; + }; + dependencies = []; + + }; + + goyo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "goyo-vim-2017-06-01"; + src = fetchgit { + url = "https://github.com/junegunn/goyo.vim"; + rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; + sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj"; }; dependencies = []; @@ -1239,6 +1548,28 @@ rec { }; + vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-easy-align-2017-06-03"; + src = fetchgit { + url = "https://github.com/junegunn/vim-easy-align"; + rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; + sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774"; + }; + dependencies = []; + + }; + + vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-dashboard-2017-08-08"; + src = fetchgit { + url = "https://github.com/junegunn/vim-github-dashboard"; + rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6"; + sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y"; + }; + dependencies = []; + + }; + vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-peekaboo-2017-03-20"; src = fetchgit { @@ -1261,23 +1592,12 @@ rec { }; - vim-clang = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-clang-2016-10-17"; - src = fetchgit { - url = "https://github.com/justmao945/vim-clang"; - rev = "0076e0c64baa71c1c1f404e6a500e45190cdad5c"; - sha256 = "04fbmlrvgl278hlrnhlxppy1dz5fdilj9rzrc1vvxrw9ih3knvr3"; - }; - dependencies = []; - - }; - vim-niceblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-niceblock-2015-08-22"; + name = "vim-niceblock-2018-01-30"; src = fetchgit { url = "https://github.com/kana/vim-niceblock"; - rev = "03c59f648fcadd415fc91d7b100cf48bd0a55fac"; - sha256 = "05p3xr61v3infi07r9ahr30190kamgdjxkjjlawbqnrn8pv9fws4"; + rev = "178629a8b81da2fa614bd6c19e7797e325ee9153"; + sha256 = "1bz8qjnwk3gz9h0194g3qqga91i4k78r9s1xymn2fv35llrfsdx0"; }; dependencies = []; @@ -1305,12 +1625,56 @@ rec { }; - vim-textobj-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-textobj-user-2017-09-28"; + vim-tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-tabpagecd-2013-11-29"; src = fetchgit { - url = "https://github.com/kana/vim-textobj-user"; - rev = "e231b65797b5765b3ee862d71077e9bd56f3ca3e"; - sha256 = "0zsgr2cn8s42d7jllnxw2cvqkl27lc921d1mkph7ny7jgnghaay9"; + url = "https://github.com/kana/vim-tabpagecd"; + rev = "8b71a03a037608fa5918f5096812577cec6355e4"; + sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; + }; + dependencies = []; + + }; + + vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-coffee-script-2018-02-27"; + src = fetchgit { + url = "https://github.com/kchmck/vim-coffee-script"; + rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; + sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; + }; + dependencies = []; + + }; + + rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "rainbow_parentheses-vim-2013-03-04"; + src = fetchgit { + url = "https://github.com/kien/rainbow_parentheses.vim"; + rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; + sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; + }; + dependencies = []; + + }; + + vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-signature-2018-04-04"; + src = fetchgit { + url = "https://github.com/kshenoy/vim-signature"; + rev = "968622e98238dd7cbd32fc5f4faa60c6b5aed6d8"; + sha256 = "0cwkb28zszf4sd5i0mcg6bjamjxxkxsr1plx79pwai5ckcgc2x72"; + }; + dependencies = []; + + }; + + vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gista-2017-02-20"; + src = fetchgit { + url = "https://github.com/lambdalisue/vim-gista"; + rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; + sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; }; dependencies = []; @@ -1328,11 +1692,11 @@ rec { }; typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "typescript-vim-2017-10-24"; + name = "typescript-vim-2018-03-08"; src = fetchgit { url = "https://github.com/leafgarland/typescript-vim"; - rev = "fbd0e9e508535f7d89778f7280dc76505348dcc6"; - sha256 = "1psxdkr35m1x6lpsrn2v482sn9n4pysw1i0j9nr1g7r4nh1058fk"; + rev = "e25636b44211a4be7b089bfed7cf09aa7dd086f5"; + sha256 = "1i422j4za5xwcv3zz7cjw523nnh5q652c04phqp681lgdmgqszh4"; }; dependencies = []; @@ -1350,11 +1714,22 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2017-12-07"; + name = "vimtex-2018-04-15"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "9851656a0c280d394f8e0f0fac61988613ea392e"; - sha256 = "1mwhj6nk00srlmvsdbpcnqcpwsr87ciwzxgdr1v489bb8l4rw9na"; + rev = "a7fc6f62e8234fc0696cfe4325153e922e2fddd5"; + sha256 = "0bvv9k3zqdmvh80mwhrzxwjacrfq1x56ba7yqndggygfxb3l17mf"; + }; + dependencies = []; + + }; + + cosco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "cosco-vim-2018-02-15"; + src = fetchgit { + url = "https://github.com/lfilho/cosco.vim"; + rev = "434dc68b93b8f42babe1887a269145ce39c97edf"; + sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv"; }; dependencies = []; @@ -1409,22 +1784,77 @@ rec { }; vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2017-12-06"; + name = "vim-highlightedyank-2018-04-17"; src = fetchgit { url = "https://github.com/machakann/vim-highlightedyank"; - rev = "7e072d62e79b68a548dfd0c18f7b739dca4cae74"; - sha256 = "1kkngy28nlbyb4dz010hjb8dxih1zlzwsr0yjkhqyvpz0k5vvyq9"; + rev = "6387f7cc3b768300d1fcf82d367dbcb8d16b6230"; + sha256 = "1ldyiy3qlxnxqkqa9yv39y5xkm7gma5gjy6nccqxxxjpjlyj39hb"; + }; + dependencies = []; + + }; + + tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tagbar-2017-12-17"; + src = fetchgit { + url = "https://github.com/majutsushi/tagbar"; + rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70"; + sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9"; + }; + dependencies = []; + + }; + + vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jsbeautify-2018-01-31"; + src = fetchgit { + url = "https://github.com/maksimr/vim-jsbeautify"; + rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624"; + sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq"; }; dependencies = []; }; Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Jenkinsfile-vim-syntax-2017-08-29"; + name = "Jenkinsfile-vim-syntax-2018-04-03"; src = fetchgit { url = "https://github.com/martinda/Jenkinsfile-vim-syntax"; - rev = "e3d2e19ad1c8f79872380901c0392c2671757831"; - sha256 = "18bfyjsxgqg562n8kkcnyd05pp17ipap7ray9az92fapzhw5q4x9"; + rev = "45418b171e06f63e0814cac6a656832384708aba"; + sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p"; + }; + dependencies = []; + + }; + + gist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "gist-vim-2016-10-10"; + src = fetchgit { + url = "https://github.com/mattn/gist-vim"; + rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; + sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; + }; + dependencies = []; + + }; + + webapi-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "webapi-vim-2018-03-14"; + src = fetchgit { + url = "https://github.com/mattn/webapi-vim"; + rev = "252250381a9509257bfb06b9f95441e41e3e23b5"; + sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a"; + }; + dependencies = []; + + }; + + undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "undotree-2017-10-26"; + src = fetchgit { + url = "https://github.com/mbbill/undotree"; + rev = "cdbb9022b8972d3e156b8d60af33bf795625b058"; + sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253"; }; dependencies = []; @@ -1464,44 +1894,55 @@ rec { }; vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grepper-git-2018-01-16"; + name = "vim-grepper-git-2018-04-13"; src = fetchgit { url = "https://github.com/mhinz/vim-grepper.git"; - rev = "4fd6260c56ffa0642095143f802d1cbfceb7437d"; - sha256 = "11rhj6m85hxd4kf8yms4mab8553dcgl0yxm9r7nhdqpz6mljsir9"; + rev = "27e73cfa7970bf38fe9037c0053a2edbb622b000"; + sha256 = "1hy9rjvfgry9426gflw4k5qmwzmijwg3gzmmzavf7m7sagl101kd"; + }; + dependencies = []; + + }; + + vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-signify-2018-04-17"; + src = fetchgit { + url = "https://github.com/mhinz/vim-signify"; + rev = "8351e5212f9415ccc1d9696518e1ec4337ad539f"; + sha256 = "12gix280mmsgn1z1ihbvzh67xqribrc39h670fzyn6302dzb05p0"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2017-12-20"; + name = "vim-startify-2018-04-10"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "5e476d8e00da70bc33c54a174fd8cb18ed991868"; - sha256 = "07k7ddjqc2jisk0sh9k8w6r5xhh47cbzbxdnbkjz7bdskkwsdsay"; + rev = "532f3db6be8c6e123abb3f6523c419b6b19436da"; + sha256 = "19inxsafsivdwgdvw59x3dbx65xkb09q0k2p66q4n57fj60bajmb"; }; dependencies = []; }; vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-indent-object-2017-03-23"; + name = "vim-indent-object-2018-04-08"; src = fetchgit { url = "https://github.com/michaeljsmith/vim-indent-object"; - rev = "41d700f14b3decccdde421fbfe49e95a084a2f89"; - sha256 = "12mi4n5abfxx7xjl46aw400acgrjf1fxjgzak763l874y0whf5v2"; + rev = "5c5b24c959478929b54a9e831a8e2e651a465965"; + sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19"; }; dependencies = []; }; ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ack-vim-2017-11-05"; + name = "ack-vim-2018-02-28"; src = fetchgit { url = "https://github.com/mileszs/ack.vim"; - rev = "6e04746a63dd2453601ae36c83d53fe2021a45f4"; - sha256 = "0453ghmaaqwv6z8a3sncd3jxs9j050sp9ymiw2aqpc1a28kdlrv8"; + rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042"; + sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm"; }; dependencies = []; @@ -1532,6 +1973,17 @@ rec { }; + gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "gruvbox-2018-02-25"; + src = fetchgit { + url = "https://github.com/morhetz/gruvbox"; + rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86"; + sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi"; + }; + dependencies = []; + + }; + hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "hlint-refactor-vim-2015-12-05"; src = fetchgit { @@ -1565,23 +2017,34 @@ rec { }; + vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-easygit-2018-04-02"; + src = fetchgit { + url = "https://github.com/neoclide/vim-easygit"; + rev = "db10f7bbe0106c7b74875d4530f0c20e6aceee51"; + sha256 = "194mgkyqxn4s8mj8gwkjznixm7kbpzhawr6f0bphk6bc5llphnkr"; + }; + dependencies = []; + + }; + haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2017-10-16"; + name = "haskell-vim-2018-04-13"; src = fetchgit { url = "https://github.com/neovimhaskell/haskell-vim"; - rev = "d877d5cd5f2f5747fa835d4b639499187fa4ae9e"; - sha256 = "16iihz0jy61s5dyzzf5dbvd6ii1zna98pckqkjlpxcqqx636sm5c"; + rev = "e027b314df128979dbd00dd94c9db080db156b5c"; + sha256 = "13dx1ifwa444q8zkwda4qha74xjm4jfhhk9lbgbj9p1mj7gvbl7f"; }; dependencies = []; }; cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "cpsm-2017-10-30"; + name = "cpsm-2018-02-01"; src = fetchgit { url = "https://github.com/nixprime/cpsm"; - rev = "3744240ca48f98eea064f3cbc1a62b3f25f44030"; - sha256 = "0x5jac7x85bqdh38vggi1fvxjw2z29b2227n471f3cxy8arvylrw"; + rev = "8a4a0a05162762b857b656d51b59a5bf01850877"; + sha256 = "0v44gf9ygrqc6rpfpiq329jija4icy0iy240yk30c0r04mjahc0b"; }; dependencies = []; buildInputs = [ @@ -1590,6 +2053,7 @@ rec { cmake boost icu + ncurses ]; buildPhase = '' patchShebangs . @@ -1598,6 +2062,17 @@ rec { ''; }; + vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-iced-coffee-script-2013-12-27"; + src = fetchgit { + url = "https://github.com/noc7c9/vim-iced-coffee-script"; + rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; + sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; + }; + dependencies = []; + + }; + shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "shabadou-vim-2016-07-19"; src = fetchgit { @@ -1631,23 +2106,34 @@ rec { }; + vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-javascript-2018-04-06"; + src = fetchgit { + url = "https://github.com/pangloss/vim-javascript"; + rev = "c99c96bdf12b5a5749c9bbdb977b070e14c15eb3"; + sha256 = "1lyiy7vfkliw91j6mvq77n4221fws6hkv0az362r32114d97309l"; + }; + dependencies = []; + + }; + vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-markdown-2017-05-10"; + name = "vim-markdown-2018-03-23"; src = fetchgit { url = "https://github.com/plasticboy/vim-markdown"; - rev = "3fcde7215e22913f004c2836fd46ff61746be6db"; - sha256 = "0ymbs7235zi5hwyzc0vaikb3n6jwj6xarmgjj4lpf4wbsa1212yy"; + rev = "8ace66328c7a2f416671b863cd842712d36c53cc"; + sha256 = "09pcxwwblq2bwdrq6qa42hw7sllgym42n7gb8igg6p9krkwvjx7s"; }; dependencies = []; }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2017-12-01"; + name = "python-mode-2018-04-09"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "2ae7a2323d7632eaa5fc5170c287608ecf8d25c5"; - sha256 = "1qd7akvqlmrcxiknv1fxqb37vimlicidibxzc4jm9i05cvk1z68p"; + rev = "5308d0cc241080057a58c1772ebd254f2922998d"; + sha256 = "1pkwhl9ab1fybc4sp5721xzlrzhzigf34w8zlmxby8v4nvmb8ggq"; }; dependencies = []; @@ -1665,44 +2151,55 @@ rec { }; purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "purescript-vim-2017-10-19"; + name = "purescript-vim-2018-03-31"; src = fetchgit { url = "https://github.com/raichoo/purescript-vim"; - rev = "ece34d9782a075761f31854a33eccd932eb2cf57"; - sha256 = "0x6hpibmhgw5aqq25rcpvgz2a60jh7i8x23gigakmmrxv51cjcrj"; + rev = "8528d2a4a84f428aefad5882212c34db5c852699"; + sha256 = "0dkh1cm9z644x5cj9dxwdkyb0r9sji71jv35cyy7z0aj9b8x2jbf"; + }; + dependencies = []; + + }; + + vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-pencil-2017-06-14"; + src = fetchgit { + url = "https://github.com/reedes/vim-pencil"; + rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; + sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; }; dependencies = []; }; vim-wordy = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wordy-2016-11-07"; + name = "vim-wordy-2018-03-10"; src = fetchgit { url = "https://github.com/reedes/vim-wordy"; - rev = "bd37684a041fce85c34bb56c41c5a12c04a376ca"; - sha256 = "0lv3ff1yfqdz2vj6lwaygslds1ccidbb09f4x1cdwlawxdgh3w2v"; + rev = "14b9dbf76a82e29273a74768573900361200467f"; + sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk"; }; dependencies = []; }; committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "committia-vim-git-2017-12-04"; + name = "committia-vim-git-2018-04-11"; src = fetchgit { url = "https://github.com/rhysd/committia.vim.git"; - rev = "51aec02e5ab07c89fa5d5445cfe3a8e0098bec27"; - sha256 = "08nqncgnmbvhnn850s6hhp6p6scqg2iiwrl9air952yh9pl91h84"; + rev = "02a317cb49689b2424232d607d218511f921f2e4"; + sha256 = "1bfdkj0jbhkklnzd894aigx1cply8bbpzkskvzmbsj7h7jm9iyz5"; }; dependencies = []; }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2017-08-25"; + name = "vim-grammarous-2018-04-16"; src = fetchgit { url = "https://github.com/rhysd/vim-grammarous"; - rev = "51ef5190813c0d9d8aaebd5191f183cff767f805"; - sha256 = "1mm8hd39q2sl4hi83c4zvrl27a8djr1pv35ch0pivg84ad9p7qq5"; + rev = "fc7e73f2af96fb1745887dabde9bf8b945d0273d"; + sha256 = "0zfnbdsva140hc50s4fr1as5c1mn3hfm43x53sk50fylb51r9hr7"; }; dependencies = []; # use `:GrammarousCheck` to initialize checking @@ -1729,11 +2226,11 @@ rec { }; vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-puppet-2017-08-25"; + name = "vim-puppet-2018-04-12"; src = fetchgit { url = "https://github.com/rodjek/vim-puppet"; - rev = "0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e3"; - sha256 = "1jgn9vahyn80zz0wfzx9abamsahh9wrrq1nf9qghljm4si3fq766"; + rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097"; + sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv"; }; dependencies = []; @@ -1751,44 +2248,77 @@ rec { }; nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nvim-completion-manager-2017-11-09"; + name = "nvim-completion-manager-2017-12-28"; src = fetchgit { url = "https://github.com/roxma/nvim-completion-manager"; - rev = "21c4b617419c4de782a533c07afcf6cbc453a94a"; - sha256 = "0rdjp1qis96d83g967h73jlhlg27danrvvndljfq2ncgpg3b2x16"; + rev = "e724a442072261993ca503e969d2cb25722ab1d2"; + sha256 = "00q52vl06hgcinclszm21a3rx7ivc147p52w1p29icksc26yxhjb"; }; dependencies = []; }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2017-09-20"; + name = "rust-vim-2018-01-15"; src = fetchgit { url = "https://github.com/rust-lang/rust.vim"; - rev = "b6d88adcf9867aa69f4d20d45d49bb54979842a4"; - sha256 = "0n0hiqlv3amnzn69wyyq6z3r8zr0gcg86hw6flk7z39cxjhjv3vr"; + rev = "8e75da9834abb22f8d7ece3f4ca4324a14fa18a6"; + sha256 = "1mn4jijfzz2jq215dnwkq5gxiw0ysmvrsrvq4aypr2ms2040iqiq"; }; dependencies = []; }; vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-devicons-2017-10-13"; + name = "vim-devicons-2018-03-14"; src = fetchgit { url = "https://github.com/ryanoasis/vim-devicons"; - rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8"; - sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m"; + rev = "390b0142f1b6f02bdecc4867009e83c9ecc01db2"; + sha256 = "1pzvhdcgyp85xx858a7i357d3xymrd0y2afwfpnsrhz35fsaw96z"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2017-12-04"; + name = "neoformat-2018-04-07"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "81d2d19e6bb65432b95f930af38ca6dab89d0434"; - sha256 = "13ivv4ymkxk5rl5hkrlb4r328vhhpw6il0zdsynp9j41d4qq198s"; + rev = "77c2c007508823f353f75a6b525d63ae21e55e82"; + sha256 = "1xrvbkc8y40dgyiq5jnp0nhg19mh7m7v902hb9z3lkl6fsbcwbmb"; + }; + dependencies = []; + + }; + + nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nerdcommenter-2018-03-03"; + src = fetchgit { + url = "https://github.com/scrooloose/nerdcommenter"; + rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1"; + sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4"; + }; + dependencies = []; + + }; + + nerdtree = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nerdtree-2018-04-10"; + src = fetchgit { + url = "https://github.com/scrooloose/nerdtree"; + rev = "727770147a7589ab3a06722f4852c0237c8b3549"; + sha256 = "105vgwy7qs6l92dm6kfby7lmxv35v2hbpjk9z5sr0qak5rad4m6c"; + }; + dependencies = []; + + }; + + syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "syntastic-2018-04-17"; + src = fetchgit { + url = "https://github.com/scrooloose/syntastic"; + rev = "d31e270cc8affc6338a9ed44e2efcaec0ca4cd34"; + sha256 = "121a1mxgfng2y5zmivyyk02mca8pyw72crivf4f1q9nhn0barf57"; }; dependencies = []; @@ -1806,44 +2336,44 @@ rec { }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2017-12-06"; + name = "vim-polyglot-2018-04-03"; src = fetchgit { url = "https://github.com/sheerun/vim-polyglot"; - rev = "11f53253ad9fd0cd3e7a44ed9f8c80a4f265b46e"; - sha256 = "1p1h0flhzcaivrpsxb1xc1lc0kc901aq80p32j15ia3g2ib8vl4y"; + rev = "cab6866e21341cab7419cdb4ae1fd18437d31bb0"; + sha256 = "17mizznm80yj5vz6vajwix8m8xmsn552lph5vmic5dpg7bcny6m6"; }; dependencies = []; }; context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "context_filetype-vim-2017-11-15"; + name = "context_filetype-vim-2018-04-01"; src = fetchgit { url = "https://github.com/shougo/context_filetype.vim"; - rev = "6856503cd938d018c2d42277ee6ca896fd63f5a2"; - sha256 = "1s4nimpvc5ps602h8xb231nvmk9jbzs981an5kxr3idmmk44j5ms"; + rev = "9ed76080795ef76f52b8c9ae4432df7cd81abc5a"; + sha256 = "137ki4104j4ch54k9n1l1xd75vbxqssi1fdckzv8kd07m5i159i2"; }; dependencies = []; }; denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-01-16"; + name = "denite-nvim-2018-04-14"; src = fetchgit { url = "https://github.com/shougo/denite.nvim"; - rev = "0d48d8d498d410a5ea4403648d528e7267d87461"; - sha256 = "1npag0da8s3jv4jm8waqvsdfg0gnqhkc07r3m17zp2r2bh3b9bjc"; + rev = "c0c75a752577399be53aa7a7e235e6ff5387494c"; + sha256 = "1zbf2f0w02q8jwr824l6v0pxbc620rwfsah6mxyqbr5mxddcf1v6"; }; dependencies = []; }; echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "echodoc-vim-2018-01-12"; + name = "echodoc-vim-2018-03-26"; src = fetchgit { url = "https://github.com/shougo/echodoc.vim"; - rev = "410ead5a9fa4400b51771cba3b7599722c9e65b1"; - sha256 = "01czpvn5rs37x0ml8bc5vwyhklm6fk3wl339smc3jvyr1w73rrf5"; + rev = "f1f711bc814165cf5b09b56fd5d733917ed1c015"; + sha256 = "0l0sm862fbr8p8m4wykx1riidxgp233cq6r2zdm2l7gvmqyj3zcr"; }; dependencies = []; @@ -1872,22 +2402,22 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2017-10-22"; + name = "neocomplete-vim-2018-03-28"; src = fetchgit { url = "https://github.com/shougo/neocomplete.vim"; - rev = "46791e7692e07384a089d125c5c536246698d04c"; - sha256 = "1iqd6fqlkm8bvibsapcvqqmyklzjad2l0c745lppdgdb959v016a"; + rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3"; + sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8"; }; dependencies = []; }; neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoinclude-vim-2017-10-01"; + name = "neoinclude-vim-2018-02-12"; src = fetchgit { url = "https://github.com/shougo/neoinclude.vim"; - rev = "b5956ac824fdd60d6eacaa597c8d329252972d8b"; - sha256 = "07x7hxqhklcr5y8zkw9939cwx7rpiicjlc65bn526fkmhcc2hng6"; + rev = "b63757822e0c31db04b32f0ca6bab01a560c2498"; + sha256 = "1q2pbvl0xspjzwnisnrmv6w9wq289avzz2248hnm0v20rxvy5lwj"; }; dependencies = []; @@ -1905,33 +2435,33 @@ rec { }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2017-09-26"; + name = "neosnippet-snippets-2018-04-15"; src = fetchgit { url = "https://github.com/shougo/neosnippet-snippets"; - rev = "8dbb78599984140c50418d3dd23d0de4c8f13e74"; - sha256 = "1hs4xvr9x03ccrcczhly4qlvr5bfxfvdk3ir4821mlg1gsgclkwh"; + rev = "f453635c60998071299c3239c3d881f2be0c248e"; + sha256 = "1df6mzk5yjhjlmzgz7lr9aa69a973mzfxmwldqnpi6yjfnmjn04c"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2017-11-23"; + name = "neosnippet-vim-2018-03-12"; src = fetchgit { url = "https://github.com/shougo/neosnippet.vim"; - rev = "9ee1b4e059d4ffcc02312da13ee36315dacbffe4"; - sha256 = "0c4pk02hnvzgj6pwy4lx481n7gj2fjwlsmcy7vxfps9h8h9qd6kw"; + rev = "8cf286e3bf7a5fc859f4c5f1bef52c351f24fefa"; + sha256 = "15mxckg5s9pjfm7xkhs4awx0vpmwdwwifqrvrh1r4mbia39pk6ry"; }; dependencies = []; }; neoyank-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoyank-vim-git-2017-12-19"; + name = "neoyank-vim-git-2018-03-26"; src = fetchgit { url = "https://github.com/shougo/neoyank.vim.git"; - rev = "5d6e6f80e1920fc38ab5cf779c424a1fdb49202d"; - sha256 = "0l2gfwyiyzppb0hs9sx3x7ndq9zzinppzqq3njwjzd1qgfv29jpq"; + rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef"; + sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928"; }; dependencies = []; @@ -1949,22 +2479,22 @@ rec { }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2017-12-06"; + name = "unite-vim-2018-04-14"; src = fetchgit { url = "https://github.com/shougo/unite.vim"; - rev = "49fe0efad7a838a5bec9e653fb80504c94744ff9"; - sha256 = "0vlpk053vdd5iqx2hmg9kvhg4270gq437smawdwjh88vriix3f1d"; + rev = "7252fc334ed24722ad70867ba9e4aba125b611d7"; + sha256 = "0r2na9i15qfmshzk0wr845nyn8h8mpbkz5xanjibsch2xz6fps76"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2017-11-21"; + name = "vimproc-vim-2018-01-07"; src = fetchgit { url = "https://github.com/shougo/vimproc.vim"; - rev = "81f4fa5239705724a49fbecd3299ced843f4972f"; - sha256 = "03pkp37d07nx857kqz2h6q2z13ca2944zq2lcqdcc97s9nnjnzha"; + rev = "2300224d366642f4f8d6f88861535d4ccbe20143"; + sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia"; }; dependencies = []; buildInputs = [ which ]; @@ -2000,11 +2530,11 @@ rec { }; alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2017-11-22"; + name = "alchemist-vim-2018-03-22"; src = fetchgit { url = "https://github.com/slashmili/alchemist.vim"; - rev = "1e08668e844ef5c6cb552e83bb842285a6ba4228"; - sha256 = "05viwrvakxnc4fajscn7chvldc9vvjssbz4c81vdw8wgwxv8qay7"; + rev = "fdc880663e0d76d29d6310553ae12d51565f692d"; + sha256 = "03p5cw5j1j6v3x9gg61d95qzcijj1q0yqz5qdkjgll0fp507j8ak"; }; dependencies = []; @@ -2043,23 +2573,67 @@ rec { }; + vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-multiple-cursors-2018-04-09"; + src = fetchgit { + url = "https://github.com/terryma/vim-multiple-cursors"; + rev = "8ae5dd3f4f344cc2abe79783a8b808e4093bf084"; + sha256 = "0zj5dm86daqzl6f76prlfalpsb3vxxl7x1k6kza8hcbyicaxsi49"; + }; + dependencies = []; + + }; + vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimpreviewpandoc-2016-03-07"; + name = "vimpreviewpandoc-2018-04-02"; src = fetchgit { url = "https://github.com/tex/vimpreviewpandoc"; - rev = "b109d41ad6478df5ec7f1311950c6efca66f36e4"; - sha256 = "1gx326xarjs3qjygpkrknncad90crjqfx8v6pir4r7k1hl7dfxc4"; + rev = "83b0958b570dace55166f565e2d88c468d99d854"; + sha256 = "1fa8624wxry53x62xjmglgm6kwppfcg50ifbzms555bfjsd4fxn8"; + }; + dependencies = []; + + }; + + vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ft-diff_fold-2013-02-10"; + src = fetchgit { + url = "https://github.com/thinca/vim-ft-diff_fold"; + rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; + sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; + }; + dependencies = []; + + }; + + vim-prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-prettyprint-2016-07-16"; + src = fetchgit { + url = "https://github.com/thinca/vim-prettyprint"; + rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; + sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; }; dependencies = []; }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2017-11-25"; + name = "vim-quickrun-2018-04-16"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun"; - rev = "1170ba086f8e27c123add196675ddab64a59ce70"; - sha256 = "1vpllpinqf46ymsr7n1ywip4y7ibm3i8cidh271a57cvac0hig6d"; + rev = "630ddff167e30c55d21985713ad6729adeb8e40b"; + sha256 = "0r2gg3a8q5627n28xgyhmb6275xwvg76ghc1wdy38xdszvykh024"; + }; + dependencies = []; + + }; + + vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-scouter-2014-08-10"; + src = fetchgit { + url = "https://github.com/thinca/vim-scouter"; + rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; + sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; }; dependencies = []; @@ -2087,34 +2661,89 @@ rec { }; + vim-solidity = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-solidity-2018-04-17"; + src = fetchgit { + url = "https://github.com/tomlion/vim-solidity"; + rev = "569bbbedc3898236d5912fed0caf114936112ae4"; + sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx"; + }; + dependencies = []; + + }; + + tlib_vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tlib_vim-2018-04-08"; + src = fetchgit { + url = "https://github.com/tomtom/tlib_vim"; + rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b"; + sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx"; + }; + dependencies = []; + + }; + + vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-commentary-2018-04-06"; + src = fetchgit { + url = "https://github.com/tpope/vim-commentary"; + rev = "296d99b353261191adb7a356ee3fefbce8e6096b"; + sha256 = "1n29rbgm2464byncmgxbvyizmag1gzswg00nfg2387nwprmpg7zj"; + }; + dependencies = []; + + }; + vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2017-10-10"; + name = "vim-dispatch-2018-04-15"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "be7b194f47bdee6baa4460ccd030b860ada548dd"; - sha256 = "0lxhk6y1lf625i8hnsl44wzh8mfxi2h1hswrmisbmm2dbmyy84hd"; + rev = "f6b3e7799e6dce08869d7744aa7faa6528f065f5"; + sha256 = "1zn6c54hlygkx348vd7kgkfpdj93vsijhc2ma42k6s7vhwqfyylg"; }; dependencies = []; }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2017-06-08"; + name = "vim-eunuch-2018-03-16"; src = fetchgit { url = "https://github.com/tpope/vim-eunuch"; - rev = "b536b887072ff3cc382842ce9f675ec222302f4f"; - sha256 = "0vp037kb12mawy186cm384m5hl0p051rihhm1jr2qck0vwaps58p"; + rev = "0971b4cb5c0865d3dd0316f725cd4236ff75b828"; + sha256 = "1lw2ycgxypp0j8kyvlgn8hivqf1dj9rfrx8n7zgayy5w756g45cy"; + }; + dependencies = []; + + }; + + vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-fugitive-2018-04-15"; + src = fetchgit { + url = "https://github.com/tpope/vim-fugitive"; + rev = "40d78f07dee2ffab68abb9d6d1a9e27843df0fe0"; + sha256 = "16fh3n8sr57cfhfpilqhz9f3svhj4swa9yqjf4wicbw9zn40hrir"; + }; + dependencies = []; + + }; + + vim-pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-pathogen-2018-04-05"; + src = fetchgit { + url = "https://github.com/tpope/vim-pathogen"; + rev = "06da921608b971fb47603671bcafdb2843992eb3"; + sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi"; }; dependencies = []; }; vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-repeat-2017-04-21"; + name = "vim-repeat-2018-01-30"; src = fetchgit { url = "https://github.com/tpope/vim-repeat"; - rev = "070ee903245999b2b79f7386631ffd29ce9b8e9f"; - sha256 = "1grsaaar2ng1049gc3r8wbbp5imp31z1lcg399vhh3k36y34q213"; + rev = "8106e142dfdc278ff3eaaadd7b362ad7949d4357"; + sha256 = "1q0bmqxi1kqxq7g8l0qj7y93g9rqffwc3fbmhpj3chx2kswhd5hc"; }; dependencies = []; @@ -2131,6 +2760,28 @@ rec { }; + vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-sensible-2018-01-22"; + src = fetchgit { + url = "https://github.com/tpope/vim-sensible"; + rev = "2d60332fa5b2b1ea346864245569df426052865a"; + sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb"; + }; + dependencies = []; + + }; + + vim-sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-sleuth-2018-03-30"; + src = fetchgit { + url = "https://github.com/tpope/vim-sleuth"; + rev = "3b9df28c39f93c5ec8179d958900be1d0100b536"; + sha256 = "10rba71hmmbgv5kfsl0lmj59z1nz7b2rr6p0dmww82zp6cyzy5j0"; + }; + dependencies = []; + + }; + vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-speeddating-2017-05-24"; src = fetchgit { @@ -2142,6 +2793,28 @@ rec { }; + vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-surround-2016-06-01"; + src = fetchgit { + url = "https://github.com/tpope/vim-surround"; + rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313"; + sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46"; + }; + dependencies = []; + + }; + + vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-vinegar-2018-04-03"; + src = fetchgit { + url = "https://github.com/tpope/vim-vinegar"; + rev = "97f3fbc9596f3997ebf8e30bfdd00ebb34597722"; + sha256 = "0y2nzvn4xxbgyjmm4mirwak4hnzka2g3w8xm64f1smh4cb3jn0yf"; + }; + dependencies = []; + + }; + hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "hasksyn-2014-09-03"; src = fetchgit { @@ -2164,23 +2837,45 @@ rec { }; + caw-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "caw-vim-2018-01-01"; + src = fetchgit { + url = "https://github.com/tyru/caw.vim"; + rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42"; + sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari"; + }; + dependencies = []; + + }; + open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "open-browser-vim-2017-12-15"; + name = "open-browser-vim-2018-03-11"; src = fetchgit { url = "https://github.com/tyru/open-browser.vim"; - rev = "ee8decb2b26020320128eecd7a96383d995c8804"; - sha256 = "1a9j13h174lkp1gqd80idwdb8d74gdkyfgvb2l153jcqyvwpzcl2"; + rev = "43b08d6642f26af5a875b0d0bdb3aa9a6d12e7eb"; + sha256 = "162dv172n16jpjr812d561yyj9rz9xn4qrfx18wlpyixj3qf2bda"; + }; + dependencies = []; + + }; + + neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neco-look-2018-01-21"; + src = fetchgit { + url = "https://github.com/ujihisa/neco-look"; + rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c"; + sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj"; }; dependencies = []; }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2017-12-03"; + name = "youcompleteme-2018-04-16"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "290dd94721d1bc97fab4f2e975a0cf6258abfbac"; - sha256 = "0jhaixhx9lxqwb8ncxkafn478cc4dkh7ss6qjn29lcn9qdy9bvd7"; + rev = "6975efddc1a90514db7c8ee882ccac91f70ff4cc"; + sha256 = "1zmbb91fc0axavxln4milmn95d9szx8zwdiiwqjdyybkm29nxhc9"; }; dependencies = []; buildPhase = '' @@ -2194,30 +2889,41 @@ rec { meta = { description = "Fastest non utf-8 aware word and C completion engine for Vim"; - homepage = https://github.com/Valloric/YouCompleteMe; + homepage = http://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; platforms = stdenv.lib.platforms.unix; }; }; + vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-airline-2018-04-17"; + src = fetchgit { + url = "https://github.com/vim-airline/vim-airline"; + rev = "3ad4a18d858bb80d45a1c054b845021abe5c8f0d"; + sha256 = "1sgf9czgajba8nf7xbfa2dm26vw356ca55m1myaxlkqrlcckcvav"; + }; + dependencies = []; + + }; + vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2017-11-18"; + name = "vim-airline-themes-2018-03-24"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "52dfa2b6c0dc2fd7a0e92954030893de3d173105"; - sha256 = "0m65xmg259781r1wk8dz0d0diiayqyl1wahsb2fdqs369wwx4irr"; + rev = "b0fca80555b8249f3c62271b7635542a7de22363"; + sha256 = "1ap7b7v1v3n4hpnj2w24w0dli2sliphvpyfhkdbhbq4c30znm1pk"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2017-11-22"; + name = "vim-pandoc-2018-01-11"; src = fetchgit { url = "https://github.com/vim-pandoc/vim-pandoc"; - rev = "6ab0e8ed4dd3325d6b304e8f97f2cba80e3269ae"; - sha256 = "07zdkp7g9y2vp3f9j2f12acap4ykgjp85in5qnhmg4dw8l8r07x5"; + rev = "3a686781ab5ea622616798475deb394e48d3cc48"; + sha256 = "1nvz8v52jydkvnlid5w8dkjmr548ryla2vaxnlgj125aamkvmgn3"; }; dependencies = []; @@ -2245,6 +2951,17 @@ rec { }; + vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ruby-2018-04-01"; + src = fetchgit { + url = "https://github.com/vim-ruby/vim-ruby"; + rev = "71f5df78a45c5458da793b2c897ff5dcdcd9a819"; + sha256 = "1nblkhb1yp3q0rfq43l9968inn1z26vngf28n23y161ncfmq674y"; + }; + dependencies = []; + + }; + Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Colour-Sampler-Pack-2012-11-29"; src = fetchgit { @@ -2289,6 +3006,17 @@ rec { }; + YankRing-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "YankRing-vim-2015-07-28"; + src = fetchgit { + url = "https://github.com/vim-scripts/YankRing.vim"; + rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65"; + sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw"; + }; + dependencies = []; + + }; + a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "a-vim-2010-11-06"; src = fetchgit { @@ -2322,6 +3050,17 @@ rec { }; + bats-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "bats-vim-2013-07-03"; + src = fetchgit { + url = "https://github.com/vim-scripts/bats.vim"; + rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a"; + sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx"; + }; + dependencies = []; + + }; + changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "changeColorScheme-vim-2010-10-17"; src = fetchgit { @@ -2333,6 +3072,17 @@ rec { }; + matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "matchit-zip-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/matchit.zip"; + rev = "ced6c409c9beeb0b4142d21906606bd194411d1d"; + sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm"; + }; + dependencies = []; + + }; + mayansmoke-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "mayansmoke-git-2010-10-17"; src = fetchgit { @@ -2366,6 +3116,17 @@ rec { }; + taglist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "taglist-vim-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/taglist.vim"; + rev = "53041fbc45398a9af631a20657e109707a455339"; + sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd"; + }; + dependencies = []; + + }; + wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "wombat256-vim-2010-10-17"; src = fetchgit { @@ -2377,34 +3138,67 @@ rec { }; + vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimoutliner-2018-04-09"; + src = fetchgit { + url = "https://github.com/vimoutliner/vimoutliner"; + rev = "4f12628247940d98eedd594961695dc504261058"; + sha256 = "1z44zf9wvd6mc1zb6ywrkjw87yrj1blmc5s03xk9zv5q8hskjl78"; + }; + dependencies = []; + + }; + + vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimwiki-2018-04-17"; + src = fetchgit { + url = "https://github.com/vimwiki/vimwiki"; + rev = "90dc1e58717bd25798bb16d3badab8908b619912"; + sha256 = "01a2gy1r4k5gw7vrdn6p0vmybb2s0gf9q0w07qps5cnxapsggxk9"; + }; + dependencies = []; + + }; + ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-02-25"; + name = "ale-2018-04-17"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "7ec684206c1395a940d8ad2d26d59773a432115c"; - sha256 = "1hvybsvs2i01q3s9wpydyxgsvg59r2valk61vl4jh2mrrh0bfi9i"; + rev = "f9ba3d924fc445ceea6ab7a6700b95dd12d268ca"; + sha256 = "12905gq95xif3963720yqywvzpvxz7j8qyk0i6pnmzjf92xnk8xm"; }; dependencies = []; }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2017-11-24"; + name = "vim-wakatime-2018-04-05"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "48b4e59dcd75890eb56d7ceb2d57ff63ed17c373"; - sha256 = "0aspkigh08cdnv2mq425dapklxizir134zksrm608q02qpf0m7hg"; + rev = "e0e7621f18a8763b851b0feb4a735633bf147cf7"; + sha256 = "1xnrcxd7r08hqrv2fnv8x8p60nx2flh2pfcr4pkkscr0ilinakwz"; }; dependencies = []; buildInputs = [ python ]; }; targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "targets-vim-2017-12-03"; + name = "targets-vim-2018-02-28"; src = fetchgit { url = "https://github.com/wellle/targets.vim"; - rev = "6f809397526797f8f419a5d2b86d90e5aff68e66"; - sha256 = "0djjm7b41kgrkz447br7qi3w96ayz9lyxd164gyp082qqxxpz63q"; + rev = "c1732189c9ec29cc3320094304019ffcafadafc4"; + sha256 = "12ryicmb29qhmn216xdv9g8rl170mz5zrbfnmqja3wdlwkj3g83j"; + }; + dependencies = []; + + }; + + vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-dirdiff-2018-01-30"; + src = fetchgit { + url = "https://github.com/will133/vim-dirdiff"; + rev = "b5a3d59bfbeb5cef7dbadbe69c455b470988b58c"; + sha256 = "16hc88k00xa757k0h53r1sbqwxdxdy0118yl2vsigd6rqk474nw1"; }; dependencies = []; @@ -2447,23 +3241,34 @@ rec { }; + vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-latex-live-preview-2017-11-09"; + src = fetchgit { + url = "https://github.com/xuhdev/vim-latex-live-preview"; + rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; + sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; + }; + dependencies = []; + + }; + nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nim-vim-2017-11-29"; + name = "nim-vim-2018-02-27"; src = fetchgit { url = "https://github.com/zah/nim.vim"; - rev = "8167c50bd421c921b198001387e60d4728868010"; - sha256 = "0yk6qmxns3jzb7riwyrddmlszy89s0ihii0462rfa4b8wlmpan1l"; + rev = "bdc19809d22190d9b8e85377252a24d930cd25f8"; + sha256 = "08abwnzim767jvin6jsp2a580hpxzb2w5hbf8w5dhkvxv2pgk0vz"; }; dependencies = []; }; deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2017-11-14"; + name = "deoplete-go-2018-02-04"; src = fetchgit { url = "https://github.com/zchee/deoplete-go"; - rev = "844a0dce554f92cbd9938baf34f1801b5d872e58"; - sha256 = "15sf8ssb85va6b0si07nyh5c5xdikdl99fihgprqk1wxi9mp28cj"; + rev = "513ae17f1bd33954da80059a21c128a315726a81"; + sha256 = "0rfxzryccrq3dnjgb9aljzrmfjk7p8l2qdjkl8ar4bh2hmz8vn5y"; }; dependencies = []; buildInputs = [ python3 ]; @@ -2476,814 +3281,22 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2017-12-05"; + name = "deoplete-jedi-2018-04-07"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "715acf2847b8fa8d436a10a4c3dfd7187d53b72f"; - sha256 = "12d16z4mvc6aln5vnrdf275ci1w7v454zl9x54khqfikc0pwyjg8"; + rev = "eb777b50b7d218a23464c7d58c8573b5223d52f4"; + sha256 = "1j2jfvgzj2y7pp8z441rs8ffbn1hmiwa7h556kf6mjlmyzs5cfma"; }; dependencies = []; }; zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zig-vim-2017-10-17"; + name = "zig-vim-2018-04-15"; src = fetchgit { url = "https://github.com/zig-lang/zig.vim"; - rev = "6059db59f61b517f5d65303b61f03324e01fdc2f"; - sha256 = "0w3pa63s0r6h6w1iqmc444qrsc99xcccwapd6nyh3gb72z228d7z"; - }; - dependencies = []; - - }; - - goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "goyo-2017-06-01"; - src = fetchgit { - url = "git://github.com/junegunn/goyo.vim"; - rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; - sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj"; - }; - dependencies = []; - - }; - - gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gruvbox-2017-10-01"; - src = fetchgit { - url = "git://github.com/morhetz/gruvbox"; - rev = "16504d394e145e0372d2491e02769d241350399a"; - sha256 = "0yhas9lnsn9lfld37lvm5msmmkj6c7d8ajgarazc5rykbl8bw8rg"; - }; - dependencies = []; - - }; - - maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "maktaba-2017-05-07"; - src = fetchgit { - url = "git://github.com/google/vim-maktaba"; - rev = "2ae8b4478ea9bc2c6c8106acb55ddfb935754fb9"; - sha256 = "1w8paqn0qyk4j5wfx48rc2za7kzhgdaggikklmjr1vsv2y0b8fzc"; - }; - dependencies = []; - - }; - - gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gitv-2017-11-26"; - src = fetchgit { - url = "https://github.com/gregsexton/gitv"; - rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35"; - sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w"; - }; - dependencies = ["fugitive"]; - - }; - - - matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "matchit-zip"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=8196"; - name = "matchit.zip"; - sha256 = "1bbm8j1bhb70kagwdimwy9vcvlrz9ax5bk2a7wrmn4cy87f9xj4l"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - homepage = "http://www.vim.org/scripts/script.php?script_id=39"; - }; - - unpackPhase = '' - ( - sourceRoot=d - mkdir $sourceRoot; cd $sourceRoot; - unzip $src - ) - ''; - }; - - neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-look-2018-01-07"; - src = fetchgit { - url = "git://github.com/ujihisa/neco-look"; - rev = "ff3de2731177694d0e85f1227b6cfd51c8e2bc8d"; - sha256 = "0zpny9sj7alzsbrjbph71b44zf575hij1ky8pwgba0ygp2p2fxd4"; - }; - dependencies = []; - - }; - - pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2017-08-04"; - src = fetchgit { - url = "git://github.com/tpope/vim-pathogen"; - rev = "e7857bed4e0705f91f781dbe99706f07d08d104b"; - sha256 = "15s08q1chrdywj7fdiwzygxywg4cpcbvk5r1r8zvw6d82kyhadw1"; - }; - dependencies = []; - - }; - - prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "prettyprint-2016-07-16"; - src = fetchgit { - url = "git://github.com/thinca/vim-prettyprint"; - rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; - sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; - }; - dependencies = []; - - }; - - quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "quickfixstatus-2011-09-02"; - src = fetchgit { - url = "git://github.com/dannyob/quickfixstatus"; - rev = "fd3875b914fc51bbefefa8c4995588c088163053"; - sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; - }; - dependencies = []; - - }; - - rainbow_parentheses = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow_parentheses-2013-03-04"; - src = fetchgit { - url = "git://github.com/kien/rainbow_parentheses.vim"; - rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; - sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; - }; - dependencies = []; - - }; - - riv = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "riv-2017-02-07"; - src = fetchgit { - url = "git://github.com/Rykka/riv.vim"; - rev = "d1efdd92fbb51dc452c61eec54a0ec084f011b4b"; - sha256 = "18qcglbrixgqk05x34dy2cksaw0dg7n51p48i6zkh5sqspv98zz3"; - }; - dependencies = []; - - }; - - sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible-2017-05-09"; - src = fetchgit { - url = "git://github.com/tpope/vim-sensible"; - rev = "49ee364222dc2a5a00dddf89fd61880e3e39d46a"; - sha256 = "0x9zn547hzzxjzplr2rkzhydh2y0a4fdkrwmdvw2yp203msyhcjx"; - }; - dependencies = []; - - }; - - sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sleuth-2017-10-24"; - src = fetchgit { - url = "git://github.com/tpope/vim-sleuth"; - rev = "d56a4302358359ddf9845252addf637a5e6bd6d5"; - sha256 = "1klp2lqsql90v156kih0mnm0j957pc4r0zy5y6srww2q3wkkjgr2"; - }; - dependencies = []; - - }; - - snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2017-04-20"; - src = fetchgit { - url = "git://github.com/garbas/vim-snipmate"; - rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; - sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - sourcemap = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sourcemap-2012-09-19"; - src = fetchgit { - url = "git://github.com/chikatoike/sourcemap.vim"; - rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; - sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; - }; - dependencies = []; - - }; - - sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sparkup-2012-06-10"; - src = fetchgit { - url = "git://github.com/chrisgeo/sparkup"; - rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; - sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; - }; - dependencies = []; - - }; - - surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "surround-2016-06-01"; - src = fetchgit { - url = "git://github.com/tpope/vim-surround"; - rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313"; - sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46"; - }; - dependencies = []; - - }; - - table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2018-01-04"; - src = fetchgit { - url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "b25fe6f9f0f0b704d05ebd05edbbf0be3038cef9"; - sha256 = "14ykj2yrwi8k6mkzg0vi4favwg88l8c7zf7m6qzvndpjqw8jggdy"; - }; - dependencies = []; - - }; - - tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tabpagecd-2013-11-29"; - src = fetchgit { - url = "git://github.com/kana/vim-tabpagecd"; - rev = "8b71a03a037608fa5918f5096812577cec6355e4"; - sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; - }; - dependencies = []; - - }; - - taglist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "taglist"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=19574"; - name = "taglist_46.zip"; - sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - homepage = "http://www.vim.org/scripts/script.php?script_id=273"; - }; - - setSourceRoot = '' - export sourceRoot=taglist - mkdir taglist - mv doc taglist - mv plugin taglist - ''; - }; - - tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2017-08-13"; - src = fetchgit { - url = "git://github.com/tomtom/tlib_vim"; - rev = "c96db6151fde9d06a8fed71b7df05c6dbb3f14fe"; - sha256 = "1dhvf1v2mkmq8aifwq57ylm7nnk3zz3hna33q2gj6p7v70vay7v8"; - }; - dependencies = []; - - }; - - undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2017-10-26"; - src = fetchgit { - url = "git://github.com/mbbill/undotree"; - rev = "cdbb9022b8972d3e156b8d60af33bf795625b058"; - sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253"; - }; - dependencies = []; - - }; - - vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-actions-2017-09-23"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-actions"; - rev = "7f48bea57fd9dfb06498422bc1cbe9f7553efa6e"; - sha256 = "0q9w2x49zd3a43cm4ikgpwrqiz0k9a6pss0zrvskaxhh6mifpxpg"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async-2017-03-20"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-async"; - rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; - sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; - }; - dependencies = ["vim-addon-signs"]; - - }; - - vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-background-cmd-2015-12-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-background-cmd"; - rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; - sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; - }; - dependencies = ["vim-addon-mw-utils"]; - - }; - - vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-commenting-2013-06-10"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-commenting"; - rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; - sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; - }; - dependencies = []; - - }; - - vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-completion-2015-02-10"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-completion"; - rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; - sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; - }; - dependencies = ["tlib"]; - - }; - - vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-errorformats-2014-11-05"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-errorformats"; - rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; - }; - dependencies = []; - - }; - - vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-goto-thing-at-cursor-2012-01-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; - rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; - sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; - }; - dependencies = ["tlib"]; - - }; - - vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-local-vimrc-2015-03-19"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; - rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; - sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; - }; - dependencies = []; - - }; - - vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager-2017-05-07"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-manager"; - rev = "2434225ae48e608c2b6ac86c8da1c62209da746f"; - sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb"; - }; - dependencies = []; - buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; - }; - - vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mru-2013-08-08"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-mru"; - rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; - }; - dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; - - }; - - vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mw-utils-2012-11-05"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-mw-utils"; - rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; - sha256 = "147s1k4n45d3x281vj35l26sv4waxjlpqdn83z3k9n51556h1d45"; - }; - dependencies = []; - - }; - - vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-nix-2017-09-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-nix"; - rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; - sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; - }; - dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-other-2014-07-15"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-other"; - rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; - sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6"; - }; - dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; - - }; - - vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-php-manual-2015-01-01"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-php-manual"; - rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; - sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; - }; - dependencies = []; - - }; - - vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-signs-2013-04-19"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-signs"; - rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; - sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; - }; - dependencies = []; - - }; - - vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql-2017-02-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-sql"; - rev = "048a139af36829fce670c8ff80d3aad927557ee6"; - sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; - }; - dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; - - }; - - vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-syntax-checker-2017-06-26"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; - rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; - sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-toggle-buffer-2012-01-13"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; - rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-xdebug-2014-08-29"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-xdebug"; - rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; - sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; - }; - dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; - - }; - - vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2017-11-27"; - src = fetchgit { - url = "git://github.com/vim-airline/vim-airline"; - rev = "6c8d0f5e6af878db71b2dc44ccf1d1417381d6a0"; - sha256 = "0azrapbb3w84c62kcbrycm75qmwdfz38852sv7cccwb7v1xgj9ab"; - }; - dependencies = []; - - }; - - vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2017-12-04"; - src = fetchgit { - url = "git://github.com/kchmck/vim-coffee-script"; - rev = "de6b6327b4e738ea5dbf0ef97d06d39217e4e6fc"; - sha256 = "0rvvsqlc3vrfpvh25a8kykwnf5dwx7blbnl5by1ja0l77l1hnrz4"; - }; - dependencies = []; - - }; - - vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-cursorword-2017-10-19"; - src = fetchgit { - url = "git://github.com/itchyny/vim-cursorword"; - rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; - sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; - }; - dependencies = []; - - }; - - vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dirdiff-2017-01-19"; - src = fetchgit { - url = "https://github.com/will133/vim-dirdiff"; - rev = "db1fe77dcefa7a5b1089c8a84d1b401a4bd780bc"; - sha256 = "1540h5skh8rcpzj0vp8sr53hg9jmmknj155pxs4z5w6gvzk7nx0p"; - }; - dependencies = []; - - }; - - vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2017-06-03"; - src = fetchgit { - url = "git://github.com/junegunn/vim-easy-align"; - rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; - sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774"; - }; - dependencies = []; - - }; - - vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ft-diff_fold-2013-02-10"; - src = fetchgit { - url = "git://github.com/thinca/vim-ft-diff_fold"; - rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; - sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; - }; - dependencies = []; - - }; - - vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2017-02-20"; - src = fetchgit { - url = "git://github.com/lambdalisue/vim-gista"; - rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; - sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; - }; - dependencies = []; - - }; - - vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2018-02-26"; - src = fetchgit { - url = "git://github.com/airblade/vim-gitgutter"; - rev = "e512d3a6fc80900c24ef293b475715f49ec6ded8"; - sha256 = "0wd6x3fb5jbqlvismp3f59ycid49gn3qvd16cj8x87v6l3anmp4s"; - }; - dependencies = []; - - }; - - vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dashboard-2017-08-08"; - src = fetchgit { - url = "git://github.com/junegunn/vim-github-dashboard"; - rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6"; - sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y"; - }; - dependencies = []; - - }; - - vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-iced-coffee-script-2013-12-27"; - src = fetchgit { - url = "git://github.com/noc7c9/vim-iced-coffee-script"; - rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; - sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; - }; - dependencies = []; - - }; - - vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-javascript-2018-01-10"; - src = fetchgit { - url = "git://github.com/pangloss/vim-javascript"; - rev = "4c0a554423df72ecb8d13b143afa7a4cfcb994ec"; - sha256 = "01lbkcfjqwrn2pbxz1jj8g2vxasc2i7s6nc7665s1warn066ykjr"; - }; - dependencies = []; - - }; - - vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsbeautify-2017-05-20"; - src = fetchgit { - url = "git://github.com/maksimr/vim-jsbeautify"; - rev = "e83f749c3de7e958e7bc285e80e484707b6f1e12"; - sha256 = "0dy9ljqp6shac406xgawzrqcapm80rjxmbzwy93ypzlhi8b67w0a"; - }; - dependencies = []; - - }; - - vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2017-11-09"; - src = fetchgit { - url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; - sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; - }; - dependencies = []; - - }; - - vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-logreview-2017-07-08"; - src = fetchgit { - url = "git://github.com/andreshazard/vim-logreview"; - rev = "b7b66ab338e904127d796af49235b8c29742f18f"; - sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; - }; - dependencies = []; - - }; - - vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2017-08-04"; - src = fetchgit { - url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "a97dab5bc440bf0a7b62bb2de4479963a888f4ff"; - sha256 = "1ac5l5h138ns9z9ni4qbcykkg9yfpjjalk0g9wrra4rp0nlakaqk"; - }; - dependencies = []; - - }; - - vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pencil-2017-06-14"; - src = fetchgit { - url = "git://github.com/reedes/vim-pencil"; - rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; - sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; - }; - dependencies = []; - - }; - - vim-rooter = buildVimPluginFrom2Nix { - name = "vim-rooter-2017-11-20"; - src = fetchgit { - url = "git://github.com/airblade/vim-rooter"; - rev = "3509dfb80d0076270a04049548738daeedf6dfb9"; - sha256 = "03j26fw0dcvcc81fn8hx1prdwlgnd3g340pbxrzgbgxxq5kr0bwl"; - }; - dependencies = []; - - }; - - vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ruby-2017-06-22"; - src = fetchgit { - url = "git://github.com/vim-ruby/vim-ruby"; - rev = "074200ffa39b19baf9d9750d399d53d97f21ee07"; - sha256 = "1w2d12cl40nf73f3hcpqc4sqma8h1a557fy8kds2x143gq7s5vx6"; - }; - dependencies = []; - - }; - - vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scouter-2014-08-10"; - src = fetchgit { - url = "git://github.com/thinca/vim-scouter"; - rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; - sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; - }; - dependencies = []; - - }; - - vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2017-09-24"; - src = fetchgit { - url = "git://github.com/kshenoy/vim-signature"; - rev = "eaa8af20ac4d46f911a083298d7a19e27be180e0"; - sha256 = "1vha52bmbs88lnwjfvkbx2jb74k8gqjky0c9gv8gqy74lypcdas5"; - }; - dependencies = []; - - }; - - vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2017-08-19"; - src = fetchgit { - url = "git://github.com/mhinz/vim-signify"; - rev = "1a8a15d835d8f2da56cd793a0222227af6c89839"; - sha256 = "13yvwy2vw64g4v08k83svhp26nmmir0qd21wpp89qclbzwb2q2k2"; - }; - dependencies = []; - - }; - - vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2017-12-05"; - src = fetchgit { - url = "git://github.com/honza/vim-snippets"; - rev = "e116db735e54a8e428f8b2c08c842ee52b7230fe"; - sha256 = "05zn4z40awqab8fz9z49wkry6hww89la33vj552cf6lhzfkbbsvv"; - }; - dependencies = []; - - }; - - vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2017-10-13"; - src = fetchgit { - url = "git://github.com/ryanoasis/vim-devicons"; - rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8"; - sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m"; - }; - dependencies = []; - - }; - - vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim2hs-2014-04-16"; - src = fetchgit { - url = "git://github.com/dag/vim2hs"; - rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; - }; - dependencies = []; - - }; - - vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2017-12-04"; - src = fetchgit { - url = "git://github.com/vimwiki/vimwiki"; - rev = "75fe1d4f003f77a33955f436e023a4ce9548cb69"; - sha256 = "1a4918jsxjvlzj4qqariygwjjcs2lflykgq5k5l3ar3jvwlw0n7p"; - }; - dependencies = []; - - }; - - vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vinegar-2017-06-27"; - src = fetchgit { - url = "git://github.com/tpope/vim-vinegar"; - rev = "c795cb739347cbddeeb288c3c35da9f140a513c9"; - sha256 = "1dcirb0b73s2l14ppn8mlh79pjpf9kgym9im05039ynr9rl83fv3"; - }; - dependencies = []; - - }; - - vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2017-11-10"; - src = fetchgit { - url = "git://github.com/gmarik/vundle"; - rev = "fcc204205e3305c4f86f07e09cd756c7d06f0f00"; - sha256 = "1wpxp59rh1l6i4mvavqsh1xxqj3fmqiggl92h6chj4lc8anssydy"; - }; - dependencies = []; - - }; - - xterm-color-table = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "xterm-color-table-2013-12-31"; - src = fetchgit { - url = "git://github.com/guns/xterm-color-table.vim"; - rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; - sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; - }; - dependencies = []; - - }; - - zeavim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zeavim-2017-12-20"; - src = fetchgit { - url = "git://github.com/KabbAmine/zeavim.vim"; - rev = "88f81078059d98d7637a93b90730897a3af231a4"; - sha256 = "1p43f6bbs9fcvvp1i90kzx1xj7k6c5w3ajf9wlrplpkz6hsiv2wv"; + rev = "eba14b79890b674432a78291ff0f16de4da2ed08"; + sha256 = "1yj7gijwbsc1vrxlb158pf083ahrpgg5g7j3gjrkrazdcmmx5d2j"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 04ccbb2a99d2..fcc4fcaa76f4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,43 +1,14 @@ -"CSApprox" -"CheckAttach" -"Cosco" -"Gist" -"Hoogle" -"Solarized" -"Supertab" -"Syntastic" -"SyntaxRange" -"Tabular" -"Tagbar" -"The_NERD_Commenter" -"The_NERD_tree" -"UltiSnips" -"VimOutliner" -"WebAPI" -"YankRing" -"caw" -"clang_complete" -"commentary" -"csv" -"ctrlp-cmatcher" -"ctrlp-py-matcher" -"ctrlp-z" -"easygit" -"extradite" -"fugitive" -"ghcmod" "github:907th/vim-auto-save" -"github:Chiel92/vim-autoformat" -"github:LnL7/vim-nix" -"github:Quramy/tsuquyomi" -"github:Shougo/deoplete.nvim" +"github:airblade/vim-gitgutter" "github:ajh17/Spacegray.vim" "github:albfan/nerdtree-git-plugin" +"github:altercation/vim-colors-solarized" "github:alvan/vim-closetag" +"github:amiorin/ctrlp-z" +"github:andreshazard/vim-logreview" "github:andsild/peskcolor.vim.git" "github:andviro/flake8-vim" "github:ap/vim-css-color" -"github:autozimu/LanguageClient-neovim" "github:bazelbuild/vim-bazel" "github:bbchung/clighter8" "github:benekastah/neomake" @@ -46,17 +17,26 @@ "github:cespare/vim-toml" "github:chemzqm/denite-extra" "github:chemzqm/denite-git" +"github:Chiel92/vim-autoformat" "github:chikatoike/concealedyank.vim" +"github:chikatoike/sourcemap.vim" +"github:chrisbra/CheckAttach" +"github:chrisbra/csv.vim" +"github:chrisgeo/sparkup" "github:christoomey/vim-sort-motion" "github:christoomey/vim-tmux-navigator" "github:ctjhoa/spacevim" "github:ctrlpvim/ctrlp.vim" +"github:dag/vim2hs" +"github:dannyob/quickfixstatus" "github:derekelkins/agda-vim" "github:derekwyatt/vim-scala" +"github:dhruvasagar/vim-table-mode" "github:digitaltoad/vim-jade" "github:dleonard0/pony-vim-syntax" "github:dracula/vim" "github:drmingdrmer/xptemplate" +"github:eagletmt/ghcmod-vim" "github:eagletmt/neco-ghc" "github:editorconfig/editorconfig-vim" "github:ehamberg/vim-cute-python.git" @@ -67,24 +47,36 @@ "github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" "github:ensime/ensime-vim" +"github:ervandew/supertab" "github:esneider/YUNOcommit.vim" "github:fatih/vim-go" +"github:FelikZ/ctrlp-py-matcher" "github:flazz/vim-colorschemes" "github:floobits/floobits-neovim" "github:frigoeu/psc-ide-vim" +"github:garbas/vim-snipmate" +"github:gmarik/vundle" +"github:godlygeek/csapprox" +"github:godlygeek/tabular" "github:google/vim-codefmt" "github:google/vim-jsonnet" "github:google/vim-maktaba" "github:gregsexton/gitv" +"github:guns/xterm-color-table.vim" "github:heavenshell/vim-jsdoc" "github:hecal3/vim-leader-guide" +"github:honza/vim-snippets" "github:idris-hackers/idris-vim" +"github:inkarkat/vim-SyntaxRange" +"github:int3/vim-extradite" "github:itchyny/calendar.vim" "github:itchyny/lightline.vim" "github:itchyny/thumbnail.vim" +"github:itchyny/vim-cursorword" "github:itchyny/vim-gitbranch" "github:ivanov/vim-ipython" "github:janko-m/vim-test.git" +"github:JazzCore/ctrlp-cmatcher" "github:jceb/vim-hier" "github:jceb/vim-orgmode" "github:jeetsukumaran/vim-buffergator" @@ -95,58 +87,108 @@ "github:jnurmine/zenburn" "github:jonbri/vim-colorstepper" "github:joonty/vim-xdebug" +"github:JuliaEditorSupport/julia-vim" "github:junegunn/fzf.vim" +"github:junegunn/goyo.vim" "github:junegunn/limelight.vim" +"github:junegunn/vim-easy-align" +"github:junegunn/vim-github-dashboard" "github:junegunn/vim-peekaboo" "github:justincampbell/vim-eighties" +"github:KabbAmine/zeavim.vim" "github:kana/vim-niceblock" "github:kana/vim-operator-replace" "github:kana/vim-operator-user" +"github:kana/vim-tabpagecd" +"github:kchmck/vim-coffee-script" +"github:kien/rainbow_parentheses.vim" +"github:kshenoy/vim-signature" +"github:lambdalisue/vim-gista" "github:latex-box-team/latex-box" "github:leafgarland/typescript-vim" "github:lepture/vim-jinja" "github:lervag/vimtex" +"github:lfilho/cosco.vim" +"github:LnL7/vim-nix" "github:lokaltog/vim-easymotion" "github:ludovicchabant/vim-lawrencium" "github:luochen1990/rainbow" "github:lyokha/vim-xkbswitch" "github:machakann/vim-highlightedyank" +"github:majutsushi/tagbar" +"github:maksimr/vim-jsbeautify" +"github:MarcWeber/vim-addon-actions" +"github:MarcWeber/vim-addon-async" +"github:MarcWeber/vim-addon-background-cmd" +"github:MarcWeber/vim-addon-commenting" +"github:MarcWeber/vim-addon-completion" +"github:MarcWeber/vim-addon-errorformats" +"github:MarcWeber/vim-addon-goto-thing-at-cursor" +"github:MarcWeber/vim-addon-local-vimrc" +"github:MarcWeber/vim-addon-manager" +"github:MarcWeber/vim-addon-mru" +"github:MarcWeber/vim-addon-mw-utils" +"github:MarcWeber/vim-addon-nix" +"github:MarcWeber/vim-addon-other" +"github:MarcWeber/vim-addon-php-manual" +"github:MarcWeber/vim-addon-signs" +"github:MarcWeber/vim-addon-sql" +"github:MarcWeber/vim-addon-syntax-checker" +"github:MarcWeber/vim-addon-toggle-buffer" +"github:MarcWeber/vim-addon-xdebug" "github:martinda/Jenkinsfile-vim-syntax" +"github:mattn/gist-vim" +"github:mattn/webapi-vim" +"github:mbbill/undotree" "github:megaannum/forms" "github:megaannum/self" "github:mfukar/robotframework-vim" "github:mhinz/vim-grepper.git" +"github:mhinz/vim-signify" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" "github:mileszs/ack.vim" "github:mindriot101/vim-yapf" "github:mkasa/lushtags" +"github:morhetz/gruvbox" "github:mpickering/hlint-refactor-vim" "github:nathanaelkane/vim-indent-guides" "github:nbouscal/vim-stylish-haskell" +"github:neoclide/vim-easygit" "github:neovimhaskell/haskell-vim" "github:nixprime/cpsm" +"github:noc7c9/vim-iced-coffee-script" "github:osyo-manga/shabadou.vim" "github:osyo-manga/vim-textobj-multiblock" "github:osyo-manga/vim-watchdogs" +"github:pangloss/vim-javascript" "github:plasticboy/vim-markdown" "github:python-mode/python-mode" +"github:Quramy/tsuquyomi" "github:racer-rust/vim-racer" "github:raichoo/purescript-vim" +"github:reedes/vim-pencil" "github:reedes/vim-wordy" "github:rhysd/committia.vim.git" "github:rhysd/vim-grammarous" "github:rhysd/vim-operator-surround" +"github:Rip-Rip/clang_complete" "github:rodjek/vim-puppet" "github:roxma/nvim-cm-racer" "github:roxma/nvim-completion-manager" "github:rust-lang/rust.vim" "github:ryanoasis/vim-devicons" +"github:ryanoasis/vim-devicons" +"github:Rykka/riv.vim" "github:sbdchd/neoformat" +"github:scrooloose/nerdcommenter" +"github:scrooloose/nerdtree" +"github:scrooloose/syntastic" "github:sebastianmarkow/deoplete-rust" "github:sheerun/vim-polyglot" "github:shougo/context_filetype.vim" "github:shougo/denite.nvim" +"github:Shougo/deoplete.nvim" "github:shougo/echodoc.vim" "github:shougo/neco-syntax" "github:shougo/neco-vim" @@ -160,40 +202,65 @@ "github:shougo/unite.vim" "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" +"github:SirVer/ultisnips" "github:sjl/gundo.vim" "github:slashmili/alchemist.vim" "github:t9md/vim-smalls" "github:takac/vim-hardtime" "github:terryma/vim-expand-region" +"github:terryma/vim-multiple-cursors" "github:tex/vimpreviewpandoc" +"github:thinca/vim-ft-diff_fold" +"github:thinca/vim-prettyprint" "github:thinca/vim-quickrun" +"github:thinca/vim-scouter" "github:thinca/vim-themis" "github:tomasr/molokai" +"github:tomlion/vim-solidity" +"github:tomtom/tlib_vim" +"github:tpope/vim-commentary" "github:tpope/vim-dispatch" "github:tpope/vim-eunuch" +"github:tpope/vim-fugitive" +"github:tpope/vim-pathogen" "github:tpope/vim-repeat" "github:tpope/vim-rhubarb" +"github:tpope/vim-sensible" +"github:tpope/vim-sleuth" "github:tpope/vim-speeddating" +"github:tpope/vim-surround" +"github:tpope/vim-vinegar" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" +"github:Twinside/vim-hoogle" +"github:tyru/caw.vim" "github:tyru/open-browser.vim" +"github:ujihisa/neco-look" "github:valloric/youcompleteme" +"github:vim-airline/vim-airline" "github:vim-airline/vim-airline-themes" +"github:vimoutliner/vimoutliner" "github:vim-pandoc/vim-pandoc" "github:vim-pandoc/vim-pandoc-after" "github:vim-pandoc/vim-pandoc-syntax" -"github:vim-scripts/Colour-Sampler-Pack" -"github:vim-scripts/Improved-AnsiEsc" -"github:vim-scripts/Rename" -"github:vim-scripts/ReplaceWithRegister" -"github:vim-scripts/a.vim" +"github:vim-ruby/vim-ruby" "github:vim-scripts/align" "github:vim-scripts/argtextobj.vim" +"github:vim-scripts/a.vim" +"github:vim-scripts/bats.vim" "github:vim-scripts/changeColorScheme.vim" +"github:vim-scripts/Colour-Sampler-Pack" +"github:vim-scripts/Improved-AnsiEsc" +"github:vim-scripts/matchit.zip" "github:vim-scripts/mayansmoke.git" "github:vim-scripts/random.vim" +"github:vim-scripts/Rename" +"github:vim-scripts/ReplaceWithRegister" "github:vim-scripts/tabmerge" +"github:vim-scripts/taglist.vim" "github:vim-scripts/wombat256.vim" +"github:vim-scripts/YankRing.vim" +"github:vimwiki/vimwiki" "github:w0rp/ale" "github:wakatime/vim-wakatime" "github:wellle/targets.vim" @@ -201,73 +268,8 @@ "github:wincent/command-t" "github:xolox/vim-easytags" "github:xolox/vim-misc" +"github:xuhdev/vim-latex-live-preview" "github:zah/nim.vim" "github:zchee/deoplete-go" "github:zchee/deoplete-jedi" "github:zig-lang/zig.vim" -"goyo" -"gruvbox" -"matchit.zip" -"neco-look" -"pathogen" -"prettyprint" -"quickfixstatus" -"rainbow_parentheses" -"riv" -"sensible" -"sleuth" -"snipmate" -"sourcemap" -"sparkup" -"surround" -"table-mode" -"tabpagecd" -"taglist" -"tlib" -"undotree" -"vim-addon-actions" -"vim-addon-async" -"vim-addon-background-cmd" -"vim-addon-commenting" -"vim-addon-completion" -"vim-addon-errorformats" -"vim-addon-goto-thing-at-cursor" -"vim-addon-local-vimrc" -"vim-addon-manager" -"vim-addon-mru" -"vim-addon-mw-utils" -"vim-addon-nix" -"vim-addon-other" -"vim-addon-php-manual" -"vim-addon-signs" -"vim-addon-sql" -"vim-addon-syntax-checker" -"vim-addon-toggle-buffer" -"vim-addon-xdebug" -"vim-airline" -"vim-coffee-script" -"vim-cursorword" -"vim-easy-align" -"vim-ft-diff_fold" -"vim-gista" -"vim-gitgutter" -"vim-github-dashboard" -"vim-iced-coffee-script" -"vim-javascript" -"vim-jsbeautify" -"vim-latex-live-preview" -"vim-logreview" -"vim-multiple-cursors" -"vim-pencil" -"vim-ruby" -"vim-scouter" -"vim-signature" -"vim-signify" -"vim-snippets" -"vim-webdevicons" -"vim2hs" -"vimwiki" -"vinegar" -"vundle" -"xterm-color-table" -"zeavim" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index e11419846aeb..514c1daed629 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -224,7 +224,7 @@ let else if builtins.isAttrs x && builtins ? out then toNix "${x}" # a derivation else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" - else throw "turning ${lib.showVal x} into a VimL thing not implemented yet"; + else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; in assert builtins.hasAttr "vim-addon-manager" knownPlugins; '' diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm index ea360765925b..c3a210a642d2 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm @@ -4,6 +4,7 @@ cmake boost icu + ncurses ]; buildPhase = '' patchShebangs . diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip deleted file mode 100644 index cc9d3fb72640..000000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip +++ /dev/null @@ -1,7 +0,0 @@ - unpackPhase = '' - ( - sourceRoot=d - mkdir $sourceRoot; cd $sourceRoot; - unzip $src - ) - ''; diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 87c782222fc5..c29611c0c662 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, vscode-utils, unzip, dos2unix, mono46, clang-tools, writeScript -, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. +{ stdenv, lib, fetchurl, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript +, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: assert gdbUseFixed -> null != gdb; @@ -33,13 +33,11 @@ let langComponentBinaries = stdenv.mkDerivation { name = "cpptools-language-component-binaries"; - src = fetchurl { - url = https://download.visualstudio.microsoft.com/download/pr/11151953/d3cc8b654bffb8a2f3896d101f3c3155/Bin_Linux.zip; - sha256 = "12qbxsrdc73cqjb84xdck1xafzhfkcyn6bqbpcy1bxxr3b7hxbii"; + src = fetchzip { + url = https://download.visualstudio.microsoft.com/download/pr/11991016/8a81aa8f89aac452956b0e4c68e6620b/Bin_Linux.zip; + sha256 = "0ma59fxfldbgh6ijlvfbs3hnl4g0cnw5gs6286zdrp065n763sv4"; }; - buildInputs = [ unzip ]; - patchPhase = '' elfInterpreter="${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2" patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.Extension.linux @@ -53,13 +51,6 @@ let ''; }; - cpptoolsJsonFile = fetchurl { - url = https://download.visualstudio.microsoft.com/download/pr/11070848/7b97d6724d52cae8377c61bb4601c989/cpptools.json; - sha256 = "124f091aic92rzbg2vg831y22zr5wi056c1kh775djqs3qv31ja6"; - }; - - - openDebugAD7Script = writeScript "OpenDebugAD7" '' #!${stdenv.shell} BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" @@ -76,23 +67,24 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.12.3"; - sha256 = "1dcqy54n1w29xhbvxscd41hdrbdwar6g12zx02f6kh2f1kw34z5z"; + version = "0.16.1"; + sha256 = "0m4cam8sf3zwp8ss1dii908g7rc8b9l6pry0dglg0rmf45pkiaj3"; }; buildInputs = [ - dos2unix + jq ]; - prePatch = '' - dos2unix package.json - ''; + postPatch = '' + mv ./package.json ./package_ori.json - patches = [ - ./vscode-cpptools-0-12-3-package-json.patch - ]; + # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. + # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. + cat ./package_ori.json | \ + jq --slurpfile actEvts ${./package-activation-events-0-16-1.json} '(.activationEvents) = $actEvts[0]' | \ + jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ + ./package.json - postPatch = '' # Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. substituteInPlace "./package.json" \ --replace "\"default\": \"/usr/bin/gdb\"" "\"default\": \"${gdbDefaultsTo}\"" @@ -103,9 +95,6 @@ vscode-utils.buildVscodeMarketplaceExtension { # Move unused files out of the way. mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused - # Bring the `cpptools.json` file at the root of the package, same as the extension would do. - cp -p "${cpptoolsJsonFile}" "./cpptools.json" - # Combining the language component binaries as part of our package. find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin" @@ -120,9 +109,9 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with stdenv.lib; { license = licenses.unfree; - maintainer = [ maintainers.jraygauthier ]; - # A 32 bit linux would also be possible with some effort (specific download of binaries + + maintainers = [ maintainers.jraygauthier ]; + # A 32 bit linux would also be possible with some effort (specific download of binaries + # patching of the elf files with 32 bit interpreter). platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh new file mode 100755 index 000000000000..f5eb08d78a5d --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p coreutils -i bash + +scriptDir=$(cd "`dirname "$0"`"; pwd) +echo "scriptDir='$scriptDir'" + +function get_pkg_out() { + local pkg="$1" + local suffix="${2:-}" + local nixExp="with (import <nixpkgs> {}); ${pkg}" + echo "$(nix-build -E "$nixExp" --no-out-link)${suffix}" +} + +interpreter="$(get_pkg_out "stdenv.glibc" "/lib/ld-linux-x86-64.so.2")" +echo "interpreter='$interpreter'" + +# For clangformat dep on 'libtinfo.so.5'. +ncursesLibDir="$(get_pkg_out "ncurses5.out" "/lib")" +echo "ncursesLibDir='$ncursesLibDir'" + +# For clanformat dep on 'libstdc++.so.6'. +stdcppLibDir="$(get_pkg_out "stdenv.cc.cc.lib" "/lib")" +echo "stdcppLibDir='$stdcppLibDir'" + +# For clangformat dep on 'libz.so.1'. +zlibLibDir="$(get_pkg_out "zlib.out" "/lib")" +echo "zlibLibDir='$zlibLibDir'" + +function patchelf_mono() { + local exe="$1" + patchelf --set-interpreter "$interpreter" "$exe" +} + +function patchelf_clangformat() { + local exe="$1" + patchelf --set-interpreter "$interpreter" "$exe" + local rpath="$ncursesLibDir:$stdcppLibDir:$zlibLibDir" + patchelf --set-rpath "$rpath" "$exe" +} + +function print_nix_version_clangtools() { + nixClangToolsBin="$(get_pkg_out "clang-tools" "/bin")" + echo "nixClangToolsBin='$nixClangToolsBin'" + $nixClangToolsBin/clang-format --version +} + +function print_nix_version_mono() { + nixMonoBin="$(get_pkg_out "mono" "/bin")" + echo "nixMonoBin='$nixMonoBin'" + $nixMonoBin/mono --version +} + diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json new file mode 100644 index 000000000000..3a12a8bc0474 --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json @@ -0,0 +1,22 @@ +[ +"onLanguage:cpp", +"onLanguage:c", +"onCommand:extension.pickNativeProcess", +"onCommand:extension.pickRemoteNativeProcess", +"onCommand:C_Cpp.ConfigurationEdit", +"onCommand:C_Cpp.ConfigurationSelect", +"onCommand:C_Cpp.SwitchHeaderSource", +"onCommand:C_Cpp.Navigate", +"onCommand:C_Cpp.GoToDeclaration", +"onCommand:C_Cpp.PeekDeclaration", +"onCommand:C_Cpp.ToggleErrorSquiggles", +"onCommand:C_Cpp.ToggleIncludeFallback", +"onCommand:C_Cpp.ToggleDimInactiveRegions", +"onCommand:C_Cpp.ShowReleaseNotes", +"onCommand:C_Cpp.ResetDatabase", +"onCommand:C_Cpp.PauseParsing", +"onCommand:C_Cpp.ResumeParsing", +"onCommand:C_Cpp.ShowParsingCommands", +"onCommand:C_Cpp.TakeSurvey", +"onDebug" +] \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh new file mode 100755 index 000000000000..00ef77553242 --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh @@ -0,0 +1,168 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p coreutils -p jq -p unzip -i bash +set -euo pipefail + +# +# A little script to help maintaining this package. It will: +# +# - download the specified version of the extension to the store and print its url, packed store path and hash +# - unpack the extension, bring it to the store and print its store path and hash +# - fetch its runtimes dependencies from the 'package.json' file using the 'jq' utility, unpack those to the store +# and print its url store path and hash +# - patch elf of the binaries that got a nix replacement +# - bring the patched version to the store +# - run their '--version' and call 'ldd' +# - print the version of the runtime deps nix replacements. +# +# TODO: Print to a properly formated nix file all the required information to fetch everything (extension + runtime deps). +# TODO: Print x86 and maybe darwin runtime dependencies. +# + +scriptDir=$(cd "`dirname "$0"`"; pwd) +echo "scriptDir='$scriptDir'" + +extPublisher="vscode" +extName="cpptools" +defaultExtVersion="0.16.1" +extVersion="${1:-$defaultExtVersion}" + +echo +echo "------------- Downloading extension ---------------" + +extZipStoreName="${extPublisher}-${extName}.zip" +extUrl="https://ms-vscode.gallery.vsassets.io/_apis/public/gallery/publisher/ms-vscode/extension/cpptools/${extVersion}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage" +echo "extUrl='$extUrl'" +storePathWithSha=$(nix-prefetch-url --name "$extZipStoreName" --print-path "$extUrl" 2> /dev/null) + +cpptoolsZipStorePath="$(echo "$storePathWithSha" | tail -n1)" +cpptoolsZipSha256="$(echo "$storePathWithSha" | head -n1)" +echo "cpptoolsZipStorePath='$cpptoolsZipStorePath'" +echo "cpptoolsZipSha256='$cpptoolsZipSha256'" + + +extStoreName="${extPublisher}-${extName}" + + +function rm_tmpdir() { + #echo "Removing \`tmpDir='$tmpDir'\`" + rm -rf -- "$tmpDir" + unset tmpDir + trap - INT TERM HUP EXIT +} +function make_trapped_tmpdir() { + tmpDir=$(mktemp -d) + trap rm_tmpdir INT TERM HUP EXIT +} + +echo +echo "------------- Unpacked extension ---------------" + +make_trapped_tmpdir +unzip -q -d "$tmpDir" "$cpptoolsZipStorePath" + +cpptoolsStorePath="$(nix add-to-store -n "$extStoreName" "$tmpDir")" +cpptoolsSha256="$(nix hash-path --base32 --type sha512 "$cpptoolsStorePath")" +echo "cpptoolsStorePath='$cpptoolsStorePath'" +echo "cpptoolsSha256='$cpptoolsSha256'" + +rm_tmpdir + +storePathWithSha=$(nix-prefetch-url --print-path "file://${cpptoolsStorePath}/extension/package.json" 2> /dev/null) + +extPackageJSONStorePath="$(echo "$storePathWithSha" | tail -n1)" +extPackageJSONSha256="$(echo "$storePathWithSha" | head -n1)" +echo "extPackageJSONStorePath='$extPackageJSONStorePath'" +echo "extPackageJSONSha256='$extPackageJSONSha256'" + +print_runtime_dep() { + + local outName="$1" + local extPackageJSONStorePath="$2" + local depDesc="$3" + + local urlRaw=$(cat "$extPackageJSONStorePath" | jq -r --arg desc "$depDesc" '.runtimeDependencies[] | select(.description == $desc) | .url') + local url=$(echo $urlRaw | xargs curl -Ls -o /dev/null -w %{url_effective}) + + local urlRawVarStr="${outName}_urlRaw='$urlRaw'" + local urlVarStr="${outName}_url='$url'" + echo "$urlRawVarStr" + echo "$urlVarStr" + + local storePathWithSha="$(nix-prefetch-url --unpack --print-path "$url" 2> /dev/null)" + + local storePath="$(echo "$storePathWithSha" | tail -n1)" + local sha256="$(echo "$storePathWithSha" | head -n1)" + + local sha256VarStr="${outName}_sha256='$sha256'" + local storePathVarStr="${outName}_storePath='$storePath'" + echo "$sha256VarStr" + echo "$storePathVarStr" + + eval "$urlRawVarStr" + eval "$urlVarStr" + eval "$sha256VarStr" + eval "$storePathVarStr" +} + +echo +echo "------------- Runtime dependencies ---------------" + +print_runtime_dep "langComponentBinaries" "$extPackageJSONStorePath" "C/C++ language components (Linux / x86_64)" +print_runtime_dep "monoRuntimeBinaries" "$extPackageJSONStorePath" "Mono Runtime (Linux / x86_64)" +print_runtime_dep "clanFormatBinaries" "$extPackageJSONStorePath" "ClangFormat (Linux / x86_64)" + + +echo +echo "------------- Runtime deps missing elf deps ---------------" + +source "$scriptDir/missing_elf_deps.sh" + +echo +echo "------------- Runtime dep mono ---------------" + +make_trapped_tmpdir +find "$monoRuntimeBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir" +chmod -R a+rwx "$tmpDir" + +ls -la "$tmpDir/debugAdapters" + +patchelf_mono "$tmpDir/debugAdapters/mono.linux-x86_64" + +chmod a+x "$tmpDir/debugAdapters/mono.linux-x86_64" +ldd "$tmpDir/debugAdapters/mono.linux-x86_64" +"$tmpDir/debugAdapters/mono.linux-x86_64" --version + +monoRuntimeBinariesPatched_storePath="$(nix add-to-store -n "monoRuntimeBinariesPatched" "$tmpDir")" +echo "monoRuntimeBinariesPatched_storePath='$monoRuntimeBinariesPatched_storePath'" + +rm_tmpdir + + +echo +echo "------------- Runtime dep clang ---------------" +make_trapped_tmpdir +find "$clanFormatBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir" +chmod -R a+rwx "$tmpDir" + +ls -la "$tmpDir/bin" + +patchelf_clangformat "$tmpDir/bin/clang-format" + +chmod a+x "$tmpDir/bin/clang-format" +ldd "$tmpDir/bin/clang-format" +"$tmpDir/bin/clang-format" --version + + +clanFormatBinariesPatched_storePath="$(nix add-to-store -n "clanFormatBinariesPatched" "$tmpDir")" +echo "clanFormatBinariesPatched_storePath='$clanFormatBinariesPatched_storePath'" + +rm_tmpdir + +echo +echo "------------- Nix mono ---------------" +print_nix_version_clangtools + +echo +echo "------------- Nix mono ---------------" +print_nix_version_mono + diff --git a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch deleted file mode 100644 index 1873963f460d..000000000000 --- a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/package.json b/package.json -index 518e839..1c17c35 100644 ---- a/package.json -+++ b/package.json -@@ -37,7 +37,26 @@ - "Linters" - ], - "activationEvents": [ -- "*" -+ "onLanguage:cpp", -+ "onLanguage:c", -+ "onCommand:extension.pickNativeProcess", -+ "onCommand:extension.pickRemoteNativeProcess", -+ "onCommand:extension.provideInitialConfigurations_cppvsdbg", -+ "onCommand:extension.provideInitialConfigurations_cppdbg", -+ "onCommand:C_Cpp.ConfigurationEdit", -+ "onCommand:C_Cpp.ConfigurationSelect", -+ "onCommand:C_Cpp.SwitchHeaderSource", -+ "onCommand:C_Cpp.UnloadLanguageServer", -+ "onCommand:C_Cpp.Navigate", -+ "onCommand:C_Cpp.GoToDeclaration", -+ "onCommand:C_Cpp.PeekDeclaration", -+ "onCommand:C_Cpp.ToggleErrorSquiggles", -+ "onCommand:C_Cpp.ToggleIncludeFallback", -+ "onCommand:C_Cpp.ShowReleaseNotes", -+ "onCommand:C_Cpp.ResetDatabase", -+ "workspaceContains:.vscode/c_cpp_properties.json", -+ "onDebug:cppdbg", -+ "onDebug:cppvsdbg" - ], - "main": "./out/src/main", - "contributes": { -@@ -281,8 +300,7 @@ - "cpp" - ] - }, -- "runtime": "node", -- "program": "./out/src/Debugger/Proxy/debugProxy.js", -+ "program": "./debugAdapters/OpenDebugAD7", - "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", - "variables": { - "pickProcess": "extension.pickNativeProcess", -@@ -722,7 +740,29 @@ - } - } - } -- } -+ }, -+ "configurationSnippets": [ -+ { -+ "label": "C/C++: (gdb) Launch", -+ "description": "Launch with gdb.", -+ "bodyText": "{\n\t\"name\": \"(gdb) Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t {\n\t \"description\": \"Enable pretty-printing for gdb\",\n\t \"text\": \"-enable-pretty-printing\",\n\t \"ignoreFailures\": true\n\t }\n\t]\n}" -+ }, -+ { -+ "label": "C/C++: (gdb) Attach", -+ "description": "Attach with gdb.", -+ "bodyText": "{ \n\t\"name\": \"(gdb) Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickProcess}\",\n\t\"MIMode\": \"gdb\"\n}" -+ }, -+ { -+ "label": "C/C++: (gdb) Pipe Launch", -+ "description": "Pipe Launch with gdb.", -+ "bodyText": "{\n\t\"name\": \"(gdb) Pipe Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t {\n\t \"description\": \"Enable pretty-printing for gdb\",\n\t \"text\": \"-enable-pretty-printing\",\n\t \"ignoreFailures\": true\n\t }\n\t]\n}" -+ }, -+ { -+ "label": "C/C++: (gdb) Pipe Attach", -+ "description": "Pipe Attach with gdb.", -+ "bodyText": "{\n\t\"name\": \"(gdb) Pipe Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickRemoteProcess}\",\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\"\n}" -+ } -+ ] - }, - { - "type": "cppvsdbg", -@@ -741,7 +781,7 @@ - "variables": { - "pickProcess": "extension.pickNativeProcess" - }, -- "initialConfigurations": "extension.provideInitialConfigurations_cppvsdbg", -+ "initialConfigurations": "", - "configurationAttributes": { - "launch": { - "required": [ diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 4e28de871b84..430ce192ed0d 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -36,6 +36,6 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with lib; { license = licenses.mit; - maintainer = [ maintainers.jraygauthier ]; + maintainers = [ maintainers.jraygauthier ]; }; -} \ No newline at end of file +} diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index 83cb559dca12..4c095278f918 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -37,7 +37,7 @@ let installPhase = '' mkdir -p "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}" - find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/" + find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/" ''; }); |