From 83eb83e70e8b05757cd291963e0aa851a6cbc813 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sat, 26 Jun 2021 23:51:48 +0100 Subject: [PATCH 01/76] houdini: remove unnecessary build steps --- pkgs/applications/misc/houdini/default.nix | 4 ---- pkgs/applications/misc/houdini/runtime.nix | 9 --------- 2 files changed, 13 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index db06efd6a2a2..3a63883c6989 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -5,10 +5,6 @@ let in buildFHSUserEnv { name = "houdini-${houdini-runtime.version}"; - extraBuildCommands = '' - mkdir -p $out/usr/lib/sesi - ''; - passthru = { unwrapped = houdini-runtime; }; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 8436b66719f7..fdf50cbe0eec 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -68,15 +68,6 @@ stdenv.mkDerivation rec { echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh ''; - postFixup = '' - INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)" - for BIN in $(find $out/bin -type f -executable); do - if patchelf $BIN 2>/dev/null ; then - echo "Patching ELF $BIN" - patchelf --set-interpreter "$INTERPRETER" "$BIN" - fi - done - ''; meta = { description = "3D animation application software"; homepage = "https://www.sidefx.com"; From d9f81d9bf62f9c0f28aa17856256a68c3a39775c Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 27 Jun 2021 21:47:50 +0100 Subject: [PATCH 02/76] Switch to pure FHS env --- pkgs/applications/misc/houdini/default.nix | 18 ++++--- pkgs/applications/misc/houdini/runtime.nix | 55 ++++------------------ 2 files changed, 20 insertions(+), 53 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 3a63883c6989..e681854de07a 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,14 +1,18 @@ { callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: -let - houdini-runtime = callPackage ./runtime.nix { }; -in buildFHSUserEnv { - name = "houdini-${houdini-runtime.version}"; +buildFHSUserEnv { + name = "houdini-${unwrapped.version}"; + + targetPkgs = pkgs: with pkgs; [ + libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils libxkbcommon + ] ++ (with xorg; [ + libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes + libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver + ]); passthru = { - unwrapped = houdini-runtime; + inherit unwrapped; }; - runScript = "${undaemonize}/bin/undaemonize ${houdini-runtime}/bin/houdini"; + runScript = "${undaemonize}/bin/undaemonize ${unwrapped}/bin/houdini"; } - diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index fdf50cbe0eec..452c763338f2 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,50 +1,17 @@ -{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib -, dbus, xkeyboardconfig, nss, nspr, expat, pciutils, libxkbcommon, bc, addOpenGLRunpath -}: +{ lib, stdenv, requireFile, bc }: let - # NOTE: Some dependencies only show in errors when run with QT_DEBUG_PLUGINS=1 - ld_library_path = builtins.concatStringsSep ":" [ - "${stdenv.cc.cc.lib}/lib64" - (lib.makeLibraryPath [ - libGLU - libGL - xorg.libXmu - xorg.libXi - xorg.libXext - xorg.libX11 - xorg.libXrender - xorg.libXcursor - xorg.libXfixes - xorg.libXrender - xorg.libXcomposite - xorg.libXdamage - xorg.libXtst - xorg.libxcb - xorg.libXScrnSaver - alsa-lib - fontconfig - libSM - libICE - zlib - libpng - dbus - addOpenGLRunpath.driverLink - nss - nspr - expat - pciutils - libxkbcommon - ]) - ]; license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { version = "18.0.460"; pname = "houdini-runtime"; src = requireFile rec { + #name = "houdini-py3-${version}-linux_x86_64_gcc6.3.tar.gz"; + #sha256 = "10qp8nml1ivl0syh0iwzx3zdwdpilnwakax50wydcrzdzyxza7xw"; # 18.5.621 + #sha256 = "1b1k7rkn7svmciijqdwvi9p00srsf81vkb55grjg6xa7fgyidjx1"; # 18.5.596 name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz"; - sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd"; + sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd"; # 18.0.460 url = meta.homepage; }; @@ -63,17 +30,13 @@ stdenv.mkDerivation rec { echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup - echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh - echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/bin/app_init.sh - echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh - echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh ''; - meta = { + meta = with lib; { description = "3D animation application software"; homepage = "https://www.sidefx.com"; - license = lib.licenses.unfree; - platforms = lib.platforms.linux; + license = licenses.unfree; + platforms = platforms.linux; hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = with lib.maintainers; [ canndrew kwohlfahrt ]; + maintainers = with maintainers; [ canndrew kwohlfahrt ]; }; } From 6fb4874a07ee098489a035bee2325ba5a55def45 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 27 Jun 2021 22:58:58 +0100 Subject: [PATCH 03/76] houdini: 18.0 -> 18.5 sesinetd must be started manually for licensing to succeed. Also add individual tools to the output. hkey requires libudev, and something requires tbb. --- pkgs/applications/misc/houdini/default.nix | 27 ++++++++++++++++++---- pkgs/applications/misc/houdini/runtime.nix | 20 ++++++++-------- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index e681854de07a..81a5eddaf6ed 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,10 +1,11 @@ -{ callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: +{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: -buildFHSUserEnv { +buildFHSUserEnv rec { name = "houdini-${unwrapped.version}"; targetPkgs = pkgs: with pkgs; [ - libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils libxkbcommon + libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils + libxkbcommon libudev tbb ] ++ (with xorg; [ libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver @@ -14,5 +15,23 @@ buildFHSUserEnv { inherit unwrapped; }; - runScript = "${undaemonize}/bin/undaemonize ${unwrapped}/bin/houdini"; + extraInstallCommands = let + executables = [ "bin/houdini" "bin/hkey" "houdini/sbin/sesinetd" ]; + in '' + WRAPPER=$out/bin/${name} + EXECUTABLES="${lib.concatStringsSep " " executables}" + for executable in $EXECUTABLES; do + mkdir -p $out/$(dirname $executable) + + echo "#!${stdenv.shell}" >> $out/$executable + echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable + done + + cd $out + chmod +x $EXECUTABLES + ''; + + runScript = writeScript "${name}-wrapper" '' + exec $@ + ''; } diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 452c763338f2..4fb2d91b99f4 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -4,14 +4,11 @@ let license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { - version = "18.0.460"; + version = "18.5.596"; pname = "houdini-runtime"; src = requireFile rec { - #name = "houdini-py3-${version}-linux_x86_64_gcc6.3.tar.gz"; - #sha256 = "10qp8nml1ivl0syh0iwzx3zdwdpilnwakax50wydcrzdzyxza7xw"; # 18.5.621 - #sha256 = "1b1k7rkn7svmciijqdwvi9p00srsf81vkb55grjg6xa7fgyidjx1"; # 18.5.596 - name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz"; - sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd"; # 18.0.460 + name = "houdini-py3-${version}-linux_x86_64_gcc6.3.tar.gz"; + sha256 = "1b1k7rkn7svmciijqdwvi9p00srsf81vkb55grjg6xa7fgyidjx1"; url = meta.homepage; }; @@ -19,18 +16,19 @@ stdenv.mkDerivation rec { installPhase = '' patchShebangs houdini.install mkdir -p $out - sed -i "s|/usr/lib/sesi|${license_dir}|g" houdini.install ./houdini.install --install-houdini \ + --install-license \ --no-install-menus \ --no-install-bin-symlink \ --auto-install \ --no-root-check \ - --accept-EULA \ + --accept-EULA 2020-05-05 \ $out - echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt - sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe - sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup + echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt ''; + + dontFixup = true; + meta = with lib; { description = "3D animation application software"; homepage = "https://www.sidefx.com"; From d7ac07cdbbba71cdd8a5f6a762595f1e7082c9a9 Mon Sep 17 00:00:00 2001 From: Phil Dyer Date: Fri, 25 Jun 2021 12:33:54 +1000 Subject: [PATCH 04/76] r-modules: fix r package build failures r-modules: fix r package system dependencies r-modules: fix terra package dependencies r-modules: fix edge case for R package import The R package "import" has a name that clashes with the nix function "import". The package name in nixpkgs is correctly modified to avoid the clash, but the name of the R package was also being changed in cran-packages.nix, which broke downloading of the package. cran-packages.nix has been manually patched, and genreate-r-packages.R has been fixed so future automatic updates will succeed. r-modules: fix repeated `pkgs.` and svglite --- pkgs/development/r-modules/cran-packages.nix | 2 +- pkgs/development/r-modules/default.nix | 112 ++++++++++-------- .../r-modules/generate-r-packages.R | 3 +- 3 files changed, 66 insertions(+), 51 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 25c945c29f72..a09fa4af80a6 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -10268,7 +10268,7 @@ in with self; { implicitMeasures = derive2 { name="implicitMeasures"; version="0.2.0"; sha256="0w0dwnzfhw5v5j7q3zpfsca4ydmq7b9fzspvyf9sibyh587isb9c"; depends=[ggplot2 stringr tidyr xtable]; }; implied = derive2 { name="implied"; version="0.3.1"; sha256="11mrvpsh9qc5a5s5mpbsksri6vx36ij1gvpli6lyz6dkg48a9kdn"; depends=[]; }; implyr = derive2 { name="implyr"; version="0.4.0"; sha256="0rblsmx1z2n4g3fims5wa3wyf5znr0gkwd2yfz3130bcm6346da0"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; - r_import = derive2 { name="r_import"; version="1.2.0"; sha256="018s0x224gqnv4cjfh0fwliyfg6ma9vslmwybrlizfsmqcc5wp37"; depends=[]; }; + r_import = derive2 { name="import"; version="1.2.0"; sha256="018s0x224gqnv4cjfh0fwliyfg6ma9vslmwybrlizfsmqcc5wp37"; depends=[]; }; importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; importinegi = derive2 { name="importinegi"; version="1.1.3"; sha256="1r0p01mc9wb24ifldn3dmi0fqxwkp0290h0qrgr72grd34v2xszc"; depends=[data_table dplyr foreign haven rgdal]; }; impressionist_colors = derive2 { name="impressionist.colors"; version="1.0"; sha256="03z5w7y7vbvlnn30r9y3ip93h364f87nhwdb9hcki26csiq2bnlv"; depends=[]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index eb244ae91df8..cc8a840eda25 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -237,54 +237,56 @@ let audio = [ pkgs.portaudio ]; BayesSAE = [ pkgs.gsl_1 ]; BayesVarSel = [ pkgs.gsl_1 ]; - BayesXsrc = [ pkgs.readline.dev pkgs.ncurses ]; + BayesXsrc = with pkgs; [ readline.dev ncurses ]; bigGP = [ pkgs.mpi ]; bio3d = [ pkgs.zlib ]; BiocCheck = [ pkgs.which ]; Biostrings = [ pkgs.zlib ]; bnpmr = [ pkgs.gsl_1 ]; cairoDevice = [ pkgs.gtk2.dev ]; - Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ]; + Cairo = with pkgs; [ libtiff libjpeg cairo.dev x11 fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw ]; - ChemmineOB = [ pkgs.openbabel pkgs.pkg-config ]; + ChemmineOB = with pkgs; [ openbabel pkg-config ]; curl = [ pkgs.curl.dev ]; - data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; - devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ]; - diversitree = [ pkgs.gsl_1 pkgs.fftw ]; + data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; + devEMF = with pkgs; [ xorg.libXft.dev x11 ]; + diversitree = with pkgs; [ gsl_1 fftw ]; + exactextractr = [ pkgs.geos ]; EMCluster = [ pkgs.lapack ]; fftw = [ pkgs.fftw.dev ]; - fftwtools = [ pkgs.fftw.dev ]; + fftwtools = with pkgs; [ fftw.dev pkg-config ]; Formula = [ pkgs.gmp ]; - gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; - git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkg-config ]; + gdtools = with pkgs; [ cairo.dev fontconfig.lib freetype.dev ]; + git2r = with pkgs; [ zlib.dev openssl.dev libssh2.dev libgit2 pkg-config ]; GLAD = [ pkgs.gsl_1 ]; - glpkAPI = [ pkgs.gmp pkgs.glpk ]; + glpkAPI = with pkgs; [ gmp glpk ]; gmp = [ pkgs.gmp.dev ]; graphscan = [ pkgs.gsl_1 ]; gsl = [ pkgs.gsl_1 ]; gert = [ pkgs.libgit2 ]; - haven = [ pkgs.libiconv pkgs.zlib.dev ]; + haven = with pkgs; [ libiconv zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; imager = [ pkgs.x11 ]; iBMQ = [ pkgs.gsl_1 ]; - igraph = [ pkgs.gmp pkgs.libxml2.dev ]; + igraph = with pkgs; [ gmp libxml2.dev ]; JavaGD = [ pkgs.jdk ]; jpeg = [ pkgs.libjpeg.dev ]; jqr = [ pkgs.jq.dev ]; KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; - lwgeom = [ pkgs.gdal pkgs.geos pkgs.proj ]; + lpsymphony = with pkgs; [ pkg-config gfortran gettext ]; + lwgeom = with pkgs; [pkgs.proj.dev proj pkg-config geos sqlite gdal ]; magick = [ pkgs.imagemagick.dev ]; ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl_1 ]; mwaved = [ pkgs.fftw.dev ]; ncdf4 = [ pkgs.netcdf ]; - nloptr = [ pkgs.nlopt pkgs.pkg-config ]; + nloptr = with pkgs; [ nlopt pkg-config ]; n1qn1 = [ pkgs.gfortran ]; odbc = [ pkgs.unixODBC ]; - pander = [ pkgs.pandoc pkgs.which ]; + pander = with pkgs; [ pandoc which ]; pbdMPI = [ pkgs.mpi ]; pbdPROF = [ pkgs.mpi ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; @@ -294,7 +296,7 @@ let png = [ pkgs.libpng.dev ]; proj4 = [ pkgs.proj ]; protolite = [ pkgs.protobuf ]; - R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ]; + R2SWF = with pkgs; [ zlib libpng freetype.dev ]; RAppArmor = [ pkgs.libapparmor ]; rapportools = [ pkgs.which ]; rapport = [ pkgs.which ]; @@ -304,42 +306,43 @@ let RcppGSL = [ pkgs.gsl_1 ]; RcppZiggurat = [ pkgs.gsl_1 ]; reprex = [ pkgs.which ]; - rgdal = [ pkgs.proj.dev pkgs.gdal ]; + rgdal = with pkgs; [ proj.dev gdal ]; rgeos = [ pkgs.geos ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; Rhdf5lib = [ pkgs.zlib.dev ]; - Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.mpi pkgs.pcre.dev ]; - Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.xz.dev pkgs.curl.dev ]; + Rhpc = with pkgs; [ zlib bzip2.dev icu xz.dev mpi pcre.dev ]; + Rhtslib = with pkgs; [ zlib.dev automake autoconf bzip2.dev xz.dev curl.dev ]; rjags = [ pkgs.jags ]; - rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ]; + rJava = with pkgs; [ zlib bzip2.dev icu xz.dev pcre.dev jdk libzip ]; Rlibeemd = [ pkgs.gsl_1 ]; rmatio = [ pkgs.zlib.dev ]; - Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; + Rmpfr = with pkgs; [ gmp mpfr.dev ]; Rmpi = [ pkgs.mpi ]; - RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ]; - RNetCDF = [ pkgs.netcdf pkgs.udunits ]; + RMySQL = with pkgs; [ zlib libmysqlclient openssl.dev ]; + RNetCDF = with pkgs; [ netcdf udunits ]; RODBC = [ pkgs.libiodbc ]; rpanel = [ pkgs.bwidget ]; Rpoppler = [ pkgs.poppler ]; - RPostgreSQL = [ pkgs.postgresql pkgs.postgresql ]; + RPostgreSQL = with pkgs; [ postgresql postgresql ]; RProtoBuf = [ pkgs.protobuf ]; RSclient = [ pkgs.openssl.dev ]; Rserve = [ pkgs.openssl ]; Rssa = [ pkgs.fftw.dev ]; rsvg = [ pkgs.pkg-config ]; runjags = [ pkgs.jags ]; - RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; - rzmq = [ pkgs.zeromq pkgs.pkg-config ]; + RVowpalWabbit = with pkgs; [ zlib.dev boost ]; + rzmq = with pkgs; [ zeromq pkg-config ]; clustermq = [ pkgs.zeromq ]; - SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.xz pkgs.pcre ]; - sdcTable = [ pkgs.gmp pkgs.glpk ]; - seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; + SAVE = with pkgs; [ zlib bzip2 icu xz pcre ]; + sdcTable = with pkgs; [ gmp glpk ]; + seewave = with pkgs; [ fftw.dev libsndfile.dev ]; seqinr = [ pkgs.zlib.dev ]; - seqminer = [ pkgs.zlib.dev pkgs.bzip2 ]; - sf = [ pkgs.gdal pkgs.proj pkgs.geos ]; - showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ]; + seqminer = with pkgs; [ zlib.dev bzip2 ]; + sf = with pkgs; [ gdal proj geos ]; + terra = with pkgs; [ gdal proj geos ]; + showtext = with pkgs; [ zlib libpng icu freetype.dev ]; simplexreg = [ pkgs.gsl_1 ]; spate = [ pkgs.fftw.dev ]; ssanv = [ pkgs.proj ]; @@ -347,19 +350,19 @@ let stringi = [ pkgs.icu.dev ]; survSNP = [ pkgs.gsl_1 ]; svglite = [ pkgs.libpng.dev ]; - sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ]; - systemfonts = [ pkgs.fontconfig.dev pkgs.freetype.dev ]; + sysfonts = with pkgs; [ zlib libpng freetype.dev ]; + systemfonts = with pkgs; [ fontconfig.dev freetype.dev ]; TAQMNGR = [ pkgs.zlib.dev ]; - tesseract = [ pkgs.tesseract pkgs.leptonica ]; + tesseract = with pkgs; [ tesseract leptonica ]; tiff = [ pkgs.libtiff.dev ]; - tkrplot = [ pkgs.xorg.libX11 pkgs.tk.dev ]; + tkrplot = with pkgs; [ xorg.libX11 tk.dev ]; topicmodels = [ pkgs.gsl_1 ]; - udunits2 = [ pkgs.udunits pkgs.expat ]; + udunits2 = with pkgs; [ udunits expat ]; units = [ pkgs.udunits ]; V8 = [ pkgs.v8 ]; - XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; + XBRL = with pkgs; [ zlib libxml2.dev ]; xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; - XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ]; + XML = with pkgs; [ libtool libxml2.dev xmlsec libxslt ]; affyPLM = [ pkgs.zlib.dev ]; bamsignals = [ pkgs.zlib.dev ]; BitSeq = [ pkgs.zlib.dev ]; @@ -369,10 +372,10 @@ let gmapR = [ pkgs.zlib.dev ]; Rsubread = [ pkgs.zlib.dev ]; XVector = [ pkgs.zlib.dev ]; - Rsamtools = [ pkgs.zlib.dev pkgs.curl.dev ]; + Rsamtools = with pkgs; [ zlib.dev curl.dev ]; rtracklayer = [ pkgs.zlib.dev ]; affyio = [ pkgs.zlib.dev ]; - VariantAnnotation = [ pkgs.zlib.dev pkgs.curl.dev ]; + VariantAnnotation = with pkgs; [ zlib.dev curl.dev ]; snpStats = [ pkgs.zlib.dev ]; hdf5r = [ pkgs.hdf5.dev ]; }; @@ -396,7 +399,7 @@ let RcppEigen = [ pkgs.libiconv ]; RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkg-config ]; - rgl = [ pkgs.libGLU pkgs.libGLU.dev pkgs.libGL pkgs.xlibsWrapper ]; + rgl = with pkgs; [ libGLU libGLU.dev libGL xlibsWrapper ]; RGtk2 = [ pkgs.pkg-config ]; RProtoBuf = [ pkgs.pkg-config ]; Rpoppler = [ pkgs.pkg-config ]; @@ -407,13 +410,14 @@ let gdtools = [ pkgs.pkg-config ]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkg-config ]; - lwgeom = [ pkgs.pkg-config pkgs.proj.dev pkgs.sqlite.dev ]; + lwgeom = with pkgs; [ pkg-config proj.dev sqlite.dev ]; magick = [ pkgs.pkg-config ]; mwaved = [ pkgs.pkg-config ]; odbc = [ pkgs.pkg-config ]; openssl = [ pkgs.pkg-config ]; pdftools = [ pkgs.pkg-config ]; - sf = [ pkgs.pkg-config pkgs.sqlite.dev pkgs.proj.dev ]; + sf = with pkgs; [ pkg-config sqlite.dev proj.dev ]; + terra = with pkgs; [ pkg-config sqlite.dev proj.dev ]; showtext = [ pkgs.pkg-config ]; spate = [ pkgs.pkg-config ]; stringi = [ pkgs.pkg-config ]; @@ -426,11 +430,11 @@ let mashr = [ pkgs.gsl ]; hadron = [ pkgs.gsl ]; AMOUNTAIN = [ pkgs.gsl ]; - Rsymphony = [ pkgs.pkg-config pkgs.doxygen pkgs.graphviz pkgs.subversion ]; - tcltk2 = [ pkgs.tcl pkgs.tk ]; - tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ]; + Rsymphony = with pkgs; [ pkg-config doxygen graphviz subversion ]; + tcltk2 = with pkgs; [ tcl tk ]; + tikzDevice = with pkgs; [ which texlive.combined.scheme-medium ]; gridGraphics = [ pkgs.which ]; - adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; + adimpro = with pkgs; [ which xorg.xdpyinfo ]; mzR = [ pkgs.netcdf ]; cluster = [ pkgs.libiconv ]; KernSmooth = [ pkgs.libiconv ]; @@ -951,6 +955,18 @@ let ''; }); + R_cache = old.R_cache.overrideDerivation (attrs: { + preConfigure = '' + export R_CACHE_ROOTPATH=$TMP + ''; + }); + + lpsymphony = old.lpsymphony.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); + }; in self diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R index da9e0970b0f4..1ac15ef79e79 100755 --- a/pkgs/development/r-modules/generate-r-packages.R +++ b/pkgs/development/r-modules/generate-r-packages.R @@ -48,8 +48,7 @@ escapeName <- function(name) { } formatPackage <- function(name, version, sha256, depends, imports, linkingTo) { - name <- escapeName(name) - attr <- gsub(".", "_", name, fixed=TRUE) + attr <- gsub(".", "_", escapeName(name), fixed=TRUE) options(warn=5) depends <- paste( if (is.na(depends)) "" else gsub("[ \t\n]+", "", depends) , if (is.na(imports)) "" else gsub("[ \t\n]+", "", imports) From 174c5e166e2e16919ad399316f1efaf194f30c0f Mon Sep 17 00:00:00 2001 From: Phil Dyer Date: Tue, 24 Aug 2021 21:16:51 +1000 Subject: [PATCH 05/76] r-modules: revert changes to lwgeom --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index cc8a840eda25..4341e659bed0 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -277,7 +277,7 @@ let KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; lpsymphony = with pkgs; [ pkg-config gfortran gettext ]; - lwgeom = with pkgs; [pkgs.proj.dev proj pkg-config geos sqlite gdal ]; + lwgeom = with pkgs; [ proj geos gdal ]; magick = [ pkgs.imagemagick.dev ]; ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl_1 ]; From 0a913855a1acaf3a5525f12946ba9f700e2d3970 Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Mon, 30 Aug 2021 00:15:29 +0200 Subject: [PATCH 06/76] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 1054 +++++++++++++-------------- 1 file changed, 527 insertions(+), 527 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 45e72bc23cd2..25804216adf0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4,7 +4,7 @@ final: prev: { a-vim = buildVimPluginFrom2Nix { - pname = "a-vim"; + pname = "a.vim"; version = "2010-11-06"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -16,7 +16,7 @@ final: prev: }; ack-vim = buildVimPluginFrom2Nix { - pname = "ack-vim"; + pname = "ack.vim"; version = "2018-02-27"; src = fetchFromGitHub { owner = "mileszs"; @@ -40,7 +40,7 @@ final: prev: }; aerial-nvim = buildVimPluginFrom2Nix { - pname = "aerial-nvim"; + pname = "aerial.nvim"; version = "2021-07-17"; src = fetchFromGitHub { owner = "stevearc"; @@ -64,7 +64,7 @@ final: prev: }; alchemist-vim = buildVimPluginFrom2Nix { - pname = "alchemist-vim"; + pname = "alchemist.vim"; version = "2020-04-27"; src = fetchFromGitHub { owner = "slashmili"; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-08-21"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f896744feec260fb196d38bba23308080c04192c"; - sha256 = "1j30gi0arpmya26cjcd5spdb1l7p4djkvpkfvd267bs2fdyh958q"; + rev = "d53a085096306c890897385692693ee653aaddce"; + sha256 = "1szqvs8dzi14pgpx8pyphc5ihkn5n9rd97zrgizf6kv475h14w43"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -136,7 +136,7 @@ final: prev: }; arcanist-vim = buildVimPluginFrom2Nix { - pname = "arcanist-vim"; + pname = "arcanist.vim"; version = "2016-05-27"; src = fetchFromGitHub { owner = "solarnz"; @@ -148,7 +148,7 @@ final: prev: }; argtextobj-vim = buildVimPluginFrom2Nix { - pname = "argtextobj-vim"; + pname = "argtextobj.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -160,7 +160,7 @@ final: prev: }; async-vim = buildVimPluginFrom2Nix { - pname = "async-vim"; + pname = "async.vim"; version = "2021-03-21"; src = fetchFromGitHub { owner = "prabirshrestha"; @@ -172,7 +172,7 @@ final: prev: }; asyncomplete-vim = buildVimPluginFrom2Nix { - pname = "asyncomplete-vim"; + pname = "asyncomplete.vim"; version = "2021-08-19"; src = fetchFromGitHub { owner = "prabirshrestha"; @@ -233,18 +233,18 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-08-16"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "acd1a7031e71ed053348c2cd4ef3408f4fdfbb19"; - sha256 = "0vxk17p37a2fs9gm68wdlfqfyw8jzw3hp1yjg0n3b4yppl9j50r5"; + rev = "153ec834cf533519cf4951900b70edc3f5e01732"; + sha256 = "0ilv67h2ppp1gv31j50qdhyz2y5ls1lwdqxnpqrbx2hcjgi1vh5j"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; autoload_cscope-vim = buildVimPluginFrom2Nix { - pname = "autoload_cscope-vim"; + pname = "autoload_cscope.vim"; version = "2011-01-28"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -280,7 +280,7 @@ final: prev: }; barbar-nvim = buildVimPluginFrom2Nix { - pname = "barbar-nvim"; + pname = "barbar.nvim"; version = "2021-08-16"; src = fetchFromGitHub { owner = "romgrk"; @@ -304,7 +304,7 @@ final: prev: }; bats-vim = buildVimPluginFrom2Nix { - pname = "bats-vim"; + pname = "bats.vim"; version = "2013-07-03"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -316,7 +316,7 @@ final: prev: }; bclose-vim = buildVimPluginFrom2Nix { - pname = "bclose-vim"; + pname = "bclose.vim"; version = "2018-10-10"; src = fetchFromGitHub { owner = "rbgrouleff"; @@ -328,7 +328,7 @@ final: prev: }; BetterLua-vim = buildVimPluginFrom2Nix { - pname = "BetterLua-vim"; + pname = "BetterLua.vim"; version = "2020-08-14"; src = fetchFromGitHub { owner = "euclidianAce"; @@ -340,7 +340,7 @@ final: prev: }; bracey-vim = buildVimPluginFrom2Nix { - pname = "bracey-vim"; + pname = "bracey.vim"; version = "2021-08-20"; src = fetchFromGitHub { owner = "turbio"; @@ -364,7 +364,7 @@ final: prev: }; bufdelete-nvim = buildVimPluginFrom2Nix { - pname = "bufdelete-nvim"; + pname = "bufdelete.nvim"; version = "2021-07-24"; src = fetchFromGitHub { owner = "famiu"; @@ -388,19 +388,19 @@ final: prev: }; bufferline-nvim = buildVimPluginFrom2Nix { - pname = "bufferline-nvim"; - version = "2021-08-23"; + pname = "bufferline.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "21fda2cfb4c692f91e4df486dc2e28a37c628a76"; - sha256 = "05wi1zb1b3b08av3l8i40jggvb2mpkqmg0w8dqhxannblfkk8h8c"; + rev = "f7385058be7822d01fcbec9991ed7e76b26fc2c8"; + sha256 = "1xz617k543wi9pj4mmm71y6pmsv1aydnkkgnjripm6g37mgxgk1v"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; BufOnly-vim = buildVimPluginFrom2Nix { - pname = "BufOnly-vim"; + pname = "BufOnly.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -412,7 +412,7 @@ final: prev: }; calendar-vim = buildVimPluginFrom2Nix { - pname = "calendar-vim"; + pname = "calendar.vim"; version = "2021-01-30"; src = fetchFromGitHub { owner = "itchyny"; @@ -436,7 +436,7 @@ final: prev: }; caw-vim = buildVimPluginFrom2Nix { - pname = "caw-vim"; + pname = "caw.vim"; version = "2021-08-21"; src = fetchFromGitHub { owner = "tyru"; @@ -449,18 +449,18 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "d8089b752346fdccdd4fe85cec82c0f9919823fa"; - sha256 = "12nn4467jhhfi2vwsywzf6fqadwjsymmmmny5d4jsbz3l5xhcfmz"; + rev = "72e7b5df88eebc9ddf73a9b8bff7d5b13129b5c3"; + sha256 = "08j0l6p63sv2gjdyydzw2r4gl7nh90zcr82y0gj3pghdn0w690wn"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; changeColorScheme-vim = buildVimPluginFrom2Nix { - pname = "changeColorScheme-vim"; + pname = "changeColorScheme.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -508,7 +508,7 @@ final: prev: }; clever-f-vim = buildVimPluginFrom2Nix { - pname = "clever-f-vim"; + pname = "clever-f.vim"; version = "2021-07-07"; src = fetchFromGitHub { owner = "rhysd"; @@ -532,7 +532,7 @@ final: prev: }; cmd-parser-nvim = buildVimPluginFrom2Nix { - pname = "cmd-parser-nvim"; + pname = "cmd-parser.nvim"; version = "2021-05-30"; src = fetchFromGitHub { owner = "winston0410"; @@ -545,96 +545,96 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2021-08-11"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "5742a1b18ebb4ffc21cd07a312bf8bacba4c81ae"; - sha256 = "0nh53gqzbm500rvwc59hbl1sg12qzpk8za3z6rvsg04s6rqv479f"; + rev = "a5774490b5ea8df8ce9e80ef4ec131cb4541702e"; + sha256 = "0zhcrx4bxcqbfs6ri31qrqd285w46fvljgmk2cymwgcm4h0bm0vx"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; cmp-calc = buildVimPluginFrom2Nix { pname = "cmp-calc"; - version = "2021-08-08"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-calc"; - rev = "bac4f988d14665a6a681df3646ff1baa2affc2da"; - sha256 = "09g5pglbfzgnzl0lbn1fa27fh88a5pv2s2agmbw0gh4idnrvi66x"; + rev = "cda036bfd147288c107b840e917fdd0a3e18f404"; + sha256 = "1s2sx9pzafrs0132qh7jym9kppyz9rk2hs3sdnizj62m4d3lwm5l"; }; meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; cmp-emoji = buildVimPluginFrom2Nix { pname = "cmp-emoji"; - version = "2021-08-09"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-emoji"; - rev = "a80d20b3461b802b3ff6f4cd60f7b99399fd7757"; - sha256 = "0q70zbd4fw6x62zar7ph1dp6zwri6dqnyprl58p6w3k5n4xgpdrf"; + rev = "bbdcc00ecbae3bba18c648a6520d78f354853ce0"; + sha256 = "0zsda2dhhvqd1968xr6p8ndpai4vhb8xmk08nv038zg9csrqkqac"; }; meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-08-23"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "899f70af0786d4100fb29987b9ab03eac7eedd6a"; - sha256 = "1gw478b77smkn3k42h2q3ddq2kcd7vm6mnmjmksvbsfv5xp9pln0"; + rev = "9af212372c41e94d55603dea8ad9700f6c31573d"; + sha256 = "1r460l4rr5g94zpsknlxb3jxvbznd37f8zsqphapzb12fmxbs814"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; cmp-nvim-lua = buildVimPluginFrom2Nix { pname = "cmp-nvim-lua"; - version = "2021-08-17"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lua"; - rev = "6bcd10433e48dc50f5330d113bd6ec6647f128dc"; - sha256 = "1nkncgrp95li2403wkcph1bglcdnlbj2pjybqx5rp27pazpi5rga"; + rev = "8046f26eb6b225890987517b55f611d4fe6d1cf3"; + sha256 = "1wii287lbphnf6w6xqbbqg1nby13wrnm2g4v5l0fqiwpgrc9p82q"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-08-09"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "175a3854242f7dd43d706e2e0acc4f08ab1ed9ee"; - sha256 = "1pimzhp5hh9gg7f37x4mklxxg44a7fnzli7mv46p73b3w97vkbl4"; + rev = "48df45154ee644edf1b955d325be60928dd28d47"; + sha256 = "0c8y3i0p2li0r0jqg4ngw2cfh9jy21832nl9x45yfbwmh6gfw8qd"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; - version = "2021-08-13"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-vsnip"; - rev = "1f7c99719adbb2258c697dc43c31729ab73a8d99"; - sha256 = "1a252mzi5nzcml2g52g5nwlih40dh19yshns6dlk5gmfwa0mf3z6"; + rev = "1588c35bf8f637e8f5287477f31895781858f970"; + sha256 = "0q3z0f7d53cbqidx8qd3z48b46a83l5ay54iw525w22j1kki3aaw"; }; meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2021-08-21"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "fc033ce441b29f1755fd2314125772d21e5c5127"; - sha256 = "1np6x7wybh7w1m06h03sczv35a7ag3j37a8sk0yjcm95vysmwikd"; + rev = "da37737ab9c569013827d60915f8d598c1483bbc"; + sha256 = "1gjgghy9kbj6j7d4s73b0nlwwk91raf7nd67b2hmpqkfrnfavb38"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -677,12 +677,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-07-22"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "b9b2b1c0991ab1a5d3b5822296c341815da00f6c"; - sha256 = "1f6g0vhd8x90j75f60j4k7ii1zi9y0nhzrahk5h04gr2qm9pnvsf"; + rev = "94583be510649b80de60a9263095fbbbbfee06e6"; + sha256 = "1qjwks027hlbv637cbkimp5f9957rg73my1zfhq8d7a0r4gzv643"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -712,7 +712,7 @@ final: prev: }; coc-nvim = buildVimPluginFrom2Nix { - pname = "coc-nvim"; + pname = "coc.nvim"; version = "2021-08-23"; src = fetchFromGitHub { owner = "neoclide"; @@ -724,7 +724,7 @@ final: prev: }; codi-vim = buildVimPluginFrom2Nix { - pname = "codi-vim"; + pname = "codi.vim"; version = "2021-01-11"; src = fetchFromGitHub { owner = "metakirby5"; @@ -736,7 +736,7 @@ final: prev: }; colorbuddy-nvim = buildVimPluginFrom2Nix { - pname = "colorbuddy-nvim"; + pname = "colorbuddy.nvim"; version = "2021-04-16"; src = fetchFromGitHub { owner = "tjdevries"; @@ -785,7 +785,7 @@ final: prev: }; committia-vim = buildVimPluginFrom2Nix { - pname = "committia-vim"; + pname = "committia.vim"; version = "2020-08-27"; src = fetchFromGitHub { owner = "rhysd"; @@ -834,12 +834,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-08-19"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "9109c5e39881cc300518888d5cd501606cbb7e0f"; - sha256 = "15n1r2dnxbbx49xv5i4aq5vkxf8rn3fviwz886hpcxvzxp39gw35"; + rev = "881b5255e12fef6c28e1039f4afeb77626205b24"; + sha256 = "1l2bvjhwi2s33cp6m58gvi9k2hpg3sdv9048ah8xk0rjd7kb2adn"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -905,7 +905,7 @@ final: prev: }; concealedyank-vim = buildVimPluginFrom2Nix { - pname = "concealedyank-vim"; + pname = "concealedyank.vim"; version = "2013-03-24"; src = fetchFromGitHub { owner = "chikatoike"; @@ -917,7 +917,7 @@ final: prev: }; conflict-marker-vim = buildVimPluginFrom2Nix { - pname = "conflict-marker-vim"; + pname = "conflict-marker.vim"; version = "2020-09-23"; src = fetchFromGitHub { owner = "rhysd"; @@ -941,7 +941,7 @@ final: prev: }; context_filetype-vim = buildVimPluginFrom2Nix { - pname = "context_filetype-vim"; + pname = "context_filetype.vim"; version = "2021-08-08"; src = fetchFromGitHub { owner = "Shougo"; @@ -953,7 +953,7 @@ final: prev: }; coq-vim = buildVimPluginFrom2Nix { - pname = "coq-vim"; + pname = "coq.vim"; version = "2013-01-16"; src = fetchFromGitHub { owner = "jvoorhis"; @@ -966,18 +966,18 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "b292682c16176f961e11e1e68eb799d9b1b3e4e9"; - sha256 = "1278z0rgvg65kprxyg02yl2fixrfy9pg5fj3d796nc607ipzdhvb"; + rev = "13147545ffe61def7d3bb1123c5c843715e9565c"; + sha256 = "0jr6c0s7g54ra8w5r5b8j6hx16ch7cg9rj60jakbqfc1qdi5y9jm"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; cosco-vim = buildVimPluginFrom2Nix { - pname = "cosco-vim"; + pname = "cosco.vim"; version = "2018-08-07"; src = fetchFromGitHub { owner = "lfilho"; @@ -1013,7 +1013,7 @@ final: prev: }; csv-vim = buildVimPluginFrom2Nix { - pname = "csv-vim"; + pname = "csv.vim"; version = "2021-06-29"; src = fetchFromGitHub { owner = "chrisbra"; @@ -1061,7 +1061,7 @@ final: prev: }; ctrlp-vim = buildVimPluginFrom2Nix { - pname = "ctrlp-vim"; + pname = "ctrlp.vim"; version = "2021-04-18"; src = fetchFromGitHub { owner = "ctrlpvim"; @@ -1121,7 +1121,7 @@ final: prev: }; defx-nvim = buildVimPluginFrom2Nix { - pname = "defx-nvim"; + pname = "defx.nvim"; version = "2021-08-18"; src = fetchFromGitHub { owner = "Shougo"; @@ -1169,25 +1169,25 @@ final: prev: }; denite-nvim = buildVimPluginFrom2Nix { - pname = "denite-nvim"; - version = "2021-08-21"; + pname = "denite.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "bde582bc5c898ce849c586255a71cec5eccef194"; - sha256 = "0p090sh70n1kxdv0wl7nby596gvlkyk7p2rbgl5z4igqqdaizdh3"; + rev = "6260889ce501ea6f09967e23295bc2adf5cc480f"; + sha256 = "1akps9sxcyi9q07mg0vrn4fqhanmzx82npbillq0qbv8y41s75f5"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { - pname = "deol-nvim"; - version = "2021-08-18"; + pname = "deol.nvim"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "a2c6bbcf4125c9256773c1c8cfb48b4179686e77"; - sha256 = "04afx7hfch9vyvm2s2i93vylk5ar1sjc8sdqszqqj7fnlz53f8db"; + rev = "355ae1f71be51faacd40a38e1046f1b1edef5788"; + sha256 = "1zwmhcjd5ygd3qq7jcb5yvprv081azwmp4x2cg3ijlazgh610ssa"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1411,19 +1411,19 @@ final: prev: }; deoplete-nvim = buildVimPluginFrom2Nix { - pname = "deoplete-nvim"; - version = "2021-08-11"; + pname = "deoplete.nvim"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "4caf12730256579921d77e80423b339b8128c5b6"; - sha256 = "0zcaxqgmjkps4vlrgd8vdq2b6ys9raj2fhg9xkvlkn5q1pz764f2"; + rev = "ec9f260e5c37ee3023ab12d2e6d40d81b615d9c4"; + sha256 = "1d62fmmj68n1zn847w0j9jgjfd32fxqzh1ynbvws2awiv2vzaiga"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; devdocs-vim = buildVimPluginFrom2Nix { - pname = "devdocs-vim"; + pname = "devdocs.vim"; version = "2018-08-27"; src = fetchFromGitHub { owner = "rhysd"; @@ -1459,7 +1459,7 @@ final: prev: }; diffview-nvim = buildVimPluginFrom2Nix { - pname = "diffview-nvim"; + pname = "diffview.nvim"; version = "2021-08-20"; src = fetchFromGitHub { owner = "sindrets"; @@ -1471,7 +1471,7 @@ final: prev: }; direnv-vim = buildVimPluginFrom2Nix { - pname = "direnv-vim"; + pname = "direnv.vim"; version = "2020-11-20"; src = fetchFromGitHub { owner = "direnv"; @@ -1495,7 +1495,7 @@ final: prev: }; DoxygenToolkit-vim = buildVimPluginFrom2Nix { - pname = "DoxygenToolkit-vim"; + pname = "DoxygenToolkit.vim"; version = "2010-11-06"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -1519,7 +1519,7 @@ final: prev: }; echodoc-vim = buildVimPluginFrom2Nix { - pname = "echodoc-vim"; + pname = "echodoc.vim"; version = "2021-08-12"; src = fetchFromGitHub { owner = "Shougo"; @@ -1532,12 +1532,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-08-10"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "c13057303e04f32c2f6c5682f553e2f3e744e262"; - sha256 = "1mqsi5i6zxylgpcn40qmgf6r9f3z2v8w0f8ngyb41v4z05zychxg"; + rev = "5e6f2796eb21c0111b251daf7b78763cb4b03352"; + sha256 = "0nx5ihgrspnfaa5q0al3v159xix8y70l3h7j8br2zk85zmc8bmnp"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1556,7 +1556,7 @@ final: prev: }; editorconfig-nvim = buildVimPluginFrom2Nix { - pname = "editorconfig-nvim"; + pname = "editorconfig.nvim"; version = "2021-08-18"; src = fetchFromGitHub { owner = "gpanders"; @@ -1580,7 +1580,7 @@ final: prev: }; elvish-vim = buildVimPluginFrom2Nix { - pname = "elvish-vim"; + pname = "elvish.vim"; version = "2019-06-29"; src = fetchFromGitHub { owner = "dmix"; @@ -1653,7 +1653,7 @@ final: prev: }; far-vim = buildVimPluginFrom2Nix { - pname = "far-vim"; + pname = "far.vim"; version = "2021-02-19"; src = fetchFromGitHub { owner = "brooth"; @@ -1677,7 +1677,7 @@ final: prev: }; fcitx-vim = buildVimPluginFrom2Nix { - pname = "fcitx-vim"; + pname = "fcitx.vim"; version = "2021-08-20"; src = fetchFromGitHub { owner = "lilydjwg"; @@ -1689,19 +1689,19 @@ final: prev: }; feline-nvim = buildVimPluginFrom2Nix { - pname = "feline-nvim"; - version = "2021-07-30"; + pname = "feline.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "9977073d8f5c064785ff6b44aad30cbc6d887da0"; - sha256 = "1cpk0jyhgx93bvjpc76gjp671k53av8mj6d19j4zwm3xm5v1by2p"; + rev = "6fd862ecd5232c59647949c836b2f7f4409ef3d1"; + sha256 = "1wpwyn3mbkfg8g7yzsmckfs1wv1mdyj4ppvs6m3n2cdab91diq8a"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; fennel-vim = buildVimPluginFrom2Nix { - pname = "fennel-vim"; + pname = "fennel.vim"; version = "2020-11-15"; src = fetchFromGitHub { owner = "bakpakin"; @@ -1713,7 +1713,7 @@ final: prev: }; fern-vim = buildVimPluginFrom2Nix { - pname = "fern-vim"; + pname = "fern.vim"; version = "2021-08-08"; src = fetchFromGitHub { owner = "lambdalisue"; @@ -1749,7 +1749,7 @@ final: prev: }; FixCursorHold-nvim = buildVimPluginFrom2Nix { - pname = "FixCursorHold-nvim"; + pname = "FixCursorHold.nvim"; version = "2021-04-16"; src = fetchFromGitHub { owner = "antoinemadec"; @@ -1774,7 +1774,7 @@ final: prev: }; float-preview-nvim = buildVimPluginFrom2Nix { - pname = "float-preview-nvim"; + pname = "float-preview.nvim"; version = "2020-11-03"; src = fetchFromGitHub { owner = "ncm2"; @@ -1786,7 +1786,7 @@ final: prev: }; floating-nvim = buildVimPluginFrom2Nix { - pname = "floating-nvim"; + pname = "floating.nvim"; version = "2021-07-19"; src = fetchFromGitHub { owner = "fhill2"; @@ -1810,13 +1810,13 @@ final: prev: }; formatter-nvim = buildVimPluginFrom2Nix { - pname = "formatter-nvim"; - version = "2021-07-28"; + pname = "formatter.nvim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "51f10c8acc610d787cad2257224cee92b40216e5"; - sha256 = "15jkrypcd3fa6vcz035yvcpd1rfrxcwvp93mqnihm0g1a74klrql"; + rev = "c80405aca78fda2f8da586d7d087c13fdd500d85"; + sha256 = "07s7yw0l9xbf55x67yqcxi5r1y9nj5pjx69rl38jffw1l6lnnbgj"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -1835,12 +1835,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "d438b0fc71447c502029320377f0ed53603b9e0c"; - sha256 = "0hnn5rlm9gb59afbfi78rs5lp9fq844x8qrpqnwi0kcz8b3d6bp7"; + rev = "53c823f92f159107efa238ad1a5837f63ecb4c2b"; + sha256 = "0sb8l0f7wzbhyr0aq5kjmn4c4llhi49ka9brhwkn24rhkizyyl51"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1858,19 +1858,19 @@ final: prev: }; fugitive-gitlab-vim = buildVimPluginFrom2Nix { - pname = "fugitive-gitlab-vim"; - version = "2019-10-24"; + pname = "fugitive-gitlab.vim"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "f3e56ff60fe3fb5ebc891cbe5fd12cd8c59ae6ef"; - sha256 = "0cx3zd7f09prxjfrj201139j00wsw66fx5crw6dhblf4z6mfpgnx"; + rev = "ff66c9cd338733a130d22422179a0071feebdc28"; + sha256 = "1l0qskjgl08izy1vw1sqk5218w1dh94003g1bsjrkik04slq6q0z"; }; meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; fwatch-nvim = buildVimPluginFrom2Nix { - pname = "fwatch-nvim"; + pname = "fwatch.nvim"; version = "2021-07-25"; src = fetchFromGitHub { owner = "rktjmp"; @@ -1882,7 +1882,7 @@ final: prev: }; fzf-checkout-vim = buildVimPluginFrom2Nix { - pname = "fzf-checkout-vim"; + pname = "fzf-checkout.vim"; version = "2021-06-25"; src = fetchFromGitHub { owner = "stsewd"; @@ -1894,7 +1894,7 @@ final: prev: }; fzf-lsp-nvim = buildVimPluginFrom2Nix { - pname = "fzf-lsp-nvim"; + pname = "fzf-lsp.nvim"; version = "2021-06-20"; src = fetchFromGitHub { owner = "gfanto"; @@ -1906,7 +1906,7 @@ final: prev: }; fzf-vim = buildVimPluginFrom2Nix { - pname = "fzf-vim"; + pname = "fzf.vim"; version = "2021-08-17"; src = fetchFromGitHub { owner = "junegunn"; @@ -1918,7 +1918,7 @@ final: prev: }; galaxyline-nvim = buildVimPluginFrom2Nix { - pname = "galaxyline-nvim"; + pname = "galaxyline.nvim"; version = "2021-04-25"; src = fetchFromGitHub { owner = "glepnir"; @@ -1930,7 +1930,7 @@ final: prev: }; gen_tags-vim = buildVimPluginFrom2Nix { - pname = "gen_tags-vim"; + pname = "gen_tags.vim"; version = "2020-10-12"; src = fetchFromGitHub { owner = "jsfaint"; @@ -1943,12 +1943,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-07-16"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "14aec3bde121c797f9131da0d4b18a932598bb8f"; - sha256 = "1mcn4dhwjay5c0y650y2rxz9acxwfsninwrvp20ssgi4gcw2vg76"; + rev = "481e8732b8fc4fba3ff5be02f0f8b48f612a556f"; + sha256 = "0iilbkc3jf6lkjbj2cw64nd05nhwmlfmj4kvj27mmhyx1z2hv72n"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -1978,7 +1978,7 @@ final: prev: }; gina-vim = buildVimPluginFrom2Nix { - pname = "gina-vim"; + pname = "gina.vim"; version = "2021-06-12"; src = fetchFromGitHub { owner = "lambdalisue"; @@ -1990,7 +1990,7 @@ final: prev: }; git-blame-nvim = buildVimPluginFrom2Nix { - pname = "git-blame-nvim"; + pname = "git-blame.nvim"; version = "2021-06-14"; src = fetchFromGitHub { owner = "f-person"; @@ -2002,7 +2002,7 @@ final: prev: }; git-messenger-vim = buildVimPluginFrom2Nix { - pname = "git-messenger-vim"; + pname = "git-messenger.vim"; version = "2021-06-06"; src = fetchFromGitHub { owner = "rhysd"; @@ -2014,19 +2014,19 @@ final: prev: }; git-worktree-nvim = buildVimPluginFrom2Nix { - pname = "git-worktree-nvim"; - version = "2021-08-18"; + pname = "git-worktree.nvim"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "57359f59bfa391360744236c6ca01f38374257fd"; - sha256 = "1v0wqzp6sp214m83hy2fxx59b0h5lihfw3rkrvk07hixi3qg71dm"; + rev = "e562d8a3baa6c96d148944592a2d7c88f48927f2"; + sha256 = "1c78pjycvnkq28ar7bp0xiadyd3jml596hsw0fsxvbdwba4a7ikk"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; gitignore-vim = buildVimPluginFrom2Nix { - pname = "gitignore-vim"; + pname = "gitignore.vim"; version = "2014-03-16"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -2038,7 +2038,7 @@ final: prev: }; gitlinker-nvim = buildVimPluginFrom2Nix { - pname = "gitlinker-nvim"; + pname = "gitlinker.nvim"; version = "2021-07-15"; src = fetchFromGitHub { owner = "ruifm"; @@ -2050,13 +2050,13 @@ final: prev: }; gitsigns-nvim = buildVimPluginFrom2Nix { - pname = "gitsigns-nvim"; - version = "2021-08-23"; + pname = "gitsigns.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "1ddb1f64f5fb15dac2d02e52af918d1fb11feb2d"; - sha256 = "0y33dsxhw55h28kvqq3655cmnl4nq4z497v69xa72872gf1dsi80"; + rev = "daa233aabb4dbc7c870ea7300bcfeef96d49c2a3"; + sha256 = "0y0il8v0g8kvsyzir4hbkwvzv9wk2iqs1apxlvijk9ccfdk9ya0p"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2074,7 +2074,7 @@ final: prev: }; gleam-vim = buildVimPluginFrom2Nix { - pname = "gleam-vim"; + pname = "gleam.vim"; version = "2020-06-24"; src = fetchFromGitHub { owner = "gleam-lang"; @@ -2086,13 +2086,13 @@ final: prev: }; glow-nvim = buildVimPluginFrom2Nix { - pname = "glow-nvim"; - version = "2021-08-20"; + pname = "glow.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "a6ee89368525e59fd4e834ee59bd5df6327ee949"; - sha256 = "1nh06qipvyb66kzgc20c7b3fjxdibjmdazc6lkbkk2gbc42nghb7"; + rev = "39af2f2e38f7485218c0557bb173713bc4326e7c"; + sha256 = "0w3jk9dcxwnnrx9j9v5idh57wh3knp4pwm3lcvhk9gs9511i5iyq"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -2134,7 +2134,7 @@ final: prev: }; goyo-vim = buildVimPluginFrom2Nix { - pname = "goyo-vim"; + pname = "goyo.vim"; version = "2020-08-29"; src = fetchFromGitHub { owner = "junegunn"; @@ -2170,7 +2170,7 @@ final: prev: }; gruvbox-flat-nvim = buildVimPluginFrom2Nix { - pname = "gruvbox-flat-nvim"; + pname = "gruvbox-flat.nvim"; version = "2021-08-17"; src = fetchFromGitHub { owner = "eddyekofo94"; @@ -2183,18 +2183,18 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-08-10"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "04fc67660a87adc2edbbc0b4b39d379e45c3baf8"; - sha256 = "03yi4n4xx3a2sbnl2s61wk8w1ncrjm4f9hpi2i4566a4fmh6mm1p"; + rev = "a4981196553db1aaf8b071a807f2d0cf131171aa"; + sha256 = "0m0q8pmwkdyn4yqjm2k5i7gsf1b0xij03vvpghnp8k1khv11r8sx"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { - pname = "gruvbox-nvim"; + pname = "gruvbox.nvim"; version = "2021-08-19"; src = fetchFromGitHub { owner = "ellisonleao"; @@ -2206,7 +2206,7 @@ final: prev: }; gundo-vim = buildVimPluginFrom2Nix { - pname = "gundo-vim"; + pname = "gundo.vim"; version = "2021-02-21"; src = fetchFromGitHub { owner = "sjl"; @@ -2218,13 +2218,13 @@ final: prev: }; gv-vim = buildVimPluginFrom2Nix { - pname = "gv-vim"; - version = "2021-05-27"; + pname = "gv.vim"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "5f902f4f7d06ef084ffd6cddcd1ee7d3c9a793c6"; - sha256 = "0am6sip4q14v2cvf9dmq6jkh37nhdhbvs466619qyd48qxcf9k9n"; + rev = "6f6a3afe73a2cb52d8517d1a95ecfc9b09fb3e92"; + sha256 = "1j1yqanqcndxzi3r3d3pvgjh14bw28sfy0ik5jh8zvggkl240sqn"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -2278,7 +2278,7 @@ final: prev: }; hologram-nvim = buildVimPluginFrom2Nix { - pname = "hologram-nvim"; + pname = "hologram.nvim"; version = "2021-08-01"; src = fetchFromGitHub { owner = "edluffy"; @@ -2290,7 +2290,7 @@ final: prev: }; hoon-vim = buildVimPluginFrom2Nix { - pname = "hoon-vim"; + pname = "hoon.vim"; version = "2020-11-09"; src = fetchFromGitHub { owner = "urbit"; @@ -2302,7 +2302,7 @@ final: prev: }; hop-nvim = buildVimPluginFrom2Nix { - pname = "hop-nvim"; + pname = "hop.nvim"; version = "2021-07-13"; src = fetchFromGitHub { owner = "phaazon"; @@ -2314,7 +2314,7 @@ final: prev: }; i3config-vim = buildVimPluginFrom2Nix { - pname = "i3config-vim"; + pname = "i3config.vim"; version = "2021-06-23"; src = fetchFromGitHub { owner = "mboughaba"; @@ -2326,7 +2326,7 @@ final: prev: }; iceberg-vim = buildVimPluginFrom2Nix { - pname = "iceberg-vim"; + pname = "iceberg.vim"; version = "2020-12-25"; src = fetchFromGitHub { owner = "cocopon"; @@ -2386,7 +2386,7 @@ final: prev: }; incsearch-easymotion-vim = buildVimPluginFrom2Nix { - pname = "incsearch-easymotion-vim"; + pname = "incsearch-easymotion.vim"; version = "2016-01-18"; src = fetchFromGitHub { owner = "haya14busa"; @@ -2398,7 +2398,7 @@ final: prev: }; incsearch-vim = buildVimPluginFrom2Nix { - pname = "incsearch-vim"; + pname = "incsearch.vim"; version = "2017-11-24"; src = fetchFromGitHub { owner = "haya14busa"; @@ -2410,13 +2410,13 @@ final: prev: }; indent-blankline-nvim = buildVimPluginFrom2Nix { - pname = "indent-blankline-nvim"; - version = "2021-08-21"; + pname = "indent-blankline.nvim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "f912393a296194e7201523a2a0b0bcd6a009de90"; - sha256 = "093bxpv3l2q25wr6xvdsnr4krlwxds0rq3168nnfwf0hy8645c7c"; + rev = "a702f809ce85b16a83c44016bf10fe5a5765e98d"; + sha256 = "0dizl286642y0h10wa7r6rs6r25rvghkg09g1zvq6dxvi7acfmgm"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2446,7 +2446,7 @@ final: prev: }; investigate-vim = buildVimPluginFrom2Nix { - pname = "investigate-vim"; + pname = "investigate.vim"; version = "2020-02-29"; src = fetchFromGitHub { owner = "keith"; @@ -2482,7 +2482,7 @@ final: prev: }; is-vim = buildVimPluginFrom2Nix { - pname = "is-vim"; + pname = "is.vim"; version = "2020-10-27"; src = fetchFromGitHub { owner = "haya14busa"; @@ -2494,7 +2494,7 @@ final: prev: }; jdaddy-vim = buildVimPluginFrom2Nix { - pname = "jdaddy-vim"; + pname = "jdaddy.vim"; version = "2014-02-22"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -2531,7 +2531,7 @@ final: prev: }; jellybeans-vim = buildVimPluginFrom2Nix { - pname = "jellybeans-vim"; + pname = "jellybeans.vim"; version = "2019-06-22"; src = fetchFromGitHub { owner = "nanotech"; @@ -2555,7 +2555,7 @@ final: prev: }; jq-vim = buildVimPluginFrom2Nix { - pname = "jq-vim"; + pname = "jq.vim"; version = "2019-05-21"; src = fetchFromGitHub { owner = "vito-c"; @@ -2580,12 +2580,12 @@ final: prev: kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2021-08-17"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "a5d7cd90059ad99b5e80a1d40d655756d86b5dad"; - sha256 = "1bgi9dzzlw09llyq09jgnyg7n64s1nk5s5knlkhijrhsw0jmxjkk"; + rev = "09d332c66b7155b14eb22c9129aee44d9d2ff496"; + sha256 = "1cdzsqilnb90wqicjb9v58wiayp8a7wa44q4aw7a5a74yyxysfhy"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; @@ -2603,7 +2603,7 @@ final: prev: }; lalrpop-vim = buildVimPluginFrom2Nix { - pname = "lalrpop-vim"; + pname = "lalrpop.vim"; version = "2017-11-22"; src = fetchFromGitHub { owner = "qnighy"; @@ -2627,7 +2627,7 @@ final: prev: }; LanguageTool-nvim = buildVimPluginFrom2Nix { - pname = "LanguageTool-nvim"; + pname = "LanguageTool.nvim"; version = "2020-10-19"; src = fetchFromGitHub { owner = "vigoux"; @@ -2663,7 +2663,7 @@ final: prev: }; lazygit-nvim = buildVimPluginFrom2Nix { - pname = "lazygit-nvim"; + pname = "lazygit.nvim"; version = "2021-08-07"; src = fetchFromGitHub { owner = "kdheepak"; @@ -2676,18 +2676,18 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-08-18"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "bafe5cda6371035220ec7c12351e6922afd691b3"; - sha256 = "13naynadf8ahz85k7wm9rmcl3mxrc8d1q0lnr23xraksbhv72lg5"; + rev = "fc59ea2b340aefe628b689f6cc22576a578ae6e1"; + sha256 = "08fmsb0rwzfnfhv57f6s7hpjxd8jf12w47p2wyk72ip1g65paqdr"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; lean-vim = buildVimPluginFrom2Nix { - pname = "lean-vim"; + pname = "lean.vim"; version = "2021-06-07"; src = fetchFromGitHub { owner = "leanprover"; @@ -2699,7 +2699,7 @@ final: prev: }; lens-vim = buildVimPluginFrom2Nix { - pname = "lens-vim"; + pname = "lens.vim"; version = "2021-05-30"; src = fetchFromGitHub { owner = "camspiers"; @@ -2711,7 +2711,7 @@ final: prev: }; lessspace-vim = buildVimPluginFrom2Nix { - pname = "lessspace-vim"; + pname = "lessspace.vim"; version = "2019-09-12"; src = fetchFromGitHub { owner = "thirtythreeforty"; @@ -2723,7 +2723,7 @@ final: prev: }; lexima-vim = buildVimPluginFrom2Nix { - pname = "lexima-vim"; + pname = "lexima.vim"; version = "2021-08-12"; src = fetchFromGitHub { owner = "cohama"; @@ -2735,7 +2735,7 @@ final: prev: }; lf-vim = buildVimPluginFrom2Nix { - pname = "lf-vim"; + pname = "lf.vim"; version = "2021-02-18"; src = fetchFromGitHub { owner = "ptzz"; @@ -2795,7 +2795,7 @@ final: prev: }; lightline-gruvbox-vim = buildVimPluginFrom2Nix { - pname = "lightline-gruvbox-vim"; + pname = "lightline-gruvbox.vim"; version = "2018-03-23"; src = fetchFromGitHub { owner = "shinchu"; @@ -2807,7 +2807,7 @@ final: prev: }; lightline-vim = buildVimPluginFrom2Nix { - pname = "lightline-vim"; + pname = "lightline.vim"; version = "2021-05-30"; src = fetchFromGitHub { owner = "itchyny"; @@ -2819,19 +2819,19 @@ final: prev: }; lightspeed-nvim = buildVimPluginFrom2Nix { - pname = "lightspeed-nvim"; - version = "2021-08-23"; + pname = "lightspeed.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "9a613fb6ea8b8a41e7956f272c8cd0dc9a65102b"; - sha256 = "1l19cn04ibw0pd1isw02mllqxzp4gy4jd0mnv4mzf24ydjkyixkn"; + rev = "038ff96d30088128ece3b227ac63cc82cec8faa7"; + sha256 = "0rrn0chz06al9j8xxydkbhfmy136q5rx2qmw0m985q9yd82rb4bk"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; limelight-vim = buildVimPluginFrom2Nix { - pname = "limelight-vim"; + pname = "limelight.vim"; version = "2020-10-13"; src = fetchFromGitHub { owner = "junegunn"; @@ -2843,19 +2843,19 @@ final: prev: }; lir-nvim = buildVimPluginFrom2Nix { - pname = "lir-nvim"; - version = "2021-08-15"; + pname = "lir.nvim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "2704b9374c541db9a1cb0da1f095d800cf1c5af3"; - sha256 = "1ixqq5jigm5fdbcgp611sjybvr8fyvfnm7z55g5nk9zk5gql4xma"; + rev = "ccbae9636949afa9d3afbcba93f35dba3437ad94"; + sha256 = "1lxh6vh4nnfldxqivnv1f03300pmm7cb5pvapa2afv6h8src8hzs"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; lispdocs-nvim = buildVimPluginFrom2Nix { - pname = "lispdocs-nvim"; + pname = "lispdocs.nvim"; version = "2021-05-16"; src = fetchFromGitHub { owner = "tami5"; @@ -2867,7 +2867,7 @@ final: prev: }; lsp-colors-nvim = buildVimPluginFrom2Nix { - pname = "lsp-colors-nvim"; + pname = "lsp-colors.nvim"; version = "2021-04-30"; src = fetchFromGitHub { owner = "folke"; @@ -2879,7 +2879,7 @@ final: prev: }; lsp-rooter-nvim = buildVimPluginFrom2Nix { - pname = "lsp-rooter-nvim"; + pname = "lsp-rooter.nvim"; version = "2021-08-13"; src = fetchFromGitHub { owner = "ahmedkhalf"; @@ -2891,7 +2891,7 @@ final: prev: }; lsp-status-nvim = buildVimPluginFrom2Nix { - pname = "lsp-status-nvim"; + pname = "lsp-status.nvim"; version = "2021-05-20"; src = fetchFromGitHub { owner = "nvim-lua"; @@ -2903,7 +2903,7 @@ final: prev: }; lsp_extensions-nvim = buildVimPluginFrom2Nix { - pname = "lsp_extensions-nvim"; + pname = "lsp_extensions.nvim"; version = "2021-06-25"; src = fetchFromGitHub { owner = "nvim-lua"; @@ -2915,13 +2915,13 @@ final: prev: }; lsp_signature-nvim = buildVimPluginFrom2Nix { - pname = "lsp_signature-nvim"; - version = "2021-08-20"; + pname = "lsp_signature.nvim"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "ea9525f20297220ddfb6c6eb0423dad80301980e"; - sha256 = "1hqrmn6ggl6xadx5klb8z5jh3szwd7p8xyb7pclxds628l9rr9sp"; + rev = "8fcba5cfe114bec9aee5a0bc7ee867099abfb89b"; + sha256 = "02hwp524mac7sbyyl6k5w9zj1hg1iri3qcas5x4as4b47rwb80lj"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2939,7 +2939,7 @@ final: prev: }; lspsaga-nvim = buildVimPluginFrom2Nix { - pname = "lspsaga-nvim"; + pname = "lspsaga.nvim"; version = "2021-04-25"; src = fetchFromGitHub { owner = "glepnir"; @@ -2963,7 +2963,7 @@ final: prev: }; lualine-nvim = buildVimPluginFrom2Nix { - pname = "lualine-nvim"; + pname = "lualine.nvim"; version = "2021-05-27"; src = fetchFromGitHub { owner = "hoob3rt"; @@ -2976,24 +2976,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "2ee1dfa64e14201a1016cd7088b612a0d2a116e2"; - sha256 = "0hqj4xv3mxdcknjqhazvnsk01jdc3x6qqgyyf6sy5d4kxm5q9q0w"; + rev = "9548bc3a3475966f8fd6bc45a0a81e5e041d94cd"; + sha256 = "1fwszxxsyhrwfa9dxis78jxfkxnafnjp4xjks8ljba9cjxba8ffz"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { - pname = "lush-nvim"; - version = "2021-08-08"; + pname = "lush.nvim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "08f64bcf46afc3a1116ef23c95822de914d14abe"; - sha256 = "02m0kshj9q61dihhgckp801gh6r2jz1hw5s3vx46ha2zvzxbvf93"; + rev = "88edaae6086059a7d2e36d390c7c1d11b3fd7c54"; + sha256 = "170r1pj5xhdsaa4cfjz1s592rdh8n1mf4sc54hqxq6ibnzkzg0p5"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3011,7 +3011,7 @@ final: prev: }; markdown-preview-nvim = buildVimPluginFrom2Nix { - pname = "markdown-preview-nvim"; + pname = "markdown-preview.nvim"; version = "2021-03-10"; src = fetchFromGitHub { owner = "iamcco"; @@ -3023,7 +3023,7 @@ final: prev: }; matchit-zip = buildVimPluginFrom2Nix { - pname = "matchit-zip"; + pname = "matchit.zip"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -3048,12 +3048,12 @@ final: prev: mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; - version = "2020-12-29"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; - rev = "9a32891101990dd88b86befb50c46575ef8a364e"; - sha256 = "0i6nxap9fx8z9dx6q33pc9hz8s8vc2ghz5zchyxxmdn2mb5fki53"; + rev = "24394ce720fcee4a672249fcdde4b088d62ed4b1"; + sha256 = "0smmwgdnby0n0hg4511wf63vbm387l4d3dw75sid3m9cm8xlpwgl"; }; meta.homepage = "https://github.com/mattn/calendar-vim/"; }; @@ -3071,13 +3071,13 @@ final: prev: }; minimap-vim = buildVimPluginFrom2Nix { - pname = "minimap-vim"; - version = "2021-07-21"; + pname = "minimap.vim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "d389e2b0c67f5cedd5ec5edfe53afc847f8daf61"; - sha256 = "180grx6317ic6ip98awvqnfjc4zkzqh91rglls5pvwcq1w5m5vwb"; + rev = "45a8eabefd500ab4496ee790d3ac178eb4de9fb9"; + sha256 = "13mlcjkdbhpfgcg45m7whylxsaylgx1lysr5npc7gk6a85l2slzq"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3107,7 +3107,7 @@ final: prev: }; moonlight-nvim = buildVimPluginFrom2Nix { - pname = "moonlight-nvim"; + pname = "moonlight.nvim"; version = "2021-05-16"; src = fetchFromGitHub { owner = "shaunsingh"; @@ -3348,18 +3348,18 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-08-20"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "5acaca6d173e1566b207c5477f06e7e49efe1a76"; - sha256 = "040jliyl8zs617kdw7xa4kjxyxakdz16gk5vp1j0zmaynwlfwf8n"; + rev = "31e5725ab5666396921d86bcec2f0b6ea0028ce7"; + sha256 = "1mm827a9d848ypp6x77paqii37a1j70vwh3hayp8p7g3pv4cimjl"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; neocomplete-vim = buildVimPluginFrom2Nix { - pname = "neocomplete-vim"; + pname = "neocomplete.vim"; version = "2021-02-18"; src = fetchFromGitHub { owner = "Shougo"; @@ -3371,7 +3371,7 @@ final: prev: }; neodark-vim = buildVimPluginFrom2Nix { - pname = "neodark-vim"; + pname = "neodark.vim"; version = "2019-12-04"; src = fetchFromGitHub { owner = "KeitaNakamura"; @@ -3396,18 +3396,18 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-08-21"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "06000011b9a8b1f2f843489c32afdb487e163c14"; - sha256 = "1qy7w190z3zvmb04pybcgxkc75hkivkj8msksbw1xlyhj7n9vz9h"; + rev = "9b3e19a8732c98f36c6ee2443efa716687531c2c"; + sha256 = "1qqam7s18clm1bdp4yzv1r1pz6yir2r1khfa17y27zfl8qvp90zz"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; neoinclude-vim = buildVimPluginFrom2Nix { - pname = "neoinclude-vim"; + pname = "neoinclude.vim"; version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; @@ -3431,7 +3431,7 @@ final: prev: }; neomru-vim = buildVimPluginFrom2Nix { - pname = "neomru-vim"; + pname = "neomru.vim"; version = "2020-02-05"; src = fetchFromGitHub { owner = "Shougo"; @@ -3444,24 +3444,24 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-08-01"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "156bfdab640c6f57a6933e5e4fa60f9648f19857"; - sha256 = "0x3rryszciai5012c6kv7dyb8jlyn3w04j22k9x7n9nids42xhqx"; + rev = "45ded3cbd52da312b71bffd8b8a6b9bed1367500"; + sha256 = "1792j7h2an4kfc9jp6p8fa7mwri7295rb30siar35c0diapzai32"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; neoscroll-nvim = buildVimPluginFrom2Nix { - pname = "neoscroll-nvim"; - version = "2021-08-15"; + pname = "neoscroll.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "54879c6957ee5e833924064ff7fc17c144502ae9"; - sha256 = "0r5dxb2qh2nkchiq7ib7aqnr46gy82i9wpv21z3h0kdj03lb12sc"; + rev = "cd4278795ed8ee120a97078b03aa6436802126d9"; + sha256 = "0byd108bmiz5rhnm4jh4sb4sqma9rcac7h8q6i89hhjwn5r0qqif"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -3479,7 +3479,7 @@ final: prev: }; neosnippet-vim = buildVimPluginFrom2Nix { - pname = "neosnippet-vim"; + pname = "neosnippet.vim"; version = "2021-08-22"; src = fetchFromGitHub { owner = "Shougo"; @@ -3516,12 +3516,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2021-07-17"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "755b4a379ef4812f9656fb3f59220cf3a45c2070"; - sha256 = "0irjjpfrl6i7hfvay6b187i7dkkjq40fdcrx53xxfk9qq47l1z13"; + rev = "c9accf0e2f1cf70e84c2a64407a3e961fb6ef986"; + sha256 = "1va9mmc9pyif86sb7s6szw864z7a2zmsayjf452h55fgww0l2flb"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -3551,7 +3551,7 @@ final: prev: }; neoyank-vim = buildVimPluginFrom2Nix { - pname = "neoyank-vim"; + pname = "neoyank.vim"; version = "2020-12-20"; src = fetchFromGitHub { owner = "Shougo"; @@ -3599,7 +3599,7 @@ final: prev: }; neuron-vim = buildVimPluginFrom2Nix { - pname = "neuron-vim"; + pname = "neuron.vim"; version = "2020-12-06"; src = fetchFromGitHub { owner = "fiatjaf"; @@ -3611,7 +3611,7 @@ final: prev: }; nginx-vim = buildVimPluginFrom2Nix { - pname = "nginx-vim"; + pname = "nginx.vim"; version = "2021-02-25"; src = fetchFromGitHub { owner = "chr4"; @@ -3623,7 +3623,7 @@ final: prev: }; nim-vim = buildVimPluginFrom2Nix { - pname = "nim-vim"; + pname = "nim.vim"; version = "2020-10-16"; src = fetchFromGitHub { owner = "zah"; @@ -3635,7 +3635,7 @@ final: prev: }; nlua-nvim = buildVimPluginFrom2Nix { - pname = "nlua-nvim"; + pname = "nlua.nvim"; version = "2021-06-15"; src = fetchFromGitHub { owner = "tjdevries"; @@ -3647,7 +3647,7 @@ final: prev: }; nnn-vim = buildVimPluginFrom2Nix { - pname = "nnn-vim"; + pname = "nnn.vim"; version = "2021-08-11"; src = fetchFromGitHub { owner = "mcchrish"; @@ -3671,7 +3671,7 @@ final: prev: }; nord-nvim = buildVimPluginFrom2Nix { - pname = "nord-nvim"; + pname = "nord.nvim"; version = "2021-08-20"; src = fetchFromGitHub { owner = "shaunsingh"; @@ -3695,31 +3695,31 @@ final: prev: }; nterm-nvim = buildVimPluginFrom2Nix { - pname = "nterm-nvim"; - version = "2021-08-10"; + pname = "nterm.nvim"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "jlesquembre"; repo = "nterm.nvim"; - rev = "9f37152269ae0fe520899f454355ad2158eee1b3"; - sha256 = "1d15l57krygxcg686naqk47g9bl802dbz3mghcihybqhw5sxdn56"; + rev = "bb612046c7775c6986e706b8ab31057ed8ca19b2"; + sha256 = "1r50z8c3jjx1ysazih298ni2iikblmj48gxh3k9p722kngfdsxjg"; }; meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { - pname = "null-ls-nvim"; - version = "2021-08-23"; + pname = "null-ls.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "414ed4690583315705955c80cdf52e86cfc134aa"; - sha256 = "084n4x0ikhxh9h33cqyzr3ajxd9zm9x7lh2q8dv0i5jlyxyb1grf"; + rev = "f1a2eaba4f00b7ff2729aed48ea98585413c9f39"; + sha256 = "0c6lvxzyw6s5dgz1kzb3d9mzlz24rq0hc29ghbq2iwyavqvsq4cj"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; numb-nvim = buildVimPluginFrom2Nix { - pname = "numb-nvim"; + pname = "numb.nvim"; version = "2021-07-12"; src = fetchFromGitHub { owner = "nacro90"; @@ -3731,7 +3731,7 @@ final: prev: }; nvcode-color-schemes-vim = buildVimPluginFrom2Nix { - pname = "nvcode-color-schemes-vim"; + pname = "nvcode-color-schemes.vim"; version = "2021-07-03"; src = fetchFromGitHub { owner = "ChristianChiarulli"; @@ -3756,24 +3756,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-08-14"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "afd3b224a0d508af38270dc87d836fc55b347561"; - sha256 = "1xgcp0s9j551l5a573rln1h47xkf9md8gb6wrvwjrxsjkinksl90"; + rev = "70ed2702c988a00f65c450a6f142b7f3df2656e1"; + sha256 = "0lzydpv90bys8rgv9sx3fmh21myazqjlz16lfzaxz783mfirx761"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-06-26"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "3be30f3165278e31333b44a6dcc937653893f623"; - sha256 = "1rzj8fqbbvbyjvcdkvy5p9q02f24m0fc0sbzh1wl2wk91yb42vqb"; + rev = "bb06f63bacdd6ca0ea6e5874843e5854ea01cb6f"; + sha256 = "1qginyalp9j9pv1pb0448ngvfjphhj03n30jjsnk7zq11pdcdrwg"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -3816,18 +3816,18 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-08-21"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "f3a54918944d2c8778e6f13e2fc3ec4251863afb"; - sha256 = "0zjmvpxx46dy1q7jg1a7r51nqc7wzqa8vjzd8ff8nphs0j5zlvfn"; + rev = "3a612d425a2bd60877a574bfc98a0a4352de00c1"; + sha256 = "0yvgcnb1b9pbk5dp7rvjsbagfmlbakiv7kc8cgzpbxs5955zr8sk"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-colorizer-lua = buildVimPluginFrom2Nix { - pname = "nvim-colorizer-lua"; + pname = "nvim-colorizer.lua"; version = "2020-06-11"; src = fetchFromGitHub { owner = "norcalli"; @@ -3840,12 +3840,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-08-19"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "253ec47cac406ff6e68020b6d18a05de323267d2"; - sha256 = "0ij5s82v7snk2iwy3w402dqxvbsb3207pv62h5fachpcdj7ybi9s"; + rev = "dc39f945e54b4547c998dc9e686df419d1077b60"; + sha256 = "0dc6nkx5648z96hgycins4gpagl4j4400vpgsqrlhk70d09q8w06"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3864,12 +3864,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-08-17"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "46cb5996c8c71c7ce96afb6a4a034693c93f7424"; - sha256 = "1fc5ivv9lkfamvcr6dlqk9dwr5j3bs4x98k43sr213z4z0a6xa75"; + rev = "42e1eec29d14a2ed159cffcf1b3c0d1b6018b855"; + sha256 = "1g9125qdf8a5g93rfsfdqkfil9sf3h2mmyqa1540z6w821wigkfz"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3924,42 +3924,42 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "a4be468d8991840641c8db5cc6bbbffc3dafd79d"; - sha256 = "09mn8gysbs54bhicg9s52s87c472h10cmvi76fyljgxrkpbjssw3"; + rev = "243a4527a592d89e9647bc2ae6914e17cd19d5a6"; + sha256 = "07gdh6jj4w5z7hxgbjzm5rr024444afgi0l0a8skgr857qy86sw7"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "671869d981c47ccb2f7370145062a9cd9967d17b"; - sha256 = "14fs6h79ccb0mp9mcllqz42pkqialvs7gwp83xlpgy0kphgksndf"; + rev = "0299850d59a04f6685b6efabe198985d5961b4dc"; + sha256 = "0xl4ac9dc4gmm0h666saahacajyjq5yfhslz6mbn1mwryspish0h"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-08-19"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "5b31ffe949774218ab4bf4857a2d027b396d502d"; - sha256 = "0h5dwa52sgqg90jw044bic2akhvm4nd7ya9jf59yj8dhwcwjsk27"; + rev = "fb2e93dde66f56aae2cafec8535e3e1e60805bf0"; + sha256 = "0isq93zgrjp34dfxxddmshbsc2a8b14l1rw426v2vbc5wm39y5y7"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; nvim-hs-vim = buildVimPluginFrom2Nix { - pname = "nvim-hs-vim"; + pname = "nvim-hs.vim"; version = "2020-08-29"; src = fetchFromGitHub { owner = "neovimhaskell"; @@ -3972,12 +3972,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-08-11"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "e04105f551a982663b8d7707a064b733ab71db9b"; - sha256 = "0vfslh8qbl03c1prg5sfff6bxpyjbpdczxfc0r3i8hl9mwvdc4zx"; + rev = "f52ed6ef5c71f5af976134e11674fec9720e70c9"; + sha256 = "1z8m1jch7mqy19f5v170a4qxi3y9snmhqfh6c9sn9lkgry4j33x3"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3996,12 +3996,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-22"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5b0fa84ee35006e06142f98b8a5b28d79cfa5000"; - sha256 = "0in0r3irawmgxp1prwryw3dpxj7gd6pviv14w8a7hnw1sd2g84l8"; + rev = "0eccc1a0ebf909aecfa1ac238d940061162ae84f"; + sha256 = "1ph5zskgvhxvs3h3x5vfscyxzc5hs3gv6nazv5dq8ljh5n1nfs91"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4032,12 +4032,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-08-06"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "2ee19cd937c98d4d40d77ae729c70fe0923a2b8c"; - sha256 = "0zldabxim43380x7i9cnan8mwjhbdffcg3vgk9zcpm4b5phr3j9z"; + rev = "280a08ca5d005b1f504fbc4906db69c23f109ccc"; + sha256 = "0kyg2acck8d1skprh06pfkjs7881x2nsqxzcn4vw8z0scbkysvgb"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4067,7 +4067,7 @@ final: prev: }; nvim-terminal-lua = buildVimPluginFrom2Nix { - pname = "nvim-terminal-lua"; + pname = "nvim-terminal.lua"; version = "2019-10-17"; src = fetchFromGitHub { owner = "norcalli"; @@ -4079,13 +4079,13 @@ final: prev: }; nvim-tree-lua = buildVimPluginFrom2Nix { - pname = "nvim-tree-lua"; - version = "2021-08-21"; + pname = "nvim-tree.lua"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "c75e4a63b73f223a80835ab3b75f602dc3e60e66"; - sha256 = "0n3h9pv029nplr2d102p8gj7ygx69iha9hgpzy7kfn4pwsaz7vzq"; + rev = "802bc0848517ce0036c8f99398ca21e7715f253c"; + sha256 = "11c8rdqlb9cdb003b9cymldd8hm9hpl8mxyilphi2zpkddj2abn0"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4164,12 +4164,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-08-17"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "68afca45319e155e9b948163192182e6649562fb"; - sha256 = "1handw02d6wqsn3f8v549z0x4z7a481xcy2g3wsmxzlf2665l4fz"; + rev = "aa27d56bc53a82f501cd89cd797969f5e2211c61"; + sha256 = "1xaigr825wd1q4kxayki8a1pqfcyps07llfl6naa05k5x4g59izv"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4187,7 +4187,7 @@ final: prev: }; nvim-whichkey-setup-lua = buildVimPluginFrom2Nix { - pname = "nvim-whichkey-setup-lua"; + pname = "nvim-whichkey-setup.lua"; version = "2021-04-16"; src = fetchFromGitHub { owner = "AckslD"; @@ -4223,7 +4223,7 @@ final: prev: }; nvimdev-nvim = buildVimPluginFrom2Nix { - pname = "nvimdev-nvim"; + pname = "nvimdev.nvim"; version = "2019-10-09"; src = fetchFromGitHub { owner = "neovim"; @@ -4271,7 +4271,7 @@ final: prev: }; onedark-nvim = buildVimPluginFrom2Nix { - pname = "onedark-nvim"; + pname = "onedark.nvim"; version = "2021-08-13"; src = fetchFromGitHub { owner = "olimorris"; @@ -4283,7 +4283,7 @@ final: prev: }; onedark-vim = buildVimPluginFrom2Nix { - pname = "onedark-vim"; + pname = "onedark.vim"; version = "2021-08-12"; src = fetchFromGitHub { owner = "joshdick"; @@ -4307,7 +4307,7 @@ final: prev: }; open-browser-github-vim = buildVimPluginFrom2Nix { - pname = "open-browser-github-vim"; + pname = "open-browser-github.vim"; version = "2021-03-21"; src = fetchFromGitHub { owner = "tyru"; @@ -4319,7 +4319,7 @@ final: prev: }; open-browser-vim = buildVimPluginFrom2Nix { - pname = "open-browser-vim"; + pname = "open-browser.vim"; version = "2020-05-20"; src = fetchFromGitHub { owner = "tyru"; @@ -4331,19 +4331,19 @@ final: prev: }; packer-nvim = buildVimPluginFrom2Nix { - pname = "packer-nvim"; - version = "2021-08-11"; + pname = "packer.nvim"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "add255996af31fcec142cb28faa99998c2d5ac4e"; - sha256 = "0k7xsrs83fqm738lmnjcd5adyiw3ld26v0ybvg5wsydi0nirwryd"; + rev = "09cc2d615bbc14bca957f941052e49e489d76537"; + sha256 = "1n7vhavf46vdpvpjk25i0w14w88lbm3nmlfac0rmikn6h5vma0kq"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; palenight-vim = buildVimPluginFrom2Nix { - pname = "palenight-vim"; + pname = "palenight.vim"; version = "2020-10-20"; src = fetchFromGitHub { owner = "drewtempelmeyer"; @@ -4379,7 +4379,7 @@ final: prev: }; pears-nvim = buildVimPluginFrom2Nix { - pname = "pears-nvim"; + pname = "pears.nvim"; version = "2021-05-27"; src = fetchFromGitHub { owner = "steelsojka"; @@ -4391,7 +4391,7 @@ final: prev: }; peskcolor-vim = buildVimPluginFrom2Nix { - pname = "peskcolor-vim"; + pname = "peskcolor.vim"; version = "2016-06-11"; src = fetchFromGitHub { owner = "andsild"; @@ -4403,7 +4403,7 @@ final: prev: }; pig-vim = buildVimPluginFrom2Nix { - pname = "pig-vim"; + pname = "pig.vim"; version = "2017-06-08"; src = fetchFromGitHub { owner = "motus"; @@ -4439,7 +4439,7 @@ final: prev: }; plenary-nvim = buildVimPluginFrom2Nix { - pname = "plenary-nvim"; + pname = "plenary.nvim"; version = "2021-08-19"; src = fetchFromGitHub { owner = "nvim-lua"; @@ -4476,7 +4476,7 @@ final: prev: }; popup-nvim = buildVimPluginFrom2Nix { - pname = "popup-nvim"; + pname = "popup.nvim"; version = "2021-08-09"; src = fetchFromGitHub { owner = "nvim-lua"; @@ -4488,7 +4488,7 @@ final: prev: }; presence-nvim = buildVimPluginFrom2Nix { - pname = "presence-nvim"; + pname = "presence.nvim"; version = "2021-08-15"; src = fetchFromGitHub { owner = "andweeb"; @@ -4584,7 +4584,7 @@ final: prev: }; quickfix-reflector-vim = buildVimPluginFrom2Nix { - pname = "quickfix-reflector-vim"; + pname = "quickfix-reflector.vim"; version = "2019-12-11"; src = fetchFromGitHub { owner = "stefandtw"; @@ -4620,7 +4620,7 @@ final: prev: }; rainbow_parentheses-vim = buildVimPluginFrom2Nix { - pname = "rainbow_parentheses-vim"; + pname = "rainbow_parentheses.vim"; version = "2013-03-05"; src = fetchFromGitHub { owner = "kien"; @@ -4632,7 +4632,7 @@ final: prev: }; random-vim = buildVimPluginFrom2Nix { - pname = "random-vim"; + pname = "random.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -4644,7 +4644,7 @@ final: prev: }; range-highlight-nvim = buildVimPluginFrom2Nix { - pname = "range-highlight-nvim"; + pname = "range-highlight.nvim"; version = "2021-08-03"; src = fetchFromGitHub { owner = "winston0410"; @@ -4656,7 +4656,7 @@ final: prev: }; ranger-vim = buildVimPluginFrom2Nix { - pname = "ranger-vim"; + pname = "ranger.vim"; version = "2021-04-25"; src = fetchFromGitHub { owner = "rafaqz"; @@ -4668,7 +4668,7 @@ final: prev: }; readline-vim = buildVimPluginFrom2Nix { - pname = "readline-vim"; + pname = "readline.vim"; version = "2019-12-28"; src = fetchFromGitHub { owner = "ryvnf"; @@ -4680,7 +4680,7 @@ final: prev: }; Recover-vim = buildVimPluginFrom2Nix { - pname = "Recover-vim"; + pname = "Recover.vim"; version = "2021-07-22"; src = fetchFromGitHub { owner = "chrisbra"; @@ -4692,19 +4692,19 @@ final: prev: }; refactoring-nvim = buildVimPluginFrom2Nix { - pname = "refactoring-nvim"; - version = "2021-08-21"; + pname = "refactoring.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "df03980e5fcdbcf1d126c63713be2781e3c0ba42"; - sha256 = "0z93igf1adnm183zamk3y10lbqg6diy42grg1k853a2xrrmjbhfk"; + rev = "d1625dd23e691b1ab7632e751917d1c79b1a4e30"; + sha256 = "1zm0pg70dznrph63h90ikvpwqzlwh07i5mkli1sd7pa2q24qmzqx"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { - pname = "registers-nvim"; + pname = "registers.nvim"; version = "2021-08-11"; src = fetchFromGitHub { owner = "tversteeg"; @@ -4740,7 +4740,7 @@ final: prev: }; riv-vim = buildVimPluginFrom2Nix { - pname = "riv-vim"; + pname = "riv.vim"; version = "2021-08-09"; src = fetchFromGitHub { owner = "gu-fan"; @@ -4776,7 +4776,7 @@ final: prev: }; rspec-vim = buildVimPluginFrom2Nix { - pname = "rspec-vim"; + pname = "rspec.vim"; version = "2020-08-20"; src = fetchFromGitHub { owner = "keith"; @@ -4800,19 +4800,19 @@ final: prev: }; rust-tools-nvim = buildVimPluginFrom2Nix { - pname = "rust-tools-nvim"; - version = "2021-08-15"; + pname = "rust-tools.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "c5f8e2d8e05eff2e3142f6808c675f5df087785f"; - sha256 = "1qx2rz5a37dw5q3dn6p02cjsdhkfaip9mwfzi2prrk7hjcf9ix5m"; + rev = "54a7a24cc7afd9cec765a3c30e23859b974e731d"; + sha256 = "16y4mdxmvbdgb5k6lds4kwd1xh005g1v1vlnbykjd1lnkfz4h4kq"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; rust-vim = buildVimPluginFrom2Nix { - pname = "rust-vim"; + pname = "rust.vim"; version = "2021-08-01"; src = fetchFromGitHub { owner = "rust-lang"; @@ -4824,7 +4824,7 @@ final: prev: }; sad-vim = buildVimPluginFrom2Nix { - pname = "sad-vim"; + pname = "sad.vim"; version = "2019-02-18"; src = fetchFromGitHub { owner = "hauleth"; @@ -4848,7 +4848,7 @@ final: prev: }; scrollbar-nvim = buildVimPluginFrom2Nix { - pname = "scrollbar-nvim"; + pname = "scrollbar.nvim"; version = "2021-06-04"; src = fetchFromGitHub { owner = "Xuyuanp"; @@ -4872,7 +4872,7 @@ final: prev: }; semantic-highlight-vim = buildVimPluginFrom2Nix { - pname = "semantic-highlight-vim"; + pname = "semantic-highlight.vim"; version = "2020-09-11"; src = fetchFromGitHub { owner = "jaxbot"; @@ -4896,7 +4896,7 @@ final: prev: }; seoul256-vim = buildVimPluginFrom2Nix { - pname = "seoul256-vim"; + pname = "seoul256.vim"; version = "2020-06-21"; src = fetchFromGitHub { owner = "junegunn"; @@ -4908,7 +4908,7 @@ final: prev: }; shabadou-vim = buildVimPluginFrom2Nix { - pname = "shabadou-vim"; + pname = "shabadou.vim"; version = "2016-07-19"; src = fetchFromGitHub { owner = "osyo-manga"; @@ -4920,7 +4920,7 @@ final: prev: }; Shade-nvim = buildVimPluginFrom2Nix { - pname = "Shade-nvim"; + pname = "Shade.nvim"; version = "2021-04-29"; src = fetchFromGitHub { owner = "sunjon"; @@ -4944,7 +4944,7 @@ final: prev: }; sideways-vim = buildVimPluginFrom2Nix { - pname = "sideways-vim"; + pname = "sideways.vim"; version = "2021-07-15"; src = fetchFromGitHub { owner = "AndrewRadev"; @@ -4969,7 +4969,7 @@ final: prev: }; skim-vim = buildVimPluginFrom2Nix { - pname = "skim-vim"; + pname = "skim.vim"; version = "2020-11-11"; src = fetchFromGitHub { owner = "lotabout"; @@ -4981,7 +4981,7 @@ final: prev: }; sky-color-clock-vim = buildVimPluginFrom2Nix { - pname = "sky-color-clock-vim"; + pname = "sky-color-clock.vim"; version = "2018-11-03"; src = fetchFromGitHub { owner = "mopp"; @@ -4993,7 +4993,7 @@ final: prev: }; smartpairs-vim = buildVimPluginFrom2Nix { - pname = "smartpairs-vim"; + pname = "smartpairs.vim"; version = "2018-01-01"; src = fetchFromGitHub { owner = "gorkunov"; @@ -5017,7 +5017,7 @@ final: prev: }; snippets-nvim = buildVimPluginFrom2Nix { - pname = "snippets-nvim"; + pname = "snippets.nvim"; version = "2020-09-09"; src = fetchFromGitHub { owner = "norcalli"; @@ -5030,18 +5030,18 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-08-10"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "0e1af11d2297ae65ba504419cd8d6bbd6ed3534d"; - sha256 = "1m6kzdyam2syly0abcjd3j4pimkmhvd9x1872lzw35bfqhbxq947"; + rev = "cb10268587c0f0616242ecb5503e22240a915136"; + sha256 = "0f7qmlmky8fx157lp4ffhp679w656r1vfbp0sy4gqwncm434vzh9"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; sourcemap-vim = buildVimPluginFrom2Nix { - pname = "sourcemap-vim"; + pname = "sourcemap.vim"; version = "2012-09-19"; src = fetchFromGitHub { owner = "chikatoike"; @@ -5065,7 +5065,7 @@ final: prev: }; Spacegray-vim = buildVimPluginFrom2Nix { - pname = "Spacegray-vim"; + pname = "Spacegray.vim"; version = "2021-07-06"; src = fetchFromGitHub { owner = "ackyshake"; @@ -5101,7 +5101,7 @@ final: prev: }; specs-nvim = buildVimPluginFrom2Nix { - pname = "specs-nvim"; + pname = "specs.nvim"; version = "2021-05-05"; src = fetchFromGitHub { owner = "edluffy"; @@ -5113,7 +5113,7 @@ final: prev: }; splice-vim = buildVimPluginFrom2Nix { - pname = "splice-vim"; + pname = "splice.vim"; version = "2020-01-15"; src = fetchFromGitHub { owner = "sjl"; @@ -5125,7 +5125,7 @@ final: prev: }; split-term-vim = buildVimPluginFrom2Nix { - pname = "split-term-vim"; + pname = "split-term.vim"; version = "2018-09-30"; src = fetchFromGitHub { owner = "vimlab"; @@ -5137,7 +5137,7 @@ final: prev: }; splitjoin-vim = buildVimPluginFrom2Nix { - pname = "splitjoin-vim"; + pname = "splitjoin.vim"; version = "2021-08-02"; src = fetchFromGitHub { owner = "AndrewRadev"; @@ -5150,13 +5150,13 @@ final: prev: }; sql-nvim = buildVimPluginFrom2Nix { - pname = "sql-nvim"; - version = "2021-08-23"; + pname = "sql.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "a0370391af2998e11c6320ba08a57d5a1827c0ed"; - sha256 = "13k9rdjwrmrv6vm2rn2b3ga02fcmig2ainllh8dxzpln3c3idwbp"; + rev = "c258857a5d981eb6daa6221b4e01d4887574db0b"; + sha256 = "052fxn4740b6adsn0knpm6nhw7qs5lbf99raprr422rmnj3sqd3a"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5186,7 +5186,7 @@ final: prev: }; starsearch-vim = buildVimPluginFrom2Nix { - pname = "starsearch-vim"; + pname = "starsearch.vim"; version = "2014-09-21"; src = fetchFromGitHub { owner = "darfink"; @@ -5198,7 +5198,7 @@ final: prev: }; suda-vim = buildVimPluginFrom2Nix { - pname = "suda-vim"; + pname = "suda.vim"; version = "2021-07-21"; src = fetchFromGitHub { owner = "lambdalisue"; @@ -5210,7 +5210,7 @@ final: prev: }; SudoEdit-vim = buildVimPluginFrom2Nix { - pname = "SudoEdit-vim"; + pname = "SudoEdit.vim"; version = "2020-02-27"; src = fetchFromGitHub { owner = "chrisbra"; @@ -5246,7 +5246,7 @@ final: prev: }; swift-vim = buildVimPluginFrom2Nix { - pname = "swift-vim"; + pname = "swift.vim"; version = "2021-08-05"; src = fetchFromGitHub { owner = "keith"; @@ -5258,13 +5258,13 @@ final: prev: }; symbols-outline-nvim = buildVimPluginFrom2Nix { - pname = "symbols-outline-nvim"; - version = "2021-08-23"; + pname = "symbols-outline.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "6f376ef4ceb88ff7f0d9e3141dbe2a2e0854e785"; - sha256 = "1882gb76hp4zpwyljrzl26qjwyyvnavhfv529nj5z5x41vyhsks5"; + rev = "80490ad0c697d7277cbd4ea24883120f6de32db0"; + sha256 = "16gl8jc7bqszmpw3yj0sxkxdq9zch6lfj8n0cd6jihd6i9ans564"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5307,7 +5307,7 @@ final: prev: }; taboo-vim = buildVimPluginFrom2Nix { - pname = "taboo-vim"; + pname = "taboo.vim"; version = "2019-08-27"; src = fetchFromGitHub { owner = "gcmt"; @@ -5319,7 +5319,7 @@ final: prev: }; tabpagebuffer-vim = buildVimPluginFrom2Nix { - pname = "tabpagebuffer-vim"; + pname = "tabpagebuffer.vim"; version = "2014-09-30"; src = fetchFromGitHub { owner = "Shougo"; @@ -5343,7 +5343,7 @@ final: prev: }; tagalong-vim = buildVimPluginFrom2Nix { - pname = "tagalong-vim"; + pname = "tagalong.vim"; version = "2021-08-19"; src = fetchFromGitHub { owner = "AndrewRadev"; @@ -5356,18 +5356,18 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-08-06"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "ab6f2d5a683041a46c48b28418d4a2a01bbd5551"; - sha256 = "1xgcgmp1nbf038wzs3v6ja9wpn1grgh4a1d89a5big6rnjcvfmc1"; + rev = "bb8ca482a5d14a771f718bd794b5945be3a6ff74"; + sha256 = "074dvmc7cnwqjx7dy8zsp6ikdzh9gxralf41vs17z8qr6pd4y7g0"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; taglist-vim = buildVimPluginFrom2Nix { - pname = "taglist-vim"; + pname = "taglist.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -5379,7 +5379,7 @@ final: prev: }; targets-vim = buildVimPluginFrom2Nix { - pname = "targets-vim"; + pname = "targets.vim"; version = "2019-12-08"; src = fetchFromGitHub { owner = "wellle"; @@ -5415,7 +5415,7 @@ final: prev: }; telescope-dap-nvim = buildVimPluginFrom2Nix { - pname = "telescope-dap-nvim"; + pname = "telescope-dap.nvim"; version = "2021-03-26"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5427,7 +5427,7 @@ final: prev: }; telescope-frecency-nvim = buildVimPluginFrom2Nix { - pname = "telescope-frecency-nvim"; + pname = "telescope-frecency.nvim"; version = "2021-08-22"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5439,19 +5439,19 @@ final: prev: }; telescope-fzf-native-nvim = buildVimPluginFrom2Nix { - pname = "telescope-fzf-native-nvim"; - version = "2021-08-14"; + pname = "telescope-fzf-native.nvim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "9fb0d2d2297f7e313abf33a80331fadf4df716a5"; - sha256 = "1dqdh1ay56z9gx2f9qx5zbb8xidn3n6n8lnby7lkmixn3plmbsx0"; + rev = "66c8705414483d768b25f7e19d445e3df0d62625"; + sha256 = "1hg908k21zbmdc4qmdnpq5kz4lfwdrghmxibcm5li6c5shb0rs1q"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; telescope-fzf-writer-nvim = buildVimPluginFrom2Nix { - pname = "telescope-fzf-writer-nvim"; + pname = "telescope-fzf-writer.nvim"; version = "2021-04-16"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5463,7 +5463,7 @@ final: prev: }; telescope-fzy-native-nvim = buildVimPluginFrom2Nix { - pname = "telescope-fzy-native-nvim"; + pname = "telescope-fzy-native.nvim"; version = "2021-04-08"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5476,7 +5476,7 @@ final: prev: }; telescope-project-nvim = buildVimPluginFrom2Nix { - pname = "telescope-project-nvim"; + pname = "telescope-project.nvim"; version = "2021-08-03"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5488,7 +5488,7 @@ final: prev: }; telescope-symbols-nvim = buildVimPluginFrom2Nix { - pname = "telescope-symbols-nvim"; + pname = "telescope-symbols.nvim"; version = "2021-08-07"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5500,7 +5500,7 @@ final: prev: }; telescope-z-nvim = buildVimPluginFrom2Nix { - pname = "telescope-z-nvim"; + pname = "telescope-z.nvim"; version = "2021-08-12"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5512,19 +5512,19 @@ final: prev: }; telescope-nvim = buildVimPluginFrom2Nix { - pname = "telescope-nvim"; - version = "2021-08-23"; + pname = "telescope.nvim"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "79dc995f820150d5de880c08e814af327ff7e965"; - sha256 = "0acyzc0k14dvd7j4ihvg84fz9lp1alwbf6qbnq083y6pd37mhj7b"; + rev = "dcee6c81f4cd5f9bc4a4cea782135a0669aa74bd"; + sha256 = "0d5hs640mcvsca97p8sxj35hr7vfjq842lra0ymnhl6smk1vknbx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; tender-vim = buildVimPluginFrom2Nix { - pname = "tender-vim"; + pname = "tender.vim"; version = "2021-05-24"; src = fetchFromGitHub { owner = "jacoborus"; @@ -5536,7 +5536,7 @@ final: prev: }; termwrapper-nvim = buildVimPluginFrom2Nix { - pname = "termwrapper-nvim"; + pname = "termwrapper.nvim"; version = "2021-03-28"; src = fetchFromGitHub { owner = "oberblastmeister"; @@ -5560,7 +5560,7 @@ final: prev: }; thesaurus_query-vim = buildVimPluginFrom2Nix { - pname = "thesaurus_query-vim"; + pname = "thesaurus_query.vim"; version = "2021-07-08"; src = fetchFromGitHub { owner = "ron89"; @@ -5572,7 +5572,7 @@ final: prev: }; thumbnail-vim = buildVimPluginFrom2Nix { - pname = "thumbnail-vim"; + pname = "thumbnail.vim"; version = "2021-01-11"; src = fetchFromGitHub { owner = "itchyny"; @@ -5596,7 +5596,7 @@ final: prev: }; tmux-complete-vim = buildVimPluginFrom2Nix { - pname = "tmux-complete-vim"; + pname = "tmux-complete.vim"; version = "2021-03-26"; src = fetchFromGitHub { owner = "wellle"; @@ -5608,7 +5608,7 @@ final: prev: }; todo-comments-nvim = buildVimPluginFrom2Nix { - pname = "todo-comments-nvim"; + pname = "todo-comments.nvim"; version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; @@ -5620,7 +5620,7 @@ final: prev: }; todo-txt-vim = buildVimPluginFrom2Nix { - pname = "todo-txt-vim"; + pname = "todo.txt-vim"; version = "2021-03-20"; src = fetchFromGitHub { owner = "freitass"; @@ -5633,19 +5633,19 @@ final: prev: }; toggleterm-nvim = buildVimPluginFrom2Nix { - pname = "toggleterm-nvim"; - version = "2021-08-23"; + pname = "toggleterm.nvim"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "317caf587448fc8d42189d2dc27dab076857aeb0"; - sha256 = "1gl27njvik0dfg9412gwnqi6ar6nqhpfhliyjm5w96pxaa6xlafp"; + rev = "ef7a882a818d1bf2598bc58ca0bc158d097d499d"; + sha256 = "0sdp260jnal7qmdqskxwk5cg1c846fz65xr66b18s0y0lm5z53c2"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { - pname = "tokyonight-nvim"; + pname = "tokyonight.nvim"; version = "2021-08-06"; src = fetchFromGitHub { owner = "folke"; @@ -5657,19 +5657,19 @@ final: prev: }; traces-vim = buildVimPluginFrom2Nix { - pname = "traces-vim"; - version = "2021-07-22"; + pname = "traces.vim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "4b06ca24de8aeb8b512727a27f2d1b3ba7b20ff6"; - sha256 = "0lyqbwjyb0sczzqhfd7nmg3hzqn9pqxbrg14szg56a14mmm59mxf"; + rev = "419ce02f68b13aa892735febc1d1887a9a11d5db"; + sha256 = "07va4rr9xfmr93qq4nn0d3ssay4mwdvxzl4f92akib36kxnv0m69"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; train-nvim = buildVimPluginFrom2Nix { - pname = "train-nvim"; + pname = "train.nvim"; version = "2020-09-10"; src = fetchFromGitHub { owner = "tjdevries"; @@ -5693,7 +5693,7 @@ final: prev: }; trouble-nvim = buildVimPluginFrom2Nix { - pname = "trouble-nvim"; + pname = "trouble.nvim"; version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; @@ -5705,7 +5705,7 @@ final: prev: }; tslime-vim = buildVimPluginFrom2Nix { - pname = "tslime-vim"; + pname = "tslime.vim"; version = "2020-09-09"; src = fetchFromGitHub { owner = "jgdavey"; @@ -5729,7 +5729,7 @@ final: prev: }; twilight-nvim = buildVimPluginFrom2Nix { - pname = "twilight-nvim"; + pname = "twilight.nvim"; version = "2021-08-06"; src = fetchFromGitHub { owner = "folke"; @@ -5754,12 +5754,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-07-26"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "8803960a4e09daf1ad4d82e16a25bbdb4c78530e"; - sha256 = "09d86328387f0qvrn3afh69889bcc67n3fxqxysxfrsifwsxqy74"; + rev = "53e1921e3ef015ef658e540c0aa9c4835f9c18a6"; + sha256 = "1ayx52rc8gki3qj6j88ij1klasn6iggn035cgmp0vvspcsrs795c"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -5777,7 +5777,7 @@ final: prev: }; unicode-vim = buildVimPluginFrom2Nix { - pname = "unicode-vim"; + pname = "unicode.vim"; version = "2021-08-11"; src = fetchFromGitHub { owner = "chrisbra"; @@ -5789,7 +5789,7 @@ final: prev: }; unite-vim = buildVimPluginFrom2Nix { - pname = "unite-vim"; + pname = "unite.vim"; version = "2021-02-06"; src = fetchFromGitHub { owner = "Shougo"; @@ -5801,7 +5801,7 @@ final: prev: }; utl-vim = buildVimPluginFrom2Nix { - pname = "utl-vim"; + pname = "utl.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -5813,7 +5813,7 @@ final: prev: }; vader-vim = buildVimPluginFrom2Nix { - pname = "vader-vim"; + pname = "vader.vim"; version = "2020-02-13"; src = fetchFromGitHub { owner = "junegunn"; @@ -5825,7 +5825,7 @@ final: prev: }; vCoolor-vim = buildVimPluginFrom2Nix { - pname = "vCoolor-vim"; + pname = "vCoolor.vim"; version = "2020-10-14"; src = fetchFromGitHub { owner = "KabbAmine"; @@ -5837,7 +5837,7 @@ final: prev: }; verilog_systemverilog-vim = buildVimPluginFrom2Nix { - pname = "verilog_systemverilog-vim"; + pname = "verilog_systemverilog.vim"; version = "2021-01-16"; src = fetchFromGitHub { owner = "vhda"; @@ -6150,12 +6150,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-08-15"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "e3e3fce70997a8d3ebd08f28b212d58c5daded11"; - sha256 = "0z1zcmry9vmagz03wh0y7smxfwsaf2fc2frhkza48clafx324rf0"; + rev = "98d5cef20ef1e706132705abb01cd53833275f5e"; + sha256 = "0201ji3mnfx09022h73kv5gv4n12dhjwgdq5ri7ysvjsbp1k12dj"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -6354,12 +6354,12 @@ final: prev: vim-capslock = buildVimPluginFrom2Nix { pname = "vim-capslock"; - version = "2021-07-13"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-capslock"; - rev = "a910e686986b239a7885e67ab6914638f88e914b"; - sha256 = "0aiqs4m5vfc22lcjkb2iphpb2qi7bz994lbjr2frsb8g8h508h18"; + rev = "252a9166fecf79e2e2a0b2ee4e0712364472e825"; + sha256 = "06l2q7mmp72kag009fgyks4ajm0apfqkcqhkfc40ysad19ghn65l"; }; meta.homepage = "https://github.com/tpope/vim-capslock/"; }; @@ -6402,12 +6402,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-08-21"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "299a5d23f6c8d8f51bbd4aeb01f8c1c27d4a0604"; - sha256 = "090hm59p6n44740irfkxv5r40iyr4mady30zqcswbx4r1xhd8vzc"; + rev = "38bc6b1eb5278b8f5bd2ef59ae5477de167408d0"; + sha256 = "1xg8ds5rbsq8619wmkdjmsrqpphg3vq5sbjn0lhnfg0cdg3w6pfs"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6678,24 +6678,24 @@ final: prev: vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2021-05-12"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "a3f8ea8e666f4bebe12739d8854a4bd31544dfbb"; - sha256 = "04m7drx86r8zqq7rq29wa9zq5ckzf5bqxzyhdc5hqn82jxcvxmpz"; + rev = "ed79f2b0ece53d38aabc056551b582f18fee48e6"; + sha256 = "034dckb589lam2c2c581asilh0psj9516pxh2n9rcpx0m1f4bpyd"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2021-08-03"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "e79b6cca4bfd7c56542353775d337a08dcbd9486"; - sha256 = "1m5ipmgw45svdlqp8rj5kpdfczzn03rgav2j7qraqrl37bwlkxzd"; + rev = "5f2bd8499f1627c1938300256e6d9abb1ae4856d"; + sha256 = "1a2icyz84lc54y4nq5amf3l51cc0f2yyzyqz5zx6m7dwb1r3nhpn"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -6918,12 +6918,12 @@ final: prev: vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-06-16"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "58084475c1e523caeac97ffff62c154f7f8fcc66"; - sha256 = "09nv87iqjnwpfkvbspgwxibjlf1aj4syw0nv885fyw8fjpbhf06l"; + rev = "c29c1ede8f9f12d9c76b7c8b5b8ead7690c5792c"; + sha256 = "1rz24r97z3dlzxn3b8m3s4m697f9vhs5688jbqgs4fcbki2wrsyj"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -7134,12 +7134,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2021-05-02"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "cabecb166bde31d9fe86caac7e51284cff575da2"; - sha256 = "13ybny4i20p6xi6rp6vzngbrjwjpikvcrhg8spj1g9n2z5wcc2xz"; + rev = "670b4efd759da01da051edf8839daa789c7f86f2"; + sha256 = "0c76vqwl0mdjsg6bk7jsdhqwkjygq4vbwfc99gf3b5c2m5kxx375"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -7182,12 +7182,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "8cdb51622fbdbf780edff35ee22d74ad9983698e"; - sha256 = "18073gnl90n7h8j3rk6shs79455svwa47n5jxyb44m1957hvzfgb"; + rev = "10b44345b0d1d31409641b71c5b697774bf99d83"; + sha256 = "18kv3rc92hniz525ij7np9any4v0slmx7lp6vjrx5jaf022nblws"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7242,12 +7242,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-07-10"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "75047b7d812cbe182ee04f0956bb31ba7efd46b0"; - sha256 = "00hz040ar9ka3mcf2pgjc6iwznh7baqi6q09xkpr0pnjhm9k0bci"; + rev = "3d68c6dcaa303f0144b7657e00b46ef98f0deb82"; + sha256 = "060djzwpx5imlw3lb3kifp3gl0drn32a2dvb5baddg0kacahdvky"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -7759,12 +7759,12 @@ final: prev: vim-jinja = buildVimPluginFrom2Nix { pname = "vim-jinja"; - version = "2021-07-19"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "lepture"; repo = "vim-jinja"; - rev = "2f0eeefe583ea477cb7605f972d57d7d5e55e13f"; - sha256 = "0r8508h9s2bikmv3wvw4iaq3j8i5n564k7s06aqx9j79i16asn22"; + rev = "7c54e2320c5f676636cdd8697480782eebfb2bf2"; + sha256 = "153qirdl5xrnj1jc0ivlvf2rk7gdby96vn3prf6ky0l0gqxlzd8g"; }; meta.homepage = "https://github.com/lepture/vim-jinja/"; }; @@ -8024,12 +8024,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-07-20"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "7ba553effb021293c9ff5176b91e76da71797825"; - sha256 = "1phfqzn94m2j7g10aifh12a4gyyrhqnj1vn2bpdp29lpm1n179yg"; + rev = "52ded667a5c8426d6845b53b943d2a5f6cc3fd6a"; + sha256 = "01jynlb339pbg9pqjnfdgq62n4hccg8ay13j9anvkvjmrpbdg7y4"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8133,12 +8133,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-08-15"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "96738bdb81c493a4313b4bc5586ad540bd4ba6ce"; - sha256 = "0nan8crcsixwxmjj1xdbiizr50882102idd1ylynv7ihbf7hgmv8"; + rev = "4bbb22d694e1ca1132a9bbee4f491b48041e1710"; + sha256 = "035bf331rr4xbxi8mlnlhnvrg3q97lnpgzkgw1gc7d7rsbf0gz6p"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8229,12 +8229,12 @@ final: prev: vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2021-03-14"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "83cd9b3775438faafc3475f9f9d5fbb8da4dfa5b"; - sha256 = "1l8rdmy9i81zq2ck0zvlsmqs7hfqpcxa0b8psf5nw72mwhbvv1np"; + rev = "2bac2066672e18a3eb9f40ca62d02917835795e0"; + sha256 = "1r8pn5as9k9ps4zky1hsn923m0hc7z0p638r6q9m1g3nzqfxlbds"; }; meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; @@ -8649,12 +8649,12 @@ final: prev: vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2021-04-30"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "fc2813ef4484c7a5c080021ceaa6d1f70390d920"; - sha256 = "0fsl8w17z15sj21x5gd5ah5p5fjsnk0gzdx2n2p0jnkcb05bwzck"; + rev = "66e038d443310315e23feb939b3ca28c2a67e236"; + sha256 = "1wg6sgvvqd1k7hddv8acz8p9cgdan3kl47yk4sa8m1b6ipfb7vf6"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -8937,12 +8937,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2021-08-21"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "e804fb67b75697f98f500f67ed11e891e370bd04"; - sha256 = "11cifxc6i2h00f71w28f2q5zr76198672g9ccx8ah5i7xw5a949x"; + rev = "e4f7fb8a1b48afe5bb93e1460a2a5bdd67573c33"; + sha256 = "0m7srvzrg0c8kcs7xh236yi5d302476xldq6qp238jmn0w2lpavh"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -8997,12 +8997,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2020-12-15"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "9e6340affe9f53c11a6975a5f50b9bf48adb692c"; - sha256 = "0ghli93qzr3i8ai90waikylwas3xgy5bdgykng55b9mqgpmc3faf"; + rev = "04f775510011606ab2b9081e3758aa0c11018c5c"; + sha256 = "1796xqfa8anbcyjb9adqdcqbpvm6l5506r4n04lx7980ivpqz6bz"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -9249,12 +9249,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-08-19"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "9e5219ae92f9b1b2ee23aff067618a6008a74fa5"; - sha256 = "1zv17p6ri0xs5qypva45afvwigw1hpkx06zf6ngk00nmi1vqd4cb"; + rev = "e081212205f767fc5b050977c0a2b0f1536a3bdf"; + sha256 = "1z7dbhjz7y9wl9gvv35pn4v25pksaavibblxakw3pxv6xk5c5kxf"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9562,12 +9562,12 @@ final: prev: vim-textobj-variable-segment = buildVimPluginFrom2Nix { pname = "vim-textobj-variable-segment"; - version = "2019-12-30"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "Julian"; repo = "vim-textobj-variable-segment"; - rev = "78457d4322b44bf89730e708b62b69df48c39aa3"; - sha256 = "14dcrnk83hj4ixrkdgjrk9cf0193f82wqckdzd4w0b76adf3habj"; + rev = "30f7bc94bc8a87d923631f5e440200b662becb1a"; + sha256 = "1168qylhs0f0xzvy68kh07p8w01ypc78h2cb4pklv8079c869k30"; }; meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/"; }; @@ -9658,12 +9658,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-08-18"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "a69dbbcccdc31fddbffd63d4db00d08daec1fff8"; - sha256 = "1pn4582qlivipy07nqyg2kigjscsprjx2vdal21jqxwrf49gh1fa"; + rev = "88e7302f705ffe60a26ee25619c27c60681bf6fe"; + sha256 = "0cgmxls4y1h7mx91mibfia2860zamfdr8k7k6qipwdmcmchmrawa"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -9706,12 +9706,12 @@ final: prev: vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2021-07-16"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "cd7286702319d676c622a5f5891dc68563bf6ad5"; - sha256 = "1xmcnhbny74hr0zciy55gq8c8agds2x1xvdsr1wrghkcr2k15w46"; + rev = "3561237047481c212b55942d9507c937841d3bc8"; + sha256 = "1099bnpagw6sv5j2rigsp2b9qc58dcyi4520hb0xz48zdvynkaac"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; @@ -9742,12 +9742,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2021-08-15"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "aee3455e19686ce84225752de678a9725866248b"; - sha256 = "0j6xz4m8p351dmvhssi0f699609wpm5nz5q9xysy15vpwxds3nl9"; + rev = "c147741c643e2fef3458e8e44834c11ef85bdd9b"; + sha256 = "0lz2kdp8wmrnrcflsbfhmv42l81gvv00s3qfgf6926zxsr7r5kpl"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -9850,12 +9850,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2021-08-15"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "37544a5d3f028d93f9ad8c4445cd1dc623d08c5e"; - sha256 = "1s8q8hch38ydkfr2fd7259swgbpchs70shjharahl5vm3x72jpgy"; + rev = "1bef11e2f277984214a7bdca250c09199b57a80b"; + sha256 = "01f3mrbcpdg3dxhy0h2khjaj1fz63f4x8iwmbqbk9vp6r1qzwkkl"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -10018,12 +10018,12 @@ final: prev: vimade = buildVimPluginFrom2Nix { pname = "vimade"; - version = "2021-04-07"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "9b9254340e39dab3dad64c05b10af0fd85490b71"; - sha256 = "0sbk9lf5w136lwl3ca866m594993s23zad5ss4whzm9j0qknihl3"; + rev = "b58f6cb0c8ab804fc16cd4d6dc452b336681f24c"; + sha256 = "1l2ks77ix9yp3nr8hvp1zrq41smlwp2npwi7kdqknhk4sjhpsas8"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -10053,7 +10053,7 @@ final: prev: }; vimfiler-vim = buildVimPluginFrom2Nix { - pname = "vimfiler-vim"; + pname = "vimfiler.vim"; version = "2020-07-13"; src = fetchFromGitHub { owner = "Shougo"; @@ -10101,7 +10101,7 @@ final: prev: }; vimproc-vim = buildVimPluginFrom2Nix { - pname = "vimproc-vim"; + pname = "vimproc.vim"; version = "2020-06-23"; src = fetchFromGitHub { owner = "Shougo"; @@ -10125,7 +10125,7 @@ final: prev: }; vimshell-vim = buildVimPluginFrom2Nix { - pname = "vimshell-vim"; + pname = "vimshell.vim"; version = "2019-07-16"; src = fetchFromGitHub { owner = "Shougo"; @@ -10151,12 +10151,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-08-22"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "058f139985f4eede396d83f45a6b2e7b3924a012"; - sha256 = "1nxxw6k0y5ccsvm39h4mfrk93ply2xh5y1lihhwy17vaigwyx687"; + rev = "f1db6a544ba4096e1df1704bea721b4a146e51ac"; + sha256 = "11sgr1zzmxmy2m2191ax47hpi133sp1wfwnp5vay9cmhn9lym8k7"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10174,7 +10174,7 @@ final: prev: }; vimway-lsp-diag-nvim = buildVimPluginFrom2Nix { - pname = "vimway-lsp-diag-nvim"; + pname = "vimway-lsp-diag.nvim"; version = "2021-08-04"; src = fetchFromGitHub { owner = "onsails"; @@ -10210,7 +10210,7 @@ final: prev: }; vissort-vim = buildVimPluginFrom2Nix { - pname = "vissort-vim"; + pname = "vissort.vim"; version = "2014-01-31"; src = fetchFromGitHub { owner = "navicore"; @@ -10222,7 +10222,7 @@ final: prev: }; vista-vim = buildVimPluginFrom2Nix { - pname = "vista-vim"; + pname = "vista.vim"; version = "2021-08-03"; src = fetchFromGitHub { owner = "liuchengxu"; @@ -10234,7 +10234,7 @@ final: prev: }; Vundle-vim = buildVimPluginFrom2Nix { - pname = "Vundle-vim"; + pname = "Vundle.vim"; version = "2019-08-17"; src = fetchFromGitHub { owner = "VundleVim"; @@ -10246,7 +10246,7 @@ final: prev: }; wal-vim = buildVimPluginFrom2Nix { - pname = "wal-vim"; + pname = "wal.vim"; version = "2020-11-08"; src = fetchFromGitHub { owner = "dylanaraps"; @@ -10270,7 +10270,7 @@ final: prev: }; which-key-nvim = buildVimPluginFrom2Nix { - pname = "which-key-nvim"; + pname = "which-key.nvim"; version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; @@ -10282,19 +10282,19 @@ final: prev: }; wilder-nvim = buildVimPluginFrom2Nix { - pname = "wilder-nvim"; - version = "2021-08-17"; + pname = "wilder.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "3b1844d9d69972bec131aa66562afa545b00c883"; - sha256 = "1lr5vp2rr3i18qjv2h83d0bzrlc0617acwsimyd5jb105qa8rs09"; + rev = "73b754d3e9c6ecb163640d9d7df1102f52ac0ea3"; + sha256 = "0759l9y2bw1p814a35ay1zvs3g11bihln0qgf8fa19az5f0fsfi7"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; wildfire-vim = buildVimPluginFrom2Nix { - pname = "wildfire-vim"; + pname = "wildfire.vim"; version = "2021-05-10"; src = fetchFromGitHub { owner = "gcmt"; @@ -10306,7 +10306,7 @@ final: prev: }; wmgraphviz-vim = buildVimPluginFrom2Nix { - pname = "wmgraphviz-vim"; + pname = "wmgraphviz.vim"; version = "2018-04-26"; src = fetchFromGitHub { owner = "wannesm"; @@ -10318,7 +10318,7 @@ final: prev: }; wombat256-vim = buildVimPluginFrom2Nix { - pname = "wombat256-vim"; + pname = "wombat256.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -10342,7 +10342,7 @@ final: prev: }; wstrip-vim = buildVimPluginFrom2Nix { - pname = "wstrip-vim"; + pname = "wstrip.vim"; version = "2021-03-14"; src = fetchFromGitHub { owner = "tweekmonster"; @@ -10366,7 +10366,7 @@ final: prev: }; xterm-color-table-vim = buildVimPluginFrom2Nix { - pname = "xterm-color-table-vim"; + pname = "xterm-color-table.vim"; version = "2014-01-01"; src = fetchFromGitHub { owner = "guns"; @@ -10378,7 +10378,7 @@ final: prev: }; YankRing-vim = buildVimPluginFrom2Nix { - pname = "YankRing-vim"; + pname = "YankRing.vim"; version = "2015-07-29"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -10390,7 +10390,7 @@ final: prev: }; yats-vim = buildVimPluginFrom2Nix { - pname = "yats-vim"; + pname = "yats.vim"; version = "2021-07-10"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; @@ -10416,7 +10416,7 @@ final: prev: }; YUNOcommit-vim = buildVimPluginFrom2Nix { - pname = "YUNOcommit-vim"; + pname = "YUNOcommit.vim"; version = "2014-11-26"; src = fetchFromGitHub { owner = "esneider"; @@ -10428,7 +10428,7 @@ final: prev: }; zeavim-vim = buildVimPluginFrom2Nix { - pname = "zeavim-vim"; + pname = "zeavim.vim"; version = "2019-06-07"; src = fetchFromGitHub { owner = "KabbAmine"; @@ -10464,7 +10464,7 @@ final: prev: }; zig-vim = buildVimPluginFrom2Nix { - pname = "zig-vim"; + pname = "zig.vim"; version = "2021-06-24"; src = fetchFromGitHub { owner = "ziglang"; @@ -10476,7 +10476,7 @@ final: prev: }; zoomwintab-vim = buildVimPluginFrom2Nix { - pname = "zoomwintab-vim"; + pname = "zoomwintab.vim"; version = "2020-10-13"; src = fetchFromGitHub { owner = "troydm"; From 8f36abb5288b2d7942bfad4e4b7caf301ff23600 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 30 Aug 2021 01:00:44 +0200 Subject: [PATCH 07/76] nixos/ipfs: run profile applications offline --- nixos/modules/services/network-filesystems/ipfs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 2748571be1f7..1d5c03787496 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -226,8 +226,8 @@ in { ${optionalString (! cfg.localDiscovery) "--profile=server"} else ${if cfg.localDiscovery - then "ipfs config profile apply local-discovery" - else "ipfs config profile apply server" + then "ipfs --offline config profile apply local-discovery" + else "ipfs --offline config profile apply server" } fi '' + optionalString cfg.autoMount '' From 4d83b2529c19f5f01866721688e4eb850827bb6b Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 26 Aug 2021 13:14:21 +0900 Subject: [PATCH 08/76] vector: 0.15.2 -> 0.16.0 --- pkgs/tools/misc/vector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 49e07b7507a2..6faaf5506306 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u/KHiny9o/q74dh/w3cShAb6oEkMxNaTMF2lOFx+1po="; + sha256 = "sha256-xLlVM4K5yDur2jhrninZL6foFWq935u6mZXUbtQofsE="; }; - cargoSha256 = "sha256-wUNF+810Yh4hPQzraWo2mDi8KSmRKp9Z9D+4kwKQ+IU="; + cargoSha256 = "sha256-mIUmYDSPCIvuZDK/5HHH3mf5Yc8D5wnhGUvgsuXrAFQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From fc87d9a067dfb13739388afd4318241c96e66b6a Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 27 Aug 2021 10:32:08 +0900 Subject: [PATCH 09/76] vector: 0.16.0 -> 0.16.1 --- pkgs/tools/misc/vector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 6faaf5506306..4778ecd4fb8e 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xLlVM4K5yDur2jhrninZL6foFWq935u6mZXUbtQofsE="; + sha256 = "sha256-10e0cWt6XW8msNR/RXbaOpdwTAlRLm6jVvDed905rho="; }; - cargoSha256 = "sha256-mIUmYDSPCIvuZDK/5HHH3mf5Yc8D5wnhGUvgsuXrAFQ="; + cargoSha256 = "sha256-ezQ/tX/uKzJprLQt2xIUZwGuUOmuRmTO+gPsf3MLEv8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From f082ab00bd29de3bea7faa1a9654fc45151f86a2 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 29 Aug 2021 09:33:29 +0900 Subject: [PATCH 10/76] vector: disable flaky tests --- pkgs/tools/misc/vector/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 4778ecd4fb8e..6c559ada9632 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -53,7 +53,16 @@ rustPlatform.buildRustPackage rec { # dev dependency includes httpmock which depends on iashc which depends on curl-sys with http2 feature enabled # compilation fails because of a missing http2 include doCheck = !stdenv.isDarwin; - checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1"; + # healthcheck_grafana_cloud is trying to make a network access + # test_stream_errors is flaky on linux-aarch64 + checkPhase = '' + TZDIR=${tzdata}/share/zoneinfo cargo test \ + --no-default-features \ + --features ${lib.concatStringsSep "," features} \ + -- --test-threads 1 \ + --skip=sinks::loki::tests::healthcheck_grafana_cloud \ + --skip=kubernetes::api_watcher::tests::test_stream_errors + ''; # recent overhauls of DNS support in 0.9 mean that we try to resolve # vector.dev during the checkPhase, which obviously isn't going to work. From 71af4f6ab199275e1a43d37875f12dd88ed3580c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 27 Aug 2021 01:31:00 -0300 Subject: [PATCH 11/76] uxn: init at 0.0.0+unstable=2021-08-27 --- pkgs/misc/emulators/uxn/default.nix | 54 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/misc/emulators/uxn/default.nix diff --git a/pkgs/misc/emulators/uxn/default.nix b/pkgs/misc/emulators/uxn/default.nix new file mode 100644 index 000000000000..3e4928412b11 --- /dev/null +++ b/pkgs/misc/emulators/uxn/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromSourcehut +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "uxn"; + version = "0.0.0+unstable=2021-08-30"; + + src = fetchFromSourcehut { + owner = "~rabbits"; + repo = pname; + rev = "a2e40d9d10c11ef48f4f93d0dc86f5085b4263ce"; + hash = "sha256-/hxDYi814nQydm2iQk4NID4vpJ3BcBcM6NdL0iuZk5M="; + }; + + buildInputs = [ + SDL2 + ]; + + dontConfigure = true; + + # It is easier to emulate build.sh script + buildPhase = '' + runHook preBuild + + cc -std=c89 -Wall -Wno-unknown-pragmas src/uxnasm.c -o uxnasm + cc -std=c89 -Wall -Wno-unknown-pragmas src/uxn.c src/uxncli.c -o uxncli + cc -std=c89 -Wall -Wno-unknown-pragmas src/uxn.c src/devices/ppu.c \ + src/devices/apu.c src/uxnemu.c $(sdl2-config --cflags --libs) -o uxnemu + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -d $out/bin/ $out/share/${pname}/ + + cp uxnasm uxncli uxnemu $out/bin/ + cp -r projects $out/share/${pname}/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://wiki.xxiivv.com/site/uxn.html"; + description = "An assembler and emulator for the Uxn stack machine"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fb2cc738db6..8aeaacbc3326 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -228,6 +228,8 @@ with pkgs; cen64 = callPackage ../misc/emulators/cen64 { }; + uxn = callPackage ../misc/emulators/uxn { }; + cereal = callPackage ../development/libraries/cereal { }; cewl = callPackage ../tools/security/cewl { }; From 2c4c91c248e83f17dd68d5a1a2bdece188305b84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Aug 2021 04:07:26 +0000 Subject: [PATCH 12/76] python38Packages.gensim: 4.0.1 -> 4.1.0 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 548dd1214fa7..8972b356805a 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.0.1"; + version = "4.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b4d0b9562796968684028e06635e0f7aff39ffb33719057fd1667754ea09a6e4"; + sha256 = "0b09983048a97c7915ab50500bc53eeec438d26366041598709ec156db3eef1f"; }; propagatedBuildInputs = [ smart-open numpy six scipy ]; From fc467e5797c3b088f690087f8d76566f05ff6483 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 Aug 2021 00:04:20 +0000 Subject: [PATCH 13/76] mcfly: 0.5.8 -> 0.5.9 https://github.com/cantino/mcfly/releases/tag/v0.5.9 --- pkgs/tools/misc/mcfly/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index a6d635a6f7ed..0d55da7fdfa4 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,30 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-D8ScF/3qyT0VuMGmWkkeGRyCu4LdOXt1wvR9whbNURE="; + sha256 = "0i3qjgq1b8h3bzc7rxa60kq1yc2im9m6dgzrvial086a1zk8s81r"; }; - postInstall = '' - substituteInPlace mcfly.bash --replace '$(which mcfly)' $out/bin/mcfly - substituteInPlace mcfly.zsh --replace '$(which mcfly)' $out/bin/mcfly - substituteInPlace mcfly.fish --replace '(which mcfly)' $out/bin/mcfly - install -Dm644 -t $out/share/mcfly mcfly.bash - install -Dm644 -t $out/share/mcfly mcfly.zsh - install -Dm644 -t $out/share/mcfly mcfly.fish - ''; - - cargoSha256 = "sha256-VZgxfVmAa5lPfdLNbsotNoRpTLe3HID36sF8T/0mywI="; + cargoSha256 = "084v4fsdi25ahz068ssq29z7d5d3k3jh3s8b07irwybdsy18c629"; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now"; - changelog = "https://github.com/cantino/mcfly/blob/v${version}/CHANGELOG.txt"; + changelog = "https://github.com/cantino/mcfly/raw/v${version}/CHANGELOG.txt"; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; }; From 39067594f5d668caa701fc3e014a8b4bf73a9ac0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 26 Aug 2021 12:06:13 +0200 Subject: [PATCH 14/76] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F13.ocaml:=20?= =?UTF-8?q?4.13.0-=CE=B12=20=E2=86=92=204.13.0-=CE=B21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/4.13.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.13.nix b/pkgs/development/compilers/ocaml/4.13.nix index 008d2cd6d075..723b597b88dc 100644 --- a/pkgs/development/compilers/ocaml/4.13.nix +++ b/pkgs/development/compilers/ocaml/4.13.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "13"; - patch_version = "0-alpha2"; + patch_version = "0-beta1"; src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha2.tar.xz"; - sha256 = "0krb0254i6ihbymjn6mwgzcfrzsvpk9hbagl0agm6wml21zpcsif"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~beta1.tar.xz"; + sha256 = "0dbz69p1kqabjvzaasy2malfdfn4b93s504x2xs0dl5l3fa3p6c3"; }; } From 8c22b541cf605dea63d479510629a728ba231d27 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 29 Aug 2021 21:22:55 +0200 Subject: [PATCH 15/76] libreswan: 4.4 -> 4.5 --- pkgs/tools/networking/libreswan/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 24b7176e82b5..766a1030fd7e 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , nixosTests , pkg-config , systemd @@ -43,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "libreswan"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "https://download.libreswan.org/${pname}-${version}.tar.gz"; - sha256 = "0xj974yc0y1r7235zl4jhvxqz3bpb8js2fy9ic820zq9swh0lgsz"; + sha256 = "18whvmaxqfmaqbmq72calyzk21wyvxa0idddcsxd8x36vhdza0q7"; }; strictDeps = true; @@ -70,14 +69,6 @@ stdenv.mkDerivation rec { python3 bash ] ++ lib.optional stdenv.isLinux libselinux; - patches = [ - # Fix compilation on aarch64, remove on next update - (fetchpatch { - url = "https://github.com/libreswan/libreswan/commit/ea50d36d2886e44317ba5ba841de1d1bf91aee6c.patch"; - sha256 = "1jp89rm9jp55zmiyimyhg7yadj0fwwxaw7i5gyclrs38w3y1aacj"; - }) - ]; - prePatch = '' # Correct iproute2 path sed -e 's|"/sbin/ip"|"${iproute2}/bin/ip"|' \ @@ -111,10 +102,8 @@ stdenv.mkDerivation rec { -i configs/Makefile ''; - # Set appropriate paths for build - preBuild = "export INC_USRLOCAL=\${out}"; - makeFlags = [ + "PREFIX=$(out)" "INITSYSTEM=systemd" "UNITDIR=$(out)/etc/systemd/system/" "TMPFILESDIR=$(out)/lib/tmpfiles.d/" From 9203210f36daed43fbd8073183d96ff9c4a81955 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Aug 2021 19:18:42 +0200 Subject: [PATCH 16/76] ceph: 16.2.4 -> 16.2.5 --- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 0ccc96ce1885..426aff81f069 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -146,10 +146,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "16.2.4"; + version = "16.2.5"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "sha256-J6FVK7feNN8cGO5BSDlfRGACAzchmRUSWR+a4ZgeWy0="; + sha256 = "sha256-uCBpFvp5k+A5SgwxoJVkuGb9E69paKrs3qda5RpsRt4="; }; in rec { ceph = stdenv.mkDerivation { From 78d20f22007a9e615c8bf1a7bf12afea518e1d39 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 27 Aug 2021 12:16:30 +0000 Subject: [PATCH 17/76] pkgsMusl.libiscsi: fix build --- pkgs/development/libraries/libiscsi/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix index adc721bc6d07..6dd23d219d95 100644 --- a/pkgs/development/libraries/libiscsi/default.nix +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -13,8 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + # This can be removed after >=1.20.0, or if the build suceeds with + # pie enabled (default on Musl). + hardeningDisable = [ "pie" ]; + # This problem is gone on libiscsi master. - NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null; + NIX_CFLAGS_COMPILE = + lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare"; meta = with lib; { description = "iscsi client library and utilities"; From a850ed0be80728fba3bc2c482f7714ba2df5a906 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Mon, 30 Aug 2021 09:12:52 +0100 Subject: [PATCH 18/76] portaudio: remove Werror (#136060) --- pkgs/development/libraries/portaudio/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 4666850c5849..9a43d5a921e5 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=nullability-completeness-on-arrays"; + postConfigure = '' + substituteInPlace Makefile --replace "-Werror" "" + ''; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; From 3257b73c94f239de5eb67afb0e26572d4c9d69dc Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 30 Aug 2021 02:05:12 +0200 Subject: [PATCH 19/76] vimPlugins: assign original name to pname instead of the normalized_name. there is no need to rename the plugin ?! and it can upset packages for instance packer.nvim generates a config/nvim/plugin/packer_compiled.lua that does vim.api.nvim_command('packadd packer.nvim') which doesnt work on nixpkgs since the "packer.nvim" folder is renamed to "packer-nvim --- pkgs/misc/vim-plugins/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index 6f15f5dd271d..126b0d3e7d8d 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -66,7 +66,7 @@ class VimEditor(pluginupdate.Editor): f.write(textwrap.indent(textwrap.dedent( f""" {plugin.normalized_name} = buildVimPluginFrom2Nix {{ - pname = "{plugin.normalized_name}"; + pname = "{plugin.name}"; version = "{plugin.version}"; src = fetchFromGitHub {{ owner = "{owner}"; From 87e5bc2cc2222a4e63ae2699be805725103db904 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 27 Aug 2021 07:39:32 +0200 Subject: [PATCH 20/76] =?UTF-8?q?ocamlPackages.ocsigen-toolkit:=202.7.0=20?= =?UTF-8?q?=E2=86=92=202.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ocsigen-toolkit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index eccdcf80d7cc..0e430e2ba291 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,27 +5,27 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.7.0"; + version = "2.12.2"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; buildInputs = [ ocaml findlib opaline ]; - installPhase = - '' + installPhase = '' + runHook preInstall + mkdir -p $OCAMLFIND_DESTDIR export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH make install opaline -prefix $out + runHook postInstall ''; src = fetchFromGitHub { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0jan5779nc0jf993hmvfii15ralcs20sm4mcnqwqrnhjbq6f6zpk"; + sha256 = "1fqrh7wrzs76qj3nvmxqy76pzqvsja2dwzqxyl8rkh5jg676vmqy"; }; - createFindlibDestdir = true; - meta = { homepage = "http://ocsigen.org/ocsigen-toolkit/"; description = " User interface widgets for Ocsigen applications"; From 36cf478468c707fa2e867227ce04b1a729fdf6f7 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 12:53:12 +0900 Subject: [PATCH 21/76] rabbitmq: nixpkgs-fmt --- nixos/modules/services/amqp/rabbitmq.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index fc8a1bc3c23c..2db28210262d 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -7,12 +7,13 @@ let inherit (builtins) concatStringsSep; - config_file_content = lib.generators.toKeyValue {} cfg.configItems; + config_file_content = lib.generators.toKeyValue { } cfg.configItems; config_file = pkgs.writeText "rabbitmq.conf" config_file_content; advanced_config_file = pkgs.writeText "advanced.config" cfg.config; -in { +in +{ ###### interface options = { services.rabbitmq = { @@ -79,7 +80,7 @@ in { }; configItems = mkOption { - default = {}; + default = { }; type = types.attrsOf types.str; example = literalExample '' { @@ -123,13 +124,13 @@ in { }; plugins = mkOption { - default = []; + default = [ ]; type = types.listOf types.str; description = "The names of plugins to enable"; }; pluginDirs = mkOption { - default = []; + default = [ ]; type = types.listOf types.path; description = "The list of directories containing external plugins"; }; @@ -180,7 +181,7 @@ in { RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" '' [ ${concatStringsSep "," cfg.plugins} ]. ''; - } // optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; }; + } // optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; }; serviceConfig = { ExecStart = "${cfg.package}/sbin/rabbitmq-server"; From f091420c1d194ad398142959266f18493da1ff83 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 17:11:49 +0900 Subject: [PATCH 22/76] rabbitmq: add option to enable management plugin --- nixos/modules/services/amqp/rabbitmq.nix | 27 ++++++++++++++++++++++++ nixos/tests/rabbitmq.nix | 6 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index 2db28210262d..8fdfda9a66d8 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -134,6 +134,28 @@ in type = types.listOf types.path; description = "The list of directories containing external plugins"; }; + + managementPlugin = mkOption { + description = "The options to run the management plugin"; + type = types.submodule { + options = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable the management plugin + ''; + }; + port = mkOption { + default = 15672; + type = types.port; + description = '' + On which port to run the management plugin + ''; + }; + }; + }; + }; }; }; @@ -158,8 +180,13 @@ in services.rabbitmq.configItems = { "listeners.tcp.1" = mkDefault "${cfg.listenAddress}:${toString cfg.port}"; + } // optionalAttrs cfg.managementPlugin.enable { + "management.tcp.port" = toString cfg.managementPlugin.port; + "management.tcp.ip" = cfg.listenAddress; }; + services.rabbitmq.plugins = optional cfg.managementPlugin.enable "rabbitmq_management"; + systemd.services.rabbitmq = { description = "RabbitMQ Server"; diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 69be29b0f9e5..03f1fa46d29e 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -7,7 +7,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; machine = { - services.rabbitmq.enable = true; + services.rabbitmq = { + enable = true; + managementPlugin.enable = true; + }; # Ensure there is sufficient extra disk space for rabbitmq to be happy virtualisation.diskSize = 1024; }; @@ -19,5 +22,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_until_succeeds( 'su -s ${pkgs.runtimeShell} rabbitmq -c "rabbitmqctl status"' ) + machine.wait_for_open_port("15672") ''; }) From 3c190ee25a519fb39901ca2b8a69d1e062f5022f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 11:49:54 +0200 Subject: [PATCH 23/76] python3Packages.typer: 0.3.2 -> 0.4.0 --- .../python-modules/typer/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 620ec7ce6892..bc55e3ab8ff7 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -4,29 +4,32 @@ , click , pytestCheckHook , shellingham -, pytest-cov , pytest-xdist , pytest-sugar , coverage , mypy , black , isort +, pythonOlder }: buildPythonPackage rec { pname = "typer"; - version = "0.3.2"; + version = "0.4.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "00v3h63dq8yxahp9vg3yb9r27l2niwv8gv0dbds9dzrc298dfmal"; + sha256 = "1pgm0zsylbmz1r96q4n3rfi0h3pn4jss2yfs83z0yxa90nmsxhv3"; }; - propagatedBuildInputs = [ click ]; + propagatedBuildInputs = [ + click + ]; checkInputs = [ pytestCheckHook - pytest-cov pytest-xdist pytest-sugar shellingham @@ -35,18 +38,17 @@ buildPythonPackage rec { black isort ]; - pytestFlagsArray = [ - "--ignore=tests/test_completion/test_completion.py" - "--ignore=tests/test_completion/test_completion_install.py" - ]; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + pythonImportsCheck = [ "typer" ]; meta = with lib; { + description = "Python library for building CLI applications"; homepage = "https://typer.tiangolo.com/"; - description = "Typer, build great CLIs. Easy to code. Based on Python type hints."; license = licenses.mit; - # is incompatible with click8 - # https://github.com/tiangolo/typer/issues/280 - broken = true; - maintainers = [ maintainers.winpat ]; + maintainers = with maintainers; [ winpat ]; }; } From 7e495c1b557f8801b538de4a49dac1a5bcae44ba Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Mon, 30 Aug 2021 11:55:59 +0200 Subject: [PATCH 24/76] terraform-providers.fastly: 0.16.1 -> 0.34.0 (#136158) --- .../cluster/terraform-providers/providers.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3071bba71f60..eefc5f1a6272 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -332,11 +332,13 @@ "version": "2.1.0" }, "fastly": { - "owner": "terraform-providers", + "owner": "fastly", + "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v0.16.1", - "sha256": "1pjrcw03a86xgkzcx778f7kk79svv8csy05b7qi0m5x77zy4pws7", - "version": "0.16.1" + "rev": "v0.34.0", + "sha256": "1za00gzmyxr6wfzzq92m3spi9563pbpjwj24sm95kj34l6mfwpyx", + "vendorSha256": null, + "version": "0.34.0" }, "flexibleengine": { "owner": "terraform-providers", From ab2501bd171f2c930ebd3f3bf6b6a1a228477a08 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 09:07:44 +0000 Subject: [PATCH 25/76] lttng-ust: 2.10.5 -> 2.13.0; clarify license Also enable parallel building; tested at -j48. --- pkgs/development/tools/misc/lttng-ust/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 94d2e4a33f29..244d6442c15f 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, liburcu, python3 }: +{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }: # NOTE: # ./configure ... @@ -13,14 +13,15 @@ stdenv.mkDerivation rec { pname = "lttng-ust"; - version = "2.10.5"; + version = "2.13.0"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; - sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; + sha256 = "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l"; }; - buildInputs = [ python3 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ numactl python3 ]; preConfigure = '' patchShebangs . @@ -28,10 +29,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ liburcu ]; + enableParallelBuilding = true; + meta = with lib; { description = "LTTng Userspace Tracer libraries"; homepage = "https://lttng.org/"; - license = licenses.lgpl21Plus; + license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; From 0f5094de5d1fc6c0438916b8cfa7318e7c64454c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 09:08:48 +0000 Subject: [PATCH 26/76] lttng-tools: 2.11.0 -> 2.13.0; clarify license Also enable parallel building; tested at -j48. --- pkgs/development/tools/misc/lttng-tools/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 223e10d04ab5..71485a2da3da 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,20 +2,22 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.11.0"; + version = "2.13.0"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w"; + sha256 = "1ri93h45q5z6l3qmg4dakm9aj0ghfmf38i63q51yjh58lzwr9j4d"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ]; + enableParallelBuilding = true; + meta = with lib; { description = "Tracing tools (kernel + user space) for Linux"; homepage = "https://lttng.org/"; - license = licenses.lgpl21; + license = with licenses; [ lgpl21Only gpl2Only ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; From 990897205571afe001a4d5b4f4c96f8ffe23a978 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 09:11:08 +0000 Subject: [PATCH 27/76] linuxPackages.lttng-modules: 2.12.6 -> 2.13.0 Fixes build with linuxPackages_5_14. --- pkgs/os-specific/linux/lttng-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 7f4036c775ff..e5645438567a 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.12.6"; + version = "2.13.0"; src = fetchurl { url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "sha256-lawqLPkthdI/+9rKah7A18FnIR0eD7hQq5AASj9HXqo="; + sha256 = "0mikc3fdjd0w6rrcyksjzmv0czvgba6yk8dfmz4a3cr8s4y2pgsy"; }; buildInputs = kernel.moduleBuildDependencies; From 0c8415335fe3fb3347bd1f75813c6da1991f1112 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 30 Aug 2021 18:48:10 +1000 Subject: [PATCH 28/76] nix-update: 0.4.0 -> 0.5.0 https://github.com/Mic92/nix-update/releases/tag/0.5.0 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index c205550b267d..1345e2caa406 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-n3YuNypKFaBtO5Fhf7Z3Wgh0+WH5bQWR0W0uHCYKtuY="; + sha256 = "sha256-D1N7ISLZJ3A8G9X5dvtCbRse5h0MRJoeZM3CHkFpqlE="; }; makeWrapperArgs = [ From a8331640b1bd4cac9595f4e0d4e77dc796fd0a91 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 30 Aug 2021 12:37:43 +0200 Subject: [PATCH 29/76] slurm: 20.11.8.1 -> 21.08.0.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 49beef53fe67..6468f12c3d9c 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.11.8.1"; + version = "21.08.0.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "0id2b01rvq81zd2p34il0gg880f94g9ip4gn1pyh20zz5bxlnbjc"; + sha256 = "0f1i64vby1qa2y9gv9a9x595s58p6dpw4yhljbgrc2wr7glvnfi3"; }; outputs = [ "out" "dev" ]; From 8a56ac5db3e83a1e19bbe3a696cab83c6f21c359 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 27 Aug 2021 16:47:11 +0900 Subject: [PATCH 30/76] epmd: add ipv6 assertion --- nixos/modules/services/networking/epmd.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix index f7cdc0fe79c0..6fc8ed2aa0ef 100644 --- a/nixos/modules/services/networking/epmd.nix +++ b/nixos/modules/services/networking/epmd.nix @@ -4,9 +4,7 @@ with lib; let cfg = config.services.epmd; - in - { ###### interface options.services.epmd = { @@ -27,16 +25,31 @@ in an Erlang runtime that is already installed for other purposes. ''; }; + listenStream = mkOption + { + type = types.str; + default = null; + description = '' + the listenStream used by the systemd socket. + see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations. + use this to change the port epmd will run on. + if not defined, epmd will use "[::]:4369" + ''; + }; }; ###### implementation config = mkIf cfg.enable { + assertions = [{ + assertion = cfg.listenStream == null -> config.networking.enableIPv6; + message = "epmd listens by default on ipv6, enable ipv6 or change config.services.epmd.listenStream"; + }]; systemd.sockets.epmd = rec { description = "Erlang Port Mapper Daemon Activation Socket"; wantedBy = [ "sockets.target" ]; before = wantedBy; socketConfig = { - ListenStream = "4369"; + ListenStream = if cfg.listenStream != null then cfg.listenStream else "[::]:4369"; Accept = "false"; }; }; From bc9e07ba1007b03d15427bac5275bea5b32f10ca Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Mon, 30 Aug 2021 13:13:36 +0200 Subject: [PATCH 31/76] terraform-providers.aws: 3.43.0 -> 3.56.0 (#136102) --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eefc5f1a6272..3779472fdf10 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -80,10 +80,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.43.0", - "sha256": "05rv93y9hf0l869q6i581748rw4bahvsgggj0h7cwjnf7xap0sxj", - "vendorSha256": "1m6pkrpknslqnv60cz5739gp5nxc7xhga402wkl37gdagmadkmrk", - "version": "3.43.0" + "rev": "v3.56.0", + "sha256": "0fa61i172maanxmxz28mj7mkgrs9a5bs61mlvb0d5y97lv6pm2xg", + "vendorSha256": "1s22k4b2zq5n0pz6iqbqsf6f7chsbvkpdn432rvyshcryxlklfvl", + "version": "3.56.0" }, "azuread": { "owner": "hashicorp", From bf6c90bd91545013f2fc7128de83fb22a98305b7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 Aug 2021 16:04:47 +0200 Subject: [PATCH 32/76] =?UTF-8?q?ocamlPackages.ppx=5Foptcomp:=200.14.1=20?= =?UTF-8?q?=E2=86=92=200.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index e348c5d9325a..5717dd07b423 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -545,8 +545,8 @@ with self; ppx_optcomp = janePackage { pname = "ppx_optcomp"; - version = "0.14.1"; - hash = "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4"; + version = "0.14.3"; + hash = "1iflgfzs23asw3k6098v84al5zqx59rx2qjw0mhvk56avlx71pkw"; minimumOCamlVersion = "4.04.2"; meta.description = "Optional compilation for OCaml"; propagatedBuildInputs = [ ppxlib ]; From 526d290b7ce8391eafb693af09281ebaa09bf00b Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 30 Aug 2021 11:01:35 +0200 Subject: [PATCH 33/76] dbeaver: 21.1.5 -> 21.2.0 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 963da1839fe6..ed3f07713e93 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.1.5"; # When updating also update fetchedMavenDeps.sha256 + version = "21.2.0"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sk19Gfu+s7KG1V4f28bFsskagGAuAsEBJEFJzvNh25M="; + sha256 = "UYLX8oUHHfdsNiby+emunLRPIHo8ht3bfiredXOjkWs="; }; fetchedMavenDeps = stdenv.mkDerivation { From 97389b76507e359679d7758afae84b4b6f41dd99 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:25:29 +0000 Subject: [PATCH 34/76] linuxPackages.rtl8188eus-aircrack: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix index 93a91f0447a4..100683ed37ba 100644 --- a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "RealTek RTL8188eus WiFi driver with monitor mode & frame injection support"; homepage = "https://github.com/aircrack-ng/rtl8188eus"; From db1f8c596dda9dcf62cb65cd042de0483c5ea5f9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:45:06 +0000 Subject: [PATCH 35/76] linuxPackages.rtl8812au: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl8812au/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 43396a99b963..7fa5ee42670d 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko ''; + enableParallelBuilding = true; + meta = with lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; homepage = "https://github.com/gordboy/rtl8812au-5.9.3.2"; From ec33cdf902a9c5cd74831b5c3cb725ef8b4c113c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:46:36 +0000 Subject: [PATCH 36/76] linuxPackages.rtl8814au: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl8814au/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index 2b0fb9622a4b..f8c74f9d22e2 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Realtek 8814AU USB WiFi driver"; homepage = "https://github.com/morrownr/8814au"; From 177074e3cb1415aa729947f811d431824f4a08f7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:47:16 +0000 Subject: [PATCH 37/76] linuxPackages.rtl8821au: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl8821au/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 08e097b0d5f3..1f7d07f7326d 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko ''; + enableParallelBuilding = true; + meta = with lib; { description = "rtl8821AU and rtl8812AU chipset driver with firmware"; homepage = "https://github.com/morrownr/8821au"; From 6da5cc14c7636eeb58d27e2aa1dd128e814e329d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:48:06 +0000 Subject: [PATCH 38/76] linuxPackages.rtl8821ce: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl8821ce/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index b4def6f001ca..27ee57ba7553 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Realtek rtl8821ce driver"; homepage = "https://github.com/tomaspinho/rtl8821ce"; From 9ef6829aead59a31a5e0c3bffa814191c0922d4a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:48:37 +0000 Subject: [PATCH 39/76] linuxPackages.rtl8821cu: parallel build Tested at -j48. --- pkgs/os-specific/linux/rtl8821cu/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 556fd7939156..2ea555ff0b8a 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Realtek rtl8821cu driver"; homepage = "https://github.com/morrownr/8821cu"; From 66a079fc31c10c44e05d53b6dc9faa0c056412c0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:49:43 +0000 Subject: [PATCH 40/76] linuxPackages.rtl88x2bu: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl88x2bu/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 4b194bb2f335..cbd604b72ed1 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Realtek rtl88x2bu driver"; homepage = "https://github.com/morrownr/88x2bu"; From 3e25f7feaaf09c15167d0410999fc38da3872e6c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:51:24 +0000 Subject: [PATCH 41/76] linuxPackages.rtl88xxau-aircrack: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index d65a601fd9e2..8d3340e16fb3 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Aircrack-ng kernel module for Realtek 88XXau network cards\n(8811au, 8812au, 8814au and 8821au chipsets) with monitor mode and injection support."; homepage = "https://github.com/aircrack-ng/rtl8812au"; From e9f8f75afc04dffb7c5d071d73d5f21037e1b136 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 30 Aug 2021 07:58:39 -0400 Subject: [PATCH 42/76] rubygems: 3.2.24 -> 3.2.26 --- pkgs/development/interpreters/ruby/rubygems/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 6f089e51221f..4150f7683d5d 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rubygems"; - version = "3.2.24"; + version = "3.2.26"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "09ff830a043y6s7390hsg3k55ffpifb1zsvs0dhz8z8pypwgiscl"; + sha256 = "sha256-9wa6lOWnua8zBblQKRgjjiTVPYp2TW0n7XOvgW7u1e8="; }; patches = [ From d874a520155a73111f227744672254de0624aae5 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 20:49:47 +0900 Subject: [PATCH 43/76] epmd: provide default --- nixos/modules/services/networking/epmd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix index 6fc8ed2aa0ef..3899d164f16a 100644 --- a/nixos/modules/services/networking/epmd.nix +++ b/nixos/modules/services/networking/epmd.nix @@ -28,7 +28,7 @@ in listenStream = mkOption { type = types.str; - default = null; + default = "[::]:4369"; description = '' the listenStream used by the systemd socket. see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations. @@ -41,7 +41,7 @@ in ###### implementation config = mkIf cfg.enable { assertions = [{ - assertion = cfg.listenStream == null -> config.networking.enableIPv6; + assertion = cfg.listenStream == "[::]:4369" -> config.networking.enableIPv6; message = "epmd listens by default on ipv6, enable ipv6 or change config.services.epmd.listenStream"; }]; systemd.sockets.epmd = rec { @@ -49,7 +49,7 @@ in wantedBy = [ "sockets.target" ]; before = wantedBy; socketConfig = { - ListenStream = if cfg.listenStream != null then cfg.listenStream else "[::]:4369"; + ListenStream = cfg.listenStream; Accept = "false"; }; }; From ead3028db029d577f6dd4b2983eb093a2919a28a Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Sun, 29 Aug 2021 22:08:36 +0200 Subject: [PATCH 44/76] nixos/syncthing: fix escapes interpreted in config Dash `echo` interprets backslash escapes. This causes two consecutive backslashes in JSON to turn into a single one before the string is passed to jq, resulting in a parsing error. --- nixos/modules/services/networking/syncthing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index d77562701492..1a1b12f979c2 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -46,7 +46,7 @@ let old_cfg=$(curl ${cfg.guiAddress}/rest/config) # generate the new config by merging with the NixOS config options - new_cfg=$(echo "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * { + new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * { "devices": (${builtins.toJSON devices}${optionalString (! cfg.overrideDevices) " + .devices"}), "folders": (${builtins.toJSON folders}${optionalString (! cfg.overrideFolders) " + .folders"}) } * ${builtins.toJSON cfg.extraOptions}') From 9b861bd3b0389c2095beb55f5795f820c1a70982 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 12:40:46 +0000 Subject: [PATCH 45/76] linuxPackages.vhba: enable PIC When this was added in 21282246208 ("linuxPackages.vhba: disable PIC hardening"), it was necessary to prevent a build failure. Since it now builds fine with PIC enabled, I think it's safe to enable it. --- pkgs/misc/emulators/cdemu/vhba.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 182469310c41..5f65dca11052 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - hardeningDisable = [ "pic" ]; - meta = with lib; { description = "Provides a Virtual (SCSI) HBA"; homepage = "http://cdemu.sourceforge.net/about/vhba/"; From 067da6cc0ba13786ee93a03a50892f1f124aa6a5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 12:37:56 +0000 Subject: [PATCH 46/76] linuxPackages.vhba: 20190831 -> 20210418 --- pkgs/misc/emulators/cdemu/vhba.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 5f65dca11052..1a4357b543b1 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vhba"; - version = "20190831"; + version = "20210418"; src = fetchurl { - url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2"; - sha256 = "1ybbk6l06n0y11n5wnfmvdz0baizmq55l458ywimghdyz0n7g0ws"; + url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz"; + sha256 = "119zgav6caialmf3hr096wkf72l9h76sqc9w5dhx26kj4yp85g8q"; }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Provides a Virtual (SCSI) HBA"; - homepage = "http://cdemu.sourceforge.net/about/vhba/"; + homepage = "https://cdemu.sourceforge.io/about/vhba/"; platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with lib.maintainers; [ bendlas ]; From 8d0364eeaefda67e8c7a39693c857c20e06db50e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 15:11:01 +0000 Subject: [PATCH 47/76] libmirage: 3.2.3 -> 3.2.5 --- pkgs/misc/emulators/cdemu/base.nix | 5 +++-- pkgs/misc/emulators/cdemu/libmirage.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index 6db1089a37f5..7c7c370b571d 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -1,10 +1,11 @@ { pkgName, version, pkgSha256 }: { lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }: let name = "${pkgName}-${version}"; + ext = if lib.versionAtLeast version "3.2.5" then ".xz" else ".bz2"; in stdenv.mkDerivation ({ inherit name buildInputs; src = fetchurl { - url = "mirror://sourceforge/cdemu/${name}.tar.bz2"; + url = "mirror://sourceforge/cdemu/${name}.tar${ext}"; sha256 = pkgSha256; }; nativeBuildInputs = [ pkg-config cmake ]; @@ -29,7 +30,7 @@ in stdenv.mkDerivation ({ Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed. ''; - homepage = "http://cdemu.sourceforge.net/"; + homepage = "https://cdemu.sourceforge.io/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with lib.maintainers; [ bendlas ]; diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index 9813c906befc..0025226d2087 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -3,9 +3,9 @@ , pcre, util-linux, libselinux, libsepol }: let pkg = import ./base.nix { - version = "3.2.3"; + version = "3.2.5"; pkgName = "libmirage"; - pkgSha256 = "08mfvqyk3833ksfd47i4j3ppmrw5ry219km6h7lywdh9hm9x14yf"; + pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm"; }; in callPackage pkg { buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate intltool ]; From a08181ed7298e89ec9b3cb079a37a00d20f82df9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 15:12:12 +0000 Subject: [PATCH 48/76] image-analyzer: 3.2.3 -> 3.2.5 --- pkgs/misc/emulators/cdemu/analyzer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index dddcc3a74682..21ec032f5cca 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,9 +1,9 @@ { callPackage, makeWrapper, gobject-introspection, cmake , python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.2.3"; + version = "3.2.5"; pkgName = "image-analyzer"; - pkgSha256 = "17yfjmf65s77214qassz6l01cjcni4cv06nzfsm7qrzw172fmci4"; + pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc"; }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper From 1c6e1eb81e223702afe20d24132f7eb1b457bc37 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 15:13:51 +0000 Subject: [PATCH 49/76] cdemu-client: 3.2.3 -> 3.2.5 --- pkgs/misc/emulators/cdemu/client.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix index 087b15cecd16..0572dda59546 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/pkgs/misc/emulators/cdemu/client.nix @@ -1,8 +1,8 @@ { callPackage, python3Packages, intltool, makeWrapper }: let pkg = import ./base.nix { - version = "3.2.3"; + version = "3.2.5"; pkgName = "cdemu-client"; - pkgSha256 = "1bvc2m63fx03rbp3ihgl2n7k24lwg5ydwkmr84gsjfcxp46q10zq"; + pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7"; }; in callPackage pkg { buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 From 346fd57a3703183a641f5bbc1e212bb9f88f6fd8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 15:14:48 +0000 Subject: [PATCH 50/76] cdemu-daemon: 3.2.3 -> 3.2.5 --- pkgs/misc/emulators/cdemu/daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix index db6ed7ddb47a..4fc3ea211993 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/pkgs/misc/emulators/cdemu/daemon.nix @@ -1,8 +1,8 @@ { callPackage, glib, libao, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.2.3"; + version = "3.2.5"; pkgName = "cdemu-daemon"; - pkgSha256 = "022xzgwmncswb9md71w3ly3mjkdfc93lbij2llp2jamq8grxjjxr"; + pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d"; }; in callPackage pkg { buildInputs = [ glib libao libmirage intltool ]; From 8a2ec31e224de9461390cdd03e5e0b0290cdad0b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 15:17:00 +0000 Subject: [PATCH 51/76] gcdemu: 3.2.3 -> 3.2.5 --- pkgs/misc/emulators/cdemu/base.nix | 3 +-- pkgs/misc/emulators/cdemu/gui.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index 7c7c370b571d..1754f2ad4bbc 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -1,11 +1,10 @@ { pkgName, version, pkgSha256 }: { lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }: let name = "${pkgName}-${version}"; - ext = if lib.versionAtLeast version "3.2.5" then ".xz" else ".bz2"; in stdenv.mkDerivation ({ inherit name buildInputs; src = fetchurl { - url = "mirror://sourceforge/cdemu/${name}.tar${ext}"; + url = "mirror://sourceforge/cdemu/${name}.tar.xz"; sha256 = pkgSha256; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 8ce84ccae204..6f5313c4cca7 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -2,9 +2,9 @@ , python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }: let pkg = import ./base.nix { - version = "3.2.3"; + version = "3.2.5"; pkgName = "gcdemu"; - pkgSha256 = "19vy1awha8s7cfja3a6npaf3rfy3pl3cbsh4vd609q9jz4v4lyg4"; + pkgSha256 = "1nvpbq4mz8caw91q5ny9gf206g9bypavxws9nxyfcanfkc4zfkl4"; }; inherit (python3Packages) python pygobject3; in callPackage pkg { From 9ec4fb0cd10d91831ba801ee675d6134f880c9f0 Mon Sep 17 00:00:00 2001 From: schotts-fired Date: Mon, 30 Aug 2021 18:24:42 +0200 Subject: [PATCH 52/76] R: add memory profiling compile option --- pkgs/applications/science/math/R/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 5de644dfdfac..a8fdfe8571a6 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -4,6 +4,7 @@ , curl, Cocoa, Foundation, libobjc, libcxx, tzdata , withRecommendedPackages ? true , enableStrictBarrier ? false +, enableMemoryProfiling ? false # R as of writing does not support outputting both .so and .a files; it outputs: # --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored , static ? false @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { --with-libtiff --with-ICU ${lib.optionalString enableStrictBarrier "--enable-strict-barrier"} + ${lib.optionalString enableMemoryProfiling "--enable-memory-profiling"} ${if static then "--enable-R-static-lib" else "--enable-R-shlib"} AR=$(type -p ar) AWK=$(type -p gawk) From d24e724084e69ea4b2bb8b283a97d4d6076778db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 11:30:09 +0200 Subject: [PATCH 53/76] ipcalc: 0.4.1 -> 1.0.1 --- pkgs/tools/networking/ipcalc/default.nix | 46 ++++++++++++++++-------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index 5fec55899e46..2237c739ec14 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -1,20 +1,38 @@ -{lib, stdenv, fetchurl, perl}: +{ lib +, stdenv +, fetchFromGitLab +, glib +, meson +, ninja +, libmaxminddb +, pkg-config +, ronn +}: + stdenv.mkDerivation rec { pname = "ipcalc"; - version = "0.41"; - src = fetchurl { - url = "http://jodies.de/ipcalc-archive/${pname}-${version}.tar.gz"; - sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a"; + version = "1.0.1"; + + src = fetchFromGitLab { + owner = "ipcalc"; + repo = "ipcalc"; + rev = version; + sha256 = "0qg516jv94dlk0qj0bj5y1dd0i31ziqcjd6m00w8xp5wl97bj2ji"; }; - buildInputs = [perl]; - installPhase = '' - mkdir -p $out/bin - cp ipcalc $out/bin - ''; - meta = { + + nativeBuildInputs = [ + glib + meson + ninja + pkg-config + libmaxminddb + ronn + ]; + + meta = with lib; { description = "Simple IP network calculator"; - homepage = "http://jodies.de/ipcalc"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; + homepage = "https://gitlab.com/ipcalc/ipcalc"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; }; } From 300b61c5944b72ed6e8b9d94aac2334b2f000c0c Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 30 Aug 2021 20:07:19 +0200 Subject: [PATCH 54/76] consul: 1.10.1 -> 1.10.2 - https://github.com/hashicorp/consul/releases/tag/v1.10.2 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 0b94528164c1..be6259e9559b 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.10.1"; + version = "1.10.2"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-oap0pXqtIbT9wMfD/RuJ2tTRynSvfzsgL8TyY4nj3sM="; + sha256 = "sha256-mA/s3J0ylE3C3IGaYfadeZV6PQ5Ooth6iQ4JEgPl44Q="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-DloQGxeooVhYWA5/ICkL2UEQvNPilb2F5pst78UzWPI="; + vendorSha256 = "sha256-MWQ1m2nvKdP8ZCDs0sjZCiW4DSGe3NnVl4sQ448cu5M="; doCheck = false; From 27e4ca6ff1446d9e8eb087d7cc28e253264e8422 Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Mon, 30 Aug 2021 09:53:41 -0500 Subject: [PATCH 55/76] vimPlugins.neon: init at 2021-07-30 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 25804216adf0..f7bd56c5c9bf 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3442,6 +3442,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/neomru.vim/"; }; + neon = buildVimPluginFrom2Nix { + pname = "neon"; + version = "2021-07-30"; + src = fetchFromGitHub { + owner = "rafamadriz"; + repo = "neon"; + rev = "5c6d24504e2177a709ad16ae9e89ab5732327ad8"; + sha256 = "1p7g3204hjj52qnm5vdvh425r4xh0y8bsyfivpnp4zgz44rqd6v3"; + }; + meta.homepage = "https://github.com/rafamadriz/neon/"; + }; + neorg = buildVimPluginFrom2Nix { pname = "neorg"; version = "2021-08-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b3a956aa78a5..7b3731d0b6ac 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -573,6 +573,7 @@ Quramy/tsuquyomi racer-rust/vim-racer radenling/vim-dispatch-neovim rafamadriz/friendly-snippets@main +rafamadriz/neon@main rafaqz/ranger.vim rafi/awesome-vim-colorschemes raghur/fruzzy From 7484cbf58e201d57a1cfafb26e08efeb50a07d2d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Aug 2021 21:07:09 +0200 Subject: [PATCH 56/76] markdown-anki-decks: jailbreak more dependencies --- pkgs/tools/misc/markdown-anki-decks/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix index d74eb84dc340..01a6d2933222 100644 --- a/pkgs/tools/misc/markdown-anki-decks/default.nix +++ b/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -29,7 +29,10 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # No API changes. - substituteInPlace pyproject.toml --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' + substituteInPlace pyproject.toml \ + --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' \ + --replace 'genanki = "^0.10.1"' 'genanki = "^0.11.0"' \ + --replace 'typer = "^0.3.2"' 'typer = "^0.4.0"' ''; # No tests available on Pypi and there is only a failing version assertion test in the repo. From 5ad9e2a74b1cfc4a0816f358a621562795638be0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 12:50:35 +0000 Subject: [PATCH 57/76] linuxPackages.akvcam: 1.2.0 -> 1.2.2 The qmake-based build didn't seem to work any more, but there's a Kbuild-based build system available anyway, so let's just switch to that and save a dependency. Also clarify license. --- pkgs/os-specific/linux/akvcam/default.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 815dc6a2ee3c..700389a4a183 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -1,32 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, kernel, qmake }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { pname = "akvcam"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "webcamoid"; repo = "akvcam"; rev = version; - sha256 = "0r5xg7pz0wl6pq5029rpzm9fn978vq0md31xjkp2amny7rrgxw72"; + sha256 = "1f0vjia2d7zj3y5c63lx1r537bdjx6821yxy29ilbrvsbjq2szj8"; }; + sourceRoot = "source/src"; - nativeBuildInputs = [ qmake ]; - dontWrapQtApps = true; - - qmakeFlags = [ + makeFlags = [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; installPhase = '' - install -m644 -b -D src/akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko + install -m644 -b -D akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko ''; + enableParallelBuilding = true; + meta = with lib; { description = "Virtual camera driver for Linux"; homepage = "https://github.com/webcamoid/akvcam"; maintainers = with maintainers; [ freezeboy ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 709e8a2054ce..d6c75d3ee6d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21341,9 +21341,7 @@ with pkgs; acpi_call = callPackage ../os-specific/linux/acpi-call {}; - akvcam = callPackage ../os-specific/linux/akvcam { - inherit (qt5) qmake; - }; + akvcam = callPackage ../os-specific/linux/akvcam { }; amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; From 7032ab6d616e3ce6092d2231f1e718ec98f8424a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 13:46:53 +0000 Subject: [PATCH 58/76] linuxPackages.isgx: enable parallel building Tested at -j48. --- pkgs/os-specific/linux/isgx/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/isgx/default.nix b/pkgs/os-specific/linux/isgx/default.nix index 3e551e559170..fb6caf3bacbe 100644 --- a/pkgs/os-specific/linux/isgx/default.nix +++ b/pkgs/os-specific/linux/isgx/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + enableParallelBuilding = true; + meta = with lib; { description = "Intel SGX Linux Driver"; longDescription = '' From 0afbe1f28b46e8de86a47c6bfed8cd96466c7f9d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 21:43:10 +0200 Subject: [PATCH 59/76] tfsec: 0.58.5 -> 0.58.6 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 5c4f07482c90..5ded1e5cab25 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.5"; + version = "0.58.6"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-awTRECHHNGebzV08Qy2I6rX4eS2z07NZLsQFPoA0UXA="; + sha256 = "sha256-FTrzEVTmMxXshDOvlSmQEwekde621KIclpFm1oEduEo="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From a7432ad3115c153a901cd49da24e7b766cce1e21 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 30 Aug 2021 14:56:52 -0500 Subject: [PATCH 60/76] qt5.qt3d: init module --- pkgs/development/libraries/qt-5/5.12/default.nix | 3 ++- pkgs/development/libraries/qt-5/5.14/default.nix | 3 ++- pkgs/development/libraries/qt-5/5.15/default.nix | 3 ++- pkgs/development/libraries/qt-5/modules/qt3d.nix | 7 +++++++ 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/modules/qt3d.nix diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 680debc164f7..3adb46cd4ee6 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -144,6 +144,7 @@ let inherit (darwin) libobjc; }; + qt3d = callPackage ../modules/qt3d.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; @@ -192,7 +193,7 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects + qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index eaf7998047f0..4662e45fdfdc 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -156,6 +156,7 @@ let inherit (darwin) libobjc; }; + qt3d = callPackage ../modules/qt3d.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; @@ -202,7 +203,7 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 59c2c7048044..d835ee63dc46 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -182,6 +182,7 @@ let inherit (darwin) libobjc; }; + qt3d = callPackage ../modules/qt3d.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; @@ -231,7 +232,7 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets diff --git a/pkgs/development/libraries/qt-5/modules/qt3d.nix b/pkgs/development/libraries/qt-5/modules/qt3d.nix new file mode 100644 index 000000000000..63a516476f27 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -0,0 +1,7 @@ +{ qtModule, qtbase, qtdeclarative }: + +qtModule { + pname = "qt3d"; + qtInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; +} From ff0dfaaee0975cc0deb118f51120e281eccc6497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 30 Aug 2021 11:49:04 -0500 Subject: [PATCH 61/76] =?UTF-8?q?nvidia=5Fx11:=20470.57.02=20=E2=86=92=204?= =?UTF-8?q?70.63.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d763c1576cd8..7dccdccaf7b8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "470.57.02"; - sha256_64bit = "sha256-VdeuEEgn+qeel1Mh/itg+d1C+/9lZCBTRDwOVv20xH0="; - settingsSha256 = "sha256-DJg5QbyuKJmPpLQVYgTLvucI1e9YgQOO16690VXIWvk="; - persistencedSha256 = "sha256-Cqv6oUFnsSi3S1sjplJKeq9bI2pqgBXPPb11HOJSlDo="; + version = "470.63.01"; + sha256_64bit = "sha256:057dsc0j3136r5gc08id3rwz9c0x7i01xkcwfk77vqic9b6486kg"; + settingsSha256 = "sha256:0lizp4hn49yvca2yd76yh3awld98pkaa35a067lpcld35vb5brgv"; + persistencedSha256 = "sha256:1f3gdpa23ipjy2xwf7qnxmw7w8xxhqy25rmcz34xkngjf4fn4pbs"; } else legacy_390; From 8bfb5762506054294052d5b1df822518c5e382fd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 08:33:52 +0000 Subject: [PATCH 62/76] linux_latest: 5.13.13 -> 5.14 --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 +++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-5.14.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix new file mode 100644 index 000000000000..e6a76146ce74 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.14"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1cki6af9r30k8820j73qdyycp23mwpf2a2rjwl82p9i61mg8n1ky"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6c75d3ee6d8..ef192a69fc77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21263,6 +21263,13 @@ with pkgs; ]; }; + linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -21553,7 +21560,7 @@ with pkgs; # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_13; + linuxPackages_latest = linuxPackages_5_14; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. @@ -21578,6 +21585,7 @@ with pkgs; linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); + linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14); # When adding to the list above: # - Update linuxPackages_latest to the latest version From 3e299737a2a34e6d6e38f724377aaf4a820a1402 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 07:46:49 +0000 Subject: [PATCH 63/76] linux_latest-libre: 18260 -> 18268 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index a183b6859498..91134e18a8a2 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18260"; - sha256 = "11mmdix0vq9yrivx300ay6np3xx1gdqdr4cqdxr1wa84dbl7c2dm"; + rev = "18268"; + sha256 = "050rk485csj41yfydr1cvn60vhb3lzbb3486sm832vp55d34i8fd"; } , ... }: From 875901c0d52abd9e69ae133794fbc4d19616f831 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 31 Aug 2021 08:18:08 +1000 Subject: [PATCH 64/76] podman: 3.3.0 -> 3.3.1 https://github.com/containers/podman/releases/tag/v3.3.1 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index a21485e984cf..e4cd268758bc 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-EDNpGDjsXULwtUYFLh4u6gntK//rsLLpYgpxRt4R1kc="; + sha256 = "sha256-DVRLdJFYD5Ovc0n5SoMv71GPTuBO3wfqREcGRJEuND0="; }; vendorSha256 = null; From 7f3a4f6b67a4887e1fbf9c576f3f4b369e98e274 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 13:43:34 +0000 Subject: [PATCH 65/76] linuxPackages.isgx: 2.11 -> 2.14 --- pkgs/os-specific/linux/isgx/default.nix | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/isgx/default.nix b/pkgs/os-specific/linux/isgx/default.nix index fb6caf3bacbe..6e97532ee5dd 100644 --- a/pkgs/os-specific/linux/isgx/default.nix +++ b/pkgs/os-specific/linux/isgx/default.nix @@ -1,29 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, kernel, kernelAtLeast }: +{ stdenv, lib, fetchFromGitHub, kernel, kernelAtLeast }: stdenv.mkDerivation rec { name = "isgx-${version}-${kernel.version}"; - version = "2.11"; + version = "2.14"; src = fetchFromGitHub { owner = "intel"; repo = "linux-sgx-driver"; - rev = "sgx_driver_${version}"; - hash = "sha256-zZ0FgCx63LCNmvQ909O27v/o4+93gefhgEE/oDr/bHw="; + rev = "sgx_diver_${version}"; # Typo is upstream's. + sha256 = "0kbbf2inaywp44lm8ig26mkb36jq3smsln0yp6kmrirdwc3c53mi"; }; - patches = [ - # Fixes build with kernel >= 5.8 - (fetchpatch { - url = "https://github.com/intel/linux-sgx-driver/commit/276c5c6a064d22358542f5e0aa96b1c0ace5d695.patch"; - sha256 = "sha256-PmchqYENIbnJ51G/tkdap/g20LUrJEoQ4rDtqy6hj24="; - }) - # Fixes detection with kernel >= 5.11 - (fetchpatch { - url = "https://github.com/intel/linux-sgx-driver/commit/ed2c256929962db1a8805db53bed09bb8f2f4de3.patch"; - sha256 = "sha256-MRbgS4U8FTCP1J1n+rhsvbXxKDytfl6B7YlT9Izq05U="; - }) - ]; - hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; From a96144ce4fe95365aa553cfda316a962e2ca34e8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 31 Aug 2021 08:19:51 +1000 Subject: [PATCH 66/76] lima: 0.6.0 -> 0.6.1 https://github.com/lima-vm/lima/releases/tag/v0.6.1 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index bf4e14a6bab3..93e4c7e0f487 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UwsAeU7Me2UN9pUWvqGgQ7XSNcrClXYOA+9F6yO2aqA="; + sha256 = "sha256-x4IRHxmVeP87M7rSrQWDd9pj2Rb9uGu133mExepxX6Q="; }; - vendorSha256 = "sha256-vdqLdSXQ2ywZoG7ROQP9PLWUqhoOO7N5li+xjc2HtzM="; + vendorSha256 = "sha256-PeIEIUX/PwwnbZfXnK3IsENO+zRYLhljBRe910aZgKs="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From db4b3ef15a3fed741820affdb35154b8af9c8b11 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Mon, 30 Aug 2021 16:27:43 -0700 Subject: [PATCH 67/76] dwz: init at 0.14 (#136078) --- pkgs/development/tools/misc/dwz/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/misc/dwz/default.nix diff --git a/pkgs/development/tools/misc/dwz/default.nix b/pkgs/development/tools/misc/dwz/default.nix new file mode 100644 index 000000000000..0a13d4a68dd0 --- /dev/null +++ b/pkgs/development/tools/misc/dwz/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchurl, elfutils }: + +stdenv.mkDerivation rec { + pname = "dwz"; + version = "0.14"; + + src = fetchurl { + url = "https://www.sourceware.org/ftp/${pname}/releases/${pname}-${version}.tar.gz"; + sha256 = "07qdvzfk4mvbqj5z3aff7vc195dxqn1mi27w2dzs1w2zhymnw01k"; + }; + + nativeBuildInputs = [ elfutils ]; + + makeFlags = [ "prefix=${placeholder "out"}" ]; + + meta = with lib; { + homepage = "https://sourceware.org/dwz/"; + description = "DWARF optimization and duplicate removal tool"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jbcrail ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef192a69fc77..6a482da66438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13747,6 +13747,8 @@ with pkgs; drush = callPackage ../development/tools/misc/drush { }; + dwz = callPackage ../development/tools/misc/dwz { }; + easypdkprog = callPackage ../development/embedded/easypdkprog { }; editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; From 197a496c7f2e5959ab4ce3b9d96cf9f2fc0e93f7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 30 Aug 2021 18:22:00 -0500 Subject: [PATCH 68/76] houdini: use libudev0-shim --- pkgs/applications/misc/houdini/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 81a5eddaf6ed..f55752a22923 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -5,7 +5,7 @@ buildFHSUserEnv rec { targetPkgs = pkgs: with pkgs; [ libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils - libxkbcommon libudev tbb + libxkbcommon libudev0-shim tbb ] ++ (with xorg; [ libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver From d702fbfe32f27e2aa62128db76ee9c845871ac44 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 11:57:31 +0900 Subject: [PATCH 69/76] elasticsearch: nixpkgs-fmt --- pkgs/servers/search/elasticsearch/7.x.nix | 13 ++-- pkgs/servers/search/elasticsearch/plugins.nix | 71 ++++++++++--------- 2 files changed, 45 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index fb15951399fe..50ec006cc5cd 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -1,10 +1,13 @@ { elk7Version , enableUnfree ? true -, lib, stdenv +, lib +, stdenv , fetchurl , makeWrapper , jre_headless -, util-linux, gnugrep, coreutils +, util-linux +, gnugrep +, coreutils , autoPatchelfHook , zlib }: @@ -17,11 +20,11 @@ let shas = if enableUnfree then { - x86_64-linux = "1s27bzx5y8vcd95qrw6av3fhyxb45219x9ahwaxa2cygmbpighrp"; + x86_64-linux = "1s27bzx5y8vcd95qrw6av3fhyxb45219x9ahwaxa2cygmbpighrp"; x86_64-darwin = "1ia3byir3i5qaarmcaysrg3dhnxjmxnf0m0kzyf61g9aiy87gb7q"; } else { - x86_64-linux = "005i7d7ag10qkn7bkx7md50iihvcvc84hay2j94wvsm7yghhbmi3"; + x86_64-linux = "005i7d7ag10qkn7bkx7md50iihvcvc84hay2j94wvsm7yghhbmi3"; x86_64-darwin = "01f81720rbzdqc0g1xymhz2lflldfbnb0rh7mpki99pss28vj9sh"; }; in @@ -48,7 +51,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre_headless util-linux ] - ++ optional enableUnfree zlib; + ++ optional enableUnfree zlib; installPhase = '' mkdir -p $out diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 19aac337057f..5ceb6b079410 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -3,17 +3,17 @@ let esVersion = elasticsearch.version; - esPlugin = a@{ - pluginName, - installPhase ? '' - mkdir -p $out/config - mkdir -p $out/plugins - ln -s ${elasticsearch}/lib $out/lib - ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin install --batch -v file://$src - rm $out/lib - '', - ... - }: + esPlugin = + a@{ pluginName + , installPhase ? '' + mkdir -p $out/config + mkdir -p $out/plugins + ln -s ${elasticsearch}/lib $out/lib + ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin install --batch -v file://$src + rm $out/lib + '' + , ... + }: stdenv.mkDerivation (a // { inherit installPhase; pname = "elasticsearch-${pluginName}"; @@ -24,10 +24,11 @@ let nativeBuildInputs = [ unzip ]; meta = a.meta // { platforms = elasticsearch.meta.platforms; - maintainers = (a.meta.maintainers or []) ++ (with lib.maintainers; [ offline ]); + maintainers = (a.meta.maintainers or [ ]) ++ (with lib.maintainers; [ offline ]); }; }); -in { +in +{ analysis-icu = esPlugin rec { name = "elasticsearch-analysis-icu-${version}"; @@ -149,26 +150,28 @@ in { }; }; - search-guard = let - majorVersion = lib.head (builtins.splitVersion esVersion); - in esPlugin rec { - pluginName = "search-guard"; - version = - # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.5.1" then "${esVersion}-38.0.0" - else if esVersion == "6.8.3" then "${esVersion}-25.5" - else throw "unsupported version ${esVersion} for plugin ${pluginName}"; - src = fetchurl { - url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; - sha256 = - if version == "7.5.1-38.0.0" then "1a1wp9wrmz6ji2rnpk0b9jqnp86w0w0z8sb48giyc1gzcy1ra9yh" - else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb" - else throw "unsupported version ${version} for plugin ${pluginName}"; + search-guard = + let + majorVersion = lib.head (builtins.splitVersion esVersion); + in + esPlugin rec { + pluginName = "search-guard"; + version = + # https://docs.search-guard.com/latest/search-guard-versions + if esVersion == "7.5.1" then "${esVersion}-38.0.0" + else if esVersion == "6.8.3" then "${esVersion}-25.5" + else throw "unsupported version ${esVersion} for plugin ${pluginName}"; + src = fetchurl { + url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; + sha256 = + if version == "7.5.1-38.0.0" then "1a1wp9wrmz6ji2rnpk0b9jqnp86w0w0z8sb48giyc1gzcy1ra9yh" + else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb" + else throw "unsupported version ${version} for plugin ${pluginName}"; + }; + meta = with lib; { + homepage = "https://search-guard.com"; + description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. "; + license = licenses.asl20; + }; }; - meta = with lib; { - homepage = "https://search-guard.com"; - description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. "; - license = licenses.asl20; - }; - }; } From 4a2d9eb0fe02bb308279f50f05d31de66a8ba857 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 12:23:41 +0900 Subject: [PATCH 70/76] kibana: nixpkgs-fmt --- pkgs/development/tools/misc/kibana/7.x.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 754559969d50..e82f557470e4 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -1,6 +1,7 @@ { elk7Version , enableUnfree ? true -, lib, stdenv +, lib +, stdenv , makeWrapper , fetchurl , nodejs-10_x @@ -18,15 +19,16 @@ let shas = if enableUnfree then { - x86_64-linux = "1wq4fc2fifkg1qz7nxdfb4yi2biay8cgdz7kl5k0p37sxn0sbkja"; + x86_64-linux = "1wq4fc2fifkg1qz7nxdfb4yi2biay8cgdz7kl5k0p37sxn0sbkja"; x86_64-darwin = "06346kj7bv49py49pmmnmh8m24322m88v1af19909pj9cxgd0p6v"; } else { - x86_64-linux = "0ygpmcm6wdcnvw8azwqc5257lyic7yw31rqvm2pw3afhpha62lpj"; + x86_64-linux = "0ygpmcm6wdcnvw8azwqc5257lyic7yw31rqvm2pw3afhpha62lpj"; x86_64-darwin = "0xy81g0bhxp47p29kkkh5llfzqkzqzr5dk50ap2hy0hjw33ld6g1"; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; version = elk7Version; From 9a3c58ee74ad3d89cd848f10d787c753a92f70bd Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 12:25:15 +0900 Subject: [PATCH 71/76] logstash: nixpkgs-fmt --- pkgs/tools/misc/logstash/7.x.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 1abc0ff9bf82..340cbd830646 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -1,6 +1,7 @@ { elk7Version , enableUnfree ? true -, lib, stdenv +, lib +, stdenv , fetchurl , makeWrapper , nixosTests @@ -21,13 +22,14 @@ let this = stdenv.mkDerivation rec { else "0nlwgaw6rmhp5b68zpp1pzsjs30b0bjzdg8f7xy6rarpk338s8yb"; }; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; dontPatchShebangs = true; buildInputs = [ - makeWrapper jre + makeWrapper + jre ]; installPhase = '' @@ -48,9 +50,9 @@ let this = stdenv.mkDerivation rec { meta = with lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = "https://www.elastic.co/products/logstash"; - license = if enableUnfree then licenses.elastic else licenses.asl20; - platforms = platforms.unix; + homepage = "https://www.elastic.co/products/logstash"; + license = if enableUnfree then licenses.elastic else licenses.asl20; + platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; passthru.tests = From 8b2cecc3ce33053da4a4aab33991839f9a7a1a54 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 12:36:15 +0900 Subject: [PATCH 72/76] beats: nixpkgs-fmt --- pkgs/misc/logging/beats/7.x.nix | 52 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 77e14e96c54e..bf252c028bcb 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,30 +1,31 @@ { lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, nixosTests, systemd }: -let beat = package : extraArgs : buildGoPackage (rec { - name = "${package}-${version}"; - version = elk7Version; +let beat = package: extraArgs: buildGoPackage (rec { + name = "${package}-${version}"; + version = elk7Version; - src = fetchFromGitHub { - owner = "elastic"; - repo = "beats"; - rev = "v${version}"; - sha256 = "192ygz3ppfah8d2b811x67jfqhcr5ivz7qh4vwrd729rjfr0bbgb"; - }; + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "192ygz3ppfah8d2b811x67jfqhcr5ivz7qh4vwrd729rjfr0bbgb"; + }; - goPackagePath = "github.com/elastic/beats"; + goPackagePath = "github.com/elastic/beats"; - subPackages = [ package ]; + subPackages = [ package ]; - meta = with lib; { - homepage = "https://www.elastic.co/products/beats"; - license = licenses.asl20; - maintainers = with maintainers; [ fadenb basvandijk ]; - platforms = platforms.linux; - }; - } // extraArgs); -in rec { - filebeat7 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; - heartbeat7 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + meta = with lib; { + homepage = "https://www.elastic.co/products/beats"; + license = licenses.asl20; + maintainers = with maintainers; [ fadenb basvandijk ]; + platforms = platforms.linux; + }; +} // extraArgs); +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"; passthru.tests = @@ -46,14 +47,15 @@ in rec { PostgreSQL, Redis or Thrift and correlate the messages into transactions. ''; }; - journalbeat7 = beat "journalbeat" { + journalbeat7 = beat "journalbeat" { meta.description = '' Journalbeat is an open source data collector to read and forward journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' - patchelf --set-rpath ${libPath} "$out/bin/journalbeat" - ''; + postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in + '' + patchelf --set-rpath ${libPath} "$out/bin/journalbeat" + ''; }; } From f9321de0f3dc6d97bf68c10ac4d5263162c25ed8 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 12:47:45 +0900 Subject: [PATCH 73/76] elk7: 7.5.1 -> 7.10.2 Update pkgs/development/tools/misc/kibana/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/servers/search/elasticsearch/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/servers/search/elasticsearch/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/development/tools/misc/kibana/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> --- pkgs/development/tools/misc/kibana/7.x.nix | 8 +++---- pkgs/misc/logging/beats/7.x.nix | 2 +- pkgs/servers/search/elasticsearch/7.x.nix | 8 +++---- pkgs/servers/search/elasticsearch/plugins.nix | 22 ++++++++++--------- pkgs/tools/misc/logstash/7.x.nix | 7 +++--- pkgs/top-level/all-packages.nix | 6 ++--- 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index e82f557470e4..fdfe655b8341 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -19,12 +19,12 @@ let shas = if enableUnfree then { - x86_64-linux = "1wq4fc2fifkg1qz7nxdfb4yi2biay8cgdz7kl5k0p37sxn0sbkja"; - x86_64-darwin = "06346kj7bv49py49pmmnmh8m24322m88v1af19909pj9cxgd0p6v"; + x86_64-linux = "sha256-lTPBppKm51zgKSQtSdO0PgZ/aomvaStwqwYYGNPY4Bo="; + x86_64-darwin = "sha256-d7xHmoASiywDlZCJX/CfUX1VIi4iOcDrqvK0su54MJc="; } else { - x86_64-linux = "0ygpmcm6wdcnvw8azwqc5257lyic7yw31rqvm2pw3afhpha62lpj"; - x86_64-darwin = "0xy81g0bhxp47p29kkkh5llfzqkzqzr5dk50ap2hy0hjw33ld6g1"; + x86_64-linux = "sha256-+pkKpiXBpLHs72KKNtMJbqipw6eu5XC1xu/iLFCHGRQ="; + x86_64-darwin = "sha256-CyJ5iRXaPgXO2lyy+E24OcGtb9V3e1gMZRIu25bVyzk="; }; in diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index bf252c028bcb..dd1f606d43d3 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -8,7 +8,7 @@ let beat = package: extraArgs: buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "192ygz3ppfah8d2b811x67jfqhcr5ivz7qh4vwrd729rjfr0bbgb"; + sha256 = "sha256-zr0a0LBR4G9okS2pUixDYtYZ0yCp4G6j08jx/zlIKOA="; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 50ec006cc5cd..b0114ad17055 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -20,12 +20,12 @@ let shas = if enableUnfree then { - x86_64-linux = "1s27bzx5y8vcd95qrw6av3fhyxb45219x9ahwaxa2cygmbpighrp"; - x86_64-darwin = "1ia3byir3i5qaarmcaysrg3dhnxjmxnf0m0kzyf61g9aiy87gb7q"; + x86_64-linux = "sha256-O3rjtvXyJI+kRBqiz2U2OMkCIQj4E+AIHaE8N4o14R4="; + x86_64-darwin = "sha256-AwuY2yMxf+v7U5/KD3Cf+Hv6ijjySEyj6pzF3RCsg24="; } else { - x86_64-linux = "005i7d7ag10qkn7bkx7md50iihvcvc84hay2j94wvsm7yghhbmi3"; - x86_64-darwin = "01f81720rbzdqc0g1xymhz2lflldfbnb0rh7mpki99pss28vj9sh"; + x86_64-linux = "sha256-cJrdkFIFgAI6wfQh34Z8yFuLrOCOKzgOsWZhU3S/3NQ="; + x86_64-darwin = "sha256-OhMVOdXei9D9cH+O5tBhdKvZ05TsImjMqUUsucRyWMo="; }; in stdenv.mkDerivation (rec { diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 5ceb6b079410..39af6976bf9b 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -37,7 +37,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.5.1" then "0v6ynbk34g7pl9cwy8ga8bk1my18jb6pc3pqbjl8p93w38219vi6" + if version == "7.10.2" then "sha256-HXNJy8WPExPeh5afjdLEFg+0WX0LYI/kvvaLGVUke5E=" else if version == "6.8.3" then "0vbaqyj0lfy3ijl1c9h92b0nh605h5mjs57bk2zhycdvbw5sx2lv" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -54,7 +54,7 @@ in src = fetchurl { url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip"; sha256 = - if version == "7.5.1" then "0js8b9a9ma797448m3sy92qxbwziix8gkcka7hf17dqrb9k29v61" + if version == "7.10.2" then "sha256-mW4YNZ20qatyfHCDAmod/gVmkPYh15NrsYPgiBy1/T8=" else if version == "6.8.3" then "12bshvp01pp2lgwd0cn9l58axg8gdimsh4g9wfllxi1bdpv4cy53" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -71,7 +71,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.5.1" then "0znmbdf99bli4kvyb3vxr5x48yb6n64nl38gpa63iqsv3nlbi0hp" + if version == "7.10.2" then "sha256-PjA/pwoulkD2d6sHKqzcYxQpb1aS68/l047z5JTcV3Y=" else if version == "6.8.3" then "0ggdhf7w50bxsffmcznrjy14b578fps0f8arg3v54qvj94v9jc37" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -88,7 +88,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.5.1" then "09wl2bpng4xx384xns960rymnm64b5zn2cb1sp25n85pd0isp4p2" + if version == "7.10.2" then "sha256-yvxSkVyZDWeu7rcxxq1+IVsljZQKgWEURiXY9qycK1s=" else if version == "6.8.3" then "0pmffz761dqjpvmkl7i7xsyw1iyyspqpddxp89rjsznfc9pak5im" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -105,7 +105,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.5.1" then "0hhwxkjlkw1yv5sp6pdn5k1y8bdv4mnmb6nby1z4367mig6rm8v9" + if version == "7.10.2" then "sha256-yOMiYJ2c/mcLDcTA99YrpQBiEBAa/mLtTqJlqTJ5tBc=" else if version == "6.8.3" then "0kfr4i2rcwinjn31xrc2piicasjanaqcgnbif9xc7lnak2nnzmll" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -122,7 +122,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = - if version == "7.5.1" then "1j1rgbha5lh0a02h55zqc5qn0mvvi16l2m5r8lmaswp97px056v9" + if version == "7.10.2" then "sha256-fN2RQsY9OACE71pIw87XVJo4c3sUu/6gf/6wUt7ZNIE=" else if version == "6.8.3" then "1mm6hj2m1db68n81rzsvlw6nisflr5ikzk5zv9nmk0z641n5vh1x" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -139,7 +139,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = - if version == "7.5.1" then "15g438zpxrcmsgddwmk3sccy92ha90cyq9c61kcw1q84wfi0a7jl" + if version == "7.10.2" then "sha256-JdWt5LzSbs0MIEuLJIE1ceTnNeTYI5Jt2N0Xj7OBO6g=" else if version == "6.8.3" then "1s2klpvnhpkrk53p64zbga3b66czi7h1a13f58kfn2cn0zfavnbk" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -158,13 +158,15 @@ in pluginName = "search-guard"; version = # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.5.1" then "${esVersion}-38.0.0" + if esVersion == "7.10.2" then "7.10.1-49.3.0" else if esVersion == "6.8.3" then "${esVersion}-25.5" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = fetchurl { - url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; + url = + if version == "7.10.1-49.3.0" then "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip" + else "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; sha256 = - if version == "7.5.1-38.0.0" then "1a1wp9wrmz6ji2rnpk0b9jqnp86w0w0z8sb48giyc1gzcy1ra9yh" + if version == "7.10.1-49.3.0" then "sha256-vKH2+c+7WlncgljrvYH9lAqQTKzg9l0ABZ23Q/xdoK4=" else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb" else throw "unsupported version ${version} for plugin ${pluginName}"; }; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 340cbd830646..13f926d851a3 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -11,15 +11,16 @@ with lib; let this = stdenv.mkDerivation rec { - version = elk7Version; + # FIXME 7.10 is not available on the mirror + version = "7.9.3"; name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "01l6alwgsq6yf0z9d08i0hi8g708nph1vm78nl4xbpg8h964bybj" - else "0nlwgaw6rmhp5b68zpp1pzsjs30b0bjzdg8f7xy6rarpk338s8yb"; + then "sha256-YM17/LqsMLH15YZp+0pqbEUzmAcCUpIwWT7o+MJN1QE=" + else "sha256-5HEs/2bi8m64P0R8aHGgyFJCqiFxs1aBF59Wzg9STCM="; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a482da66438..730fa1f35f4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4618,7 +4618,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. # When updating make sure to update all plugins or they will break! elk6Version = "6.8.3"; - elk7Version = "7.5.1"; + elk7Version = "7.10.2"; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { util-linux = util-linuxMinimal; @@ -4631,12 +4631,12 @@ with pkgs; }; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { util-linux = util-linuxMinimal; - jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; util-linux = util-linuxMinimal; - jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch = elasticsearch6; elasticsearch-oss = elasticsearch6-oss; From 159be7791c43ec5b3db0403bf47373981a6d7f9f Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 22:50:10 +0900 Subject: [PATCH 74/76] logstash: fix download url Update pkgs/tools/misc/logstash/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Update pkgs/tools/misc/logstash/7.x.nix Co-authored-by: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> --- pkgs/development/tools/misc/kibana/7.x.nix | 4 +-- pkgs/tools/misc/logstash/7.x.nix | 32 ++++++++++++++-------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index fdfe655b8341..a2b6f740db4c 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { - name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; + pname = "kibana${optionalString (!enableUnfree) "-oss"}"; version = elk7Version; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz"; sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 13f926d851a3..83a063c125ef 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -10,17 +10,28 @@ with lib; -let this = stdenv.mkDerivation rec { - # FIXME 7.10 is not available on the mirror - version = "7.9.3"; - name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; +let + info = splitString "-" stdenv.hostPlatform.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = + if enableUnfree + then { + x86_64-linux = "sha256-5qv4fbFpLf6aduD7wyxXQ6FsCeUqrszRisNBx44vbMY="; + x86_64-darwin = "sha256-7H+Xpo8qF1ZZMkR5n92PVplEN4JsBEYar91zHQhE+Lo="; + } + else { + x86_64-linux = "sha256-jiV2yGPwPgZ5plo3ftImVDLSOsk/XBzFkeeALSObLhU="; + x86_64-darwin = "sha256-UYG+GGr23eAc2GgNX/mXaGU0WKMjiQMPpD1wUvAVz0A="; + }; +in +stdenv.mkDerivation rec { + version = elk7Version; + pname = "logstash${optionalString (!enableUnfree) "-oss"}"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = - if enableUnfree - then "sha256-YM17/LqsMLH15YZp+0pqbEUzmAcCUpIwWT7o+MJN1QE=" - else "sha256-5HEs/2bi8m64P0R8aHGgyFJCqiFxs1aBF59Wzg9STCM="; + url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}-${plat}-${arch}.tar.gz"; + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; dontBuild = true; @@ -63,5 +74,4 @@ let this = stdenv.mkDerivation rec { elk = nixosTests.elk.ELK-7; } ); -}; -in this +} From 59e34733b7b0276f364f53c2bbac8721a0214aa9 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 23:10:11 +0900 Subject: [PATCH 75/76] beats: buildGoPackage -> buildGoModule --- pkgs/misc/logging/beats/7.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index dd1f606d43d3..99a79fecedc5 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,7 +1,7 @@ -{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, nixosTests, systemd }: +{ lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd }: -let beat = package: extraArgs: buildGoPackage (rec { - name = "${package}-${version}"; +let beat = package: extraArgs: buildGoModule (rec { + pname = package; version = elk7Version; src = fetchFromGitHub { @@ -11,7 +11,7 @@ let beat = package: extraArgs: buildGoPackage (rec { sha256 = "sha256-zr0a0LBR4G9okS2pUixDYtYZ0yCp4G6j08jx/zlIKOA="; }; - goPackagePath = "github.com/elastic/beats"; + vendorSha256 = "sha256-xmw432vY1T2EixkDcXdGrnMdc8fYOI4R2lEjbkav3JQ="; subPackages = [ package ]; From 6f28a718e5a7d6c278d795274246f6b3eac488ab Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 23:26:13 +0900 Subject: [PATCH 76/76] kibana update nodejs 10 -> 14 --- pkgs/development/tools/misc/kibana/7.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index a2b6f740db4c..33298f68334a 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -4,14 +4,14 @@ , stdenv , makeWrapper , fetchurl -, nodejs-10_x +, nodejs-14_x , coreutils , which }: with lib; let - nodejs = nodejs-10_x; + nodejs = nodejs-14_x; inherit (builtins) elemAt; info = splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0;