diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/misc | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/misc')
87 files changed, 2473 insertions, 1127 deletions
diff --git a/nixpkgs/pkgs/misc/apulse/default.nix b/nixpkgs/pkgs/misc/apulse/default.nix index 085ad7902f5d..95beb8bcdf3f 100644 --- a/nixpkgs/pkgs/misc/apulse/default.nix +++ b/nixpkgs/pkgs/misc/apulse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkg-config, glib +{ lib, stdenv, fetchFromGitHub, alsa-lib, cmake, pkg-config, glib , tracingSupport ? true, logToStderr ? true }: let oz = x: if x then "1" else "0"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ alsaLib glib ]; + buildInputs = [ alsa-lib glib ]; cmakeFlags = [ "-DWITH_TRACE=${oz tracingSupport}" diff --git a/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix index 6ef92e170eb4..f3e2f0dca239 100644 --- a/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix +++ b/nixpkgs/pkgs/misc/arm-trusted-firmware/default.nix @@ -6,7 +6,7 @@ let , platform ? null , extraMakeFlags ? [] , extraMeta ? {} - , version ? "2.4" + , version ? "2.5" , ... } @ args: stdenv.mkDerivation ({ @@ -17,7 +17,7 @@ let owner = "ARM-software"; repo = "arm-trusted-firmware"; rev = "v${version}"; - sha256 = "12k0n79j156bdzqws18kpbli04kn00nh6dy42pjv6gakqrkx9px3"; + sha256 = "sha256-qfzZ3aVYYn0ZcZgKcLdB13B+eweDebLSBA3HTqdPdv0="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/nixpkgs/pkgs/misc/autotiling/default.nix b/nixpkgs/pkgs/misc/autotiling/default.nix index b104f359363b..56e607c9d604 100644 --- a/nixpkgs/pkgs/misc/autotiling/default.nix +++ b/nixpkgs/pkgs/misc/autotiling/default.nix @@ -1,12 +1,14 @@ -{ lib, buildPythonApplication, fetchPypi, i3ipc, importlib-metadata }: +{ lib, buildPythonApplication, fetchFromGitHub, i3ipc, importlib-metadata }: buildPythonApplication rec { pname = "autotiling"; - version = "1.1"; + version = "1.5"; - src = fetchPypi { - inherit pname version; - sha256 = "0hwvy9bxwv9fakqqiyrkmpckxgm0z85c240p84ibdhja9sm086v0"; + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "0ih8yd1gankjxn88gd88vxs6f1cniyi04z25jz4nsgqi9snz65v4"; }; propagatedBuildInputs = [ i3ipc importlib-metadata ]; @@ -16,7 +18,7 @@ buildPythonApplication rec { homepage = "https://github.com/nwg-piotr/autotiling"; description = "Script for sway and i3 to automatically switch the horizontal / vertical window split orientation"; license = licenses.gpl3Plus; - platforms= platforms.linux; + platforms = platforms.linux; maintainers = with maintainers; [ artturin ]; }; } diff --git a/nixpkgs/pkgs/misc/deepspeech/default.nix b/nixpkgs/pkgs/misc/deepspeech/default.nix deleted file mode 100644 index eddeea6eb542..000000000000 --- a/nixpkgs/pkgs/misc/deepspeech/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook }: - -stdenv.mkDerivation rec { - pname = "deepspeech"; - version = "0.9.3"; - - src = fetchurl { - url = "https://github.com/mozilla/DeepSpeech/releases/download/v${version}/native_client.amd64.cpu.linux.tar.xz"; - sha256 = "1qy2gspprcxi76jk06ljp028xl0wkk1m3mqaxyf5qbhhfbvvpfap"; - }; - setSourceRoot = "sourceRoot=`pwd`"; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - stdenv.cc.cc.lib - ]; - - installPhase = '' - install -D deepspeech $out/bin/deepspeech - install -D deepspeech.h $out/include/deepspeech.h - install -D libdeepspeech.so $out/lib/libdeepspeech.so - ''; - - meta = with lib; { - homepage = https://github.com/mozilla/DeepSpeech; - description = "Open source embedded (offline, on-device) speech-to-text engine, which can run in real time on broad range of devices"; - license = licenses.mpl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ rvolosatovs ]; - }; -} diff --git a/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix b/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix index 2a0fd92867ee..5551f734138c 100644 --- a/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/nixpkgs/pkgs/misc/drivers/epson-alc1100/default.nix @@ -13,8 +13,8 @@ in inherit version; src = fetchurl { - url = "http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/01/58/65/cd71929d2bf41ebf7e96f68fa9f1279556545ef1/Epson-ALC1100-filter-1.2.tar.gz"; - sha256 = "0q0bf4dfm4v69l7xg6sgkh7rwb0h77i8j9kplq1dfkd208g7y81p"; + url = "https://download3.ebz.epson.net/dsc/f/03/00/11/33/07/4027e99517b5c388d444b8444d719b4b77f7e9db/Epson-ALC1100-filter-1.2.tar.gz"; + sha256 = "1dfw75a3kj2aa4iicvlk9kz3jarrsikpnpd4cdpw79scfc5mwm2p"; }; patches = [ ./cups-data-dir.patch ./ppd.patch ]; diff --git a/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix b/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix index 7302cfb25bcf..6e4a38ed171e 100644 --- a/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix +++ b/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim, time }: +{ lib, stdenv, fetchurl, foomatic-filters, bc, ghostscript, systemd, vim, time }: stdenv.mkDerivation rec { pname = "foo2zjs"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x"; }; - nativeBuildInputs = [ unzip ]; buildInputs = [ foomatic-filters bc ghostscript systemd vim ]; patches = [ ./no-hardcode-fw.diff ]; diff --git a/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix b/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix index c62161c96f80..3c2f8fa2a08f 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/3.18.5.nix @@ -75,7 +75,7 @@ python2Packages.buildPythonApplication { pygobject2 reportlab usbutils - sip + sip_4 ] ++ lib.optionals withQt5 [ pyqt5 ]; diff --git a/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/nixpkgs/pkgs/misc/drivers/hplip/default.nix index 6a7eb35ae52b..98a67a75f0bc 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/default.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/default.nix @@ -36,13 +36,13 @@ let x86_64-linux = "x86_64"; armv6l-linux = "arm32"; armv7l-linux = "arm32"; - aarch64-linux = "aarch64"; + aarch64-linux = "arm64"; }; hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); - pluginArches = [ "x86_32" "x86_64" "arm32" "aarch64" ]; + pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; in @@ -79,7 +79,7 @@ python3Packages.buildPythonApplication { pygobject3 reportlab usbutils - sip + sip_4 dbus-python ] ++ lib.optionals withQt5 [ pyqt5 diff --git a/nixpkgs/pkgs/misc/drivers/spacenavd/configure-cfgfile-path.patch b/nixpkgs/pkgs/misc/drivers/spacenavd/configure-cfgfile-path.patch new file mode 100644 index 000000000000..268282e96eae --- /dev/null +++ b/nixpkgs/pkgs/misc/drivers/spacenavd/configure-cfgfile-path.patch @@ -0,0 +1,63 @@ +diff --git a/src/spnavd.c b/src/spnavd.c +index 2d4eca6..a5227ed 100644 +--- a/src/spnavd.c ++++ b/src/spnavd.c +@@ -27,6 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. + #include <sys/select.h> + #include <sys/socket.h> + #include <sys/un.h> ++#include <sys/types.h> ++#include <pwd.h> + #include "spnavd.h" + #include "logger.h" + #include "dev.h" +@@ -47,13 +49,39 @@ static void handle_events(fd_set *rset); + static void sig_handler(int s); + static char *fix_path(char *str); + +-static char *cfgfile = DEF_CFGFILE; ++static char* config_path; ++char* cfg_path() ++{ ++ char* buf; ++ if((buf = getenv("XDG_CONFIG_HOME"))) { ++ if(config_path == NULL) { ++ config_path = malloc(strlen(buf) + strlen("/spnavrc") + 1); ++ if ( config_path != NULL) { ++ sprintf(config_path, "%s/spnavrc", buf); ++ } ++ }; ++ return config_path; ++ } else { ++ if (!(buf = getenv("HOME"))) { ++ struct passwd *pw = getpwuid(getuid()); ++ buf = pw->pw_dir; ++ } ++ config_path = malloc(strlen(buf) + strlen("/.config/spnavrc") + 1); ++ if ( config_path != NULL) { ++ sprintf(config_path, "%s/.config/spnavrc", buf); ++ } ++ return config_path; ++ } ++} ++ ++static char *cfgfile = NULL; + static char *logfile = DEF_LOGFILE; + static char *pidpath = NULL; + + int main(int argc, char **argv) + { + int i, pid, ret, become_daemon = 1; ++ cfgfile = cfg_path(); + + for(i=1; i<argc; i++) { + if(argv[i][0] == '-') { +@@ -247,7 +275,7 @@ static void print_usage(const char *argv0) + printf("usage: %s [options]\n", argv0); + printf("options:\n"); + printf(" -d: do not daemonize\n"); +- printf(" -c <file>: config file path (default: " DEF_CFGFILE ")\n"); ++ printf(" -c <file>: config file path (default: %s)\n", cfg_path()); + printf(" -l <file>|syslog: log file path or log to syslog (default: " DEF_LOGFILE ")\n"); + printf(" -v: verbose output\n"); + printf(" -V,-version: print version number and exit\n"); diff --git a/nixpkgs/pkgs/misc/drivers/spacenavd/configure-pidfile-path.patch b/nixpkgs/pkgs/misc/drivers/spacenavd/configure-pidfile-path.patch new file mode 100644 index 000000000000..bc2cad9784cb --- /dev/null +++ b/nixpkgs/pkgs/misc/drivers/spacenavd/configure-pidfile-path.patch @@ -0,0 +1,82 @@ +diff --git a/src/spnavd.c b/src/spnavd.c +index 03080da..2d4eca6 100644 +--- a/src/spnavd.c ++++ b/src/spnavd.c +@@ -42,12 +42,14 @@ static void cleanup(void); + static void daemonize(void); + static int write_pid_file(void); + static int find_running_daemon(void); ++static char *pidfile_path(void); + static void handle_events(fd_set *rset); + static void sig_handler(int s); + static char *fix_path(char *str); + + static char *cfgfile = DEF_CFGFILE; + static char *logfile = DEF_LOGFILE; ++static char *pidpath = NULL; + + int main(int argc, char **argv) + { +@@ -270,7 +272,7 @@ static void cleanup(void) + remove_device(tmp); + } + +- remove(PIDFILE); ++ remove(pidfile_path()); + } + + static void daemonize(void) +@@ -314,7 +316,7 @@ static int write_pid_file(void) + FILE *fp; + int pid = getpid(); + +- if(!(fp = fopen(PIDFILE, "w"))) { ++ if(!(fp = fopen(pidfile_path(), "w"))) { + return -1; + } + fprintf(fp, "%d\n", pid); +@@ -329,7 +331,7 @@ static int find_running_daemon(void) + struct sockaddr_un addr; + + /* try to open the pid-file */ +- if(!(fp = fopen(PIDFILE, "r"))) { ++ if(!(fp = fopen(pidfile_path(), "r"))) { + return -1; + } + if(fscanf(fp, "%d\n", &pid) != 1) { +@@ -356,6 +358,22 @@ static int find_running_daemon(void) + return pid; + } + ++char *pidfile_path(void) ++{ ++ char *xdg_runtime_dir; ++ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) { ++ if ( pidpath == NULL ) { ++ pidpath = malloc(strlen(xdg_runtime_dir) + strlen("/spnavd.pid") + 1); ++ if ( pidpath != NULL ) { ++ sprintf(pidpath, "%s/spnavd.pid", xdg_runtime_dir); ++ } ++ }; ++ return pidpath; ++ } else { ++ return DEFAULT_PIDFILE; ++ } ++} ++ + static void handle_events(fd_set *rset) + { + int dev_fd, hotplug_fd; +diff --git a/src/spnavd.h b/src/spnavd.h +index 2d1c48b..17d22d3 100644 +--- a/src/spnavd.h ++++ b/src/spnavd.h +@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. + #define DEF_CFGFILE "/etc/spnavrc" + #define DEF_LOGFILE "/var/log/spnavd.log" + +-#define PIDFILE "/var/run/spnavd.pid" ++#define DEFAULT_PIDFILE "/run/spnavd.pid" + #define DEFAULT_SOCK_NAME "/run/spnav.sock" + #define SYSLOG_ID "spnavd" + diff --git a/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch b/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch new file mode 100644 index 000000000000..c59987dcc051 --- /dev/null +++ b/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch @@ -0,0 +1,118 @@ +diff --git a/src/proto_unix.c b/src/proto_unix.c +index 998f234..d38452c 100644 +--- a/src/proto_unix.c ++++ b/src/proto_unix.c +@@ -36,11 +36,14 @@ enum { + + static int lsock = -1; + ++static char *spath = NULL; ++ + int init_unix(void) + { + int s; + mode_t prev_umask; + struct sockaddr_un addr; ++ char *sock_path; + + if(lsock >= 0) return 0; + +@@ -49,16 +52,18 @@ int init_unix(void) + return -1; + } + +- unlink(SOCK_NAME); /* in case it already exists */ ++ sock_path = socket_path(); ++ ++ unlink(sock_path); /* in case it already exists */ + + memset(&addr, 0, sizeof addr); + addr.sun_family = AF_UNIX; +- strcpy(addr.sun_path, SOCK_NAME); ++ strcpy(addr.sun_path, sock_path); + + prev_umask = umask(0); + + if(bind(s, (struct sockaddr*)&addr, sizeof addr) == -1) { +- logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", SOCK_NAME, strerror(errno)); ++ logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", sock_path, strerror(errno)); + close(s); + return -1; + } +@@ -68,7 +73,7 @@ int init_unix(void) + if(listen(s, 8) == -1) { + logmsg(LOG_ERR, "listen failed: %s\n", strerror(errno)); + close(s); +- unlink(SOCK_NAME); ++ unlink(sock_path); + return -1; + } + +@@ -82,7 +87,7 @@ void close_unix(void) + close(lsock); + lsock = -1; + +- unlink(SOCK_NAME); ++ unlink(socket_path()); + } + } + +@@ -173,3 +178,19 @@ int handle_uevents(fd_set *rset) + + return 0; + } ++ ++char *socket_path(void) ++{ ++ char *xdg_runtime_dir; ++ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) { ++ if ( spath == NULL ) { ++ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1); ++ if ( spath != NULL ) { ++ sprintf(spath, "%s/spnav.sock", xdg_runtime_dir); ++ } ++ }; ++ return spath; ++ } else { ++ return DEFAULT_SOCK_NAME; ++ } ++} +diff --git a/src/proto_unix.h b/src/proto_unix.h +index 045b379..ec4509c 100644 +--- a/src/proto_unix.h ++++ b/src/proto_unix.h +@@ -23,6 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. + #include "event.h" + #include "client.h" + ++char *socket_path(void); + int init_unix(void); + void close_unix(void); + int get_unix_socket(void); +diff --git a/src/spnavd.c b/src/spnavd.c +index cbea191..03080da 100644 +--- a/src/spnavd.c ++++ b/src/spnavd.c +@@ -344,7 +344,7 @@ static int find_running_daemon(void) + } + memset(&addr, 0, sizeof addr); + addr.sun_family = AF_UNIX; +- strncpy(addr.sun_path, SOCK_NAME, sizeof addr.sun_path); ++ strncpy(addr.sun_path, socket_path(), sizeof addr.sun_path); + + if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) { + close(s); +diff --git a/src/spnavd.h b/src/spnavd.h +index fa0a916..2d1c48b 100644 +--- a/src/spnavd.h ++++ b/src/spnavd.h +@@ -26,8 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. + #define DEF_CFGFILE "/etc/spnavrc" + #define DEF_LOGFILE "/var/log/spnavd.log" + +-#define SOCK_NAME "/var/run/spnav.sock" + #define PIDFILE "/var/run/spnavd.pid" ++#define DEFAULT_SOCK_NAME "/run/spnav.sock" + #define SYSLOG_ID "spnavd" + + /* Multiple devices support */ diff --git a/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix b/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix index 734b2229c877..5cc1b4601332 100644 --- a/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix +++ b/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libX11 }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, libX11, IOKit }: stdenv.mkDerivation rec { version = "0.8"; @@ -11,9 +11,29 @@ stdenv.mkDerivation rec { sha256 = "1zz0cm5cgvp9s5n4nzksl8rb11c7sw214bdafzra74smvqfjcjcf"; }; - buildInputs = [ libX11 ]; + patches = [ + # Fixes Darwin: https://github.com/FreeSpacenav/spacenavd/pull/38 + (fetchpatch { + url = "https://github.com/FreeSpacenav/spacenavd/commit/d6a25d5c3f49b9676d039775efc8bf854737c43c.patch"; + sha256 = "02pdgcvaqc20qf9hi3r73nb9ds7yk2ps9nnxaj0x9p50xjnhfg5c"; + }) + # Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock + # to allow for a user service + ./configure-socket-path.patch + # Changes the pidfile path from /run/spnavd.pid to $XDG_RUNTIME_DIR/spnavd.pid + # to allow for a user service + ./configure-pidfile-path.patch + # Changes the config file path from /etc/spnavrc to $XDG_CONFIG_HOME/spnavrc or $HOME/.config/spnavrc + # to allow for a user service + ./configure-cfgfile-path.patch + ]; - configureFlags = [ "--disable-debug"]; + buildInputs = [ libX11 ] + ++ lib.optional stdenv.isDarwin IOKit; + + configureFlags = [ "--disable-debug" ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { homepage = "http://spacenav.sourceforge.net/"; diff --git a/nixpkgs/pkgs/misc/emulators/atari++/default.nix b/nixpkgs/pkgs/misc/emulators/atari++/default.nix index 2019820510ef..5e35dcaebd0f 100644 --- a/nixpkgs/pkgs/misc/emulators/atari++/default.nix +++ b/nixpkgs/pkgs/misc/emulators/atari++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: +{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsa-lib, gcc-unwrapped, libXext }: stdenv.mkDerivation rec { pname = "atari++"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "04fm2ic2qi4a52mi72wcaxyrpll4k8vvchx3qrik8rhg3jrxgm47"; }; - buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ]; + buildInputs = [ libSM libX11 SDL libICE alsa-lib gcc-unwrapped libXext ]; postFixup = '' patchelf --set-rpath ${lib.makeLibraryPath buildInputs} "$out/bin/atari++" diff --git a/nixpkgs/pkgs/misc/emulators/atari800/default.nix b/nixpkgs/pkgs/misc/emulators/atari800/default.nix index 53f1009cfad5..37e0d83f1406 100644 --- a/nixpkgs/pkgs/misc/emulators/atari800/default.nix +++ b/nixpkgs/pkgs/misc/emulators/atari800/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: +, zlib, SDL, readline, libGLU, libGL, libX11 }: with lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; }; - nativeBuildInputs = [ autoreconfHook unzip ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib SDL readline libGLU libGL libX11 ]; diff --git a/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix b/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix index 92c42a1d3943..7a3f61fd8dc2 100644 --- a/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix +++ b/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix @@ -1,4 +1,4 @@ -{ expat, fetchFromGitHub, ffmpeg_3, fontconfig, freetype, libarchive, libjpeg +{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg , libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat ffmpeg_3 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib + expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib ]; meta = with lib; { diff --git a/nixpkgs/pkgs/misc/emulators/caprice32/default.nix b/nixpkgs/pkgs/misc/emulators/caprice32/default.nix index 3e20ba616423..6c2932f7e10b 100644 --- a/nixpkgs/pkgs/misc/emulators/caprice32/default.nix +++ b/nixpkgs/pkgs/misc/emulators/caprice32/default.nix @@ -5,6 +5,9 @@ stdenv.mkDerivation rec { pname = "caprice32"; version = "4.6.0"; + # NOTE: When bumping version beyond 4.6.0, you likely need to remove + # string.patch below. The fix of this patch has already been + # done upstream but is not yet part of a release src = fetchFromGitHub { repo = "caprice32"; @@ -16,6 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils pkg-config ]; buildInputs = [ libpng SDL freetype zlib ]; + patches = [ ./string.patch ]; + makeFlags = [ "APP_PATH=${placeholder "out"}/share/caprice32" "RELEASE=1" diff --git a/nixpkgs/pkgs/misc/emulators/caprice32/string.patch b/nixpkgs/pkgs/misc/emulators/caprice32/string.patch new file mode 100644 index 000000000000..fabbbd80d5d3 --- /dev/null +++ b/nixpkgs/pkgs/misc/emulators/caprice32/string.patch @@ -0,0 +1,12 @@ +diff --git a/src/configuration.h b/src/configuration.h +index 34fd690..97fb0e5 100644 +--- a/src/configuration.h ++++ b/src/configuration.h +@@ -2,6 +2,7 @@ + #define CONFIGURATION_H + + #include <map> ++#include <string> + + namespace config + { diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix b/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix index 246dbb7dd350..dddcc3a74682 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk-pixbuf, librsvg, intltool, libmirage }: +, python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { version = "3.2.3"; pkgName = "image-analyzer"; @@ -7,7 +7,7 @@ let pkg = import ./base.nix { }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper - gnome3.adwaita-icon-theme gdk-pixbuf librsvg intltool + gnome.adwaita-icon-theme gdk-pixbuf librsvg intltool python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix b/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix index 599531950a21..8ce84ccae204 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk-pixbuf, librsvg }: +, python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }: let pkg = import ./base.nix { version = "3.2.3"; @@ -9,7 +9,7 @@ let inherit (python3Packages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome3.adwaita-icon-theme gdk-pixbuf librsvg ]; + gnome.adwaita-icon-theme gdk-pixbuf librsvg ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' diff --git a/nixpkgs/pkgs/misc/emulators/desmume/default.nix b/nixpkgs/pkgs/misc/emulators/desmume/default.nix index ff17833f690b..03e97743905b 100644 --- a/nixpkgs/pkgs/misc/emulators/desmume/default.nix +++ b/nixpkgs/pkgs/misc/emulators/desmume/default.nix @@ -3,7 +3,7 @@ , libXmu , lua , tinyxml -, agg, alsaLib, soundtouch, openal +, agg, alsa-lib, soundtouch, openal , desktop-file-utils , gtk2, gtkglext, libglade , libGLU, libpcap, SDL, zziplib }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { CXXFLAGS = "-fpermissive"; buildInputs = - [ pkg-config libtool intltool libXmu lua agg alsaLib soundtouch + [ pkg-config libtool intltool libXmu lua agg alsa-lib soundtouch openal desktop-file-utils gtk2 gtkglext libglade libGLU libpcap SDL zziplib tinyxml ]; diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index 116279145603..8e08be28eda8 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama -, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib +, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib , miniupnpc, enet, mbedtls, soundtouch, sfml , vulkan-loader ? null, libpulseaudio ? null @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase ] ++ lib.optionals stdenv.isLinux [ - bluez udev libevdev alsaLib vulkan-loader + bluez udev libevdev alsa-lib vulkan-loader ] ++ lib.optionals stdenv.isDarwin [ CoreBluetooth OpenGL ForceFeedback IOKit ]; diff --git a/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix index 458b27d33044..4cb5ca9ec2e6 100644 --- a/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix +++ b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen -, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive +, freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive , fetchpatch }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; + buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; installPhase = '' install -D ../emulationstation $out/bin/emulationstation diff --git a/nixpkgs/pkgs/misc/emulators/epsxe/default.nix b/nixpkgs/pkgs/misc/emulators/epsxe/default.nix index 7cdd88d0b941..f70e90e98722 100644 --- a/nixpkgs/pkgs/misc/emulators/epsxe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/epsxe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, +{ lib, stdenv, fetchurl, alsa-lib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }: with lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; buildInputs = [ - alsaLib + alsa-lib curl gdk-pixbuf glib diff --git a/nixpkgs/pkgs/misc/emulators/higan/default.nix b/nixpkgs/pkgs/misc/emulators/higan/default.nix index c7bc7e9f976e..8e10b7bb3154 100644 --- a/nixpkgs/pkgs/misc/emulators/higan/default.nix +++ b/nixpkgs/pkgs/misc/emulators/higan/default.nix @@ -4,7 +4,7 @@ , udev , libGLU, libGL, SDL2 , libao, openal, libpulseaudio -, alsaLib +, alsa-lib , gtk2, gtksourceview , runtimeShell # Darwin dependencies @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isDarwin [ libicns ]; buildInputs = [ SDL2 libao ] - ++ optionals stdenv.isLinux [ alsaLib udev libpulseaudio openal + ++ optionals stdenv.isLinux [ alsa-lib udev libpulseaudio openal gtk2 gtksourceview libX11 libXv libGLU libGL ] ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ]; diff --git a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix index 1b00a55fe058..e8feb1ea7ed5 100644 --- a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix +++ b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }: +{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsa-lib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }: let - libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsa-lib libSM libX11 gdk-pixbuf pango libXinerama ]; in stdenv.mkDerivation { pname = "kega-fusion"; diff --git a/nixpkgs/pkgs/misc/emulators/maiko/default.nix b/nixpkgs/pkgs/misc/emulators/maiko/default.nix new file mode 100644 index 000000000000..e78b680d617a --- /dev/null +++ b/nixpkgs/pkgs/misc/emulators/maiko/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libX11 }: + +stdenv.mkDerivation rec { + pname = "maiko"; + version = "2021-04-14"; + src = fetchFromGitHub { + owner = "Interlisp"; + repo = "maiko"; + rev = "91fe7d51f9d607bcedde0e78e435ee188a8c84c0"; + hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM="; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libX11 ]; + installPhase = '' + runHook preInstall + find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \; + runHook postInstall + ''; + meta = with lib; { + description = "Medley Interlisp virtual machine"; + homepage = "https://interlisp.org/"; + license = licenses.mit; + maintainers = with maintainers; [ ehmry ]; + inherit (libX11.meta) platforms; + }; +} diff --git a/nixpkgs/pkgs/misc/emulators/mame/default.nix b/nixpkgs/pkgs/misc/emulators/mame/default.nix index b50181a4d98d..26abda81b309 100644 --- a/nixpkgs/pkgs/misc/emulators/mame/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mame/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper -, python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama +, python, pkg-config, SDL2, SDL2_ttf, alsa-lib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: @@ -41,7 +41,7 @@ in mkDerivation { buildInputs = [ SDL2 SDL2_ttf qtbase libXinerama ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ] ; nativeBuildInputs = [ python pkg-config which makeWrapper installShellFiles ]; @@ -82,6 +82,6 @@ in mkDerivation { platforms = platforms.unix; # makefile needs fixes for install target badPlatforms = [ "aarch64-linux" ]; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/misc/emulators/mednafen/default.nix b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix index aaf736f3e5e4..f76ddb78bd56 100644 --- a/nixpkgs/pkgs/misc/emulators/mednafen/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }: +, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsa-lib }: stdenv.mkDerivation rec { pname = "mednafen"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libGLU libGL libcdio libjack2 - alsaLib + alsa-lib libsamplerate libsndfile libX11 diff --git a/nixpkgs/pkgs/misc/emulators/mgba/default.nix b/nixpkgs/pkgs/misc/emulators/mgba/default.nix index be097c311856..fa25609dcdb8 100644 --- a/nixpkgs/pkgs/misc/emulators/mgba/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mgba/default.nix @@ -1,6 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkg-config -, cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick -, qtbase, qtmultimedia, qttools, minizip }: +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, cmake +, epoxy +, ffmpeg +, imagemagick +, libedit +, libelf +, libzip +, makeDesktopItem +, minizip +, pkg-config +, qtbase +, qtmultimedia +, qttools +, wrapQtAppsHook +}: let desktopItem = makeDesktopItem { @@ -21,14 +37,26 @@ in stdenv.mkDerivation rec { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "sha256-JVauGyHJVfiXVG4Z+Ydh1lRypy5rk9SKeTbeHFNFYJs="; + hash = "sha256-JVauGyHJVfiXVG4Z+Ydh1lRypy5rk9SKeTbeHFNFYJs="; }; - nativeBuildInputs = [ wrapQtAppsHook pkg-config cmake ]; - + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ - epoxy libzip libelf libedit ffmpeg_3 SDL2 imagemagick - qtbase qtmultimedia qttools minizip + SDL2 + epoxy + ffmpeg + imagemagick + libedit + libelf + libzip + minizip + qtbase + qtmultimedia + qttools ]; postInstall = '' @@ -38,21 +66,19 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://mgba.io"; description = "A modern GBA emulator with a focus on accuracy"; - longDescription = '' mGBA is a new Game Boy Advance emulator written in C. - The project started in April 2013 with the goal of being fast - enough to run on lower end hardware than other emulators - support, without sacrificing accuracy or portability. Even in - the initial version, games generally play without problems. It - is loosely based on the previous GBA.js emulator, although very - little of GBA.js can still be seen in mGBA. - - Other goals include accurate enough emulation to provide a - development environment for homebrew software, a good workflow - for tool-assist runners, and a modern feature set for emulators - that older emulators may not support. + The project started in April 2013 with the goal of being fast enough to + run on lower end hardware than other emulators support, without + sacrificing accuracy or portability. Even in the initial version, games + generally play without problems. It is loosely based on the previous + GBA.js emulator, although very little of GBA.js can still be seen in mGBA. + + Other goals include accurate enough emulation to provide a development + environment for homebrew software, a good workflow for tool-assist + runners, and a modern feature set for emulators that older emulators may + not support. ''; license = licenses.mpl20; @@ -60,3 +86,4 @@ in stdenv.mkDerivation rec { platforms = platforms.linux; }; } +# TODO [ AndersonTorres ]: use desktopItem functions diff --git a/nixpkgs/pkgs/misc/emulators/nestopia/default.nix b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix index 70e5d94def6f..e19b97a477ef 100644 --- a/nixpkgs/pkgs/misc/emulators/nestopia/default.nix +++ b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 +{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsa-lib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils -, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook +, epoxy, gdk-pixbuf, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 - alsaLib + alsa-lib epoxy gtk3 gdk-pixbuf @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libarchive libao xdg-utils - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/misc/emulators/openmsx/default.nix b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix index d34a921e1773..61d416e17ac8 100644 --- a/nixpkgs/pkgs/misc/emulators/openmsx/default.nix +++ b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config , python -, alsaLib, glew, libGL, libpng +, alsa-lib, glew, libGL, libpng , libogg, libtheora, libvorbis , SDL2, SDL2_image, SDL2_ttf , freetype, tcl, zlib @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python ]; - buildInputs = [ alsaLib glew libGL libpng + buildInputs = [ alsa-lib glew libGL libpng libogg libtheora libvorbis freetype SDL2 SDL2_image SDL2_ttf tcl zlib ]; diff --git a/nixpkgs/pkgs/misc/emulators/pcem/default.nix b/nixpkgs/pkgs/misc/emulators/pcem/default.nix index 6e7e3bc6379c..2e6aa683e4d3 100644 --- a/nixpkgs/pkgs/misc/emulators/pcem/default.nix +++ b/nixpkgs/pkgs/misc/emulators/pcem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsaLib, pkg-config +{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsa-lib, pkg-config , autoreconfHook, withNetworking ? true, withALSA ? true }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ wxGTK31 coreutils SDL2 openal ] - ++ lib.optional withALSA alsaLib; + ++ lib.optional withALSA alsa-lib; configureFlags = [ "--enable-release-build" ] ++ lib.optional withNetworking "--enable-networking" diff --git a/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix b/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix index 52d1010b5a4f..13d2ea74f342 100644 --- a/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix +++ b/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , cmake , fetchFromGitHub , fmt @@ -71,7 +71,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake makeWrapper perl pkg-config wrapGAppsHook ]; buildInputs = [ - alsaLib + alsa-lib fmt gettext glib @@ -102,6 +102,7 @@ stdenv.mkDerivation { ''; homepage = "https://pcsx2.net"; maintainers = with maintainers; [ hrdinka govanify ]; + mainProgram = "PCSX2"; # PCSX2's source code is released under LGPLv3+. It However ships # additional data files and code that are licensed differently. diff --git a/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix index a50bc3eb3ec8..4f5b4f7d69b6 100644 --- a/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix @@ -1,11 +1,11 @@ -{ SDL2 -, cmake +{ mkDerivation , fetchFromGitHub -, ffmpeg_3 +, SDL2 +, cmake +, ffmpeg , glew , lib , libzip -, mkDerivation , pkg-config , python3 , qtbase @@ -23,7 +23,7 @@ mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "19948jzqpclf8zfzp3k7s580xfjgqcyfwlcp7x7xj8h8lyypzymx"; + sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU="; }; postPatch = '' @@ -35,7 +35,7 @@ mkDerivation rec { buildInputs = [ SDL2 - ffmpeg_3 + ffmpeg glew libzip qtbase @@ -45,23 +45,25 @@ mkDerivation rec { ]; cmakeFlags = [ + "-DHEADLESS=OFF" "-DOpenGL_GL_PREFERENCE=GLVND" "-DUSE_SYSTEM_FFMPEG=ON" "-DUSE_SYSTEM_LIBZIP=ON" "-DUSE_SYSTEM_SNAPPY=ON" "-DUSING_QT_UI=ON" - "-DHEADLESS=OFF" ]; installPhase = '' + runHook preInstall mkdir -p $out/share/ppsspp install -Dm555 PPSSPPQt $out/bin/ppsspp mv assets $out/share/ppsspp + runHook postInstall ''; meta = with lib; { - description = "A HLE Playstation Portable emulator, written in C++"; homepage = "https://www.ppsspp.org/"; + description = "A HLE Playstation Portable emulator, written in C++"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix b/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix new file mode 100644 index 000000000000..f8295c6c5b4d --- /dev/null +++ b/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "proton-caller"; + version = "2.2.3"; + + src = fetchFromGitHub { + owner = "caverym"; + repo = pname; + rev = version; + sha256 = "0968pmapg6157q4rvfp690l1sjnws8hm62lvm8kaaqysac339z7z"; + }; + + cargoSha256 = "1vp2vvgy8z350a59k1c3s5ww6w2wikiha4s7jkkz9khl0spn19a8"; + + nativeBuildInputs = [ installShellFiles ]; + + outputs = [ "out" "man" ]; + + postInstall = '' + installManPage manual/proton-call.6 + ''; + + meta = with lib; { + description = "Run Windows programs with Proton"; + changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}"; + homepage = "https://github.com/caverym/proton-caller"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kho-dialga ]; + }; +} diff --git a/nixpkgs/pkgs/misc/emulators/punes/default.nix b/nixpkgs/pkgs/misc/emulators/punes/default.nix new file mode 100644 index 000000000000..0d2a5b117984 --- /dev/null +++ b/nixpkgs/pkgs/misc/emulators/punes/default.nix @@ -0,0 +1,61 @@ +{ mkDerivation +, stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, qtbase +, qtsvg +, qttools +, autoreconfHook +, cmake +, pkg-config +, ffmpeg +, libGLU +, alsa-lib +, sndio +}: + +mkDerivation rec { + pname = "punes"; + version = "unstable-2021-04-25"; + + src = fetchFromGitHub { + owner = "punesemu"; + repo = "puNES"; + rev = "4b4c3495a56d3989544cb56079ce641da8aa9b35"; + sha256 = "1wszvdgm38513v26p14k58shbkxn1qhkn8l0hsqi04vviicad59s"; + }; + + postPatch = '' + substituteInPlace configure.ac \ + --replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease' + ''; + + nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ]; + + buildInputs = [ ffmpeg qtbase qtsvg libGLU ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ]; + + dontUseCmakeConfigure = true; + + enableParallelBuilding = true; + + configureFlags = [ + "--prefix=${placeholder "out"}" + "--without-opengl-nvidia-cg" + "--with-ffmpeg" + ]; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/punesemu/puNES.git"; + }; + + meta = with lib; { + description = "Qt-based Nintendo Entertaiment System emulator and NSF/NSFe Music Player"; + homepage = "https://github.com/punesemu/puNES"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = with platforms; linux ++ freebsd ++ openbsd ++ windows; + }; +} diff --git a/nixpkgs/pkgs/misc/emulators/reicast/default.nix b/nixpkgs/pkgs/misc/emulators/reicast/default.nix index 8c0bc30d4384..f9e8e4d69376 100644 --- a/nixpkgs/pkgs/misc/emulators/reicast/default.nix +++ b/nixpkgs/pkgs/misc/emulators/reicast/default.nix @@ -3,7 +3,7 @@ , cmake , pkg-config , curl -, alsaLib +, alsa-lib , libGLU , libX11 , libevdev @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl - alsaLib + alsa-lib libGLU libX11 libevdev diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix index 887e79999ca1..bddabede0a07 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python37, retroarch -, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL -, ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump +{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch +, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL +, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl , buildPackages }: @@ -548,7 +548,7 @@ in with lib.licenses; description = "Port of MAME to libretro"; license = gpl2Plus; - extraBuildInputs = [ alsaLib libGLU libGL portaudio python27 xorg.libX11 ]; + extraBuildInputs = [ alsa-lib libGLU libGL portaudio python27 xorg.libX11 ]; postPatch = '' # Prevent the failure during the parallel building of: # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o @@ -617,7 +617,7 @@ in with lib.licenses; description = "Port of MAME ~2015 to libretro"; license = gpl2Plus; extraNativeBuildInputs = [ python27 ]; - extraBuildInputs = [ alsaLib ]; + extraBuildInputs = [ alsa-lib ]; makefile = "Makefile"; }; @@ -638,7 +638,7 @@ in with lib.licenses; description = "Port of MAME ~2016 to libretro"; license = gpl2Plus; extraNativeBuildInputs = [ python27 ]; - extraBuildInputs = [ alsaLib ]; + extraBuildInputs = [ alsa-lib ]; postPatch = '' # Prevent the failure during the parallel building of: # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o @@ -831,15 +831,24 @@ in with lib.licenses; ppsspp = mkLibRetroCore { core = "ppsspp"; - src = fetchgit { - url = "https://github.com/hrydgard/ppsspp"; - rev = "bf1777f7d3702e6a0f71c7ec1fc51976e23c2327"; - sha256 = "17sym0vk72lzbh9a1501mhw98c78x1gq7k1fpy69nvvb119j37wa"; + src = fetchFromGitHub { + owner = "hrydgard"; + repo = "ppsspp"; + rev = "v1.11"; + fetchSubmodules = true; + sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU="; }; + patches = [ + (fetchpatch { + name = "fix_ffmpeg_4.4.patch"; # to be removed with next release + url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch"; + sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo="; + }) + ]; description = "ppsspp libretro port"; license = gpl2; - extraNativeBuildInputs = [ cmake pkg-config ]; - extraBuildInputs = [ libGLU libGL libzip ffmpeg_3 python37 snappy xorg.libX11 ]; + extraNativeBuildInputs = [ cmake pkg-config python3 ]; + extraBuildInputs = [ libGLU libGL libzip ffmpeg snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ]; postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/default.nix b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix index a6ada570a500..86ca803d965a 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/default.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, which, pkg-config, makeWrapper -, ffmpeg_3, libGLU, libGL, freetype, libxml2, python3 +, ffmpeg, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation -, alsaLib ? null +, alsa-lib ? null , libdrm ? null , libpulseaudio ? null , libv4l ? null @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wayland ] ++ optional withVulkan makeWrapper; - buildInputs = [ ffmpeg_3 freetype libxml2 libGLU libGL python3 SDL2 which ] + buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] - ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 + ++ optionals stdenv.isLinux [ alsa-lib libdrm libpulseaudio libv4l libX11 libXdmcp libXext libXxf86vm mesa udev wayland libxkbcommon ]; diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 79dd025cf948..ee97e6f7493c 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -1,9 +1,7 @@ -{ stdenv, pkgs, cores, runtimeShell }: +{ stdenv, pkgs, lib, cores, runtimeShell }: assert cores != []; -with pkgs.lib; - let script = exec: '' diff --git a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix index ecda439e7ab7..bf1dc1c95732 100644 --- a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix +++ b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix @@ -1,23 +1,26 @@ -{ mkDerivation, lib, fetchgit, cmake, pkg-config, git +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config, git , qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng -, ffmpeg, libevdev, python3 +, ffmpeg, libevdev, libusb1, zlib, curl, python3 +, sdl2Support ? true, SDL2 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland -, alsaSupport ? true, alsaLib +, alsaSupport ? true, alsa-lib }: let - majorVersion = "0.0.12"; - gitVersion = "10811-a86a3d2fe"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) + majorVersion = "0.0.16"; + gitVersion = "12235-a4f4b81e6"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in mkDerivation { pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; - src = fetchgit { - url = "https://github.com/RPCS3/rpcs3"; - rev = "v${majorVersion}"; - sha256 = "182rkmbnnlcfzam4bwas7lwv10vqiqvvaw3299a3hariacd7rq8x"; + src = fetchFromGitHub { + owner = "RPCS3"; + repo = "rpcs3"; + rev = "a4f4b81e6b0c00f4c30f9f5f182e5fe56f9fb03c"; + fetchSubmodules = true; + sha256 = "1d70nljl1kmpbk50jpjki7dglw1bbxd7x4qzg6nz5np2sdsbpckd"; }; preConfigure = '' @@ -30,8 +33,13 @@ mkDerivation { ''; cmakeFlags = [ + "-DUSE_SYSTEM_ZLIB=ON" + "-DUSE_SYSTEM_LIBUSB=ON" "-DUSE_SYSTEM_LIBPNG=ON" "-DUSE_SYSTEM_FFMPEG=ON" + "-DUSE_SYSTEM_CURL=ON" + # NB: Can't use this yet, our CMake doesn't include FindWolfSSL.cmake + #"-DUSE_SYSTEM_WOLFSSL=ON" "-DUSE_NATIVE_INSTRUCTIONS=OFF" ]; @@ -39,16 +47,17 @@ mkDerivation { buildInputs = [ qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev python3 - ] ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional alsaSupport alsaLib + libevdev zlib libusb1 curl python3 + ] ++ lib.optional sdl2Support SDL2 + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional alsaSupport alsa-lib ++ lib.optional waylandSupport wayland; meta = with lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; maintainers = with maintainers; [ abbradar neonfuz ilian ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/misc/emulators/ruffle/default.nix b/nixpkgs/pkgs/misc/emulators/ruffle/default.nix index affbf0af15a9..84837322e971 100644 --- a/nixpkgs/pkgs/misc/emulators/ruffle/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ruffle/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , fetchFromGitHub , makeWrapper , openssl @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2021-04-02"; + version = "nightly-2021-05-14"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "1diz94y53hvii28894zz65aya12v8yw1864lqpkrdbj67yc6ykdj"; + sha256 = "15azv8y7a4sgxvvhl7z45jyxj91b4nn681vband5726c7znskhwl"; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - alsaLib + alsa-lib openssl wayland xorg.libX11 @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ''; - cargoSha256 = "0pnp5kmij4dwwvmgdv81mqcawcjcgg5gd6cpyf0xalyfjgj8i732"; + cargoSha256 = "0ihy4rgw9b4yqlqs87rx700h3a8wm02wpahhg7inic1lcag4bxif"; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; diff --git a/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index db3b87b7b59e..91f4ef519346 100644 --- a/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -1,28 +1,30 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs , dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert -, SDL2, libX11, libgdiplus, ffmpeg, openal, libsoundio +, libX11, libgdiplus, ffmpeg +, SDL2_mixer, openal, libsoundio, sndio , gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook }: let runtimeDeps = [ - SDL2 gtk3 libX11 libgdiplus ffmpeg + SDL2_mixer openal libsoundio + sndio ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.6835"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.6893"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "e520eecb5ba682d4b51bb782e3bc99fb1d6afe04"; - sha256 = "1yy1xslnvvl0m7g0jszj2pjwdwf0pbv53crzfkhla3n68kvfy00f"; + rev = "fb65f392d1c4b0e01f22b6ddebcc8317ba9769c3"; + sha256 = "0ncrcbwyirz21j81vc6yvcjc2fn8nc5ilrfczclq6f8cpy09c3y8"; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; diff --git a/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix b/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix index 1ccd7c9b38fe..23eacb690a0e 100644 --- a/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix +++ b/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix @@ -21,13 +21,13 @@ }) (fetchNuGet { name = "DiscordRichPresence"; - version = "1.0.166"; - sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a"; + version = "1.0.175"; + sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; - version = "4.3.0"; - sha256 = "03lb3xzgwxik8nljq87pr1b9bsxbsl3a4kvy0kqkw9f57n29ihvk"; + version = "4.4.0"; + sha256 = "02n4az1jv30078019png9gbspygz051inxsn6w4iar20dqp55g2w"; }) (fetchNuGet { name = "GdkSharp"; @@ -45,16 +45,16 @@ sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { - name = "GtkSharp"; - version = "3.22.25.128"; - sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; - }) - (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) (fetchNuGet { + name = "GtkSharp"; + version = "3.22.25.128"; + sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; + }) + (fetchNuGet { name = "LibHac"; version = "0.12.0"; sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; @@ -90,6 +90,11 @@ sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.8.0"; + sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; + }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.5"; sha256 = "14d6wz593dwm2j3apd3ny10idk8bfxqgfrparhc1q7q4i66y21ws"; @@ -145,11 +150,6 @@ sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.8.0"; - sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; - }) - (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.0"; sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m"; @@ -280,24 +280,19 @@ sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) - (fetchNuGet { name = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) (fetchNuGet { - name = "runtime.any.System.IO"; + name = "runtime.any.System.Globalization"; version = "4.3.0"; - sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) (fetchNuGet { - name = "runtime.any.System.Reflection"; + name = "runtime.any.System.IO"; version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; @@ -310,14 +305,14 @@ sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; + name = "runtime.any.System.Reflection"; version = "4.3.0"; - sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) (fetchNuGet { - name = "runtime.any.System.Runtime"; + name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; @@ -330,9 +325,9 @@ sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; + name = "runtime.any.System.Runtime"; version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; @@ -340,6 +335,11 @@ sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) + (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; @@ -365,16 +365,6 @@ sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; @@ -385,14 +375,24 @@ sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; @@ -511,8 +511,8 @@ }) (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; - version = "4.3.0"; - sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll"; + version = "4.4.0-build7"; + sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m"; }) (fetchNuGet { name = "SharpZipLib"; @@ -525,19 +525,19 @@ sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) (fetchNuGet { - name = "SixLabors.ImageSharp"; - version = "1.0.2"; - sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; - }) - (fetchNuGet { name = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) (fetchNuGet { + name = "SixLabors.ImageSharp"; + version = "1.0.2"; + sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; + }) + (fetchNuGet { name = "SPB"; - version = "0.0.2"; - sha256 = "178z9mi7zlk0laj79nkjh75ych47jjajiaj33hnh7zfmz05d8h6r"; + version = "0.0.3-build15"; + sha256 = "0h00yi2j65q31r5npsziq2rpiw832vf9r72j1hjqibp2l5m6v6yw"; }) (fetchNuGet { name = "System.AppContext"; @@ -565,16 +565,6 @@ sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; }) (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; @@ -590,9 +580,14 @@ sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { - name = "System.ComponentModel"; + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { name = "System.ComponentModel.EventBasedAsync"; @@ -610,6 +605,11 @@ sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { name = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; @@ -660,16 +660,6 @@ sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; @@ -685,14 +675,19 @@ sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { - name = "System.IO"; + name = "System.Globalization"; version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { name = "System.IO.Compression"; @@ -700,9 +695,14 @@ sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) (fetchNuGet { - name = "System.IO.Compression.ZipFile"; + name = "System.IO.FileSystem.Primitives"; version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { name = "System.IO.FileSystem"; @@ -715,14 +715,19 @@ sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "System.IO"; version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { name = "System.Linq"; @@ -735,11 +740,6 @@ sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) - (fetchNuGet { name = "System.Management"; version = "5.0.0"; sha256 = "09hyv3p0zd549577clydlb2szl84m4gvdjnsry73n8b12ja7d75s"; @@ -785,26 +785,6 @@ sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) - (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; @@ -825,6 +805,16 @@ sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; @@ -855,24 +845,24 @@ sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { - name = "System.Resources.ResourceManager"; + name = "System.Reflection"; version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { - name = "System.Runtime"; + name = "System.Resources.ResourceManager"; version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; @@ -905,16 +895,6 @@ sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; @@ -925,6 +905,16 @@ sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; @@ -935,6 +925,16 @@ sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; @@ -985,11 +985,6 @@ sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) (fetchNuGet { - name = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) - (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; @@ -1005,14 +1000,9 @@ sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; + name = "System.Security.Principal"; version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; @@ -1025,6 +1015,16 @@ sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; @@ -1035,19 +1035,19 @@ sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + name = "System.Threading.Overlapped"; + version = "4.3.0"; + sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { - name = "System.Threading.Overlapped"; + name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; - sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { name = "System.Threading.Tasks"; @@ -1060,16 +1060,6 @@ sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; @@ -1085,6 +1075,16 @@ sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; @@ -1105,13 +1105,13 @@ sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { - name = "System.Xml.XPath"; + name = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; - sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; + sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; + name = "System.Xml.XPath"; version = "4.3.0"; - sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; + sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) ] diff --git a/nixpkgs/pkgs/misc/emulators/ryujinx/log.patch b/nixpkgs/pkgs/misc/emulators/ryujinx/log.patch index 7283ef9e7d5d..57e96e5c25cb 100644 --- a/nixpkgs/pkgs/misc/emulators/ryujinx/log.patch +++ b/nixpkgs/pkgs/misc/emulators/ryujinx/log.patch @@ -1,8 +1,16 @@ -diff --git a/Ryujinx.Common/Configuration/LoggerModule.cs b/Ryujinx.Common/Configuration/LoggerModule.cs -index 20c0fb46..534576bc 100644 ---- a/Ryujinx.Common/Configuration/LoggerModule.cs -+++ b/Ryujinx.Common/Configuration/LoggerModule.cs -@@ -75,7 +75,7 @@ namespace Ryujinx.Configuration +diff --git a/Ryujinx/Configuration/LoggerModule.cs b/Ryujinx/Configuration/LoggerModule.cs +index 44631ea0..534576bc 100644 +--- a/Ryujinx/Configuration/LoggerModule.cs ++++ b/Ryujinx/Configuration/LoggerModule.cs +@@ -1,6 +1,7 @@ + using Ryujinx.Common; + using Ryujinx.Common.Logging; + using System; ++using System.IO; + + namespace Ryujinx.Configuration + { +@@ -74,7 +75,7 @@ namespace Ryujinx.Configuration if (e.NewValue) { Logger.AddTarget(new AsyncLogTargetWrapper( diff --git a/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix b/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix index 3b5cb487f77a..8cebc664bca2 100644 --- a/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { sha256 = "12hpn7zcdvp30ldpw2zf115yjqv55n1ldjbids7vx0lvbpr06dm1"; }; - enableParallelBuilding = true; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; diff --git a/nixpkgs/pkgs/misc/emulators/uae/default.nix b/nixpkgs/pkgs/misc/emulators/uae/default.nix index 75b86eaeebd1..803efe5149c2 100644 --- a/nixpkgs/pkgs/misc/emulators/uae/default.nix +++ b/nixpkgs/pkgs/misc/emulators/uae/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkg-config, gtk2, alsaLib, SDL}: +{lib, stdenv, fetchurl, pkg-config, gtk2, alsa-lib, SDL}: stdenv.mkDerivation rec { name = "uae-0.8.29"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 alsaLib SDL ]; + buildInputs = [ gtk2 alsa-lib SDL ]; hardeningDisable = [ "format" ]; LDFLAGS = [ "-lm" ]; diff --git a/nixpkgs/pkgs/misc/emulators/vbam/default.nix b/nixpkgs/pkgs/misc/emulators/vbam/default.nix index c21f67845db4..bb5e7cea4e00 100644 --- a/nixpkgs/pkgs/misc/emulators/vbam/default.nix +++ b/nixpkgs/pkgs/misc/emulators/vbam/default.nix @@ -2,6 +2,7 @@ , cairo , cmake , fetchFromGitHub +, fetchpatch , ffmpeg , gettext , libGLU, libGL @@ -46,6 +47,15 @@ stdenv.mkDerivation rec { "-DENABLE_SDL='true'" ]; + patches = [ + (fetchpatch { + # https://github.com/visualboyadvance-m/visualboyadvance-m/pull/793 + name = "fix-build-SDL-2.0.14.patch"; + url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/619a5cce683ec4b1d03f08f316ba276d8f8cd824.patch"; + sha256 = "099cbzgq4r9g83bvdra8a0swfl1vpfng120wf4q7h6vs0n102rk9"; + }) + ]; + meta = with lib; { description = "A merge of the original Visual Boy Advance forks"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/misc/emulators/vice/default.nix b/nixpkgs/pkgs/misc/emulators/vice/default.nix index 7d63927e33f6..f8b9e5906f3e 100644 --- a/nixpkgs/pkgs/misc/emulators/vice/default.nix +++ b/nixpkgs/pkgs/misc/emulators/vice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw +{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsa-lib, readline, libGLU, libGL, libXaw , pkg-config, gtk2, SDL, autoreconfHook, makeDesktopItem }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; - buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU libGL + buildInputs = [ bison flex perl libpng giflib libjpeg alsa-lib readline libGLU libGL pkg-config gtk2 SDL autoreconfHook libXaw ]; dontDisableStatic = true; configureFlags = [ "--enable-fullscreen --enable-gnomeui" ]; diff --git a/nixpkgs/pkgs/misc/emulators/wine/base.nix b/nixpkgs/pkgs/misc/emulators/wine/base.nix index 6d7c2543d805..0023d9878b36 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/base.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/base.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional gphoto2Support pkgs.libgphoto2 ++ lib.optional ldapSupport pkgs.openldap ++ lib.optional fontconfigSupport pkgs.fontconfig - ++ lib.optional alsaSupport pkgs.alsaLib + ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev @@ -151,5 +151,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { license = with lib.licenses; [ lgpl21Plus ]; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; maintainers = with lib.maintainers; [ avnik raskin bendlas ]; + mainProgram = "wine"; }; }) diff --git a/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/nixpkgs/pkgs/misc/emulators/wine/sources.nix index 0fe4e4da92d7..6103472a7cc1 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.7"; + version = "6.9"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-wwUUt3YdRhFRSuAhyx41QSjXfv9UooPxQB7nAid7vqQ="; + sha256 = "sha256-GFVOYB3vhqmiAXKwhcZoMpFPwh511VX25U/4nn6uW/4="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,19 +65,23 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-fWriizSk2+U7Mpn6w/Dlrevd4vc5MnlSWSGxQDf2p+M="; + sha256 = "sha256-g0NmiypafOAmKDRoRf4uz5NnhFo6uga0fKYNCF29jbE="; owner = "wine-staging"; repo = "wine-staging"; - rev = "v${version}"; + #rev = "v${version}"; + # FIXME: replace with line above with 6.10 release + # Fix https://bugs.winehq.org/show_bug.cgi?id=51172 + rev = "5bbe3e47a559b3c04bc8791e0b398a271c772af7"; - # Just keep list empty, if current release haven't broken patchsets - disabledPatchsets = [ ]; + # Actually only "d3d11-Deferred_Context" cause problems, two others only dependencies + # see FIXME above + disabledPatchsets = [ "d3d11-Deferred_Context" "wined3d-CSMT_Main" "nvapi-Stub_DLL" "nvcuvid-CUDA_Video_Support" "nvencodeapi-Video_Encoder" ]; }; winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20201206"; - sha256 = "1xs09v1zr98yvwvdsmzgryc2hbk92mwn54yxx8162l461465razc"; + version = "20210206"; + sha256 = "sha256-tnwownY9A05nYlkYaoCQZjeGGHuE+kJYzA7MPE2bXnQ="; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/nixpkgs/pkgs/misc/emulators/yapesdl/default.nix b/nixpkgs/pkgs/misc/emulators/yapesdl/default.nix index 307068cde045..5f4b7771fb5f 100644 --- a/nixpkgs/pkgs/misc/emulators/yapesdl/default.nix +++ b/nixpkgs/pkgs/misc/emulators/yapesdl/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { SDL2 ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ]; + installPhase = '' runHook preInstall install --directory $out/bin $out/share/doc/$pname diff --git a/nixpkgs/pkgs/misc/emulators/yuzu/base.nix b/nixpkgs/pkgs/misc/emulators/yuzu/base.nix index b0459d61679f..1160a5fc1e7f 100644 --- a/nixpkgs/pkgs/misc/emulators/yuzu/base.nix +++ b/nixpkgs/pkgs/misc/emulators/yuzu/base.nix @@ -1,7 +1,7 @@ { pname, version, src, branchName , stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook , cmake, pkg-config -, libpulseaudio, libjack2, alsaLib, sndio +, libpulseaudio, libjack2, alsa-lib, sndio , vulkan-loader, vulkan-headers , qtbase, qtwebengine, qttools , nlohmann_json, rapidjson @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ - libpulseaudio libjack2 alsaLib sndio + libpulseaudio libjack2 alsa-lib sndio vulkan-loader vulkan-headers qtbase qtwebengine qttools nlohmann_json rapidjson @@ -44,6 +44,9 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ + "-DYUZU_USE_BUNDLED_QT=OFF" + "-DYUZU_USE_BUNDLED_SDL2=OFF" + "-DYUZU_USE_BUNDLED_FFMPEG=OFF" "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" diff --git a/nixpkgs/pkgs/misc/emulators/yuzu/default.nix b/nixpkgs/pkgs/misc/emulators/yuzu/default.nix index d47c5937385c..806ec806e4d6 100644 --- a/nixpkgs/pkgs/misc/emulators/yuzu/default.nix +++ b/nixpkgs/pkgs/misc/emulators/yuzu/default.nix @@ -4,25 +4,25 @@ let in { mainline = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-mainline"; - version = "576"; + version = "633"; branchName = branch; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "121pn3kmghpcf4pzs0mc8z3viyp32rzm7rssva7cdd5016z2648k"; + sha256 = "1zq20dd6x3kk179ls7y3mc5rj9vr73qs12bdj52bl3kscphxybf1"; fetchSubmodules = true; }; }; early-access = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-ea"; - version = "1536"; + version = "1704"; branchName = branch; src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "0smrx05xxr4b96i8bw6n6pynkl9r21ydfvpjdzxkr9amin20r54y"; + sha256 = "07pcldcmn8ammzbnxki6by7hgacr6z0548dvhv2p5lp9qcf3xz22"; }; }; }.${branch} diff --git a/nixpkgs/pkgs/misc/frescobaldi/default.nix b/nixpkgs/pkgs/misc/frescobaldi/default.nix index 82a3aa8c7bef..60fee5a6c861 100644 --- a/nixpkgs/pkgs/misc/frescobaldi/default.nix +++ b/nixpkgs/pkgs/misc/frescobaldi/default.nix @@ -2,23 +2,29 @@ buildPythonApplication rec { pname = "frescobaldi"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "wbsoft"; repo = "frescobaldi"; rev = "v${version}"; - sha256 = "07hjlq29npasn2bsb3qrzr1gikyvcc85avx0sxybfih329bvjk03"; + sha256 = "1p8f4vn2dpqndw1dylmg7wms6vi69zcfj544c908s4r8rrmbycyf"; }; propagatedBuildInputs = with python3Packages; [ - lilypond pygame python-ly sip + lilypond pygame python-ly sip_4 pyqt5 poppler-qt5 pyqtwebengine ]; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; + # Needed because source is fetched from git + preBuild = '' + make -C i18n + make -C linux + ''; + # no tests in shipped with upstream doCheck = false; diff --git a/nixpkgs/pkgs/misc/jackaudio/default.nix b/nixpkgs/pkgs/misc/jackaudio/default.nix index 9dd973674412..7474a304f032 100644 --- a/nixpkgs/pkgs/misc/jackaudio/default.nix +++ b/nixpkgs/pkgs/misc/jackaudio/default.nix @@ -5,7 +5,7 @@ , aften, AudioUnit, CoreAudio, libobjc, Accelerate # Optional Dependencies -, dbus ? null, libffado ? null, alsaLib ? null +, dbus ? null, libffado ? null, alsa-lib ? null , libopus ? null # Extra options @@ -15,14 +15,14 @@ with lib; let inherit (python3Packages) python dbus-python; - shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; libOnly = prefix == "lib"; optDbus = if stdenv.isDarwin then null else shouldUsePkg dbus; optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; optLibffado = if libOnly then null else shouldUsePkg libffado; - optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; + optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib; optLibopus = shouldUsePkg libopus; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/misc/jackaudio/jack1.nix b/nixpkgs/pkgs/misc/jackaudio/jack1.nix index ea7356b32e91..aebe32497c1d 100644 --- a/nixpkgs/pkgs/misc/jackaudio/jack1.nix +++ b/nixpkgs/pkgs/misc/jackaudio/jack1.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config # Optional Dependencies -, alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null +, alsa-lib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null }: let - shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; - optAlsaLib = shouldUsePkg alsaLib; + optAlsaLib = shouldUsePkg alsa-lib; optDb = shouldUsePkg db; optLibuuid = shouldUsePkg libuuid; optLibffado = shouldUsePkg libffado; diff --git a/nixpkgs/pkgs/misc/lightspark/default.nix b/nixpkgs/pkgs/misc/lightspark/default.nix index 7c9a4815e0a5..0e99767a2cb6 100644 --- a/nixpkgs/pkgs/misc/lightspark/default.nix +++ b/nixpkgs/pkgs/misc/lightspark/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg_3, glew, pcre +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg, glew, pcre , rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, xz, nasm , llvm, glibmm }: @@ -14,21 +14,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-pIiv5wEDLvTHjlYSicXUTTI6pVAsO6FC39Gie9Z/hZ4="; }; - patchPhase = '' + postPatch = '' sed -i 's/SET(ETCDIR "\/etc")/SET(ETCDIR "etc")/g' CMakeLists.txt ''; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg + curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg pango xz nasm llvm glibmm ]; meta = with lib; { description = "Open source Flash Player implementation"; homepage = "https://lightspark.github.io/"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ jchw ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/misc/lilypond/default.nix b/nixpkgs/pkgs/misc/lilypond/default.nix index d8db893f7d70..b75f9c3f8008 100644 --- a/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/nixpkgs/pkgs/misc/lilypond/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.22.0"; + version = "2.22.1"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "0khg9dlm1b02mm9w54xqc9ydj416xkikn6p08g1asiyjf4qx1pb4"; + sha256 = "sha256-cqwtVMMQwxQcC3gtTgvvkALVUZz0ZjJ1mx8D72lpzDA="; }; postInstall = '' diff --git a/nixpkgs/pkgs/misc/logging/beats/6.x.nix b/nixpkgs/pkgs/misc/logging/beats/6.x.nix index ce80b174d327..81b8ba0ab5bf 100644 --- a/nixpkgs/pkgs/misc/logging/beats/6.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -22,10 +22,17 @@ let beat = package : extraArgs : buildGoPackage (rec { platforms = platforms.linux; }; } // extraArgs); -in { +in rec { filebeat6 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; heartbeat6 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat6 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + metricbeat6 = beat "metricbeat" { + meta.description = "Lightweight shipper for metrics"; + passthru.tests = + assert metricbeat6.drvPath == nixosTests.elk.ELK-6.elkPackages.metricbeat.drvPath; + { + elk = nixosTests.elk.ELK-6; + }; + }; packetbeat6 = beat "packetbeat" { buildInputs = [ libpcap ]; meta.broken = true; diff --git a/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/nixpkgs/pkgs/misc/logging/beats/7.x.nix index 43ea85508c69..77e14e96c54e 100644 --- a/nixpkgs/pkgs/misc/logging/beats/7.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, nixosTests, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -22,10 +22,17 @@ let beat = package : extraArgs : buildGoPackage (rec { platforms = platforms.linux; }; } // extraArgs); -in { +in rec { filebeat7 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; heartbeat7 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat7 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + metricbeat7 = beat "metricbeat" { + meta.description = "Lightweight shipper for metrics"; + passthru.tests = + assert metricbeat7.drvPath == nixosTests.elk.ELK-7.elkPackages.metricbeat.drvPath; + { + elk = nixosTests.elk.ELK-7; + }; + }; packetbeat7 = beat "packetbeat" { buildInputs = [ libpcap ]; meta.description = "Network packet analyzer that ships data to Elasticsearch"; diff --git a/nixpkgs/pkgs/misc/scream-receivers/default.nix b/nixpkgs/pkgs/misc/scream-receivers/default.nix deleted file mode 100644 index 6c0f73f1b258..000000000000 --- a/nixpkgs/pkgs/misc/scream-receivers/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, alsaLib -, pulseSupport ? false, libpulseaudio ? null -}: - -stdenv.mkDerivation rec { - pname = "scream-receivers"; - version = "3.4"; - - src = fetchFromGitHub { - owner = "duncanthrax"; - repo = "scream"; - rev = version; - sha256 = "1ig89bmzfrm57nd8lamzsdz5z81ks5vjvq3f0xhgm2dk2mrgjsj3"; - }; - - buildInputs = [ alsaLib ] ++ lib.optional pulseSupport libpulseaudio; - - buildPhase = '' - (cd Receivers/alsa && make) - (cd Receivers/alsa-ivshmem && make) - '' + lib.optionalString pulseSupport '' - (cd Receivers/pulseaudio && make) - (cd Receivers/pulseaudio-ivshmem && make) - ''; - - installPhase = '' - mkdir -p $out/bin - mv ./Receivers/alsa/scream-alsa $out/bin/ - mv ./Receivers/alsa-ivshmem/scream-ivshmem-alsa $out/bin/ - '' + lib.optionalString pulseSupport '' - mv ./Receivers/pulseaudio/scream-pulse $out/bin/ - mv ./Receivers/pulseaudio-ivshmem/scream-ivshmem-pulse $out/bin/ - ''; - - doInstallCheck = true; - installCheckPhase = '' - export PATH=$PATH:$out/bin - set -o verbose - set +o pipefail - - # Programs exit with code 1 when testing help, so grep for a string - scream-alsa -h 2>&1 | grep -q Usage: - scream-ivshmem-alsa 2>&1 | grep -q Usage: - '' + lib.optionalString pulseSupport '' - scream-pulse -h 2>&1 | grep -q Usage: - scream-ivshmem-pulse 2>&1 | grep -q Usage: - ''; - - meta = with lib; { - description = "Audio receivers for the Scream virtual network sound card"; - homepage = "https://github.com/duncanthrax/scream"; - license = licenses.mspl; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; - }; -} diff --git a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix index 8d40df14616e..facac2717c4c 100644 --- a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "betterlockscreen"; - version = "3.0.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "pavanjadhaw"; repo = "betterlockscreen"; rev = version; - sha256 = "0jc8ifb69shmd0avx6vny4m1w5dfxkkf5vnm7qcrmc8yflb0s3z6"; + sha256 = "sha256-UOMCTHtw1C+MiJL6AQ+8gqmmbqrs1QTzEi1Ar03PyMs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch index 3bbbfcfd613d..439c3561f960 100644 --- a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch +++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch @@ -1,12 +1,14 @@ +diff --git a/betterlockscreen b/betterlockscreen +index 6dd06e0..746d820 100755 --- a/betterlockscreen +++ b/betterlockscreen -@@ -76,7 +76,7 @@ prelock() { +@@ -87,7 +87,7 @@ prelock() { lock() { #$1 image path - i3lock \ + i3lock-color \ + -c 00000000 \ -t -i "$1" \ --timepos='x+110:h-70' \ - --datepos='x+43:h-45' \ diff --git a/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix index 74d9e3cffee0..d1aa7d9911b2 100644 --- a/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; homepage = "https://electricsheep.org/"; - maintainers = with maintainers; [ nand0p fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; license = licenses.gpl1; }; diff --git a/nixpkgs/pkgs/misc/screensavers/vlock/default.nix b/nixpkgs/pkgs/misc/screensavers/vlock/default.nix index 243d582bdcee..4813e2493075 100644 --- a/nixpkgs/pkgs/misc/screensavers/vlock/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/vlock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Virtual console locking program"; license = licenses.gpl2; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/misc/sndio/default.nix b/nixpkgs/pkgs/misc/sndio/default.nix index c86198a6985b..9e4035801f1e 100644 --- a/nixpkgs/pkgs/misc/sndio/default.nix +++ b/nixpkgs/pkgs/misc/sndio/default.nix @@ -1,17 +1,19 @@ -{ lib, stdenv, fetchurl, alsaLib, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, alsa-lib, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "sndio"; - version = "1.7.0"; - enableParallelBuilding = true; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; + version = "1.8.0"; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x"; + sha256 = "027hlqji0h2cm96rb8qvkdmwxl56l59bgn828nvmwak2c2i5k703"; }; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib; + + enableParallelBuilding = true; + meta = with lib; { homepage = "http://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; diff --git a/nixpkgs/pkgs/misc/solfege/default.nix b/nixpkgs/pkgs/misc/solfege/default.nix index af2ce3f53cf2..fc7062d904c3 100644 --- a/nixpkgs/pkgs/misc/solfege/default.nix +++ b/nixpkgs/pkgs/misc/solfege/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook , buildPythonApplication, pycairo, pygobject3 , gobject-introspection, gtk3, librsvg -, alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond +, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond }: buildPythonApplication rec { @@ -24,7 +24,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pycairo pygobject3 ]; preBuild = '' - sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \ + sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \ -e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \ -e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \ -e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \ diff --git a/nixpkgs/pkgs/misc/t-rec/default.nix b/nixpkgs/pkgs/misc/t-rec/default.nix new file mode 100644 index 000000000000..b9663cee5c33 --- /dev/null +++ b/nixpkgs/pkgs/misc/t-rec/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, imagemagick, ffmpeg, rustPlatform, fetchFromGitHub, makeWrapper +, libiconv, Foundation }: + +let + binPath = lib.makeBinPath [ + imagemagick + ffmpeg + ]; +in +rustPlatform.buildRustPackage rec { + pname = "t-rec"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "sassman"; + repo = "t-rec-rs"; + rev = "v${version}"; + sha256 = "InArrBqfhDrsonjmCIPTBVOA/s2vYml9Ay6cdrKLd7c="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ imagemagick ] + ++ lib.optionals stdenv.isDarwin [ libiconv Foundation ]; + + postInstall = '' + wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" + ''; + + cargoSha256 = "4gwfrC65YlXV6Wu2ninK1TvMNUkY1GstVYPr0FK+xLU="; + + meta = with lib; { + description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; + homepage = "https://github.com/sassman/t-rec-rs"; + license = with licenses; [ gpl3Only ]; + maintainers = [ maintainers.hoverbear ]; + }; +} diff --git a/nixpkgs/pkgs/misc/uboot/default.nix b/nixpkgs/pkgs/misc/uboot/default.nix index 6c59c13d12e2..cd401907125b 100644 --- a/nixpkgs/pkgs/misc/uboot/default.nix +++ b/nixpkgs/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2021.01"; + defaultVersion = "2021.04"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "0m04glv9kn3bhs62sn675w60wkrl4m3a4hnbnnw67s3l198y21xl"; + sha256 = "06p1vymf0dl6jc2xy5w7p42mpgppa46lmpm2ishmgsycnldqnhqd"; }; buildUBoot = { version ? null diff --git a/nixpkgs/pkgs/misc/uq/default.nix b/nixpkgs/pkgs/misc/uq/default.nix index 5c0fb9549100..e0c62ca92cab 100755 --- a/nixpkgs/pkgs/misc/uq/default.nix +++ b/nixpkgs/pkgs/misc/uq/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb"; }; - cargoSha256 = "1fv13rbghfw7114h7sda04gpqrjrsgnnki0p9kdd6r6sk5cbhn9x"; + cargoSha256 = "1p6008vxm2pi9v31qhsq7zysanal6rcvcl8553373bkqlfd7w5c4"; meta = with lib; { description = "A simple, user-friendly alternative to sort | uniq"; diff --git a/nixpkgs/pkgs/misc/vim-plugins/aliases.nix b/nixpkgs/pkgs/misc/vim-plugins/aliases.nix index 4cfb6ccd372f..4e08e5fe05e1 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/aliases.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/aliases.nix @@ -1,8 +1,7 @@ # Deprecated aliases - for backward compatibility +lib: -lib: overriden: - -with overriden; +final: prev: let # Removing recurseForDerivation prevents derivations of aliased attribute @@ -21,12 +20,12 @@ let # Make sure that we are not shadowing something from # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n overriden + checkInPkgs = n: alias: if builtins.hasAttr n prev then throw "Alias ${n} is still in vim-plugins" else alias; mapAliases = aliases: - lib.mapAttrs (n: alias: removeDistribute + lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations (checkInPkgs n alias))) aliases; @@ -36,7 +35,7 @@ let ) (builtins.fromJSON (builtins.readFile ./deprecated.json)); in -mapAliases ({ +mapAliases (with prev; { airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 bats = bats-vim; diff --git a/nixpkgs/pkgs/misc/vim-plugins/default.nix b/nixpkgs/pkgs/misc/vim-plugins/default.nix index e6bca9484a26..cbc6ec7380ba 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/default.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/default.nix @@ -5,8 +5,12 @@ let inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; + inherit (lib) extends; + + initialPackages = self: {}; + plugins = callPackage ./generated.nix { - inherit buildVimPluginFrom2Nix overrides; + inherit buildVimPluginFrom2Nix; }; # TL;DR @@ -21,8 +25,13 @@ let inherit llvmPackages; }; - aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins); + aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else final: prev: {}; + extensible-self = lib.makeExtensible + (extends aliases + (extends overrides + (extends plugins initialPackages) + ) + ); in - -plugins // aliases + extensible-self diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 651515c3150d..a7fdb5fd9193 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -1,7 +1,7 @@ # This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! -{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: -let - packages = ( self: +{ lib, buildVimPluginFrom2Nix, fetchFromGitHub }: + +final: prev: { a-vim = buildVimPluginFrom2Nix { pname = "a-vim"; @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-04-20"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "737c1bf1ac9becd67519f7a6832ad276feca8f08"; - sha256 = "0imngagc6p5mfx1v2maxcwzh75l1y4diyd1ymwjil51x93qkrzxi"; + rev = "1b08791228f5aca4545a3fba6699b29a003028fe"; + sha256 = "07fmvg4hcri98zxnyjab2inzaapqc2w08rzdkspcgrhibqvp53jk"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,24 +89,24 @@ let aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-02-27"; + version = "2021-05-31"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "984d84a1bda7208587feb3d62cfec5bcab404af2"; - sha256 = "00gf2xm20wg0p1ik55jwhzlbd5sz06k3hk30415xayfa6flgh0n4"; + rev = "4ca3d418eebc0da452b7defc18970c83f7de5070"; + sha256 = "0ax3hfwppbkm7haxvsllac6r4zk2ys9rrj7sj4p3ayl1w8v3n8nq"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2021-04-11"; + version = "2021-06-01"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "bc9c3bf48961f5babb24243bd407c715ce551210"; - sha256 = "1pvjjxw3nz3s11f83rbmdhad5rvks0q2am09sfxns0x4rwiwcyrk"; + rev = "804099202b72ffd4bf4ea4ce24d8d7bac8b9ae2d"; + sha256 = "0p93g0zi8j6bf5zh0ng9vdl9f76dan524g22jpb8c0xmm6ywns5l"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -161,12 +161,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2021-03-03"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "8e018dee9c5e2205288bda01be0de196b04b7cf2"; - sha256 = "1ghv6zp3qajd4n9qv3mnxqhczi77qmds2b2iicbl252slvldr604"; + rev = "6c653c3f8f1c1cf7a34522c9555d5160f36d29ee"; + sha256 = "1zzdybfswlh66gw8a3imkwf7m6g13rlf6dqyg71c6bfmn3zlx2l0"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -183,6 +183,18 @@ let meta.homepage = "https://github.com/vmchale/ats-vim/"; }; + aurora = buildVimPluginFrom2Nix { + pname = "aurora"; + version = "2021-06-06"; + src = fetchFromGitHub { + owner = "ray-x"; + repo = "aurora"; + rev = "6a77e8ecf38b0e7a547df58f499cecc1c50cd444"; + sha256 = "1yh88v6p1ingwydzr40jcva9gw58ihmgjndaf7h3sp0ldvl75ci2"; + }; + meta.homepage = "https://github.com/ray-x/aurora/"; + }; + auto-git-diff = buildVimPluginFrom2Nix { pname = "auto-git-diff"; version = "2019-09-23"; @@ -209,12 +221,12 @@ let auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-04-24"; + version = "2021-06-01"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "6e87fa2ed6b6fe7ccd14fe4b30cc00be47afc3c6"; - sha256 = "00d3ga6rpzwcz2pcdgwrnr2xymh1hizs46zzc8jjmrj58k8sg033"; + rev = "80ddcf26eca11cf4d48a52ffec094fe5a4711f32"; + sha256 = "0kh6a5hm0ppsbfpp7yhr2k4v36mj203q59wy15sgajx08ww0jj3m"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -233,12 +245,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-02-26"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "1ed59bff2a84e48e1a243a7e5d336a395f610e2a"; - sha256 = "1acz9zwb9mwyhfckpzv22dy5c4bq83jrmvvbd22z9k0hm5py2538"; + rev = "39f8083c885149f52712b65b8d5380d63939bc23"; + sha256 = "1kc8lszdc4gglf5pyp7g6kb4kspml8rd41jv083p29ipwy9n8a8j"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -257,12 +269,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-04-21"; + version = "2021-06-03"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "54b4376d9a44b45f12b0f6f5bcc46f98b66782e1"; - sha256 = "0nh4rgyix8mj3wag8wpcy68avyrh5ps89a842fqdd5x6054d3apv"; + rev = "23b6f64c9523522dd185482c856de492476a760c"; + sha256 = "1ijm4w4nqa037vjpjgjizhzrnpj10hwjc93lhzq29qs3cx85df1q"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -315,6 +327,18 @@ let meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/"; }; + bracey-vim = buildVimPluginFrom2Nix { + pname = "bracey-vim"; + version = "2021-05-11"; + src = fetchFromGitHub { + owner = "turbio"; + repo = "bracey.vim"; + rev = "457933c107db65ff7e2695e07209a9a2934544b7"; + sha256 = "1x8c8l9x4i9n2rlh3a8zha0ni85v04p32w7yciwxp7ddlwzf3lwh"; + }; + meta.homepage = "https://github.com/turbio/bracey.vim/"; + }; + brainfuck-vim = buildVimPluginFrom2Nix { pname = "brainfuck-vim"; version = "2021-01-28"; @@ -389,12 +413,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-04-24"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e7c2807bf0c029864f346024981f1a7927044393"; - sha256 = "063jk33l7yz467b0v00s3h5gb3lbwb0x5gh4r5bignlhm518sfa3"; + rev = "eaee30fe7afdbce73f92d0c766f4b411c8de5525"; + sha256 = "0b73k55zfhd4ygqiwwps17fp9nksbs8km57vfl0y85vb3ajzg0l6"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -425,12 +449,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-04-24"; + version = "2021-06-04"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "4c314000b5a21a1b9f52442a0c80e4b3fd4f0a1f"; - sha256 = "1wxsgaixdmb8v87kavvyyiyqlkn7ck5g39hkq4j19747jnb6lvqf"; + rev = "d50cd0c60ecdaffb779d2acb7ce2bb94df1ed867"; + sha256 = "0pqpvqas1z173c2ngka787d9gp49ai3x85haingkxvir3bf0nbqm"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -461,12 +485,12 @@ let coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; - version = "2021-03-04"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "vn-ki"; repo = "coc-clap"; - rev = "57116d2f999dfa025fac579835fd23e1a6341fa2"; - sha256 = "0m2khf11krkqmbykfx21yq9ydglz6dldw4xml5nkyqm93n37xn1s"; + rev = "8622be2674f3197bec8a0c4cfd177eb8455f45e6"; + sha256 = "063azqsibg25iv2c9smn4k6933frrwarqz640b14c041sgi6h8cx"; }; meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; @@ -485,24 +509,24 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-04-24"; + version = "2021-05-29"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "70f0691e14c8e55290e554591c0a2661dea530fa"; - sha256 = "1m3kwgng7xi8xycc0dcx0wr9i7q0anx9lpax0r4p2a26vaqam539"; + rev = "1be2273dc37c07b98b7a1b2b67fd57c80feb85a9"; + sha256 = "06w052x13idb8wfvyasg36hakffxnzfs7paj3wk83qa2m1kiz1n4"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-04-14"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "f76e290d6765261b0a4aee2247dfaaba77e30ab9"; - sha256 = "0xm9clynyp7h248iddpns7rqdllgvf3f34qlxn47fby2nh07galc"; + rev = "02cd0ca0fa06712b7609b87c50e5e05998b3a771"; + sha256 = "093dcv4hzxxz2ygawjka08j4s7akygh2fldn4mfzrxjyjpxqal0c"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -533,12 +557,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-04-23"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "f9c4fc96fd08f13f549c4bc0eb56f2d91ca91919"; - sha256 = "087nvvxfxrllnx2ggi8m088wgcrm1hd9c5mqfx37zmzfjqk78rw4"; + rev = "898335d52ed925e8dd5dd3da3c25470d352b2e11"; + sha256 = "19ks20v1mjm5yrhlrkxqpmsc8jz2nfz5w38ixfkpbhdj3qwdf5gg"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -555,6 +579,18 @@ let meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; + colorbuddy-nvim = buildVimPluginFrom2Nix { + pname = "colorbuddy-nvim"; + version = "2021-04-16"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "colorbuddy.nvim"; + rev = "87c80e3f4a590d0387d9b128d1f1fc456759408a"; + sha256 = "19gfmyhmwpr8gi03w44zm056zrzaj74hplpl4psy9mylvb0ghf0k"; + }; + meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; + }; + colorizer = buildVimPluginFrom2Nix { pname = "colorizer"; version = "2020-07-23"; @@ -581,12 +617,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2021-03-14"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "a7ce436b211a7ac1f47cfd440370653e33c2a1d5"; - sha256 = "1yfcbh9q35w1ckdv8isbwjwlgnjnjmqm8yc7bcbfirkx9pjlsw2z"; + rev = "6a00a2cabfb5ee3f49ff556ceea56892825c0397"; + sha256 = "0z2zr2mfc5m4xn8b0j0br7q96hs42md5wd53viv0zmw67i2pnbcs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -616,18 +652,54 @@ let meta.homepage = "https://github.com/tami5/compe-conjure/"; }; + compe-latex-symbols = buildVimPluginFrom2Nix { + pname = "compe-latex-symbols"; + version = "2021-05-14"; + src = fetchFromGitHub { + owner = "GoldsteinE"; + repo = "compe-latex-symbols"; + rev = "70f58e53e142e3c59fe0f673dd54ce690ae57367"; + sha256 = "0p4xss3zyp6002hsa6dx989zhp672mc30b57w5cjhcgbknw0iy1l"; + }; + meta.homepage = "https://github.com/GoldsteinE/compe-latex-symbols/"; + }; + compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-04-23"; + version = "2021-05-09"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "f6ace45ef5cbd8b274d7163a2931c11083d34d44"; - sha256 = "0wjy38v3h5nqr2vw2ydhy2227cqkd8k14cnb3vr39xm5c0fc3ci5"; + rev = "755e45c97d29d73400f8fba591ff06054d37127a"; + sha256 = "0gsq2v0qpzw211fmss3c004pmqcfns9vy4fhki9a0c69zk1ggalp"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; + compe-tmux = buildVimPluginFrom2Nix { + pname = "compe-tmux"; + version = "2021-05-31"; + src = fetchFromGitHub { + owner = "andersevenrud"; + repo = "compe-tmux"; + rev = "b199db008d07caf7f1d488ac3f171910416528a4"; + sha256 = "1qiir95bz046ppp6pp8k6m00jrjcy2yp098s72lwfnsls6pqsgpf"; + }; + meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; + }; + + compe-zsh = buildVimPluginFrom2Nix { + pname = "compe-zsh"; + version = "2021-04-03"; + src = fetchFromGitHub { + owner = "tamago324"; + repo = "compe-zsh"; + rev = "1a46a0ee661242f6a015b2abead34b606bb97171"; + sha256 = "0m8fmsx4bwmgqgjpwpldckp68hpx6qfschwdg275xsxkzw8pdnbk"; + }; + meta.homepage = "https://github.com/tamago324/compe-zsh/"; + }; + completion-buffers = buildVimPluginFrom2Nix { pname = "completion-buffers"; version = "2021-01-17"; @@ -642,12 +714,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2021-04-08"; + version = "2021-06-01"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "8bca7aca91c947031a8f14b038459e35e1755d90"; - sha256 = "02zqc75p9ggrz6fyiwvzpnzipfd1s5xfr7fli2yypb4kp72mrbaf"; + rev = "c8db953a8e9f4bc8183e31831297cf84d6f521b8"; + sha256 = "0p35msrh7g100ayl0g8285q43v20n6hlv1grdb0rmw8sil0j881a"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -688,26 +760,38 @@ let meta.homepage = "https://github.com/chikatoike/concealedyank.vim/"; }; + conflict-marker-vim = buildVimPluginFrom2Nix { + pname = "conflict-marker-vim"; + version = "2020-09-23"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "conflict-marker.vim"; + rev = "6a9b8f92a57ea8a90cbf62c960db9e5894be2d7a"; + sha256 = "0vw5kvnmwwia65gni97vk42b9s47r3p5bglrhpcxsvs3f4s250vq"; + }; + meta.homepage = "https://github.com/rhysd/conflict-marker.vim/"; + }; + conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-04-01"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "46b766dee43a97266741087085889751b474fb56"; - sha256 = "1034n76bg4p4yvqmz9g9clsrrhx0kvqs0z8fy6p9axmxqzi8z9rr"; + rev = "643ae9bf5f08e752a22027628b69a31ce271f1b5"; + sha256 = "0jbd1y0riq6xdyh0x5msw8475b7v0viapgkmawyda3ax8bczb3jv"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2021-03-04"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "f5e4ed8f7847cd5474017459c2a0f2dfd2bf971c"; - sha256 = "039mnsd6k0sgs8l1a8ngl3y817c8g657nv8v9bdw9h8l5a934cb2"; + rev = "eca5b28dca1bace3b5694eb20b3ab244f65180e0"; + sha256 = "0n0av5x6js5ld4xnlq5nh18cdwhvrljdsx17gq2sf54q342hlwp0"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -726,12 +810,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-04-05"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "54b9cbf9da4a956dc55cd903f3b4f7b211b712a2"; - sha256 = "0ir10ff5va38ch52fvyl5cfz4mjins3lpklqyh23rrqc0hfd8154"; + rev = "2f1c81a86342e333a916a1bc7db5218cf115a191"; + sha256 = "0ysnsixa7zy4plxr2qm2phyvl63qnmszjh3d8cbr4852klmv0shw"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -774,12 +858,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2021-03-15"; + version = "2021-05-09"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "24da62f64e6025be12ad60b16489b561f228e619"; - sha256 = "0x5z46rzhwrdr1fzq69c6bpn3dnjjj9a64s97wn220n4xwrz1y54"; + rev = "a7baf1ce934e725fbcd61b7e6aa27572c0439681"; + sha256 = "1bfi90h3xn0iz9kp2jglxsw22aq72si6xccvsfhxhjsz329rw239"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -882,12 +966,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-04-21"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "3730b008158327d0068b8a9b19d57fd7459bb8b9"; - sha256 = "0bc1gfwsms0mrxjfp7ia4r2rw1b95ih8xgkh02l9b30wp81xdfr3"; + rev = "b42f1b974a50d4c0ebe563a210b5a3bf138c0166"; + sha256 = "0z0xd5qnrm85ibwy826n7wbk0w8nzwmrs5xii9xkxgych4q9xanp"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -930,24 +1014,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-04-17"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "c3d1c1893bcaaa6b44135cbc8f3b809b703cf4dc"; - sha256 = "14y1fz4i7ym2f2q1lv93giq99y6jai0jwdvm5nlcr8ksrazfwq9v"; + rev = "a20d2376b57ca500782719f1c4f83796d160c296"; + sha256 = "15hrlr6f98y1cmdyrlady6h4b501b7mvyzfbvsqcxjj8vj18pxas"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-04-12"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "b9dd634beacfda00a6d4c388867cc1348735f3a2"; - sha256 = "055k2fph67glzlx10611a6z7s10z3jsms21ixzy25hsdvr75xpda"; + rev = "6f3574b091d48e37599dcb356349a31472556716"; + sha256 = "0im9jnrbf1qbglh9wzqalfvp98wx9ccg5gk89k40nz3gggpwsbfh"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1076,12 +1160,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2021-02-07"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "e526dbecda137e37c45492ce72fa92ea32314154"; - sha256 = "03dwis03zx88j4dan1y39b03rvf7f2q7hykhgqsfcx1zj8lp8s7n"; + rev = "00937dd6e4270287c34cdd7f64e8dad5d16914aa"; + sha256 = "0fzp5zvwb85nx9nw1f2im1qllz7ihblgi8xi9mski19p40pgay3j"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1172,12 +1256,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-04-21"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "187b2bd2beb7802e66c93900430c29b4ab9c20c8"; - sha256 = "0l6i6wybhdzbj6p0x86kygyirhnhc1fj67p4l83v3jdgypqy246a"; + rev = "218229c593de9ca3b526605c50da7cb7e6ffb47c"; + sha256 = "13xhzhpdwq680imvm7208wyhb2l5hppnflhbzyl1w3i7bzpczaxc"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1196,12 +1280,12 @@ let dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2020-08-19"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "77d1c165bcbe6bb7f9eedbeafe390c2107d3c52e"; - sha256 = "03x55x0gvf7n4i8hh6s5453mf5h43pf7kdy817q6w1149bd90vxy"; + rev = "68500ef46ff3706f46c99db3be7a0c8abcf6a3ae"; + sha256 = "0lwna4kcq7davfvh3535n8wl9jxkjm7cg6jgpisd17kvagihh8qw"; }; meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; @@ -1218,6 +1302,18 @@ let meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; + diffview-nvim = buildVimPluginFrom2Nix { + pname = "diffview-nvim"; + version = "2021-06-08"; + src = fetchFromGitHub { + owner = "sindrets"; + repo = "diffview.nvim"; + rev = "93c3aba19c54a7e68fab6c9864eff499a744b4cc"; + sha256 = "01s43bg2y0yb5h7gkr75j23i5jy5acaz0m65nbx5c6x1lbm7fy20"; + }; + meta.homepage = "https://github.com/sindrets/diffview.nvim/"; + }; + direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; version = "2020-11-20"; @@ -1244,28 +1340,40 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-04-23"; + version = "2021-06-04"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "d21059cd5960f4d0a5627fda82d29371772b247f"; - sha256 = "0cbsiw0qkynm0glq8kidkbfxwy6lhn7rc6dvxflrrm62cl7yvw91"; + rev = "869f70a7603b77cdb2f63983dd286f3f61b7a966"; + sha256 = "031c000nr2raw0v6bdnisczjz20y5iw0yapj8wih0nc703dirhih"; }; meta.homepage = "https://github.com/dracula/vim/"; }; echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2021-04-16"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "63d3c193ccb1652a972ca0def7ab82048bfb6068"; - sha256 = "0v0fd6n6fza1rj008zpjicvh9d8mcvz3kza8hhby9nx9cjlj2dpc"; + rev = "d02232ff17517f9bc048f0d4a668ef00d57b5f6c"; + sha256 = "17m9nph5xk1dcd5l89asp2fw6jd97hsmr78ni67id23v9mjyqslk"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; + edge = buildVimPluginFrom2Nix { + pname = "edge"; + version = "2021-06-08"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "edge"; + rev = "d1fa03e861b514aa485b6b1369ebb4cc34d4a817"; + sha256 = "1v28cl52bfxl9c12bk0hnr14nn8mp5wg6qqp5ycmsw44rbg18vh4"; + }; + meta.homepage = "https://github.com/sainnhe/edge/"; + }; + editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; version = "2021-04-04"; @@ -1305,12 +1413,12 @@ let embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2021-03-12"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "fda8867d405a93938f154fb9d70e4f4a4e6ef8c8"; - sha256 = "09kvk3wjmpvssv8j5iba2dngnfkv178gkr620pa3k1imb0m9f0bq"; + rev = "95847fbae47aa5d49b6470568b8151a93e15307a"; + sha256 = "06qvnbhwm2gl8921hyq75dwxxfbkwfvvsn4pci89831qn6w3pa6f"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -1402,12 +1510,12 @@ let fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-04-18"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "609610754b52d3d32616bd70094dcce3a88db3e6"; - sha256 = "1va4iaxnb03zk880k2kilsyr498pv0g78418d0nzxa4cdmvxcp5z"; + rev = "5fe781e4a12101871bc778b977ce6b76685c1ab0"; + sha256 = "1220sclgczaqww0d2zdgr0lfpjwrrjyscjn2j40k8h4j1axah9zi"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1461,6 +1569,18 @@ let meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; + floating-nvim = buildVimPluginFrom2Nix { + pname = "floating-nvim"; + version = "2021-05-08"; + src = fetchFromGitHub { + owner = "fhill2"; + repo = "floating.nvim"; + rev = "c47af010aa8e88758995858f0ed2771a99cd3e98"; + sha256 = "0cvs6c903bq4jk4l197vvdrk8q85rl7z7iy7cvd5m4k7yd937r50"; + }; + meta.homepage = "https://github.com/fhill2/floating.nvim/"; + }; + floobits-neovim = buildVimPluginFrom2Nix { pname = "floobits-neovim"; version = "2018-08-01"; @@ -1485,6 +1605,18 @@ let meta.homepage = "https://github.com/megaannum/forms/"; }; + friendly-snippets = buildVimPluginFrom2Nix { + pname = "friendly-snippets"; + version = "2021-05-28"; + src = fetchFromGitHub { + owner = "rafamadriz"; + repo = "friendly-snippets"; + rev = "496ccb632e1dd66ab4561304faa431125c0bf0de"; + sha256 = "1rbgji9x0bf8l7kqph77nfnpipy4d1863ml3wx75404q43nld7w8"; + }; + meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; + }; + fruzzy = buildVimPluginFrom2Nix { pname = "fruzzy"; version = "2020-08-31"; @@ -1509,38 +1641,50 @@ let meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; + fwatch-nvim = buildVimPluginFrom2Nix { + pname = "fwatch-nvim"; + version = "2021-04-26"; + src = fetchFromGitHub { + owner = "rktjmp"; + repo = "fwatch.nvim"; + rev = "5fd6bff00d7fa432cdc847819563dad90bcf649d"; + sha256 = "1jc3kv0w3767593p9capif3p0msf8ac5xal170757ghfiy2jhsp9"; + }; + meta.homepage = "https://github.com/rktjmp/fwatch.nvim/"; + }; + fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp-nvim"; - version = "2021-02-04"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "1386cbae761415b9c7b45565d87283fb4d584aed"; - sha256 = "1ab4si6j6s6fimpr513mqbhc5nnlsqmazw26cl7r89lbq7jswhyv"; + rev = "fdbe8e8f447870c8693d81045031fc1d5812e38e"; + sha256 = "0rygh4dxrvz7cqsjvp7ymim24hv2czamb9jn1qbbaj33vn85403b"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-04-14"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "ee91c93d4cbc6f29cf82877ca39f3ce23d5c5b7b"; - sha256 = "0zpf45wp0p924x96w9i171w5mbh25rzbmp987wpv8kgfzq7dviir"; + rev = "e34f6c129d39b90db44df1107c8b7dfacfd18946"; + sha256 = "0rn0b48zxf46ak0a2dwbx4aas0fjiywhch0viffzhj5b61lvy218"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-04-10"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "cbf64bd4869c810b92f6450ed8763456c489be87"; - sha256 = "0c7xgracnl92psc5b7m90ys9v5p20hipli8q797r495r59wnza20"; + rev = "d544cb9d0b56f6ef271db3b4c3cf19ef665940d5"; + sha256 = "1390lqsqdcj1q89zn6y5qrm1id7p8fnpy07vlz6mm4cki47211mb"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1559,24 +1703,24 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-02-07"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "762f31ff620eb822ae4ca43c5dc2a62ca621f5fe"; - sha256 = "035nj257r2nkwriqq5l4qjn5z1a04l39k4i9s1yz0mgv902kmics"; + rev = "9b016fd42ba37395d9299e1e811b282b29effb63"; + sha256 = "0x3rg1pxildm2mrfr28f4d41z4zzf6v2jng41nzylwm5r4c5r1gd"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-02-14"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "abbb157ac9d06fdfba537f97ab96e197b3bb36cb"; - sha256 = "008alqgqbrjh9sqgazqq1kk5hnpikd8afnia5lx9rv8c2am1d2fv"; + rev = "dec6adb151cc5514f8ea99b8568e7a4c94db6318"; + sha256 = "14k0crk6lvj6qp1rpfmldmw5w9axy7336aacpvfsh7d4a93xdjzv"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1595,12 +1739,12 @@ let gina-vim = buildVimPluginFrom2Nix { pname = "gina-vim"; - version = "2020-10-07"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "gina.vim"; - rev = "97116f338f304802ce2661c2e7c0593e691736f8"; - sha256 = "1j3sc6dpnwp4fipvv3vycqb77cb450nrk5abc4wpikmj6fgi5hk0"; + rev = "7069668147157d872821ebed1eee07742ece48fd"; + sha256 = "0fbr154jgvr71liq0cwdl1qwg8j40yg9i2gb6ykz4p2y5cvs3wz6"; }; meta.homepage = "https://github.com/lambdalisue/gina.vim/"; }; @@ -1619,24 +1763,24 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-04-18"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "866b3ed000d483b27067d9bc89dbaa57a83244e8"; - sha256 = "1jj2nbsm5g1y9pw0frh35kbj17zpxy56gqym44gv8hy2wbhzwhbf"; + rev = "f17e40e9995bbb21e0e9b7fd29278637a69fcc02"; + sha256 = "09izgdlba3413llb698r8iagpfnhvp57yaz7qlcypbyvqr9l41mm"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-04-23"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "34d1c630546dc21517cd2faad82e23f02f2860d1"; - sha256 = "0ddz2z7plw320kgsddlfywsa202bl8sxr9jbvldhh0j34q5lgdja"; + rev = "b036b2f8a0f9cd973ab25292460e0c7b323616ef"; + sha256 = "1mn2pwcp482p7rrg0jk8i2g9pql58yqylzpp31308ssw32j8f9fj"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -1655,12 +1799,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-04-22"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "0b556d0b7ab50e19dc7db903d77ac6a8376d8a49"; - sha256 = "06v2wbm582hplikjqw01r9zqgg45ji2887n288apg9yx43iknsy3"; + rev = "b5a6c6c0cbac430d61965be1fac5b984d3c9c469"; + sha256 = "19k96irs8saibjxah457ir418l3aih1rp3arj6b1m14p3yf2dxy3"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1677,14 +1821,26 @@ let meta.homepage = "https://github.com/gregsexton/gitv/"; }; + gleam-vim = buildVimPluginFrom2Nix { + pname = "gleam-vim"; + version = "2020-06-24"; + src = fetchFromGitHub { + owner = "gleam-lang"; + repo = "gleam.vim"; + rev = "847a5ef57c2faef2774242c87f711d1131b89fe6"; + sha256 = "17kjby64zdnmhyia1cx9jnk4mss0gca1jz1m4hff9rl63i56bql1"; + }; + meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; + }; + glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-03-31"; + version = "2021-05-29"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "89b4edfcb70529d9c713687aa6fcfa76a2010ae0"; - sha256 = "0qq6cjzirr4zicy2n259sxi2ypz7w740qaf4a4vhphh4rd6gi18w"; + rev = "d7f5eb0af3f2a51c2f493fec066015dc29184a4e"; + sha256 = "1180g55d6adj9jzx9dxld3345hw80vjjj3r8n7snba1m3c8jd5xm"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -1739,16 +1895,40 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-04-15"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "42668ea643d56729467fb79c1a0a5e30289fe590"; - sha256 = "090jh2pwkl2mpycnii78457k2pkdj76l9x4p4yn9j662986imnhl"; + rev = "51ae4557e8941943d70da36320cc80a521e2d99e"; + sha256 = "0dgvd4qpzg7fn7rwvpknzi2bxzzb2g8jl9jh9byj07yll413gzqh"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; + gruvbox-flat-nvim = buildVimPluginFrom2Nix { + pname = "gruvbox-flat-nvim"; + version = "2021-06-09"; + src = fetchFromGitHub { + owner = "eddyekofo94"; + repo = "gruvbox-flat.nvim"; + rev = "0b27de51438f62870f1558ef9c27cb20caec69cf"; + sha256 = "0k9hqjw857ri0vbgjncbbfgh0yh1bpqr25vj0drp9wiakn5pywqf"; + }; + meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; + }; + + gruvbox-nvim = buildVimPluginFrom2Nix { + pname = "gruvbox-nvim"; + version = "2021-06-07"; + src = fetchFromGitHub { + owner = "npxbr"; + repo = "gruvbox.nvim"; + rev = "2dc25bb14fbd69f888dd0615c5576dd730de869a"; + sha256 = "1i87f7vfgk1szy18cg7nng2yqvcny4v1wnh4dbw74lcqmmazgi7y"; + }; + meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; + }; + gundo-vim = buildVimPluginFrom2Nix { pname = "gundo-vim"; version = "2021-02-21"; @@ -1763,12 +1943,12 @@ let gv-vim = buildVimPluginFrom2Nix { pname = "gv-vim"; - version = "2020-10-16"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "486b5c4e960d5ec9e79888939534b7b2fc7453ad"; - sha256 = "07pj94s5kf8qgwdz73xbb7b2h3w6gkv4sw9faicdb6hla3i19d9b"; + rev = "5f902f4f7d06ef084ffd6cddcd1ee7d3c9a793c6"; + sha256 = "0am6sip4q14v2cvf9dmq6jkh37nhdhbvs466619qyd48qxcf9k9n"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -1797,6 +1977,18 @@ let meta.homepage = "https://github.com/travitch/hasksyn/"; }; + hiPairs = buildVimPluginFrom2Nix { + pname = "hiPairs"; + version = "2020-12-10"; + src = fetchFromGitHub { + owner = "Yggdroot"; + repo = "hiPairs"; + rev = "8272bf6979d0ee65a3fdbbb97eff3dda79b661b2"; + sha256 = "1hcskq9zdkf8vlxwd2n403m4rq7495v2fj35hjf6461hqx9v9dnw"; + }; + meta.homepage = "https://github.com/Yggdroot/hiPairs/"; + }; + hlint-refactor-vim = buildVimPluginFrom2Nix { pname = "hlint-refactor-vim"; version = "2015-12-05"; @@ -1809,6 +2001,18 @@ let meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; + hologram-nvim = buildVimPluginFrom2Nix { + pname = "hologram-nvim"; + version = "2021-05-21"; + src = fetchFromGitHub { + owner = "edluffy"; + repo = "hologram.nvim"; + rev = "593a458d04f7457669280373d98e41195c106d13"; + sha256 = "0diq42zdr9l8qw198c5y4jy5siab3cwh4ncsb5z111m28n6a6i5c"; + }; + meta.homepage = "https://github.com/edluffy/hologram.nvim/"; + }; + hoon-vim = buildVimPluginFrom2Nix { pname = "hoon-vim"; version = "2020-11-09"; @@ -1823,12 +2027,12 @@ let hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-04-16"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "998452d18934af4a527d4e1aa315fd2c74cb652a"; - sha256 = "0y17zm792fxakja4c852k9pw3lp20vgbyyzrmnc20112dll8vzgn"; + rev = "56727073356756a86c4b1be95d7c565e4ab1f11e"; + sha256 = "00ch6mhcxvqk7kshmi6rfm0n1wna47v5kcxjxwhndm79liq3h91b"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -1929,6 +2133,18 @@ let meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; + indent-blankline-nvim-lua = buildVimPluginFrom2Nix { + pname = "indent-blankline-nvim-lua"; + version = "2021-06-07"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "indent-blankline.nvim"; + rev = "4e1004b4efcb8f4bbb29d69dd4898ed14120a973"; + sha256 = "1y1skj9q29sk7dfza1s21gfwyjfk49v5b298br39xiankin1b8jx"; + }; + meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; + }; + indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; version = "2021-03-06"; @@ -2088,12 +2304,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-04-23"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "d0bb06ffc40ff7c49dfa2548e007e9013eaeabb7"; - sha256 = "0zj12xp8djy3zr360lg9pkydz92cgkjiz33n9v5s2wyx63gk0dq4"; + rev = "69673e40a3c9c6532c1500ba92fed93ccd55af90"; + sha256 = "07nh2pdl09z6k6bzfsbxyna1rccji7s1sz6z4lmhi6fdi7wjby7j"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2172,48 +2388,48 @@ let lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit-nvim"; - version = "2021-03-25"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "fb5ab7d26ac414a7e7bfff6b89f69e2dd2fd3884"; - sha256 = "1nn6zhjqfk88jmavl9y8li4y08v3wb2m2kskq9yf36hadw29im30"; + rev = "acc383d1eab516318816f43e3e380fead8249acb"; + sha256 = "0w777was4z7yk3z6fn55phqzxmsbzbz0v4959h52yi91pdbb4qfc"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-04-16"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "6c49ab524b883495193ff3a4eab5c7846aba4261"; - sha256 = "19dyd148silyaiprjrcd23y62kcsp6hpvpansmpxri55x53a772w"; + rev = "183fa5f3203983fed87174e6f193f271133fe974"; + sha256 = "17if75p3x4lkqncl296f3jdq0rcc69b0mgj0dbz6cl851bmqvy40"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; lean-vim = buildVimPluginFrom2Nix { pname = "lean-vim"; - version = "2021-01-02"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean.vim"; - rev = "313fd1e09e7a14352f87d44c82005b6e6316c9bc"; - sha256 = "0f6jq0hliy4jignjc1d30bsvfkb4xl4nzj900hphbc7l2aw7scqr"; + rev = "48ac5798b74b8ef8212adc70048ff0ed6f4e1976"; + sha256 = "08n8zfglml4v983nnm8gg25vggg5cfjsqrm96k8s3j5wmzi95mhx"; }; meta.homepage = "https://github.com/leanprover/lean.vim/"; }; lens-vim = buildVimPluginFrom2Nix { pname = "lens-vim"; - version = "2020-04-24"; + version = "2021-05-30"; src = fetchFromGitHub { owner = "camspiers"; repo = "lens.vim"; - rev = "868b195be3cc3000d1d3f875ee0a52a11972e5b9"; - sha256 = "0qpx84k52pz29rx6q0zh3qq4g3a1gyvyfcipx3kaw4lxlld6agd5"; + rev = "099c3502d001f7081edf113de57e8b1cfd121c55"; + sha256 = "1h25isrw96qhfacf37h3anscnrisdxsz6vv7826hpb17r0ygb5ms"; }; meta.homepage = "https://github.com/camspiers/lens.vim/"; }; @@ -2280,12 +2496,12 @@ let lightline-ale = buildVimPluginFrom2Nix { pname = "lightline-ale"; - version = "2021-01-19"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "maximbaz"; repo = "lightline-ale"; - rev = "932ea5b9287b8ddfd7b7f0218bb28de52d013140"; - sha256 = "1b3xbhd32jk43z8baj1djls294whbq2qls01l90k4ihsq97jplb9"; + rev = "98a7417ff66829b1d14cb9e4e7aa6a1a0ef25103"; + sha256 = "1ripdl58pcmylgzzj92v8myjjw22h1g9g6drld9ng1qcg1zn2br8"; }; meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; @@ -2302,14 +2518,26 @@ let meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; + lightline-gruvbox-vim = buildVimPluginFrom2Nix { + pname = "lightline-gruvbox-vim"; + version = "2018-03-23"; + src = fetchFromGitHub { + owner = "shinchu"; + repo = "lightline-gruvbox.vim"; + rev = "21659af1fc980ebe7de0f475e57c3fda9a82c2d3"; + sha256 = "0h9br1r5vbrx5cplnk34xlg1kagasj3zn18f8d4ifi0pibyq6pm1"; + }; + meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/"; + }; + lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2021-03-21"; + version = "2021-05-30"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "8a712365f9708044667589d9fffd87a4825d29f6"; - sha256 = "1622qd5lizfv65m5iy3r0bl3zy8phh4anyx93kj631p836s8y6cq"; + rev = "b06d921023cf6536bcbee5754071d122296e8942"; + sha256 = "1dsqssxgbglq6al6di9grxl24rgwidgd6jrc8d4gk6v6ymgzckl8"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2328,36 +2556,36 @@ let lispdocs-nvim = buildVimPluginFrom2Nix { pname = "lispdocs-nvim"; - version = "2021-04-14"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "tami5"; repo = "lispdocs.nvim"; - rev = "5225b347a722ba54ce3744364a3e0ff2939743cd"; - sha256 = "0x4nshkizivjz5ldb3scsxxi6x379g3rfpiplsixcs6bpxkib166"; + rev = "69fbcd854e9600b0f2c6f1c9ec4cb8fde8f5e6da"; + sha256 = "19n12m6rnv8blbavd2zkwwv6x7gjfziavc5i0zdh4h1l9x9hmwq3"; }; meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; }; lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors-nvim"; - version = "2021-04-23"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "525c57c1138ca5640547efb476758938aedba943"; - sha256 = "0dxalh12ifsghksl423bbawq096k8fcl1cgmnvaw3f2x71fngfs6"; + rev = "00b40add53f2f6bd249932d0c0cd25a42ce7a2fc"; + sha256 = "1qa1kb5abrka5iixmz81kz4v8xrs4jv620nd583rhwya2jmkbaji"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; - version = "2021-04-09"; + version = "2021-05-20"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "7c376c3924d4f807d6ce49450fdeaa18720349c9"; - sha256 = "0lf71qxg9hs3r4nwsla085fk5jkqzppj2r57w9imz4wqzb201bd7"; + rev = "54c395248539d65fddda46f7d92e3421856874c1"; + sha256 = "1qfrfckdbqyav8l1g7lwpjrrwh559nm71ki74qd1xd18y1h63ny2"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; @@ -2374,50 +2602,62 @@ let meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; + lsp_signature-nvim = buildVimPluginFrom2Nix { + pname = "lsp_signature-nvim"; + version = "2021-06-08"; + src = fetchFromGitHub { + owner = "ray-x"; + repo = "lsp_signature.nvim"; + rev = "88272b6d89e8140a35099ea563978172f2776dc9"; + sha256 = "013ffydnhjwzj0y106m0x65zx31kabsxrs86ndq2vik3pc6vyslq"; + }; + meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; + }; + lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2021-02-06"; + version = "2021-05-22"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind-nvim"; - rev = "953ca895203c095e13f97a8ece790bf546c82d1c"; - sha256 = "15rfzcmfwig7x8pbgc1maimqkqwqr4dbpf7498a0s16vng673bgk"; + rev = "3469f0c9a6767625d532a74a167f5d6ba2b8c5bf"; + sha256 = "1ff1i6m9kk3n36n24c109g6yddcbbzm10iigvi0pv1z2fdpsrl07"; }; meta.homepage = "https://github.com/onsails/lspkind-nvim/"; }; lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-04-18"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "333178b4e941eb19d9c97c0b0b5640c76363b0ad"; - sha256 = "1ygqz8mf8h48jfn17ldr5fnpir1ylf37l10kla8rp197j8acidsy"; + rev = "cb0e35d2e594ff7a9c408d2e382945d56336c040"; + sha256 = "0ywhdgh6aqs0xlm8a4d9jhkik254ywagang12r5nyqxawjsmjnib"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-04-23"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "e3a558bc1dfbda29cde5b356b975a8abaf3f41b2"; - sha256 = "1qwrpyjfcn23z4lw5ln5gn4lh8y0rw68gbmyd62pdqazckqhasds"; + rev = "9726824f1dcc8907632bc7c32f9882f26340f815"; + sha256 = "0gmbv0pbswkxjd4qw7dq66gp3fj594di0pgkb47yh3b46id8vkyj"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-04-11"; + version = "2021-06-01"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "3db21525382fa158fba22e2a5d033d6afdbc763a"; - sha256 = "1k0678h22falk08mpvlxlfsx7z89p89clrc9hlk452dzj7wjy7wi"; + rev = "684c06d4879a38e50a247ce23b32beaacc75c4d1"; + sha256 = "1khws788sww2dw4s3nqyigyxi7099kqh60dabs66hj9byb84irql"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -2434,6 +2674,18 @@ let meta.homepage = "https://github.com/mkasa/lushtags/"; }; + markdown-preview-nvim = buildVimPluginFrom2Nix { + pname = "markdown-preview-nvim"; + version = "2021-03-10"; + src = fetchFromGitHub { + owner = "iamcco"; + repo = "markdown-preview.nvim"; + rev = "e5bfe9b89dc9c2fbd24ed0f0596c85fd0568b143"; + sha256 = "0bfkcfjqg2jqm4ss16ks1mfnlnpyg1l4l18g7pagw1dfka14y8fg"; + }; + meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; + }; + matchit-zip = buildVimPluginFrom2Nix { pname = "matchit-zip"; version = "2010-10-18"; @@ -2484,24 +2736,24 @@ let minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-04-13"; + version = "2021-06-03"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "6afcca86b2274b43de9d39e3c1235f4b0f659129"; - sha256 = "08wabfqhj697qy92jrf6mzbhjbybyil45fsvhn6q3ffl161gvsak"; + rev = "b2c27ca4b25dedef968f3e746533bb973b148c34"; + sha256 = "0wx1hk7ml4r49gdfqnww1002c5aw4dgndlrhwy8fhyvg8117902r"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2021-04-09"; + version = "2021-05-28"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "7fc33a899acfbc172d8e12059c1ca18696346a89"; - sha256 = "05fhqvr9pinw6zfbjcdbm31c27wd94z7nyzp9f4vi8m1yhp4h6mk"; + rev = "e129e3c7d92477563aeb068628ee0ccdd46ed36e"; + sha256 = "0q0cyigkszw0qsdvg9dxs293sf8hbmwwy6qxlknmrfiy5xyn6ik5"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -2518,6 +2770,18 @@ let meta.homepage = "https://github.com/tomasr/molokai/"; }; + moonlight-nvim = buildVimPluginFrom2Nix { + pname = "moonlight-nvim"; + version = "2021-05-16"; + src = fetchFromGitHub { + owner = "shaunsingh"; + repo = "moonlight.nvim"; + rev = "e24e4218ec680b6396532808abf57ca0ada82e66"; + sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3"; + }; + meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; + }; + ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; version = "2020-12-19"; @@ -2796,12 +3060,12 @@ let neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-04-23"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "a62ce86411048e1bed471d4c4ba5f56eb5b59c50"; - sha256 = "1cnywkl21a8mw62bing202nw04y375968bggqraky1c57fpdq35j"; + rev = "55dcb4206324e3f90dd9dd41bed22fc6d4887098"; + sha256 = "0iiblvqmn7xg3mpyppzng081wgpdfrdn9jpa3ijr2ly6w5jg0yqa"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -2820,12 +3084,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-12-20"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "5e140db568eb2f7b88e4110cd4b651562e8878ab"; - sha256 = "0gvlpv7mfqrac10ccndl58axib42ack92m2simn78ksdap9g7n6n"; + rev = "3663e065b4f3d0c4a1144b668129ef43e0d8ff10"; + sha256 = "0l87p48lyx78a9ayqygpba76z04ld64w747m0mrdlgci0x8jnqb7"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -2844,24 +3108,24 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2021-04-05"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "3ae169d555afb0dd8a3be4b0bb20c38efda62e68"; - sha256 = "1kjlhlnjf69hnl7aw11d211psi18qyb4l6k49xr868h7nrc2bns2"; + rev = "1315d10e60bd93483aaac4cc5a1623d13aede504"; + sha256 = "1w80id0123rbwmkicm8n053mp1wzqwh9lxxjmmp6bp6c2x97mgzk"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-09-10"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "30b6b53b7a86b84371714b4a0f092d5d303c4a35"; - sha256 = "0q06a0wq2aqgkjc5jndccffibr85hf33w2igcah3x6dl203p4ips"; + rev = "d2e1e6b4c4e17cab2debd0353fed77b417b53237"; + sha256 = "0bwlcija1sbml5ni7mz4q97hhnl7hiqamzzvqw8qyp8aw2b0kj1q"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -2880,24 +3144,24 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-12-01"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "1283da9f078669593f3828e4345b68b59ee9740f"; - sha256 = "1262bxgh6mcrm1w6w47hsngsaj2fn4dw8jwp433clxvzsf2myk38"; + rev = "cae4f19aeac40037039e914932da850443b7729f"; + sha256 = "0h3d36vj7sdx10f9gndplwkyqmjxq9frafyj9vmsjhj117nn8agh"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2020-09-16"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "78f4d79f703aff49c9bcee5d527234c2f64425d5"; - sha256 = "1dq79jabyyyphgigqac9jf7hhadfh336fm8hklh1d64xlzyrfp6s"; + rev = "46f908aedef6af039c5134056ad008fe7aae1cbc"; + sha256 = "0mszwcvj61y9jqxc0vgghjl1x0xxvy7mqspmv3ikd8sglg54gz2d"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -2928,12 +3192,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-04-13"; + version = "2021-05-29"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "1b53686d5f1d1607dc67430e9243283fee3a9764"; - sha256 = "03qzbvry4mygx109mxxqqmbv9adh9ifsiwl0rsvfgp7kl6l6fzkk"; + rev = "a5d1663185bee20bfb120c9ab212144444514982"; + sha256 = "03799774h9f7k52gwjnhjjm2w9s6ip5zdrpljinwp6lfavxd4w8a"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -2952,12 +3216,12 @@ let nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2021-04-02"; + version = "2021-06-04"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "73da0283ead8fa2bbce83d219fcab3ba1e8cf0dd"; - sha256 = "17n79pmpnjnp6nirz4m4wwgfacrg26bdzjn4xj8i6ldkff5n20km"; + rev = "bca0ed63883d028e6afc7f11a78c56fcaf34d363"; + sha256 = "1j5llx2l36hgr10mjjdrp8xdv9mhmc6panpjgdxzdg5ncwn4ndzm"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -3012,12 +3276,12 @@ let nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-03-22"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "6408b859f9fac3880d82109d25874fb6656026d9"; - sha256 = "0r5s89882hj54qyi5rcwmf8g54jkjmap5c2rd2mhfjs3j4dfny72"; + rev = "abf700104c0450bac10be3ece613ff88997f47e4"; + sha256 = "0s3z5kd2h8cx6lplvg3yqp2pacx8c7kcavpvwnl71vmi0s2ld85s"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3034,6 +3298,18 @@ let meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; + nord-nvim = buildVimPluginFrom2Nix { + pname = "nord-nvim"; + version = "2021-06-07"; + src = fetchFromGitHub { + owner = "shaunsingh"; + repo = "nord.nvim"; + rev = "f6464fa295005049c07650f41b06c0216c3c112d"; + sha256 = "124qxhi9ckjqhxwj8wlxd6srlalmhpr58pidpvvdpvzcpp205yr2"; + }; + meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; + }; + NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; version = "2020-05-29"; @@ -3048,12 +3324,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2021-04-09"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "90ee71d66da58d57f0cb4a59103874bb519c79d4"; - sha256 = "0sabb0iyrmfwfld57d1mf44k69bf8pk0c1ilfi3vz2hz04imxgab"; + rev = "7c85366c9d457ed0e3c3532ee312307476afbbdc"; + sha256 = "02hxjwi8g07zhx6xagma5m3sa0j4ljg79377zfn2vy4snnib452p"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -3072,48 +3348,48 @@ let nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-04-23"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "41b3ed55c345b56190a282b125897dc99d2292d4"; - sha256 = "1pjfani0g0wixsyxk8j0g4289jhnkbxl703fpdp9dls7c427pi8x"; + rev = "34a02b4f37a99b80eff03dff90c675b7374af54b"; + sha256 = "0vz610ifrzzish5qysz8pz7w0zcfhm0q0xvya3r48fgs12ipahmq"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-04-12"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "9d6649c01221680e5bb20ff9e2455280d9665de2"; - sha256 = "18a974l753d92x3jyv5j0anri99hxzfw454lkz94amabbnc010p6"; + rev = "b53dbb4d33a77e1b9b16672565749d6990e84cf0"; + sha256 = "1fwb797jcp5xkrfcqqljlhpnggkj3wfrc6zb0h662i35yhbhnin8"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-04-23"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "55135d23dc8da4f75a95f425283c0080ec5a8ac6"; - sha256 = "162wa2hwq1i9v2xgdfvg1d4ab392m4jcw815cn9l3z4r10g9719p"; + rev = "2063533b0f496ac7047fa9c58937d2a35b995dbe"; + sha256 = "1k95dyrqcy88b0s8jsijgx7mpnfmw2ay2fzj3bhbdqagdghsgpp4"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-04-22"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "78ffd345d079246738ea06b04f58ad53503f48e2"; - sha256 = "08xn8s9asa6b2gpbrsw1iy80s8419bck0z6nh9nmffisr3aga1bn"; + rev = "7b510d5241fb29f5a5e985e02c4cfa046ec4ee3e"; + sha256 = "1ahy4v7z08l0z6c7v19dik8icw943kc243vlzhs1bfa4aj13nncs"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3144,12 +3420,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-04-19"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "99452ae6875889c12653963b68e53c4564848954"; - sha256 = "1d5hpn3mr2h3s5h2svajbxm0n49mmc5w0sip9cpzyfdpbnv1gic3"; + rev = "c459c3f3a18c7ff7a312593c481af2b90fa01655"; + sha256 = "148k41db7ncri3mgdhc13mi4xk7chdchbgf42zldhcrf05y3xd58"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3168,60 +3444,72 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-04-23"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c6cb4fcbc91b0404ae157f1942e305d66073ca1a"; - sha256 = "07mncx8bzigbh6yy7nbsgjb3g3fm1kx73wb6p7jl6h9ay3fmgrfc"; + rev = "dfacc1fb7aeb0789c4fd27004e312cf363becba5"; + sha256 = "058kjgngg7l37q9zbfz0xfqajx526m4cp85i3chcsfrvp99c7mzv"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; + nvim-dap-ui = buildVimPluginFrom2Nix { + pname = "nvim-dap-ui"; + version = "2021-06-08"; + src = fetchFromGitHub { + owner = "rcarriga"; + repo = "nvim-dap-ui"; + rev = "9190b4a625a449927ffc3777b45db6cb392dc8f6"; + sha256 = "1gai54z6w4dw17irwnwfd35k8zy2aiws2ia9vqamzicaf0n8axr8"; + }; + meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; + }; + nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-04-24"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "f144a3bb6a39ef5c07173fe08e6f3ce8f5f184ba"; - sha256 = "1zax0vx77fqx7jr1xipfy0dp3l05gzbqdvc1wvq2cnjvqd7s8i2v"; + rev = "29a79b7c15e7e15a416bcaa0efddfe67928b7bdd"; + sha256 = "0wl9dl83cx2hlik7yx6kknb7spsaqlzri2kybf3xcna44mqfq688"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-03-07"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "07aa4b435a832b122154a157ab6892ac4efb81fb"; - sha256 = "05cgypswm7qdl26jd6nfqahk2bmqvp482k9zjbk0an12kbzlsrz0"; + rev = "53bfce7a254651469ce9577349811bc76d9af46c"; + sha256 = "1xcwrjfvikb1qqyaic2m0fi12l0hmxj0y5mwx1h95karpydbb0rz"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-04-01"; + version = "2021-05-29"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "ff28f2dde464a9e105c7dc041127eb60059d955a"; - sha256 = "089019br0f3massc2sz3l0r8cjc33i5qqwbm4k7cz50x71g89wrq"; + rev = "9c15a789df5af1d3c83c0d680154ca226253eb26"; + sha256 = "0dz3bbyrwgxvsdmix2h6xbgj7wv9zbj08wgy46sjhzdhaxdfjx4z"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-04-23"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "2f8bd90f3b4fa7620c61f66bcddb965139eb176f"; - sha256 = "1zsvr9pba62ngchfmab7yns64mlkdqclqv516c7h62fh82fyx23a"; + rev = "081fac590588ce0f6bcf54699658ba960a514172"; + sha256 = "05sw210pfsb4nfcix978x1mrnmjz5yv1rmv1501mqla8xq18cskv"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3240,60 +3528,60 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-04-21"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "362a149dac40c90d917ac7bb78da988b8da6a971"; - sha256 = "0psd99km6kfqwdw383w41aaq1cipcfhl1v5srjw29y2v6rgvnw9p"; + rev = "89fdc14457f2b18eebebeb226df9f6d5e464e318"; + sha256 = "09rd1hq8rzp84aiplvp0w4j1wykycrb55z1qwk83d9fv006sqvcl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-03-13"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "9c3b264ae2da1d984f0482d5a0dfa43f567fa064"; - sha256 = "0yjxmnn3a7fw0fjwfqk284zshlw8v7wp8pn16d5m40rvbkk2ipzr"; + rev = "388cc8caaf3e10836810aabbb9283a27dd8584cd"; + sha256 = "0a7izbvpwn0sx9gvpczvl57fy9rm7jaibc4m44asjz501m04lbra"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-04-23"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "62977b6b2eeb20bd37703ebe4bc4b4c2ef006db2"; - sha256 = "0niwaq3mc7x1zaf3qx9dp43607rnhq2nvyizkxb7j1yir8a8dk4x"; + rev = "f95be0c947237edb88df148dd61790988ab3a23e"; + sha256 = "1cddnkil9xid7xq3k0iszk12ma9pi396khqx6dzh2z9p7nkhk2rg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-02-05"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "b68862afee6dfb611d866818cafdba41cf51d749"; - sha256 = "0w4kff5jrg6i55nqjnp52vb2jng4zql9s2r1jz75jfv2khdrw7dm"; + rev = "f34927f8ec777f4e91e14afc709de9da1cd70116"; + sha256 = "1s1pvddgkdslh3r9p08r3xjdpi93d15i4k1jssh8apxzm37gw7lm"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2021-03-18"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "f136ab905ac99c9bd20a8bc4c470eb33768c54a0"; - sha256 = "1590gszcra3pagva6zplib35fqlgj26masjq3i6qgq85kpx5s55j"; + rev = "5056aebb8d0ecc87b26a4f7fe9e9e520e5ea493f"; + sha256 = "0z1j18hb5n3500b6sxm1dsya9yd9jnnywhhw9z3sbndb3irn2mny"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; @@ -3312,12 +3600,12 @@ let nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-03-23"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "902f24503ab7a754be2a1c483de1cd3428bd85ec"; - sha256 = "0b31lpzdx1z88fm60p7d5gs442h4apm2n9h098n4j0ghcs5ppvnf"; + rev = "bf7155b11278b5c849ddde2da76bfade668d8a92"; + sha256 = "01pcvq1kany4nrni4g7jnqkdg23bgyl68hfwfqcw8xabrl46p746"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3336,96 +3624,108 @@ let nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-04-22"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "34cc65e594d4f4b9e0d6658a7ceb49f62820d762"; - sha256 = "1gg4iyqpy68hhk4wly9k87841zns29vh04wcddn91awj5mpigb40"; + rev = "7e13134c7e252746586ccb35a535c42a1c3b07c4"; + sha256 = "17md8wvfvy9z2an89fxcg64d6lmqndmzj9qn294s311fn7zpaz0p"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-04-22"; + version = "2021-06-09"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "f39869514645b98ec30bc8826763c288b6cbdbef"; - sha256 = "0z6arqc2i8745vc08hdbwsm1i4biywq65v1zdzrhs3ysx0agppq0"; + rev = "906a35cd0e7520eaff369688cb0a090240d7c2b9"; + sha256 = "18nw0xm4dp45v9s9kn0cmjwxdwydgr5f1v2kgm6h6kc1wvvd5scj"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-04-24"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b68f0cc70022fedec9b9190904d6035393111cdf"; - sha256 = "07zp1fbah65f7lglfkmdzi6cyfchlaf1ap02wzwixiv5hpy6zji4"; + rev = "37ed50f28f8350de8dc70b56d8ac198aac9b1178"; + sha256 = "16mmjpk0pqqshlw1qj3zxx197iv4g7mscgfya17c7r03rybz0q19"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-04-18"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "d5070fb1171220e8db6eef77ed994079198d6522"; - sha256 = "1x534yrbjnf4bny3bykj7jkydhkjxspmipkbb685ja4nppc2lp41"; + rev = "bdc598b519cfbfdf61baf9a27953da2fc1642b23"; + sha256 = "1slyjfjcrna06b23kbw4vf81qbncgimzhw1qsqwsqldnvdc35lcr"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; + nvim-treesitter-pyfold = buildVimPluginFrom2Nix { + pname = "nvim-treesitter-pyfold"; + version = "2021-05-22"; + src = fetchFromGitHub { + owner = "eddiebergman"; + repo = "nvim-treesitter-pyfold"; + rev = "01185457e9c0a118d5807998de624179bc605a2a"; + sha256 = "13dhix449mvbfsmg8j1554nv6i7gdr8d6143gdy3ihp8sx66bg6k"; + }; + meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/"; + }; + nvim-treesitter-refactor = buildVimPluginFrom2Nix { pname = "nvim-treesitter-refactor"; - version = "2021-03-17"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "edf1790d9cd365785d4f86848c079704aa7e4854"; - sha256 = "12rp2mj7va5qf55jzca0rgy1xrwkyf7p3zd3xw262m9lqm4hjqqc"; + rev = "1a377fafa30920fa974e68da230161af36bf56fb"; + sha256 = "06vww83i73f4gyp3x0007qqdk06dd2i9v1v9dk12ky9d8r0pmxl6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-04-23"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "522b26a8795994b719a921a03cfacb0d7dcabf78"; - sha256 = "0ww1agq33l3jhbfwr5ri9m3ipr48kgwzlzxv96w43x6y29p61g2v"; + rev = "cadb8110817884fff506043497c0f2b92026aacb"; + sha256 = "01f1913r1q1x1qwp6l6xrqxfc9lffngnc8js5n37r7naszc9r7w8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-04-19"; + version = "2021-06-04"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "d42bf9f52607c1cb281db570f3f47e0d84b03a02"; - sha256 = "13ndyskp3yx3nazg6xc1j3lzad588a1qdacs6ymh8vs616p5mqsf"; + rev = "0fffdcb37cf7d43bc138c89eb002957819c748af"; + sha256 = "0xd79f7a7zyqj6yzkjanli8r4wjhy17gsp1wl7p7vws6axrbgvjl"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-04-16"; + version = "2021-05-19"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "1db27380053de0cd4aaabd236a67c52d33199f1a"; - sha256 = "1qq9mk102jj5hqdkmrirccr3jkh2dgsfb3gy4wvpcp7mdcqapsqc"; + rev = "da717e19678bd6ec33008cf92da05da1b8ceb87d"; + sha256 = "0jvvjpbxdgch0wvgdmihkqng84rwifq74q858cvfahrx3y5y1cnw"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -3492,24 +3792,24 @@ let one-nvim = buildVimPluginFrom2Nix { pname = "one-nvim"; - version = "2021-03-20"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "Th3Whit3Wolf"; repo = "one-nvim"; - rev = "b1461ea89c940bdc5ed142327e1cd85ed2c0e877"; - sha256 = "1w5avzyrcbg60prx3239iazcjvh2mk7lk6k256a1iyxb6dnkpbas"; + rev = "d6e62bc7cdfae97d1ffc4f508a43955664ad5b73"; + sha256 = "0bna2kpvaxvwglgmdgp1g93bcygvnc1c25w4isawlgmsclzz9cc6"; }; meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; - version = "2021-02-25"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "b70ed293f3c3adaea23f9fcd84ef942015664756"; - sha256 = "0wz4kmbgc9rlvbxj8s8xg1sx53w0v94r6qicq3ggs9raca51ywfg"; + rev = "f209c5b6741e6cf847bf4a77e19f2fbf6ffc5290"; + sha256 = "146ypfx9rxcfp031a4zhzns637bjsf0bznplgyfmz3zjarj85422"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -3552,12 +3852,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-04-19"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "f9dc29914f34cb2371960236d514191b9feba8b5"; - sha256 = "02vg6m7572867gahvpsc1n9363mbk2ci5cvqwwqyh2spsx5f4g88"; + rev = "d21e0e2c157af0fad6c6752ca07a274632202710"; + sha256 = "0zww9975x8wkmcdxzg4b51v94iy9644lb1miaz9ra2nwzz4ljqzj"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3598,6 +3898,18 @@ let meta.homepage = "https://github.com/tmsvg/pear-tree/"; }; + pears-nvim = buildVimPluginFrom2Nix { + pname = "pears-nvim"; + version = "2021-05-27"; + src = fetchFromGitHub { + owner = "steelsojka"; + repo = "pears.nvim"; + rev = "14e6c47c74768b74190a529e41911ae838c45254"; + sha256 = "04kg7g6v6k6jv2pmapaqvkvf6py1i211l822m3lsvf26jcyfs3ag"; + }; + meta.homepage = "https://github.com/steelsojka/pears.nvim/"; + }; + peskcolor-vim = buildVimPluginFrom2Nix { pname = "peskcolor-vim"; version = "2016-06-11"; @@ -3636,24 +3948,24 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-04-17"; + version = "2021-05-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "a141bf5c9734ac164cb0dda5e7a2b8b16273a4f6"; - sha256 = "1grhxhnh5zij2brlk2bmy3b2y8bp9j75hyajfki8dk908pplng0i"; + rev = "1e02dece0daa4bef6a24c7a8b6edd48169885b18"; + sha256 = "182nkdzcviz3ap3vphcks4gzw99d4jsmxxlkmb42m0gzd54k1hwq"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-04-21"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "9bd408ba679d1511e269613af840c5019de59024"; - sha256 = "1xjrd445jdjy789di6d3kdgxk9ds04mq47qigmplfsnv41d5c2nj"; + rev = "3834d42236c155bb4240fb4008ea6e62c4a21dae"; + sha256 = "1y9aqpb6j36873kcp8dbv5mm04qccjicrs0z0z9cy53s8sgfx558"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3685,16 +3997,28 @@ let popup-nvim = buildVimPluginFrom2Nix { pname = "popup-nvim"; - version = "2021-03-10"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "popup.nvim"; - rev = "bc98ca6df9179452c368f0d7bac821a8fd4c01ac"; - sha256 = "0j1gkaba6z5vb922j47i7sq0d1zwkr5581w0nxd8c31klghg3kyn"; + rev = "5e3bece7b4b4905f4ec89bee74c09cfd8172a16a"; + sha256 = "1k6rz652fjkzhjd8ljr0l6vfispanrlpq0r4aya4qswzxni4rxhg"; }; meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; + presence-nvim = buildVimPluginFrom2Nix { + pname = "presence-nvim"; + version = "2021-06-08"; + src = fetchFromGitHub { + owner = "andweeb"; + repo = "presence.nvim"; + rev = "f4c1e227be0a0c863c2de201155401950eda572e"; + sha256 = "08s4az1gv6r5sl0jqkaf4yzibglibb7n2sivh7qccj8dz8id3883"; + }; + meta.homepage = "https://github.com/andweeb/presence.nvim/"; + }; + PreserveNoEOL = buildVimPluginFrom2Nix { pname = "PreserveNoEOL"; version = "2013-06-14"; @@ -3721,12 +4045,12 @@ let psc-ide-vim = buildVimPluginFrom2Nix { pname = "psc-ide-vim"; - version = "2019-09-17"; + version = "2021-05-31"; src = fetchFromGitHub { owner = "frigoeu"; repo = "psc-ide-vim"; - rev = "5fb4e329e5c0c7d80f0356ab4028eee9c8bd3465"; - sha256 = "0gzbxsq6wh8d9z9vyrff4hdpc66yg9y8hnxq4kjrz9qrccc75c1f"; + rev = "20ff325813ab114d70573a6768565a36aba796b9"; + sha256 = "1s79rz8rjp9bqw4yn97wbmzkc6jav4nixvnky22vbma2d0ckkcm0"; }; meta.homepage = "https://github.com/frigoeu/psc-ide-vim/"; }; @@ -3755,6 +4079,18 @@ let meta.homepage = "https://github.com/python-mode/python-mode/"; }; + QFEnter = buildVimPluginFrom2Nix { + pname = "QFEnter"; + version = "2020-10-09"; + src = fetchFromGitHub { + owner = "yssl"; + repo = "QFEnter"; + rev = "df0a75b287c210f98ae353a12bbfdaf73d858beb"; + sha256 = "0gdp7nmjlp8ng2rp2v66d8bincnkwrqqpbggb079f0f9szrqlp54"; + }; + meta.homepage = "https://github.com/yssl/QFEnter/"; + }; + quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; version = "2020-12-28"; @@ -3829,12 +4165,12 @@ let ranger-vim = buildVimPluginFrom2Nix { pname = "ranger-vim"; - version = "2019-02-08"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "rafaqz"; repo = "ranger.vim"; - rev = "6def86f4293d170480ce62cc41f15448075d7835"; - sha256 = "0890rbmdw3p25cww6vsji7xrndcxsisfyv5przahpclk9fc9sxs8"; + rev = "aa2394bd429e98303f2273011f0429ce92105960"; + sha256 = "0kfhzamryaxhzrwg2rqipcbrnfxnjrfk2bk4f0z27a2hk6c0r7b9"; }; meta.homepage = "https://github.com/rafaqz/ranger.vim/"; }; @@ -3853,24 +4189,24 @@ let Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2021-02-24"; + version = "2021-05-18"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "f019bb0bc15093da74ef0bd1a9356dedf13ba885"; - sha256 = "1v23k4wfiazvkm9iaqw987cs69fwf230a7i15x3rv68azw63fl2b"; + rev = "097b098e62d6499967e44091689c104165ad5e22"; + sha256 = "12qizfs7d0xh10vzm7spcqsi53k3iqvbfp5nhb3qh3xdsavzyp0m"; }; meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-04-13"; + version = "2021-05-28"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "b8ad2cd8a01dc3e4c2530820409d01b1bbd6fb95"; - sha256 = "1jz41mskrrbb4w2hkxcpmnpgj93nbh2rb30mn566xkjn3zkh1r23"; + rev = "34bbf868da6ef0225739e7977a4063872cd2b1e8"; + sha256 = "0ghy760dc07xwjaf5ci2di8qfq0qip8jyrp7x0rsl820ryy7rggy"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -3913,12 +4249,12 @@ let rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2020-10-02"; + version = "2021-05-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "d83f5a8e070a1fc7e7af0aeea58e71b78956daab"; - sha256 = "0iwj01p9c2kczhx69vxrh1qd4z41ymcgfq5235b1l0rnz4d6v82y"; + rev = "dacb2ba386d982d4466aa469799376c38ddcfd2a"; + sha256 = "1b8zb6k92iwmvdny5g16d5y5zl8fc235vlgvxrnipcfj4m3ch0yy"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -3961,12 +4297,12 @@ let rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-04-23"; + version = "2021-06-03"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "7d734e9b52fe54b6cd19435f0823d56dc2d17426"; - sha256 = "181vq3p1f136qmb0qbd77khc04vrkdw8z9851car7lxs5m83wwp2"; + rev = "177507f1443be150250ce90c18f5f6fb8d798543"; + sha256 = "0wj6pccjbcvj42i4516y6wjrssyl3p060454yjxhgqnnnzxc2dh4"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -3983,6 +4319,18 @@ let meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; + sad-vim = buildVimPluginFrom2Nix { + pname = "sad-vim"; + version = "2019-02-18"; + src = fetchFromGitHub { + owner = "hauleth"; + repo = "sad.vim"; + rev = "2f5b33b239a566ffedaa81cee3051bb613482d1e"; + sha256 = "11kxnrp3b6qc2rcp5jdqjb7cxh6lqy09v3yh7dk4kd51jkgxqbn4"; + }; + meta.homepage = "https://github.com/hauleth/sad.vim/"; + }; + salt-vim = buildVimPluginFrom2Nix { pname = "salt-vim"; version = "2017-07-01"; @@ -3995,6 +4343,18 @@ let meta.homepage = "https://github.com/saltstack/salt-vim/"; }; + scrollbar-nvim = buildVimPluginFrom2Nix { + pname = "scrollbar-nvim"; + version = "2021-06-04"; + src = fetchFromGitHub { + owner = "Xuyuanp"; + repo = "scrollbar.nvim"; + rev = "c338467dd6ef141fa8ce3172097a1f5be6c43779"; + sha256 = "1wvzdrj8gckhh6x4szipjjb6mg0v3ix5cq5dy83lfb28psyznshw"; + }; + meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; + }; + self = buildVimPluginFrom2Nix { pname = "self"; version = "2014-05-28"; @@ -4055,6 +4415,18 @@ let meta.homepage = "https://github.com/osyo-manga/shabadou.vim/"; }; + Shade-nvim = buildVimPluginFrom2Nix { + pname = "Shade-nvim"; + version = "2021-04-29"; + src = fetchFromGitHub { + owner = "sunjon"; + repo = "Shade.nvim"; + rev = "0196387bba50b8d36cec99cd6483583ff2dedb42"; + sha256 = "0831k71gm8rpl54x63v7mgp9i1fgxydp2wig3yyd98dc7z9d8f48"; + }; + meta.homepage = "https://github.com/sunjon/Shade.nvim/"; + }; + ShowMultiBase = buildVimPluginFrom2Nix { pname = "ShowMultiBase"; version = "2010-10-18"; @@ -4069,12 +4441,13 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-04-21"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "93021c0623c1822502a72131e2d45617510428b9"; - sha256 = "042d7zmwmi0xhlshwwrf9bhc0j4ybksxxnrs986vm65y58c11fk3"; + rev = "bf19ffb2ea583516908ceb861e7c52a0c3260221"; + sha256 = "1mrqli7gpn3bzfjn3095ms9m8vkpf7zlia6m75c0ppxgmyry8ngs"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4141,12 +4514,12 @@ let sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-04-24"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "784de58d2bcad8b16bce972c1727fb0cb07e43b2"; - sha256 = "04wlqd902fy474mk7688y2mysy8vsm3pf36d59bxd3jlspgp6zcl"; + rev = "5c1fc0452387cae323692e3345238a780a942056"; + sha256 = "0j2bba7img06m6b7lzgw1q5r8g38cs70pynwisqdb34l5jbj0fqx"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4211,6 +4584,18 @@ let meta.homepage = "https://github.com/chrisgeo/sparkup/"; }; + specs-nvim = buildVimPluginFrom2Nix { + pname = "specs-nvim"; + version = "2021-05-05"; + src = fetchFromGitHub { + owner = "edluffy"; + repo = "specs.nvim"; + rev = "a62319a224b73b70af47a48ba076d7ec67b08526"; + sha256 = "1hs7qp3fr451ziddv08nyygnxx1n6y32fr0y97s9zjc7j13d3nc3"; + }; + meta.homepage = "https://github.com/edluffy/specs.nvim/"; + }; + splice-vim = buildVimPluginFrom2Nix { pname = "splice-vim"; version = "2020-01-15"; @@ -4237,12 +4622,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2021-04-24"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "f4773c0d2f7453fea23f5f69f433547f3d62ea0a"; - sha256 = "06fsfsvrq6sqyqpmj693vn810c6zvzn16781mw6bb2912cmyrs5z"; + rev = "a8c4af3d69839cd2c03d458044fb3d3b128e450d"; + sha256 = "0s87vzdb3j3hna5yda4jay1k4zw419mqd8yn3h4q22qhhsr36q0k"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -4262,24 +4647,24 @@ let srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-04-14"; + version = "2021-06-01"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "9c692e3f17b3485969b55d76a708136e2ccaa5de"; - sha256 = "1cd4vxx0zb4xcn2yp7kl5xgl8crfr0fwifn4apkn878lqx6ni7gj"; + rev = "93711180123b9ba6958bfc682d305ef0a1056fa5"; + sha256 = "1i3hhihlvh5mkn1vl9f1baiz712h8lwp1hfi5arsb36picsmgbfd"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; stan-vim = buildVimPluginFrom2Nix { pname = "stan-vim"; - version = "2020-08-05"; + version = "2021-05-28"; src = fetchFromGitHub { owner = "eigenfoo"; repo = "stan-vim"; - rev = "9d3b6ec149f9559bd9bd021dfa827c29c5d1dc38"; - sha256 = "0qv748m1vrp1qcl41y7fj2jm8cac9b01ljq6ydq3z4syxdf7yzcc"; + rev = "2adaa984e531e1876f053cacb07d8d181d70fbd1"; + sha256 = "1a826cfmwyn4kfyrj6164425gf2wbjs85cdkhzkqsrj0i924hjqz"; }; meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; @@ -4322,12 +4707,12 @@ let supertab = buildVimPluginFrom2Nix { pname = "supertab"; - version = "2020-10-01"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "ervandew"; repo = "supertab"; - rev = "d80e8e2c1fa08607fa34c0ca5f1b66d8a906c5ef"; - sha256 = "0wjaq6k1sb38qmjcp47cr0avvwhphr0wiyl8qvnc8qqyjf8y803k"; + rev = "f0093ae12a9115498f887199809a6114659fc858"; + sha256 = "1r1ck62raxhwcxjv7hic7jm9b5inm1vdqc51zn4nybclys7grnss"; }; meta.homepage = "https://github.com/ervandew/supertab/"; }; @@ -4346,24 +4731,24 @@ let swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2020-09-04"; + version = "2021-05-30"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "bfc662d11b3a006815d0b6972c1c0c2ebbc3b16e"; - sha256 = "1qf5f9p0kfi6bq2qi9izarva6r711vzlbrbdax8nq9g0pxa1bj3f"; + rev = "7ef452b47f14a2bfed26324793777cf12d2a8d78"; + sha256 = "0s12iv8vmqp8yr8fg7a6yf73kgq84i9zy18fhgb0jcc6cwwwz3iq"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-04-22"; + version = "2021-05-19"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "a739985ef9fbb9888bdeea2f442d0574a9db0565"; - sha256 = "0ajpn3q36mvczmvs0g17n1lz0h69rvm25bjsalw83mjxwn46g1h4"; + rev = "176f364f1b4acf894cdc248944f2d5506a37cc80"; + sha256 = "01ylf4vjlisgls2f2gwlagg7x1yyhcr64kzdlzhcs3r8s3wdsf25"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -4406,12 +4791,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-03-23"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "f6012cb65da4bda46b0779a36840df36ad01483e"; - sha256 = "08vb3ffm1f47q5gxyqmmfv75x12001qpkqml7v612wnnfpclcqf5"; + rev = "225e6530c2b083e37744b23bac74ae40d7639d68"; + sha256 = "0qgks9li8zp7lvagq2wzhr4ahzzalgjzps4l9laj5rq3klmc270v"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4442,12 +4827,12 @@ let taskwiki = buildVimPluginFrom2Nix { pname = "taskwiki"; - version = "2021-04-03"; + version = "2021-05-22"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "23a3c20a7d5185700e1e6504c3808cfa9eff78d4"; - sha256 = "0jwb4hcyqwpjaxlissvi69d6fx4dwb7ypdigc2w5hnhfw8nv0kb1"; + rev = "48e24b03c079be43e296981b2ed0a464bbb710d2"; + sha256 = "0x57cjzxhphvmxai4pl5752vvi6mlgf0d2mwwnwj0mwc8h0n5dhz"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; @@ -4464,6 +4849,18 @@ let meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-dap-nvim = buildVimPluginFrom2Nix { + pname = "telescope-dap-nvim"; + version = "2021-03-26"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-dap.nvim"; + rev = "b4134fff5cbaf3b876e6011212ed60646e56f060"; + sha256 = "1fcpw42bwl5iych3hxrrl08s5hm6r6k0qx2savw853f3ff982s38"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-dap.nvim/"; + }; + telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; version = "2021-04-17"; @@ -4527,24 +4924,24 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-04-23"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "6fd1b3bd255a6ebc2e44cec367ff60ce8e6e6cab"; - sha256 = "1qifrnd0fq9844vvxy9fdp90kkb094a04wcshbfdy4cv489cqfax"; + rev = "feaed4b6e23bd56906089154f293f2b1ecb68c7e"; + sha256 = "0kx9xmlv6smpqgf2mdz0n6r4cwrsldw9d92xk5m1pdsmpi1b61sa"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; - version = "2020-06-29"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "25924cb8b29a5158e56fb896a2540c70691c7a28"; - sha256 = "0mm5h5jhb6y0f1zsfhq0frvdm6s93skshi66rfrpn82l93zigw4c"; + rev = "7746453a045eaa97dc413a7209268345f33f3243"; + sha256 = "0yxgcnx5x82ak74nz3pvkd1z8i3c7lcl068lh5izdpx65fk7m5yh"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -4621,6 +5018,18 @@ let meta.homepage = "https://github.com/wellle/tmux-complete.vim/"; }; + todo-comments-nvim = buildVimPluginFrom2Nix { + pname = "todo-comments-nvim"; + version = "2021-05-26"; + src = fetchFromGitHub { + owner = "folke"; + repo = "todo-comments.nvim"; + rev = "8560546c466d1f555573d37e062e95e7ae94bbab"; + sha256 = "1g0ypjdcj7sp433n933n3qazp7301b2q7p968v57mgmlh5saq6kb"; + }; + meta.homepage = "https://github.com/folke/todo-comments.nvim/"; + }; + todo-txt-vim = buildVimPluginFrom2Nix { pname = "todo-txt-vim"; version = "2021-03-20"; @@ -4670,6 +5079,18 @@ let meta.homepage = "https://github.com/tremor-rs/tremor-vim/"; }; + trouble-nvim = buildVimPluginFrom2Nix { + pname = "trouble-nvim"; + version = "2021-06-04"; + src = fetchFromGitHub { + owner = "folke"; + repo = "trouble.nvim"; + rev = "a7dca6204316b9be7c95d056088c67371151c8ab"; + sha256 = "0b2wha4qmn9gb5fmj57ymhn3jrajq71yk48m8gddr1hx244adknh"; + }; + meta.homepage = "https://github.com/folke/trouble.nvim/"; + }; + tslime-vim = buildVimPluginFrom2Nix { pname = "tslime-vim"; version = "2020-09-09"; @@ -4708,36 +5129,36 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-04-18"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "204b501cc8f4acd7f32ebdea262bd5772ca007a2"; - sha256 = "0jdb3v8lplrl3sqrmx8j8p4pirnwc42fc01arw64rjigrh0fwm4k"; + rev = "b6c9a814a4fdfcad3ea53d8888746803a7218a9e"; + sha256 = "0iqirp8pmsrgrk3i0hkk1a66igc5ydi96scp62yl97nazhz45xxr"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2021-04-02"; + version = "2021-05-28"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "101edfb795bc17b814efb12e6df6a884507a34f6"; - sha256 = "0fa2iqgzc85955ixa4hf1mjy7sm7hrbkha5l1scganc9zswd5iv2"; + rev = "1cc3b9069e4356efd4ce1c3c4bdbb227fb54e1e5"; + sha256 = "0m8wc66ml2h6lsbwq452w8y9s95a4kwp4lfdw94pi4q3h5qhvkxj"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2021-04-22"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "090e77e30e46aceafd53a3219fb2a81b79927d8d"; - sha256 = "136a8c4d4nrzvab2qa6sxc81x1mwg56nn8ajxikqgyvsr9fp1f9i"; + rev = "62f7a3558ee4402bcaaae8638e768268f1137a0f"; + sha256 = "1y5inpiaqvnq69n1dbpiwilqfq2hf56m7w5a6kj2fkav15pyczx7"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -5056,12 +5477,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-04-23"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "0a87d08dbdb398b2bb644b5041f68396f0c92d5d"; - sha256 = "1ihg44f3pn4v3naxlzd9gmhw7hzywv4zzc97i9smbcacg9xm6mna"; + rev = "49cdcb7b3ea76ee19c737885c0ab19e64e564169"; + sha256 = "17p0j9i6ylns66cx6qw4266yd6al1gvmran3k4v2mhjlynf5c4s3"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -5080,24 +5501,24 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2021-04-16"; + version = "2021-05-18"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "0f9995d5996adf613297896c744415cd9e6b7a80"; - sha256 = "1zwicvlrfpvgczjnzjdkjhv2b110v5xbmvj132xl8a7xsj3rzg1d"; + rev = "531bcc9e5a4cb1b1fb4dec8face230bf3d205ac7"; + sha256 = "05yapm3g9rj7k69dhlm7hspakbczwwlbx1lcdydvkx639ka7j09d"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-04-12"; + version = "2021-05-28"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "a3158ec78e63e4858af2704d7a8127728639981e"; - sha256 = "0rpmsf3ykg6q848f0ahp7qrr33pfp1zzxkpc32w3najyqwsfmz6a"; + rev = "520e29d4dd2c4418e246bc28a3383fefdf501cd2"; + sha256 = "13kdbp6542k2g2vnzvfrijyc3qmkfysn4wyrsq95bai4pqaipraf"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -5152,14 +5573,14 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-04-20"; + version = "2021-06-08"; src = fetchFromGitHub { - owner = "Chiel92"; + owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "7ea00a64553854e04ce12be1fe665e02a0c7d9db"; - sha256 = "1jy5c50rd27k43rgl9wim502rp00cfnyh2zkd5bvbg0j85a9q72k"; + rev = "43ec20e20f21f4f4a5eccadef01186ee7bf1df98"; + sha256 = "0qa9a6l9snkvnf41924mvv5yhm8ywcz6mzdirsr43inp5hgv6r8n"; }; - meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; + meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; vim-automkdir = buildVimPluginFrom2Nix { @@ -5212,12 +5633,12 @@ let vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; - version = "2021-04-16"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "nathangrigg"; repo = "vim-beancount"; - rev = "dd2f56a122b698454af582cbe7eae471dbdc48f8"; - sha256 = "00wcq3wg02rjzhc83cm4gvc9fw78a7s5gds4qdn7zqf55ha2d6vi"; + rev = "2f970a0c826275f7d07fa145ba9a35c15b15232d"; + sha256 = "0fzacrlfr8fy5j1kps1mbkik0ln7lgd9c9jv74xd3mrz50hzqzby"; }; meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; @@ -5332,12 +5753,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-04-17"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "8e13b23d69549c95d9c223ea5c2487d5dd9558f7"; - sha256 = "1biiq07dhrz9vhk0yg3zkkv3329nyla6lp8kavdzqrvqg0hsbr2j"; + rev = "c7e013cb273597e37eb65b481cbeb7d1b92b01b7"; + sha256 = "1i33y3jqjqbrg2mgnz4sxvsckl1ggdg3aymxxz4l3qivnbn1fni5"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5390,6 +5811,18 @@ let meta.homepage = "https://github.com/alvan/vim-closetag/"; }; + vim-code-dark = buildVimPluginFrom2Nix { + pname = "vim-code-dark"; + version = "2021-04-09"; + src = fetchFromGitHub { + owner = "tomasiser"; + repo = "vim-code-dark"; + rev = "670fed53a2ae67542a78ef7b642f4aca6b6326dc"; + sha256 = "0zdhhv3h8lzba8dpv0amc5abpkzayp6gbjw6qv712p638zyr99vw"; + }; + meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; + }; + vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; version = "2021-04-15"; @@ -5512,12 +5945,12 @@ let vim-crates = buildVimPluginFrom2Nix { pname = "vim-crates"; - version = "2021-04-03"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-crates"; - rev = "96a40ee5c976390c142b0074d7a4a7e54b0cfa00"; - sha256 = "0nd8w4rx1s0fnhxn0ngl3dxj94ar8vjn611684v5pbxdpj6b92fm"; + rev = "f6f13113997495654a58f27d7169532c0d125214"; + sha256 = "1acm52hlv0qhisgcy8xwck6zv29b8x40bcngg7z3invv47b1gi7k"; }; meta.homepage = "https://github.com/mhinz/vim-crates/"; }; @@ -5536,12 +5969,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2021-02-02"; + version = "2021-05-30"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "8dd7f1bf25acee493a5114e627ea90a9850c5fa8"; - sha256 = "0pjq14i7w2snlbzsqhfdn0fkribjsyngg6fcmpgacm4jvx3iviql"; + rev = "7337c35588e9027b516f80f03c3b9621a271e168"; + sha256 = "05np2fr8q8r8n5mlspjywibl7hx54liy77wxvjya7n2p085n49ks"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -5584,16 +6017,28 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-04-22"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "63bfd6d99ba17832f4740efa5e2e6ad6537d4552"; - sha256 = "0p9n1n8n0167kgq4wwwxsnair2hqqvy6vwcqchnb15hifl3cl0w3"; + rev = "9e4fdb8ab029c0436728a96e1c92677737c2e784"; + sha256 = "1rmiza1km214mvlrdaqycv5hk8ki35giab11b9ggwcigbh743h01"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; + vim-dadbod-completion = buildVimPluginFrom2Nix { + pname = "vim-dadbod-completion"; + version = "2021-05-12"; + src = fetchFromGitHub { + owner = "kristijanhusak"; + repo = "vim-dadbod-completion"; + rev = "a3f8ea8e666f4bebe12739d8854a4bd31544dfbb"; + sha256 = "04m7drx86r8zqq7rq29wa9zq5ckzf5bqxzyhdc5hqn82jxcvxmpz"; + }; + meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; + }; + vim-dasht = buildVimPluginFrom2Nix { pname = "vim-dasht"; version = "2020-07-11"; @@ -5618,14 +6063,26 @@ let meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; + vim-deus = buildVimPluginFrom2Nix { + pname = "vim-deus"; + version = "2021-03-28"; + src = fetchFromGitHub { + owner = "ajmwagar"; + repo = "vim-deus"; + rev = "1be965e7bc1c01e7db5e46dcd0e50d32d4eef434"; + sha256 = "1h0imrxhxw81hkh9xl75rcnx7ll5fry6hcf7flx84n6nawvfzyvm"; + }; + meta.homepage = "https://github.com/ajmwagar/vim-deus/"; + }; + vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-02-19"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "4d14cb82cf7381c2f8eca284d1a757faaa73b159"; - sha256 = "1wwqchf50c19a5d5g037rjjpskn7dpsq9alhzim2x6bgffb5yamd"; + rev = "4c2df59e37b6680e0ec17b543b11a405dc40262c"; + sha256 = "0knpfl0lwiy0w2f9qd3gz3yl03dqzn6fllv0isl0iz24csya6v2h"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -5644,12 +6101,12 @@ let vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; - version = "2020-11-03"; + version = "2021-06-03"; src = fetchFromGitHub { owner = "will133"; repo = "vim-dirdiff"; - rev = "0191693f0d3dfc624c61ac95ec951183a50b3b32"; - sha256 = "0har8iri09nkjsvag4wgsynb9fxan2g8nlvlvd5zsalbnmlmdh9j"; + rev = "84bc8999fde4b3c2d8b228b560278ab30c7ea4c9"; + sha256 = "06qjfz94hqsmg43dpj347cvc72p16xp76zq216js35yphv6sgx65"; }; meta.homepage = "https://github.com/will133/vim-dirdiff/"; }; @@ -5668,12 +6125,12 @@ let vim-dirvish-git = buildVimPluginFrom2Nix { pname = "vim-dirvish-git"; - version = "2020-12-18"; + version = "2021-05-22"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dirvish-git"; - rev = "0c8c1a2878074abb0ac24054810de427ebff5500"; - sha256 = "0gan44cyjskzjx5wv20zyvw2jn4cs4537fpwh2m3vi6758s2bmwy"; + rev = "1d938c826503059660d89f186d2e8affc686a0e8"; + sha256 = "11vd07cy8bylh75hznddpkpjyr4jg8sgcq12rv1pig4p6wh4lzm5"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dirvish-git/"; }; @@ -5738,6 +6195,18 @@ let meta.homepage = "https://github.com/junegunn/vim-easy-align/"; }; + vim-easyescape = buildVimPluginFrom2Nix { + pname = "vim-easyescape"; + version = "2020-11-22"; + src = fetchFromGitHub { + owner = "zhou13"; + repo = "vim-easyescape"; + rev = "fd7875f1657fd54fae85088acf289b9723d8a790"; + sha256 = "0h8kmhliicbdqhximp3d961crp6qkjjs4yciksl037ds47kzrkif"; + }; + meta.homepage = "https://github.com/zhou13/vim-easyescape/"; + }; + vim-easygit = buildVimPluginFrom2Nix { pname = "vim-easygit"; version = "2018-07-08"; @@ -5788,12 +6257,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-04-21"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "c3cb96e153728fbfd050173b4af19118b131f278"; - sha256 = "1v0rgzpnpanics4zhx3y9m6ppa727yc0mvcx065jg2a2a1563sgy"; + rev = "6dc61ad4dcfa520d56f3a4373bd507f529a25382"; + sha256 = "1rqr16wcwzrs6w9iwg4wghqm7nb1jgzwjmfimvclnkbqpp8ssaq6"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -5932,12 +6401,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2021-03-20"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "e04a615e72ec2e216116b5c6514ac4d86b21ffc3"; - sha256 = "1q17xlwprkvx27fbb9xg1zh5nyx8gif3pp6p8vd3r6zhzqqdl469"; + rev = "07b0256b08e0da6d31200663cbe6d6f8c995a287"; + sha256 = "0zp3ghiqyg1qf8rxx5a1hqxyz4sqqw1afbh9qzsjlw18g0va86kj"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -5992,24 +6461,24 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-04-22"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "4a1938457489fe072acf2fbbe7142a3cfb0d8ad8"; - sha256 = "1va57czyrihcc2cihbbil5vqhnlzvjrb9bw7wirdrpjrd04ciaa4"; + rev = "808cb148d552d0369b0d2b74492086b1bfdbd22a"; + sha256 = "0mv56lb18zcjp18jfr9a8262bjsnsjsgirw8a2md8df60gd5jn5n"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2021-03-07"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "904b964eb0f878e44f47d39898e72fc0b939756b"; - sha256 = "07x8xafcvpg6dgxlvmf46gh7a9xvnrxj7i326q73g3yfh5xpma6c"; + rev = "cabecb166bde31d9fe86caac7e51284cff575da2"; + sha256 = "13ybny4i20p6xi6rp6vzngbrjwjpikvcrhg8spj1g9n2z5wcc2xz"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -6052,12 +6521,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-04-23"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "8f4a23e6639ff67c0efd7242870d4beed47b5d37"; - sha256 = "0ss8qlxgidlf1ma6z3ma63lqgaynnbrj9fdbw38szwc823vdqiid"; + rev = "41960996e0c532069533072b3fd820fafe9ce0b3"; + sha256 = "0lzjwjbdq90b39561yp7qs1l69iw4jlxcjrsi5yvh1rbhv7gpy1i"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6100,12 +6569,12 @@ let vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-03-18"; + version = "2021-05-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "e9058ebb9b9563ec77bc96fb19b2138f6512beef"; - sha256 = "17wpar2ais3cx1jaak9l8fck7fks2yczn7flcvgfcwvjxd9vyxgq"; + rev = "314fa6f289cec56d7d6e631f71b6d987832f0af4"; + sha256 = "0ar095jxrnfcfbg5gzwb82mz93hpwsdsclzam80424m0iapgl4li"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -6124,12 +6593,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-04-22"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "f4bdaa4e9cf07f62ce1161a3d0ff70c8aad25bc5"; - sha256 = "0h00i0b8p0mnynp7hhj2vpgj9rhqmlx14y2kcskvac8i2wlyj30c"; + rev = "0f98634b92da9a35580b618c11a6d2adc42d9f90"; + sha256 = "0l1f98zfmxq8xi2ii31ih0mbq5yilpc0l61qbprs1g5h5p4azjy8"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -6172,12 +6641,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-04-23"; + version = "2021-06-04"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "87fd4bf57646f984b37de5041232047fa5fdee5a"; - sha256 = "00clqf82731zz6r1h4vs15zy4dka549cbngr1j9w605k5m9hrrzs"; + rev = "edd8c160e54c2861a617777192a48d0a64704192"; + sha256 = "1xdggzasvv3x1h61yqp2rl30r6kppf6aqdjqsrpzihz809w5zgry"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6208,24 +6677,24 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2020-07-12"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "e9004ce564891412cfe433cfbb97295cccd06b39"; - sha256 = "1cs72x3wv4i11x7ch3gna1sxqn5zj3bd34smchfd00g4mf201lhs"; + rev = "b80004c050501122d58f82712b21d0b7c8dfc019"; + sha256 = "049552dvsk14hx4h9rp9g65xkf13n42z304lzxca69j5q6k1qrdl"; }; meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; vim-gruvbox8 = buildVimPluginFrom2Nix { pname = "vim-gruvbox8"; - version = "2021-04-22"; + version = "2021-05-28"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "217a87f4f751ed0d6fe5c79b2c0963f557bf0314"; - sha256 = "1gdys8ycmmykq121ix34wva75m18nda0camiqr4aavb9hj32faj6"; + rev = "66d58b569fdbe0ec389acb66eb4a585f3110e43e"; + sha256 = "0bggkq2p109vc67s0idplrf4sy4j12smwkx2wvsc626bzflzc2fb"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -6304,12 +6773,12 @@ let vim-hcl = buildVimPluginFrom2Nix { pname = "vim-hcl"; - version = "2021-03-17"; + version = "2021-06-03"; src = fetchFromGitHub { owner = "jvirtanen"; repo = "vim-hcl"; - rev = "d50f93204b606b4ff40a9522be0e8dbf6055b815"; - sha256 = "0sdaldmdrgha5ij02flsqrc77ijjifdvl8b6pdw24xrpd9j5cwhs"; + rev = "6289d1a1424229a8f6523f4ef9441dbf2468250b"; + sha256 = "0x33bdvacmj82m838frr40r16mc0cvb2p9alkr2gw30ls2ym3zdy"; }; meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; }; @@ -6340,12 +6809,12 @@ let vim-hexokinase = buildVimPluginFrom2Nix { pname = "vim-hexokinase"; - version = "2021-03-31"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-hexokinase"; - rev = "6bd30278c7af4c624bf996650d62dac404342dc7"; - sha256 = "1wimsi6pxhw410dbcgj4sr9q5k21066i762fyaaf424jyf1g8d2i"; + rev = "62324b43ea858e268fb70665f7d012ae67690f43"; + sha256 = "1qdy028i9zrldjx24blk5im35lcijvq4fwg63ks2vrrvn0dfsj01"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; @@ -6413,12 +6882,12 @@ let vim-html-template-literals = buildVimPluginFrom2Nix { pname = "vim-html-template-literals"; - version = "2020-09-02"; + version = "2021-06-03"; src = fetchFromGitHub { owner = "jonsmithers"; repo = "vim-html-template-literals"; - rev = "602dba70bdcfc2e280e0c0503e74a8a92519db49"; - sha256 = "0x0sbmcig3r058sg78bfj8dv0lwlgdcwvw9kxviynyhk2qkg9zl9"; + rev = "e6f3f8ffaae9c2f9deea2bbb596b64468041616c"; + sha256 = "1lrkby9m60ccgm35y1z82llgzjd5vmdwfscy7byjd5ycnkhyangi"; }; meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; @@ -6473,12 +6942,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-04-13"; + version = "2021-06-03"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "d20beb074f2de67104dda1f698cf83c920ffd78a"; - sha256 = "0lll31xp6vjqrzphs6f3zkz15rwis6lavw2cibvi7hx2vfp4hds2"; + rev = "daa49da1e7a6d8c8dcbd3a40f91046d1505fd645"; + sha256 = "1qvnij7z48g1m6n2qz5lbgbiwwaqnb626sz6qvhkd5jh556pmfah"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -6593,12 +7062,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2021-04-02"; + version = "2021-05-23"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "585ad542834fd3d9e47e0ef59abafd69c696c80d"; - sha256 = "0y0lpx54yfmqbmvrhy95d0gp3qvrqn7ak7mdfsqlddp77gzs7qk2"; + rev = "f8345cdb6734aefa5c0f9cb128c9efd005410a43"; + sha256 = "0s8bsfsjzc2djy2gvvf44g5ypsr7r3ax436xn0qpvhr58aa5m4dv"; }; meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; @@ -6642,12 +7111,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-04-01"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "fc059e80ff0b368a9188d6c16db052da6ac0951f"; - sha256 = "03x8hhaf5mirk38gb8j7k3fk6jjis64a4r2hnvkgg6hwf9h02f2g"; + rev = "e9e8547a57fa113945047c003d321fbbee770e03"; + sha256 = "15j7fb20rz6gndm04ac9lfwrbq9ss5pk9ilxj90rd1dmppvkdkfr"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -6702,12 +7171,12 @@ let vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2021-03-31"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "f09007be7e477a491a478444b302d079104af23d"; - sha256 = "06m9rf0c9nxmyz9qnri1lmyb7cljv3vz2njxvh3fz8q7hjghh6cd"; + rev = "50b87c4287c791addc7364dfa377605d0837d326"; + sha256 = "0z3hmgflpiv0czdrkvpc845ms7bjy9rs2a6mp7gyzlqyqrjvqzzy"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -6858,48 +7327,60 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-03-23"; + version = "2021-04-28"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "2f0cbbfb8ea8997b408e447a2bc9554a3de33617"; - sha256 = "1y3r5a5mcjf8dp0pkmhgnbay10hh48w1b3wd795wwbm6nx4izjjq"; + rev = "4b0fc48037c628f14209f30616a19287d9e54823"; + sha256 = "1jwfc193wbh2rmyi6mdwgr3lcq82qhlclq4hjwg1hcw94442r5xv"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-04-17"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "296fb98d198cbbb5c5c937c09b84c8c7a9605a16"; - sha256 = "1khiygamq1jirlz2hgjjksr12a7sj4x90hs7z4zkvzl83ysnbmdn"; + rev = "516fd7ce956bdfa2fa6ee8ac6d77ad8a57616811"; + sha256 = "0anfwxq93ddmymdna692xz74h3kimwmw1ii6pq8ci08i3pkqjrf7"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { pname = "vim-lsp-cxx-highlight"; - version = "2021-04-06"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "jackguo380"; repo = "vim-lsp-cxx-highlight"; - rev = "130fd4189e0328630be7ad4aa7e1d98a0a503170"; + rev = "9e42350272a413a51ce9a93b00c98682815ff7c1"; sha256 = "1nsac8f2c0lj42a77wxcv3k6i8sbpm5ghip6nx7yz0dj7zd4xm10"; }; meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; }; + vim-lua = buildVimPluginFrom2Nix { + pname = "vim-lua"; + version = "2020-08-05"; + src = fetchFromGitHub { + owner = "tbastos"; + repo = "vim-lua"; + rev = "fa810f85437525bcea0fc4ff22c634935721d86d"; + sha256 = "1fkpfjpmv80lcd7jn95pzxrcbzn8avdywjknd5bn3212ahydg43m"; + }; + meta.homepage = "https://github.com/tbastos/vim-lua/"; + }; + vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-12-23"; + version = "2021-05-29"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "46730b0d818da2da005e3c8a38ff987a2dd36d7c"; - sha256 = "1lc4lysv3q7qvivfrwqggrpdgsb3zkhq1clvzfsxfsa2m1y4gr0z"; + rev = "2b5565881b31ed4e7ac32b4903827ec9c164216d"; + sha256 = "13nzkqhyz8jydrwprw06jqcx3w37xv0qdq0809gx748kfvh1dznw"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -6967,12 +7448,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-04-20"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "71b97bac53aa09760e8d8c36767c657b274c468d"; - sha256 = "0ign21d8w6hcrbz9j6c0p1ff0y396wl7snm5dj81m7fck2287pj3"; + rev = "fd9f3c09b04725c8042149bfe3fd080b6f6962cb"; + sha256 = "08cqh4b01jl0iqd1nj2sw2jcwxp48m9rdh50sdnfjgdvynnpagik"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -7027,12 +7508,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2021-02-12"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "65fa0678d8426ae2cc7a4c42a8f0d72bde2a7bbe"; - sha256 = "0r118mxm34kr8yk66x9ddg2yh44gn00iaxljfbhg43nhp8jyzjbn"; + rev = "66f7dc9c63296ea6ba408faa60bebe54a34c57f2"; + sha256 = "10ip0y9p2qf869h2yhp2zs6qc048rw1x5i0spziajca96251gvig"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -7147,24 +7628,24 @@ let vim-ninja-feet = buildVimPluginFrom2Nix { pname = "vim-ninja-feet"; - version = "2019-05-12"; + version = "2021-05-27"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-ninja-feet"; - rev = "5b48f97bf4865a25f5f4568c45cdfd08f946ec4f"; - sha256 = "1i3n5nlwyg65k0f0qrimbfs67l2xx39cqp4gyrycw4vzp6hs0lsc"; + rev = "cb9b448dd468a338255aed474e6113ed115612c1"; + sha256 = "1aqmhqaxb72ih56mh85kv4fkxyqw5hfispd208lfyp4w3zhvli30"; }; meta.homepage = "https://github.com/tommcdo/vim-ninja-feet/"; }; vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2020-11-16"; + version = "2021-05-28"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "7542a2bf66d72cb86fc80529867accbc787f744b"; - sha256 = "1kgziwckdjg3sb1z4anwsn1c72hny60vhimxpb6424bylk1qy22j"; + rev = "63b47b39c8d481ebca3092822ca8972e08df769b"; + sha256 = "08n9cgphv2m96kk5w996lwlqak011x5xm410hajmc91vy5fws361"; }; meta.homepage = "https://github.com/LnL7/vim-nix/"; }; @@ -7303,12 +7784,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-04-20"; + version = "2021-05-21"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "2a0af02d0fd59baeb84cf865e395827750c875f0"; - sha256 = "06vrham1zg5vfr4q4gmz2ski4y02c3bfivzy4rlfvjs81qj3vn3m"; + rev = "20fade09069cd35602387c2e7d2a7cd0f6cff8b0"; + sha256 = "1ym87hd85l67976dxk919mdwab8fi8iq8azqk4mpa75gzl2ia7wl"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -7351,12 +7832,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2021-04-16"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "5af0dcf7878a8c947ae5a69989524f0a1ba5f6da"; - sha256 = "17vb0xnzq6ic9naqg2wvjdh7s7ckz82ixv45pknxc21b6wjrfc75"; + rev = "587399591a9e9b8da9846c0d724a84a3bd1ce98e"; + sha256 = "1xghmq15i8wqfwx7gib8j54c5s3an9q4idy6c6mbywd75s4384m5"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -7471,12 +7952,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2021-02-08"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "cffcfe150bda75177920530c5f1911b52f70a065"; - sha256 = "0sgfnxi1f5mnzcbklcmq6x17r1z1kz8s7h2h94girmd4aga3gcp0"; + rev = "fc2813ef4484c7a5c080021ceaa6d1f70390d920"; + sha256 = "0fsl8w17z15sj21x5gd5ah5p5fjsnk0gzdx2n2p0jnkcb05bwzck"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -7495,12 +7976,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2021-04-14"; + version = "2021-06-04"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "730dcb02caab60a6ae5d8b4bdc16d290041061ec"; - sha256 = "1pgqw008xy3fn821zxfiwc9xpd0v33wxmk4yf9avm5jgqbkwn1ld"; + rev = "c312d30231f136d2fbb32a2cfea554af5066e6b0"; + sha256 = "1apd860v2xfi3fjgl15j7mgn6nczx10vj324w1vf1ic5nyy4b594"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -7627,12 +8108,12 @@ let vim-qf = buildVimPluginFrom2Nix { pname = "vim-qf"; - version = "2021-03-29"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-qf"; - rev = "127257057c4befb8c1026a7ba7e07713af1fb5c8"; - sha256 = "1ai915kfxq4m8ba304qpcc2qb5rcj2vsrfcdh3blb1slw3a90hiq"; + rev = "4fe7e33a514874692d6897edd1acaaa46d9fb646"; + sha256 = "054p9f3a3yljng3r51asgyq2ifmmrr35ws5f8dv8ssmby2f7an1l"; }; meta.homepage = "https://github.com/romainl/vim-qf/"; }; @@ -7651,12 +8132,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2021-04-22"; + version = "2021-05-18"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "31274b11e0a658b84f220ef1f5d69e171ba53ebf"; - sha256 = "1687ih32rgjjxf84dw7yx2qkylrqwp4ir8hj6mlh1hmysfd13vvl"; + rev = "759c9dd42d02c8634a044af998fd895682a0ce75"; + sha256 = "0wdfya3kzk0xygk8ngg1kz1kdd3qzfxld3w0bq3pxsns41838a8c"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -7699,12 +8180,12 @@ let vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2021-03-29"; + version = "2021-06-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "9c3c831a089c7b4dcc4ebd8b8c73f366f754c976"; - sha256 = "15m7hhqadvpf3ryig5vifp8m0md2mg9apx71z8xrpc7hgwsvy1bi"; + rev = "3b3796352a6f1a68e54e5f7ae5e0c1b9103fab0e"; + sha256 = "1f0xns0h55szamms17wi06k1ninvygsc4yw82hr29kfq94hvn57l"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -7735,12 +8216,12 @@ let vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2021-04-12"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "662c00676abab9d7ce16bf9f202420bf86cc6554"; - sha256 = "1birkzysn8midk627zyp3pla51wmz4sp613gs5xxlms5imq4diaq"; + rev = "9a5ce8edc67cca36cc530ee27a805112ce7a7e9b"; + sha256 = "0zx1mzaiqwqyg7imahwy0mzp52b2dzp4qdnrsgcnkvkxf8v67bak"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -7903,16 +8384,28 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2021-04-22"; + version = "2021-05-19"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "6b9afcce385b1121d46f749f9cd46d05e132c1e4"; - sha256 = "04yh7cq9vi1hksksyphg8s4xz64qc6pmwnrbqapfgfsmp6jk11s5"; + rev = "22f05607d4d7406781af56cafc1121152988c6d2"; + sha256 = "1rq5d3v5qvv0hnvk18q66zd8963flnjvxb4b65vh88md15qc3p3j"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; + vim-simpledb = buildVimPluginFrom2Nix { + pname = "vim-simpledb"; + version = "2020-10-02"; + src = fetchFromGitHub { + owner = "ivalkeen"; + repo = "vim-simpledb"; + rev = "1e9e72160dd01c837b5afb4f75cbb587a15b31b5"; + sha256 = "1y0i876p2pxx7gbr04acnv94cjrincsbg03bqxr89xbqlbggxf0w"; + }; + meta.homepage = "https://github.com/ivalkeen/vim-simpledb/"; + }; + vim-slash = buildVimPluginFrom2Nix { pname = "vim-slash"; version = "2019-08-28"; @@ -7949,6 +8442,18 @@ let meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; + vim-smali = buildVimPluginFrom2Nix { + pname = "vim-smali"; + version = "2015-11-05"; + src = fetchFromGitHub { + owner = "mzlogin"; + repo = "vim-smali"; + rev = "012c21565e6be8f1718ad634aa84730a0a84b42c"; + sha256 = "1mcdbcfiq5r21q297fxi18c3ah4193j1fnjnbjnrjh20r50wggx8"; + }; + meta.homepage = "https://github.com/mzlogin/vim-smali/"; + }; + vim-smalls = buildVimPluginFrom2Nix { pname = "vim-smalls"; version = "2015-05-02"; @@ -7975,12 +8480,12 @@ let vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2021-02-16"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "196d05f7152fb95c4613476368ebae9dd842d470"; - sha256 = "0lk9clnvrkjbxgszg52zdl28d313vk2fiyh86aa6xx5pr0nr9iw3"; + rev = "2cc8c80c0a88e0d47de85bef1d50df86e197c302"; + sha256 = "0djk8s8q4b72blw73r4m7z9gc15gys167xgnvd1avmfyfw8fb22a"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -7999,12 +8504,12 @@ let vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2021-01-22"; + version = "2021-06-04"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "cbec960ab558b20281c0634b9b1a45fb16aaf638"; - sha256 = "1k35rh5gq8lv67qx3l31xvl4iz7rlpybls7pwhsbmz4m598w03bm"; + rev = "ed3c5426a20bf1c06d7980946ada34fd9f93320e"; + sha256 = "0bxaalza02sgm045cj4vciy3qhmj7pj1rp9bdwm5837ldq8paj1h"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; @@ -8059,12 +8564,12 @@ let vim-speeddating = buildVimPluginFrom2Nix { pname = "vim-speeddating"; - version = "2019-11-12"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-speeddating"; - rev = "fe98cfaa7ea9c4b838d42a6830437c919eb55b4e"; - sha256 = "02875qswrmanr7b798ymlc7w60055q0av0qj3fh7fvpqhsqpg52k"; + rev = "95da3d72efc91a5131acf388eafa4b1ad6512a9b"; + sha256 = "1al53c1x2bnnf0nnn7319jxq7bphaxdcnb5i7qa86m337jb2wqrp"; }; meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; @@ -8083,24 +8588,24 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2021-04-23"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "df0f1dbdc0689f6172bdd3b8685868aa93446c6f"; - sha256 = "0idrzl2kgclalsxixrh21fkw6d2vd53apw47ajjlcsl94acy2139"; + rev = "81e36c352a8deea54df5ec1e2f4348685569bed2"; + sha256 = "1y8yi099lqg03781bnma2bj6x5lkvfq65vhdpnm65mfyak6dpzgz"; }; meta.homepage = "https://github.com/mhinz/vim-startify/"; }; vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-03-22"; + version = "2021-05-29"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "cee157ee4f73ddacfe1a70bb833b96f7a47a10c2"; - sha256 = "1y049vbjhsg80am0hxyrcq0d0p7qfyvb1z38nc7yd7bcgwsqc5ac"; + rev = "7a97baae32bedbf6f62d5a573777e4d1652787d1"; + sha256 = "1sphykwbjd35kwsibm9wcxbs2iwjkzkg7madqvlxzi7sqh4vkc7y"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -8191,12 +8696,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-10-13"; + version = "2021-05-29"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "659ba4f39caa38e6913f88c9f4369c00e852160f"; - sha256 = "0fqj9l7i052mvw0wlyg30bmihzi937svk3ggsp0rc9wlr30frg2p"; + rev = "35e9fbf64c06fddc41651e65b92200f902d8ae0b"; + sha256 = "16p68x4669y4qpg91hmi4gc3f8qc8bzbr8v6w3nc75vm48s64z6k"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -8227,12 +8732,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2021-03-07"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "e62cac4d3186209a510f51becd768ee414b2be76"; - sha256 = "1c93kvlrgzp5fw5rgv053sin0f2f2chydxbvrkprpz71qmxqmq05"; + rev = "9166d42e5dc9bc0ef7e1b9e93d52bb4c5b923560"; + sha256 = "1wr1sqxjy1dqyvkvii8jrxwagfph52z2ij8p1nz5b1kpyzvvpg7b"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -8252,12 +8757,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-04-06"; + version = "2021-05-24"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "206eb5492b4afa03c31cea529aa917b4a7085d10"; - sha256 = "084yaqw0zw1bc4y4pk1vdb58vza7dn31phjr53dvwdj0kyl7j088"; + rev = "4eb72005f87ff1bf3bc7e523b176bd6b391f6e24"; + sha256 = "1m42skcd6mn6gp5a6wrjg9zxsbdqa1qbg4d998js5chiwv2ajq4k"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -8372,24 +8877,24 @@ let vim-tmux-focus-events = buildVimPluginFrom2Nix { pname = "vim-tmux-focus-events"; - version = "2021-04-04"; + version = "2021-04-27"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; - rev = "26237f9284c3853084fbf9e8303efb8fb62e0aa9"; - sha256 = "0pmkjwpad63gdrp0qykkcsjdavb5kxwqvlcip0ykdm6ivvzi9fy5"; + rev = "b1330e04ffb95ede8e02b2f7df1f238190c67056"; + sha256 = "19r8gslq4m70rgi51bnlazhppggiy3crnmaqyvjc25f59f1213a7"; }; meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2020-11-12"; + version = "2021-05-29"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "6a1e58c3ca3bc7acca36c90521b3dfae83b2a602"; - sha256 = "17219h69vd6b994qrywg1rpx80y1rmycbfsmf9wb6c693sx721sn"; + rev = "0cabb1ef01af0986b7bf6fb7acf631debdbbb470"; + sha256 = "0xxc5wpyfqv7f7sfy6xncy7ipj0cvshw28s12ld3jfgyimjllr62"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -8420,12 +8925,12 @@ let vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-04-19"; + version = "2021-06-03"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "256235f8b60ccae36699e92edd61dbcf26fe0b17"; - sha256 = "000wyqm06h0614k6qwr90xxrvmwfbii7jjif5fjavk474ijgwckp"; + rev = "683cf4f2e16149c477a8f5c96b7429932a68d801"; + sha256 = "0gr5k4bzzzvn00plimpkjiavya04jvcgg322k8yblzmm01r6vcr2"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -8478,6 +8983,30 @@ let meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; + vim-ultest = buildVimPluginFrom2Nix { + pname = "vim-ultest"; + version = "2021-06-07"; + src = fetchFromGitHub { + owner = "rcarriga"; + repo = "vim-ultest"; + rev = "d864a6b2b0f394b9371246cad226adac7507e13d"; + sha256 = "0bvdhbla38mvq9x595h5mcvib13sb84mz3z9f7sqf4m3c9v9376m"; + }; + meta.homepage = "https://github.com/rcarriga/vim-ultest/"; + }; + + vim-unicoder = buildVimPluginFrom2Nix { + pname = "vim-unicoder"; + version = "2019-04-16"; + src = fetchFromGitHub { + owner = "arthurxavierx"; + repo = "vim-unicoder"; + rev = "a71fc3670f9337c56806fa9e8e97b7ea09fd5e39"; + sha256 = "1kcnxx909pdvrvk0kyz3h8f9szn6hmalm8qyakq3pv6dknlkwb0b"; + }; + meta.homepage = "https://github.com/arthurxavierx/vim-unicoder/"; + }; + vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; version = "2020-04-26"; @@ -8528,12 +9057,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-03-21"; + version = "2021-06-01"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "08e37d47406d7f57e5907af4dc6bd35cff2b04b3"; - sha256 = "157gvlpb0i3jn9gjcjgz02y843jh03pqnwfkv2bf9qh7bknrnxr5"; + rev = "2b9d104c57aeb612d7f00e1d071d712ed8671949"; + sha256 = "17f92pka2flwnhx8yg7skbp8kyhbb6gmvm0mni2jm7w3iq68nbmw"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -8552,12 +9081,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-04-21"; + version = "2021-06-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "395d200728b467e141615f53afe564adc26985b9"; - sha256 = "1g0fhdqr6qmqmhvm3amv22fqb1aacmvd0swmk38w25zzcbl4b4gy"; + rev = "552403842b992efde3816a89b20055f7d66d9a0d"; + sha256 = "1pkkysv2mnbzm2bi33l1xccdb6sh06dgyg83dg0dgd0gmp94l7ya"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -8612,28 +9141,40 @@ let vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2021-03-15"; + version = "2021-05-01"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "1f7f05039c572fde082043915953a88b77c0ddb0"; - sha256 = "0ihyfdvgiclmcric66nd54ha7ikf2c1pl1slbn4y6mkbxla02yv9"; + rev = "722aaf34486ffee924ccbc34eb22553642c1c153"; + sha256 = "1vg242139r1arz4kia4bbpmvzr4v5rp7gzy063f61xbvkdjwjx4q"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2021-04-22"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "20163f6ffda855fa40a11cb999002211dc66288f"; - sha256 = "1g29z5f2w1g6znljdgwn49wp8g85m1pawvg8qjrh1kxyjv9dr8x1"; + rev = "da2934fcd36350b871ed8ccd54c8eae3a0dfc8ae"; + sha256 = "18n5mqwgkjsf67jg2r24d4w93hadg7fnqyvmqq6dd5bsmqwp9v14"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; + vim-wordmotion = buildVimPluginFrom2Nix { + pname = "vim-wordmotion"; + version = "2021-06-04"; + src = fetchFromGitHub { + owner = "chaoren"; + repo = "vim-wordmotion"; + rev = "dca1a1827513497def6362411d093ae6b3cff7f8"; + sha256 = "1ij2j35bskk20wyiwjg1krqr9fi5fk043gfpxihhlbxd7yxlbpq1"; + }; + meta.homepage = "https://github.com/chaoren/vim-wordmotion/"; + }; + vim-wordy = buildVimPluginFrom2Nix { pname = "vim-wordy"; version = "2020-10-24"; @@ -8660,24 +9201,24 @@ let vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2020-12-02"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "f851600045c543f3646c709d7e03e231408eab81"; - sha256 = "0pi85rzls3g7ilb18idk8xbqya8ygjab5ndk09p4xmmww9z4v711"; + rev = "cd88d9bc34ca1df6bd06a9e427350d45a6c2931c"; + sha256 = "0gf0xla3jm8cp4j5mldn79kfbd3zlwil3wdgdvsx8w3kybi6dap1"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-01-31"; + version = "2021-06-08"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "654675222adde47c9d72caa400e35c7e680fe5a1"; - sha256 = "1f7d4vmr7n5v7h5a1bjcvxaqygrdi33y0vdx4yjfdswi835yd45h"; + rev = "5e67677a4815bbf474b52f8aefcfa2090fe43768"; + sha256 = "17pb39zhzsmmibxmsbrsd3znky88sar2sl0h7b1418qqkaakx4p9"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -8718,6 +9259,18 @@ let meta.homepage = "https://github.com/dag/vim2hs/"; }; + vim_current_word = buildVimPluginFrom2Nix { + pname = "vim_current_word"; + version = "2021-01-27"; + src = fetchFromGitHub { + owner = "dominikduda"; + repo = "vim_current_word"; + rev = "84ae9300de73cf878c805a6228a58d408b6b829d"; + sha256 = "0k0wq3aqrbwrqyfz36qdqzyq7cw16d34yvw0gvzyg7iany0z0r6r"; + }; + meta.homepage = "https://github.com/dominikduda/vim_current_word/"; + }; + vimacs = buildVimPluginFrom2Nix { pname = "vimacs"; version = "2016-03-24"; @@ -8792,12 +9345,12 @@ let vimoutliner = buildVimPluginFrom2Nix { pname = "vimoutliner"; - version = "2021-04-20"; + version = "2021-04-24"; src = fetchFromGitHub { owner = "vimoutliner"; repo = "vimoutliner"; - rev = "054f957779dff8e5fbb859e8cfbca06f1ed9e7f0"; - sha256 = "1bsfrma06mkigr1jhzic98z4v1gckzrjv908vx2wlbjq9cdv7d39"; + rev = "6d849acb977fc2d008f9cd2edf4f1356537794fe"; + sha256 = "1hy4zgxrc0zn6dnbdv7zy2cn4ny99srsvrgkyvwhg4pzd9rwcqpp"; }; meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; @@ -8828,12 +9381,12 @@ let vimsence = buildVimPluginFrom2Nix { pname = "vimsence"; - version = "2021-03-17"; + version = "2021-05-01"; src = fetchFromGitHub { owner = "vimsence"; repo = "vimsence"; - rev = "ad036250a116472218430aed1817e5b6c204d0b8"; - sha256 = "0yn3w193h9h1fyaniwdj4y7b744kwj11prxcq8iyg897v8jj25bk"; + rev = "79f43e9da378f66e7c7eb1c6193de8a805d8afe3"; + sha256 = "0ymdrv74q513ghz7cfsbs9y4qgimk5wbwizwf20dbqy2pcsq6i46"; }; meta.homepage = "https://github.com/vimsence/vimsence/"; }; @@ -8852,12 +9405,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-04-22"; + version = "2021-06-07"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "a47d0b921c42be740e57d75a73ae15a8ee0141d4"; - sha256 = "05nhav31i3d16d1qdcgbkr8dfgwi53123sv3xd9pr8j7j3rdd0ix"; + rev = "1cbb400d426760a63d5383e2574e9d8905bebe51"; + sha256 = "172kryvxphsvbh2f60ka21rjsrq4abgdh1ijyxp57p1qbbv9fhcc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8865,24 +9418,24 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-04-23"; + version = "2021-06-06"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "91c011f6c156f405ed259c9749ea049726ef8912"; - sha256 = "1pwq5wxyky38nhs8ckcl6x4yxkia5lk5hcd12l1d5iimddjfsx9i"; + rev = "fef77c8edf655d947e4d9c78d7bd2740ccda70cd"; + sha256 = "06hdz4rwwnmm1hhhjhvcd50r04qnvmksriaw4csv3gfnkfkm5v9r"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-04-10"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "ee3075ad30560ffba20c695124c60faef97ec4a4"; - sha256 = "19plkjvifvbfnq56vcmzl0q3hxmcbd7q5f5cxk42jp038cry26ay"; + rev = "a1650d5f9bc2d617bb546bb8014a206e41089dc8"; + sha256 = "0gdhhkpcq654c7jv5ycnss3fra2mysz3zl64n46cq17vmwczbcrh"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -8913,12 +9466,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-03-31"; + version = "2021-05-28"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "a2236deb0a40d745f38fac4523ed6a0c86639863"; - sha256 = "14gxwqykm4cql80la3x1x7sxcfmdvpm05r9brxw3xfn9bsqy3qsk"; + rev = "19cad968d2cd759e7f9de1d662ec680bd93ebebc"; + sha256 = "0r01b6mml6qgyybi6i59bflgqi03w0fnl0wfgwac96ixs2wdvl1l"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -8949,24 +9502,36 @@ let webapi-vim = buildVimPluginFrom2Nix { pname = "webapi-vim"; - version = "2020-12-02"; + version = "2021-06-04"; src = fetchFromGitHub { owner = "mattn"; repo = "webapi-vim"; - rev = "6f5ffb6f547cda1b6cbc26a06f12d81e6283bd82"; - sha256 = "1144jk4dfqb8pzblqksc1wjgbraxy6pdgr4q567wzcf93bviv81l"; + rev = "b09cbd3a27157a5baf0468403b392f577adefe45"; + sha256 = "17vlzg5dm5phirwyk8xkqnrkplybd8d5rj9kdx7rgla3h7rqn4wg"; }; meta.homepage = "https://github.com/mattn/webapi-vim/"; }; + which-key-nvim = buildVimPluginFrom2Nix { + pname = "which-key-nvim"; + version = "2021-06-04"; + src = fetchFromGitHub { + owner = "folke"; + repo = "which-key.nvim"; + rev = "9ea98e59ddeeafc9181815dd714bea513b298e33"; + sha256 = "0zhlbbd969p4bg5vrifsi5sgqi2wbp8zxlak3l7zk67akpbb395n"; + }; + meta.homepage = "https://github.com/folke/which-key.nvim/"; + }; + wildfire-vim = buildVimPluginFrom2Nix { pname = "wildfire-vim"; - version = "2014-11-16"; + version = "2021-05-10"; src = fetchFromGitHub { owner = "gcmt"; repo = "wildfire.vim"; - rev = "e2baded7162260e05d2527f5bca9fca81f0bc8f2"; - sha256 = "01i12x8brsnqicj5vclg57nv6ha7nz70gilphf6sr14xr741ra1y"; + rev = "fa91b732fd1c5acd23b7b32d5fbbc884eedafc8d"; + sha256 = "15gikqmpaf5c6687kgc5ib57pw7gyvxaihdv5549s7p2xkkbcl24"; }; meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; @@ -9057,12 +9622,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2021-02-15"; + version = "2021-05-29"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "11112853180a933574f431cf78cd5a462ee3f473"; - sha256 = "0bnq02dbsqwsizhlldb2pj92gjybr5aaa7a5m786xvb7ljvd82vi"; + rev = "7c5e526f1aac81e4913be72a5a891e8de38925bd"; + sha256 = "1p3rgw1fx6ficzyk7ba9s22aj9xjsf50ipkx4bdmp4a2zskacqcp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -9070,12 +9635,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-04-20"; + version = "2021-05-25"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "c8acf70d23337047af6548dbb8337d3e3a0c0357"; - sha256 = "0l24b07l1bdiwffpj2ajks879w69cjkn1adx9ak6pv98jlmsdzi1"; + rev = "4df6f35f0c9f9aec21a3f567397496b5dee6acc7"; + sha256 = "1ywdxm9sy57k9wp9gkcahhsy8r75ahxsgb7xcdjpzacg4iranj99"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -9131,12 +9696,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2021-04-07"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "fc32adfada0fac7a2f6088672e177d410c9e3ae1"; - sha256 = "051l2dig6861xzl6zg41d6a776jhms7v6a86cap1ipd2rxkqh5yh"; + rev = "9ec189bc76ed2850f916394ed8d6127290f51338"; + sha256 = "0xl2pxgmam5ls7a59bdvx3gyzcgsq3wvgby2c5667627kcq05j6s"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -9153,5 +9718,4 @@ let meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; -}); -in lib.fix' (lib.extends overrides packages) +} diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 8b7e41ed3bd0..4e43bbe29a24 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -20,7 +20,8 @@ , dasht , direnv , fzf -, gnome3 +, gnome +, himalaya , khard , languagetool , llvmPackages @@ -97,7 +98,7 @@ self: super: { # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 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}/lib/libclang.so'" + --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'" substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/libclang.py \ --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" @@ -273,6 +274,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); + gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { + dependencies = with self; [ lush-nvim ]; + }); + jedi-vim = super.jedi-vim.overrideAttrs (old: { # checking for python3 support in vim would be neat, too, but nobody else seems to care buildInputs = [ python3.pkgs.jedi ]; @@ -282,6 +287,21 @@ self: super: { }; }); + himalaya-vim = buildVimPluginFrom2Nix { + pname = "himalaya-vim"; + inherit (himalaya) src version; + configurePhase = "cd vim/"; + dependencies = with self; [ himalaya ]; + preFixup = '' + substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \ + --replace 'if !executable("himalaya")' 'if v:false' + ''; + postFixup = '' + mkdir -p $out/bin + ln -s ${himalaya}/bin/himalaya $out/bin/himalaya + ''; + }; + LanguageClient-neovim = let version = "0.1.161"; @@ -511,7 +531,7 @@ self: super: { vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { # on linux can use either Zenity or Yad. - propagatedBuildInputs = [ gnome3.zenity ]; + propagatedBuildInputs = [ gnome.zenity ]; meta = { description = "Simple color selector/picker plugin"; license = lib.licenses.publicDomain; @@ -601,7 +621,7 @@ self: super: { libiconv ]; - cargoSha256 = "25UkYKhlGmlDg4fz1jZHjpQn5s4k5FKlFK0MU8YM5SE="; + cargoSha256 = "sha256-/ALOjJayCmLpMV8zC9ryEofUxYdvqj4Cn+sY1qRuqcs="; }; in '' @@ -611,16 +631,6 @@ self: super: { meta.platforms = lib.platforms.all; }); - vim-closer = super.vim-closer.overrideAttrs (old: { - patches = [ - # Fix duplicate tag in doc - (fetchpatch { - url = "https://github.com/rstacruz/vim-closer/commit/a504be8c7050e41b7dfc50c2362948e2cf7c5422.patch"; - sha256 = "065q30d913fm3pc7r5y53wmnb7q7bhv21qxavm65bkb91242d409"; - }) - ]; - }); - vim-codefmt = super.vim-codefmt.overrideAttrs (old: { dependencies = with self; [ vim-maktaba ]; }); @@ -726,7 +736,7 @@ self: super: { vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; - cargoSha256 = "iuhq2Zhdkib8hw4uvXBjwE5ZiN1kzairlzufaGuVkWc="; + cargoSha256 = "1cvnjsw5dd02wrm1q5xi8b033rsn44f7fkmw5j7lhskv5j286zrh"; }; in super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { diff --git a/nixpkgs/pkgs/misc/vim-plugins/update.py b/nixpkgs/pkgs/misc/vim-plugins/update.py index 1180b4572d22..df948cc0e55d 100755 --- a/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/nixpkgs/pkgs/misc/vim-plugins/update.py @@ -47,9 +47,9 @@ def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: s f.write(HEADER) f.write( """ -{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: -let - packages = ( self: +{ lib, buildVimPluginFrom2Nix, fetchFromGitHub }: + +final: prev: {""" ) for owner, repo, plugin in sorted_plugins: @@ -75,8 +75,7 @@ let ) f.write( """ -}); -in lib.fix' (lib.extends overrides packages) +} """ ) print(f"updated {outfile}") diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index ecaa316c465c..015504c5b45d 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -4,6 +4,7 @@ AckslD/nvim-whichkey-setup.lua@main ackyshake/Spacegray.vim@main airblade/vim-gitgutter airblade/vim-rooter +ajmwagar/vim-deus akinsho/nvim-bufferline.lua akinsho/nvim-toggleterm.lua aklt/plantuml-syntax @@ -12,17 +13,20 @@ alvan/vim-closetag alx741/vim-hindent alx741/vim-stylishask amiorin/ctrlp-z +andersevenrud/compe-tmux@main andrep/vimacs andreshazard/vim-logreview AndrewRadev/sideways.vim@main AndrewRadev/splitjoin.vim@main andsild/peskcolor.vim andviro/flake8-vim +andweeb/presence.nvim andymass/vim-matchup andys8/vim-elm-syntax antoinemadec/coc-fzf ap/vim-css-color arcticicestudio/nord-vim +arthurxavierx/vim-unicoder artur-shaik/vim-javacomplete2 autozimu/LanguageClient-neovim axelf4/vim-strip-trailing-whitespace @@ -46,7 +50,7 @@ camspiers/lens.vim carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file cespare/vim-toml -Chiel92/vim-autoformat +chaoren/vim-wordmotion chikatoike/concealedyank.vim chikatoike/sourcemap.vim chkno/vim-haskell-module-name @@ -94,6 +98,7 @@ digitaltoad/vim-pug direnv/direnv.vim dleonard0/pony-vim-syntax dmix/elvish.vim +dominikduda/vim_current_word dpelle/vim-LanguageTool dracula/vim as dracula-vim drewtempelmeyer/palenight.vim @@ -104,7 +109,11 @@ dylanaraps/wal.vim eagletmt/ghcmod-vim eagletmt/neco-ghc easymotion/vim-easymotion +eddiebergman/nvim-treesitter-pyfold +eddyekofo94/gruvbox-flat.nvim editorconfig/editorconfig-vim +edluffy/hologram.nvim@main +edluffy/specs.nvim@main edwinb/idris2-vim ehamberg/vim-cute-python eigenfoo/stan-vim @@ -127,11 +136,15 @@ fatih/vim-go fcpg/vim-osc52 FelikZ/ctrlp-py-matcher fenetikm/falcon +fhill2/floating.nvim fiatjaf/neuron.vim fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim folke/lsp-colors.nvim@main +folke/todo-comments.nvim@main +folke/trouble.nvim@main +folke/which-key.nvim@main freitass/todo.txt-vim frigoeu/psc-ide-vim fruit-in/brainfuck-vim @@ -146,6 +159,7 @@ GEverding/vim-hocon gfanto/fzf-lsp.nvim@main gibiansky/vim-textobj-haskell gioele/vim-autoswap +gleam-lang/gleam.vim glepnir/dashboard-nvim glepnir/galaxyline.nvim@main glepnir/lspsaga.nvim@main @@ -154,6 +168,7 @@ glepnir/zephyr-nvim@main glts/vim-textobj-comment godlygeek/csapprox godlygeek/tabular +GoldsteinE/compe-latex-symbols google/vim-codefmt google/vim-jsonnet google/vim-maktaba @@ -169,6 +184,7 @@ guns/xterm-color-table.vim hashivim/vim-packer hashivim/vim-terraform hashivim/vim-vagrant +hauleth/sad.vim haya14busa/incsearch-easymotion.vim haya14busa/incsearch.vim haya14busa/is.vim @@ -187,6 +203,7 @@ hrsh7th/vim-vsnip-integ hsanson/vim-android hsitz/VimOrganizer iamcco/coc-spell-checker +iamcco/markdown-preview.nvim ianks/vim-tsx idanarye/vim-merginal idris-hackers/idris-vim @@ -200,6 +217,7 @@ itchyny/thumbnail.vim itchyny/vim-cursorword itchyny/vim-gitbranch itspriddle/vim-shellcheck +ivalkeen/vim-simpledb ivanov/vim-ipython jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim @@ -276,7 +294,7 @@ keith/rspec.vim keith/swift.vim kevinhwang91/nvim-bqf@main kevinhwang91/nvim-hlslens@main -kevinhwang91/rnvimr +kevinhwang91/rnvimr@main kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold @@ -286,6 +304,7 @@ kristijanhusak/defx-git kristijanhusak/defx-icons kristijanhusak/deoplete-phpactor kristijanhusak/vim-carbon-now-sh +kristijanhusak/vim-dadbod-completion kristijanhusak/vim-dirvish-git kristijanhusak/vim-hybrid-material kshenoy/vim-signature @@ -320,6 +339,7 @@ LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium lukas-reineke/indent-blankline.nvim +lukas-reineke/indent-blankline.nvim@lua as indent-blankline-nvim-lua lukaszkorecki/workflowish lumiliet/vim-twig luochen1990/rainbow @@ -390,6 +410,7 @@ mpickering/hlint-refactor-vim ms-jpq/chadtree@chad mtikekar/vim-bsv mzlogin/vim-markdown-toc +mzlogin/vim-smali nanotech/jellybeans.vim natebosch/vim-lsc nathanaelkane/vim-indent-guides @@ -436,6 +457,7 @@ norcalli/nvim-colorizer.lua norcalli/nvim-terminal.lua norcalli/snippets.nvim npxbr/glow.nvim@main +npxbr/gruvbox.nvim@main ntpeters/vim-better-whitespace numirias/semshi nvie/vim-flake8 @@ -445,6 +467,7 @@ nvim-lua/lsp-status.nvim nvim-lua/lsp_extensions.nvim nvim-lua/plenary.nvim nvim-lua/popup.nvim +nvim-telescope/telescope-dap.nvim nvim-telescope/telescope-frecency.nvim nvim-telescope/telescope-fzf-writer.nvim nvim-telescope/telescope-fzy-native.nvim @@ -504,15 +527,21 @@ qpkorr/vim-bufkill Quramy/tsuquyomi racer-rust/vim-racer radenling/vim-dispatch-neovim +rafamadriz/friendly-snippets@main rafaqz/ranger.vim rafi/awesome-vim-colorschemes raghur/fruzzy raghur/vim-ghost Raimondi/delimitMate rakr/vim-one +ray-x/aurora +ray-x/lsp_signature.nvim rbgrouleff/bclose.vim rbong/vim-flog +rcarriga/nvim-dap-ui +rcarriga/vim-ultest rhysd/committia.vim +rhysd/conflict-marker.vim rhysd/devdocs.vim rhysd/git-messenger.vim rhysd/vim-clang-format @@ -520,6 +549,7 @@ rhysd/vim-grammarous rhysd/vim-operator-surround RishabhRD/nvim-lsputils RishabhRD/popfix +rktjmp/fwatch.nvim@main rktjmp/lush.nvim@main rmagatti/auto-session@main rodjek/vim-puppet @@ -540,6 +570,7 @@ rstacruz/vim-closer rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim +sainnhe/edge sainnhe/sonokai sakhnik/nvim-gdb saltstack/salt-vim @@ -547,7 +578,10 @@ samoshkin/vim-mergetool sbdchd/neoformat sebastianmarkow/deoplete-rust SevereOverfl0w/deoplete-github +shaunsingh/moonlight.nvim@pure-lua +shaunsingh/nord.nvim sheerun/vim-polyglot +shinchu/lightline-gruvbox.vim Shougo/context_filetype.vim Shougo/defx.nvim Shougo/denite.nvim @@ -572,6 +606,7 @@ sickill/vim-pasta SidOfc/mkdx simnalamburt/vim-mundo simrat39/rust-tools.nvim +sindrets/diffview.nvim@main SirVer/ultisnips sjl/gundo.vim sjl/splice.vim @@ -582,17 +617,21 @@ solarnz/arcanist.vim sonph/onehalf srcery-colors/srcery-vim steelsojka/completion-buffers +steelsojka/pears.nvim stefandtw/quickfix-reflector.vim stephpy/vim-yaml sunaku/vim-dasht +sunjon/Shade.nvim svermeulen/vim-subversive t9md/vim-choosewin t9md/vim-smalls TaDaa/vimade takac/vim-hardtime +tamago324/compe-zsh tami5/compe-conjure tami5/lispdocs.nvim tami5/sql.nvim +tbastos/vim-lua tbodt/deoplete-tabnine ternjs/tern_for_vim terryma/vim-expand-region @@ -613,12 +652,14 @@ thosakwe/vim-flutter tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl TimUntersberger/neogit +tjdevries/colorbuddy.nvim tjdevries/nlua.nvim tjdevries/train.nvim tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux tmux-plugins/vim-tmux-focus-events +tomasiser/vim-code-dark tomasr/molokai tomlion/vim-solidity tommcdo/vim-exchange @@ -662,6 +703,7 @@ travitch/hasksyn tremor-rs/tremor-vim@main triglav/vim-visual-increment troydm/zoomwintab.vim +turbio/bracey.vim tversteeg/registers.nvim@main tweekmonster/wstrip.vim twerth/ir_black @@ -682,6 +724,7 @@ vhda/verilog_systemverilog.vim vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes +vim-autoformat/vim-autoformat vim-erlang/vim-erlang-compiler vim-erlang/vim-erlang-omnicomplete vim-erlang/vim-erlang-runtime @@ -750,12 +793,16 @@ xolox/vim-easytags xolox/vim-misc xuhdev/vim-latex-live-preview Xuyuanp/nerdtree-git-plugin +Xuyuanp/scrollbar.nvim yamatsum/nvim-nonicons@main ycm-core/YouCompleteMe +Yggdroot/hiPairs Yggdroot/indentLine Yggdroot/LeaderF Yilin-Yang/vim-markbar +yssl/QFEnter yuki-yano/ncm2-dictionary yunlingz/ci_dark zah/nim.vim +zhou13/vim-easyescape ziglang/zig.vim diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix index c55e8aa0a011..5ca3aef23588 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix @@ -184,7 +184,7 @@ let rtpPath = "share/vim-plugins"; - nativeImpl = packages: lib.optionalString (packages != null) + nativeImpl = packages: (let link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}"); packageLinks = (packageName: {start ? [], opt ? []}: @@ -232,8 +232,7 @@ let let /* pathogen mostly can set &rtp at startup time. Its used very commonly. */ - pathogenImpl = lib.optionalString (pathogen != null) - (let + pathogenImpl = let knownPlugins = pathogen.knownPlugins or vimPlugins; plugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); @@ -244,15 +243,15 @@ let }; in '' - let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.pathogen.rtp}" + let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.vim-pathogen.rtp}" execute pathogen#infect('${pluginsEnv}/{}') filetype indent plugin on | syn on - ''); + ''; /* vim-plug is an extremely popular vim plugin manager. */ - plugImpl = lib.optionalString (plug != null) + plugImpl = ('' source ${vimPlugins.vim-plug.rtp}/plug.vim call plug#begin('/dev/null') @@ -340,10 +339,12 @@ let entries = [ beforePlugins - vamImpl pathogenImpl plugImpl - (nativeImpl packages) - customRC - ]; + vamImpl + ] + ++ lib.optional (packages != null && packages != []) (nativeImpl packages) + ++ lib.optional (pathogen != null) pathogenImpl + ++ lib.optional (plug != null) plugImpl + ++ [ customRC ]; in lib.concatStringsSep "\n" (lib.filter (x: x != null && x != "") entries); diff --git a/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 72581f340a3b..7951636c60c6 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }: +{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -12,6 +12,19 @@ let # baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { + _4ops.terraform = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "4ops"; + name = "terraform"; + version = "0.2.1"; + sha256 = "196026a89pizj8p0hqdgkyllj2spx2qwpynsaqjq17s8v15vk5dg"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + a5huynh.vscode-ron = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-ron"; @@ -36,6 +49,18 @@ let }; }; + alefragnani.project-manager = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "project-manager"; + publisher = "alefragnani"; + version = "12.1.0"; + sha256 = "sha256-fYBKmWn9pJh2V0fGdqVrXj9zIl8oTrZcBycDaMOXL/8="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + alexdima.copy-relative-path = buildVscodeMarketplaceExtension { mktplcRef = { name = "copy-relative-path"; @@ -87,6 +112,26 @@ let }; }; + b4dm4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nixpkgs-fmt"; + publisher = "B4dM4n"; + version = "0.0.1"; + sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; + }; + nativeBuildInputs = [ jq ]; + buildInputs = [ nixpkgs-fmt ]; + postInstall = '' + cd "$out/$installPrefix" + tmp_package_json=$(mktemp) + jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json > "$tmp_package_json" + mv "$tmp_package_json" package.json + ''; + meta = with lib; { + license = licenses.mit; + }; + }; + baccata.scaladex-search = buildVscodeMarketplaceExtension { mktplcRef = { name = "scaladex-search"; @@ -111,6 +156,30 @@ let }; }; + bodil.file-browser = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "file-browser"; + publisher = "bodil"; + version = "0.2.10"; + sha256 = "sha256-RW4vm0Hum9AeN4Rq7MSJOIHnALU0L1tBLKjaRLA2hL8="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-tailwindcss"; + publisher = "bradlc"; + version = "0.6.6"; + sha256 = "sha256-CRd+caKHFOXBnePr/LqNkzw0kRGYvNSkf4ecNgedpdA="; + }; + meta = with lib; { + license = licenses.mpl20; + }; + }; + brettm12345.nixfmt-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "nixfmt-vscode"; @@ -439,13 +508,26 @@ let }; }; + jkillian.custom-local-formatters = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "jkillian"; + name = "custom-local-formatters"; + version = "0.0.4"; + sha256 = "1pmqnc759fq86g2z3scx5xqpni9khcqi5z2kpl1kb7yygsv314gm"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + github = { github-vscode-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "github-vscode-theme"; publisher = "github"; - version = "4.0.2"; - sha256 = "06mysdwjh7km874rrk0xc0xxaqx15b4a7x1i8dly440h8w3ng5bs"; + version = "4.1.1"; + sha256 = "14wz2b0bn1rnmpj28c0mivz2gacla2dgg8ncv7qfx9bsxhf95g68"; }; meta = with lib; { description = "GitHub theme for VS Code"; @@ -496,8 +578,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.211"; - sha256 = "1di2v1bhlhl1yi9rrmbq0r9gypiydl8xvj24yw64vsnkqs9yxbp3"; + version = "0.0.213"; + sha256 = "0fj7vvaqdldhbzm9dqh2plqlhg34jv5khd690xd87h418sv8rk95"; }; meta = with lib; { license = licenses.mit; @@ -516,7 +598,7 @@ let }; }; - hashicorp.terraform = callPackage ./terraform {}; + hashicorp.terraform = callPackage ./terraform { }; hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { @@ -559,6 +641,18 @@ let }; }; + jakebecker.elixir-ls = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "elixir-ls"; + publisher = "JakeBecker"; + version = "0.7.0"; + sha256 = "sha256-kFrkElD7qC1SpOx1rpcHW1D2hybHCf7cqvIO7JfPuMc="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; @@ -600,6 +694,18 @@ let }; }; + johnpapa.vscode-peacock = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-peacock"; + publisher = "johnpapa"; + version = "3.9.1"; + sha256 = "1g7apzzgfm8s9sjavhwr8jpf9slhq8b9jfkww3q5n41mzzx8m94p"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-styled-components"; @@ -624,6 +730,31 @@ let }; }; + kahole.magit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "magit"; + publisher = "kahole"; + version = "0.6.15"; + sha256 = "sha256-fRXm70FXnHduoywI4YC9ya6/J7wyd6EBzbnrcijBIbA="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + mads-hartmann.bash-ide-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "mads-hartmann"; + name = "bash-ide-vscode"; + version = "1.11.0"; + sha256 = "1hq41fy2v1grjrw77mbs9k6ps6gncwlydm03ipawjnsinxc9rdkp"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + mikestead.dotenv = buildVscodeMarketplaceExtension { mktplcRef = { name = "dotenv"; @@ -698,13 +829,20 @@ let }; }; - ms-vscode.cpptools = callPackage ./cpptools {}; + ms-vscode.cpptools = callPackage ./cpptools { }; - ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {}; + ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; - ms-python.python = callPackage ./python { - extractNuGet = callPackage ./python/extract-nuget.nix { }; - }; + ms-python.python = + let + raw-package = callPackage ./python { + extractNuGet = callPackage ./python/extract-nuget.nix { }; + }; + in + buildEnv { + name = "vscode-extension-ms-python-python-full"; + paths = [ raw-package self.ms-toolsai.jupyter ]; + }; msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { mktplcRef = { @@ -718,6 +856,18 @@ let }; }; + ms-toolsai.jupyter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter"; + publisher = "ms-toolsai"; + version = "2021.5.745244803"; + sha256 = "0gjpsp61l8daqa87mpmxcrvsvb0pc2vwg7xbkvwn0f13c1739w9p"; + }; + meta = { + license = lib.licenses.unfree; + }; + }; + naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { name = "color-highlight"; @@ -730,6 +880,18 @@ let }; }; + octref.vetur = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vetur"; + publisher = "octref"; + version = "0.34.1"; + sha256 = "09w3bik1mxs7qac67wgrc58vl98ham3syrn2anycpwd7135wlpby"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + redhat.java = buildVscodeMarketplaceExtension { mktplcRef = { name = "java"; @@ -768,7 +930,7 @@ let }; }; - matklad.rust-analyzer = callPackage ./rust-analyzer {}; + matklad.rust-analyzer = callPackage ./rust-analyzer { }; ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = with lib; { @@ -839,8 +1001,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.10.3"; - sha256 = "0m4qm1z1j6gfqjjnxl8v48ga7zkaspjy3gcnkrch3aj4fyafjl09"; + version = "1.10.4"; + sha256 = "0q6zjpdi98png4vpzz39q85nxmsh3h1nnan58saz5rr83d6jgj89"; }; meta = { license = lib.licenses.asl20; @@ -859,6 +1021,18 @@ let }; }; + shardulm94.trailing-spaces = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "shardulm94"; + name = "trailing-spaces"; + version = "0.3.1"; + sha256 = "0h30zmg5rq7cv7kjdr5yzqkkc1bs20d72yz9rjqag32gwf46s8b8"; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; shyykoserhiy.vscode-spotify = buildVscodeMarketplaceExtension { mktplcRef = { @@ -908,6 +1082,23 @@ let }; }; + stephlin.vscode-tmux-keybinding = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-tmux-keybinding"; + publisher = "stephlin"; + version = "0.0.6"; + sha256 = "0mph2nval1ddmv9hpl51fdvmagzkqsn8ljwqsfha2130bb7la0d9"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/stephlin.vscode-tmux-keybinding/changelog"; + description = "A simple extension for tmux behavior in vscode terminal."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=stephlin.vscode-tmux-keybinding"; + homepage = "https://github.com/StephLin/vscode-tmux-keybinding"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks ]; + }; + }; + streetsidesoftware.code-spell-checker = buildVscodeMarketplaceExtension { mktplcRef = { name = "code-spell-checker"; @@ -920,6 +1111,18 @@ let }; }; + svelte.svelte-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "svelte-vscode"; + publisher = "svelte"; + version = "105.0.0"; + sha256 = "sha256-my3RzwUW5MnajAbEnqxtrIR701XH+AKYLbnKD7ivASE="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "even-better-toml"; @@ -932,6 +1135,19 @@ let }; }; + tiehuis.zig = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "zig"; + publisher = "tiehuis"; + version = "0.2.5"; + sha256 = "sha256-P8Sep0OtdchTfnudxFNvIK+SW++TyibGVI9zd+B5tu4="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + timonwong.shellcheck = buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; @@ -994,7 +1210,7 @@ let }; }; - ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {}; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { }; vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1008,6 +1224,42 @@ let }; }; + vspacecode.vspacecode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vspacecode"; + publisher = "VSpaceCode"; + version = "0.9.1"; + sha256 = "sha256-/qJKYXR0DznqwF7XuJsz+OghIBzdWjm6dAlaRX4wdRU="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + vspacecode.whichkey = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "whichkey"; + publisher = "VSpaceCode"; + version = "0.8.5"; + sha256 = "sha256-p5fukIfk/tZFQrkf6VuT4fjmeGtKAqHDh6r6ky847ks="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + wix.vscode-import-cost = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-import-cost"; + publisher = "wix"; + version = "2.15.0"; + sha256 = "0d3b6654cdck1syn74vmmd1jmgkrw5v4c4cyrhdxbhggkip732bc"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + xaver.clang-format = buildVscodeMarketplaceExtension { mktplcRef = { name = "clang-format"; @@ -1059,7 +1311,7 @@ let llvm-org.lldb-vscode = llvmPackages_8.lldb; - WakaTime.vscode-wakatime = callPackage ./wakatime {}; + WakaTime.vscode-wakatime = callPackage ./wakatime { }; wholroyd.jinja = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1074,17 +1326,17 @@ let }; }; - aliases = self: super: { - # aliases - ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; - }; + aliases = self: super: { + # aliases + ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; + }; - # TODO: add overrides overlay, so that we can have a generated.nix - # then apply extension specific modifcations to packages. + # TODO: add overrides overlay, so that we can have a generated.nix + # then apply extension specific modifcations to packages. - # overlays will be applied left to right, overrides should come after aliases. - overlays = lib.optionals (config.allowAliases or true) [ aliases ]; + # overlays will be applied left to right, overrides should come after aliases. + overlays = lib.optionals (config.allowAliases or true) [ aliases ]; - toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; + toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; in - lib.fix toFix +lib.fix toFix diff --git a/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix index a7b0e17ecbfb..6f4bbfb7e92e 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -7,14 +7,12 @@ , icu , stdenv , openssl -, mono6 +, mono }: let # Get as close as possible as the `package.json` required version. # This is what drives omnisharp. - mono = mono6; - rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json); rtDepsBinSrcs = builtins.mapAttrs (k: v: @@ -114,7 +112,7 @@ vscode-utils.buildVscodeMarketplaceExtension { declare omnisharp_dir="$PWD/${omnisharp.installPath}" unzip_to "${omnisharp.bin-src}" "$omnisharp_dir" rm "$omnisharp_dir/bin/mono" - ln -s -T "${mono6}/bin/mono" "$omnisharp_dir/bin/mono" + ln -s -T "${mono}/bin/mono" "$omnisharp_dir/bin/mono" chmod a+x "$omnisharp_dir/run" touch "$omnisharp_dir/install.Lock" @@ -136,6 +134,7 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with lib; { description = "C# for Visual Studio Code (powered by OmniSharp)"; + homepage = "https://github.com/OmniSharp/omnisharp-vscode"; license = licenses.mit; maintainers = [ maintainers.jraygauthier ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index fb58c94cde9a..eb215d0fd228 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.4131"; - sha256 = "167fwb1nri9xs5bx14zdg2q3fsmlbihcvnk90fv9av8zirpwa3vs"; + version = "1.0.4272"; + sha256 = "kH8ZiNzpAfR1BnKjYc+hcNMEmhBNyHlnOlj8fCdNGjY="; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ @@ -128,7 +128,7 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; homepage = "https://aka.ms/vsls-docs"; license = licenses.unfree; - maintainers = with maintainers; [ jraygauthier ]; + maintainers = with maintainers; [ jraygauthier V ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix index 1d86f82d278f..89950a51598c 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix @@ -41,13 +41,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.9.114305"; + version = "2021.5.829140558"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "1vh0wvfvzszc58lw7dbl60knpm5l6rrsghfchhn5dvwyadx4a33h"; + sha256 = "0y2HN4WGYUUXBfqp8Xb4oaA0hbLZmE3kDUXMBAOjvPQ="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix index 746bb4608ab8..29ca973a0aae 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -2,7 +2,7 @@ , vscode-utils , useLocalExtensions ? false}: # Note that useLocalExtensions requires that vscode-server is not running -# on host. If it is, you'll need to remove ~/.vscode-server, +# on host. If it is, you'll need to remove $HOME/.vscode-server, # and redo the install by running "Connect to host" on client let @@ -11,7 +11,7 @@ let # patch runs on remote machine hence use of which # links to local node if version is 12 patch = '' - f="/home/''$USER/.vscode-server/bin/''$COMMIT_ID/node" + f="$HOME/.vscode-server/bin/$COMMIT_ID/node" localNodePath=''$(which node) if [ -x "''$localNodePath" ]; then localNodeVersion=''$(node -v) @@ -23,10 +23,10 @@ let fi ${lib.optionalString useLocalExtensions '' # Use local extensions - if [ -d ~/.vscode/extensions ]; then - if ! test -L "~/.vscode-server/extensions"; then - mkdir -p ~/.vscode-server - ln -s ~/.vscode/extensions ~/.vscode-server/ + if [ -d $HOME/.vscode/extensions ]; then + if ! test -L "$HOME/.vscode-server/extensions"; then + mkdir -p $HOME/.vscode-server + ln -s $HOME/.vscode/extensions $HOME/.vscode-server/ fi fi ''} diff --git a/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix index 592994c33147..90ea121850d2 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.10.0"; + version = "2.12.0"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; - sha256 = "1xhypy4vvrzxj3qwkzpfx8b48hddf72mxmh0hgz7iry6bch6sh5f"; + sha256 = "1r12yxpf0wlh7vdxpj04356zlgxmlwz9apdlxnv5ay056a2a8k3a"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index d91ffcc17ab4..95e8d92da332 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,11 +1,11 @@ diff --git a/out/extension.js b/out/extension.js -index e44cef2..fba0899 100644 +index e932d27..099126b 100644 --- a/out/extension.js +++ b/out/extension.js -@@ -141,24 +141,6 @@ function updateLanguageServer() { +@@ -143,25 +143,6 @@ function updateLanguageServer() { return __awaiter(this, void 0, void 0, function* () { - const delay = 1000 * 60 * 24; - setTimeout(updateLanguageServer, delay); // check for new updates every 24hrs + const delay = 1000 * 60 * 60 * 24; + languageServerUpdater.timeout(updateLanguageServer, delay); // check for new updates every 24hrs - // skip install if a language server binary path is set - if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) { - const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter); @@ -16,6 +16,7 @@ index e44cef2..fba0899 100644 - yield installer.install(); - } - catch (err) { +- console.log(err); // for test failure reporting - reporter.sendTelemetryException(err); - throw err; - } @@ -27,7 +28,7 @@ index e44cef2..fba0899 100644 return startClients(); // on repeat runs with no install, this will be a no-op }); } -@@ -256,7 +238,7 @@ function pathToBinary() { +@@ -259,7 +240,7 @@ function pathToBinary() { reporter.sendTelemetryEvent('usePathToBinary'); } else { diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index c4d228281038..3ebb30fac650 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -24,7 +24,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-HPVbqYsst/iFrHn5wvmWtqeVHOHR7JT8lu+/xZq1lK0="; + cargoSha256 = "sha256-vcL/nSGhyE0INQVWxEIpYwXmnOl1soBn+mymZr1FaSM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix index 86453b960cba..7290c04342ea 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -13,8 +13,8 @@ in }; postPatch = '' - mkdir -p wakatime-master - cp -rt wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime + mkdir wakatime-cli + ln -s ${wakatime}/bin/wakatime ./wakatime-cli/wakatime-cli ''; meta = with lib; { |