From afecbb2f7534a0530fc0da53af74d0bb85697d36 Mon Sep 17 00:00:00 2001 From: pennae Date: Fri, 24 Dec 2021 22:36:08 +0100 Subject: [PATCH 01/29] lib/modules: optimize byName the foldl is equivalent to a zip with concat. list concatenation in nix is an O(n) operation, which makes this operation extremely inefficient when large numbers of modules are involved. this change reduces the number of list elements by 7 million on the system used to write this, total memory spent on lists by 58MB, and total memory allocated on the GC heap by almost 100MB (with a similar reduction in GC heap size). it's also slightly faster. --- lib/modules.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 573bf40e4b34..091c72e30aae 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -37,6 +37,7 @@ let toList types warnIf + zipAttrsWith ; inherit (lib.options) isOption @@ -442,7 +443,8 @@ rec { } */ byName = attr: f: modules: - foldl' (acc: module: + zipAttrsWith (n: concatLists) + (map (module: if !(builtins.isAttrs module.${attr}) then throw '' You're trying to declare a value of type `${builtins.typeOf module.${attr}}' @@ -454,11 +456,8 @@ rec { this option by e.g. referring to `man 5 configuration.nix'! '' else - acc // (mapAttrs (n: v: - (acc.${n} or []) ++ f module v - ) module.${attr} - ) - ) {} modules; + mapAttrs (n: f module) module.${attr} + ) modules); # an attrset 'name' => list of submodules that declare ‘name’. declsByName = byName "options" (module: option: [{ inherit (module) _file; options = option; }] From 2dcae7d82f5ef0b373413d2fbfc1001141561c74 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 25 Dec 2021 15:20:26 +0100 Subject: [PATCH 02/29] lib/attrsets: use builtins.zipAttrsWith if available --- lib/attrsets.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 812521ce6d1c..4721c833337e 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -378,7 +378,8 @@ rec { zipAttrsWith (name: values: values) [{a = "x";} {a = "y"; b = "z";}] => { a = ["x" "y"]; b = ["z"] } */ - zipAttrsWith = f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets; + zipAttrsWith = + builtins.zipAttrsWith or (f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets); /* Like `zipAttrsWith' with `(name: values: values)' as the function. Example: From 0de4ecff8cbeb9c3f36e58b3bdb406d676a5e118 Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 28 Dec 2021 16:53:50 +0100 Subject: [PATCH 03/29] lib/modules: extract multiply-used value in byName module.${attr} is used at least twice, so it must be evaluated at least twice (and since it's a function argument, be turned into a thunk twice). --- lib/modules.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 091c72e30aae..c68bbfcaa3e0 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -444,10 +444,10 @@ rec { */ byName = attr: f: modules: zipAttrsWith (n: concatLists) - (map (module: - if !(builtins.isAttrs module.${attr}) then + (map (module: let subtree = module.${attr}; in + if !(builtins.isAttrs subtree) then throw '' - You're trying to declare a value of type `${builtins.typeOf module.${attr}}' + You're trying to declare a value of type `${builtins.typeOf subtree}' rather than an attribute-set for the option `${builtins.concatStringsSep "." prefix}'! @@ -456,7 +456,7 @@ rec { this option by e.g. referring to `man 5 configuration.nix'! '' else - mapAttrs (n: f module) module.${attr} + mapAttrs (n: f module) subtree ) modules); # an attrset 'name' => list of submodules that declare ‘name’. declsByName = byName "options" (module: option: From aaafdfd1d7b65c1c29b1180eb7d7adf05a487257 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Dec 2021 10:03:11 +0000 Subject: [PATCH 04/29] duo-unix: 1.11.4 -> 1.11.5 --- pkgs/tools/security/duo-unix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 40645ce089d8..0ec07371df38 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "1.11.4"; + version = "1.11.5"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "1hqklf6jzrxn5hgh69bbl6962hwwgf06dlrb0ry7n5iy8w8imnsg"; + sha256 = "sha256-7pE4EnyV22qQ13RFKHv0ah/BQYHJE1jdTwXBeqpBFgs="; }; buildInputs = [ pam openssl zlib ]; From b25107949d255346cef4089db7cf04288d876a32 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Mon, 3 Jan 2022 23:24:46 +0100 Subject: [PATCH 05/29] papermc: 1.17.1r399 -> 1.18.1r132 --- pkgs/games/papermc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index e1554bdcb410..09dbfb6c3c83 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let - mcVersion = "1.17.1"; - buildNum = "399"; + mcVersion = "1.18.1"; + buildNum = "132"; jar = fetchurl { url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - sha256 = "01374201dkzrx28phy87wji7kzjwx8bpjzv85bjl6672ziskbmpd"; + sha256 = "af26babef1e9134804bdf61e14eed7677d603516638f5a2ffe97e176ebd9839b"; }; in stdenv.mkDerivation { pname = "papermc"; From f38f65717816fd051baa3ae04056e9dee2bc9b22 Mon Sep 17 00:00:00 2001 From: Benjamin Kober Date: Mon, 3 Jan 2022 18:29:40 +0100 Subject: [PATCH 06/29] maintainers: add lammermann --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 74f61430715c..0a35581a1011 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6573,6 +6573,12 @@ githubId = 55911173; name = "Gwendolyn Quasebarth"; }; + lammermann = { + email = "k.o.b.e.r@web.de"; + github = "lammermann"; + githubId = 695526; + name = "Benjamin Kober"; + }; larsr = { email = "Lars.Rasmusson@gmail.com"; github = "larsr"; From d2e6d89ba7048ac644a405aeb5a91946b0cd05c0 Mon Sep 17 00:00:00 2001 From: 13r0ck Date: Tue, 28 Dec 2021 03:24:41 -0700 Subject: [PATCH 07/29] popsicle: init at unstable-2021-12-20 Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> use better command Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> remove duplicate Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> remove newline Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> use correct package Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> add arm support Tested on aarch64 and still works revert Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> --- pkgs/tools/misc/popsicle/default.nix | 73 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/tools/misc/popsicle/default.nix diff --git a/pkgs/tools/misc/popsicle/default.nix b/pkgs/tools/misc/popsicle/default.nix new file mode 100644 index 000000000000..e9369270fcd0 --- /dev/null +++ b/pkgs/tools/misc/popsicle/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, fetchFromGitHub +, rustc +, cargo +, rustPlatform +, pkg-config +, dbus +, glib +, cairo +, pango +, atk +, lib +, gdk-pixbuf +, gtk3 +}: + +rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { + pname = "popsicle"; + version = "unstable-2021-12-20"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = "b02ebf5f2e6c18777453ca9a144d69689a6fa901"; + sha256 = "03ilhvnr4mwy7b8bipp616h16m2ilxzxz2zjpkzy3afwvh9bz1mx"; + }; + + cargoSha256 = "1c54wxyrfxk5chnjhxw6vaznm7ff9dkx1rxlgp417jfygiwijjs4"; + + nativeBuildInputs = [ gtk3 pkg-config ]; + + buildInputs = [ + gtk3 + dbus + glib + cairo + pango + atk + gdk-pixbuf + ]; + + # Use the stdenv default phases (./configure; make) instead of the + # ones from buildRustPackage. + configurePhase = "configurePhase"; + buildPhase = "buildPhase"; + checkPhase = "checkPhase"; + installPhase = "installPhase"; + + postPatch = '' + # Have to do this here instead of in preConfigure because + # cargoDepsCopy gets unset after postPatch. + configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy") + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "DESTDIR=${placeholder "out"}" + ]; + + postInstall = '' + # install man page, icon, etc... + mv $out/usr/local/* $out + rm -rf $out/usr + ''; + + meta = with lib; { + description = "Multiple USB File Flasher"; + homepage = "https://github.com/pop-os/popsicle"; + maintainers = with maintainers; [ _13r0ck ]; + license = licenses.mit; + platforms = [ "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8125d0ad73d0..e11a20f894ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1142,6 +1142,8 @@ with pkgs; pikchr = callPackage ../tools/graphics/pikchr { }; + popsicle = callPackage ../tools/misc/popsicle { }; + roxterm = callPackage ../applications/terminal-emulators/roxterm { }; rxvt = callPackage ../applications/terminal-emulators/rxvt { }; From 0bf01ef23a3f489e22d4561e063f3aa324c52851 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Jan 2022 09:19:42 +0000 Subject: [PATCH 08/29] python38Packages.soco: 0.25.2 -> 0.25.3 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index df9a06aec14c..1a7747e2c2ec 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.25.2"; + version = "0.25.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-Bu9RtzvQVDPekIzkVvcDkTs5Z+IDx6lSBCMv5zs8gNA="; + sha256 = "sha256-CoAmpcXy4oHMk0X4iJ/XMbUnI2m3ZWl8QzobH677FrI="; }; propagatedBuildInputs = [ From 29c02b33a95c0f6952bcc31c30dd052e74f16b1c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 27 Dec 2021 20:52:04 +0800 Subject: [PATCH 09/29] aria2: fix cross compilation and set strictDeps --- pkgs/tools/networking/aria2/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index db239e034f51..8fabea35ba90 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ErjFfSJDIgZq0qy0Zn5uZ9bZS2AtJq4FuBVuUuQgPTI="; }; + strictDeps = true; nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { ]; prePatch = '' - patchShebangs doc/manual-src/en/mkapiref.py + patchShebangs --build doc/manual-src/en/mkapiref.py ''; checkInputs = [ cppunit ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4a599c7c177..11e5d18fd158 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2042,7 +2042,6 @@ with pkgs; aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; - inherit (python3Packages) sphinx; }; aria = aria2; From 7ada385af0b5ca1ce6ed865a7b2fc7ce603e8831 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sun, 9 Jan 2022 22:56:36 +1100 Subject: [PATCH 10/29] zsh: Support building from Git checkouts A pregenerated `./configure` script is included with `zsh` release tarballs which makes it so that `zsh` won't build Git checkouts without `autoreconfHook`. There are also other files that were pregenerated and included in releases so a few other tools are necessary to successfully build `zsh`. We can also build the docs ourselves instead of using the `docs` tarball. This means that users can now easily override the `zsh` derivation: pkgs.zsh.overrideAttrs (old: { src = fetchgit { url = "https://git.code.sf.net/p/zsh/code.git"; rev = "zsh-5.8"; sha256 = "sha256-Gou2UgafLHnZnG2X8DulidOTO1idTQpnZ3DicZuhCZc="; }; }) --- pkgs/shells/zsh/default.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index e0fd68f13b60..821247535050 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, pcre, buildPackages }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, yodl +, perl +, groff +, util-linux +, texinfo +, ncurses +, pcre +, buildPackages }: let version = "5.8"; - - documentation = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; - }; in stdenv.mkDerivation { @@ -30,6 +37,8 @@ stdenv.mkDerivation { }) ]; + nativeBuildInputs = [ autoreconfHook yodl perl groff util-linux texinfo ]; + buildInputs = [ ncurses pcre ]; configureFlags = [ @@ -47,9 +56,7 @@ stdenv.mkDerivation { # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' - mkdir -p $out/share/info - tar xf ${documentation} -C $out/share - ln -s $out/share/zsh-*/Doc/zsh.info* $out/share/info/ + make install.info install.html mkdir -p $out/etc/ cat > $out/etc/zprofile < Date: Sun, 9 Jan 2022 23:53:22 +0200 Subject: [PATCH 11/29] gnuradio3_8: 3.8.4.0 -> 3.8.5.0 --- pkgs/applications/radio/gnuradio/3.8.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index a6d4099c8639..63adbf04b0e4 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -43,13 +43,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.8"; - minor = "4"; + minor = "5"; patch = "0"; } }: let - sourceSha256 = "sha256-C8S3iF7vj9A8SpxriW9y7idrhXzonvenoQtVAMex+Iw="; + sourceSha256 = "sha256-p4VFjTE0GXmdA7QGhWSUzO/WxJ+8Dq3JEnOABtQtJUU="; featuresInfo = { # Needed always basic = { @@ -243,11 +243,6 @@ stdenv.mkDerivation rec { patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.3_8.patch - (fetchpatch { - # https://github.com/gnuradio/gnuradio/pull/5226 - url = "https://github.com/gnuradio/gnuradio/commit/9d7343526dd793120b6425cd9a6969416ed32503.patch"; - sha256 = "sha256-usSoRDDuClUfdX4yFbQNu8wDzve6UEhZYTFj1oZbFic="; - }) # Fix compilation with boost 177 (fetchpatch { url = "https://github.com/gnuradio/gnuradio/commit/2c767bb260a25b415e8c9c4b3ea37280b2127cec.patch"; From 9ad49004804bec8659fa57f98da6692ad119fbd9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 9 Jan 2022 23:53:33 +0200 Subject: [PATCH 12/29] gnuradio: 3.9.4.0 -> 3.9.5.0 --- pkgs/applications/radio/gnuradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 61aafb63b5db..784ab7bd0fc2 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "4"; + minor = "5"; patch = "0"; } }: let - sourceSha256 = "sha256-O+37CyF0IVPdUB1e68HsaXD0T2VsOLPXOpLNlRYEXUk="; + sourceSha256 = "sha256-TWCXLoS+ImKNd2zkxMks4FXsQMvGKgcW5/MW8S1Y1TY="; featuresInfo = { # Needed always basic = { From 8f200e0e38b1adfaf15790a003e1488115805652 Mon Sep 17 00:00:00 2001 From: Brandon Weeks Date: Sun, 9 Jan 2022 21:34:42 -0800 Subject: [PATCH 13/29] linux: enable IO_STRICT_DEVMEM --- pkgs/os-specific/linux/kernel/common-config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 667a682fba00..4e963133773e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -456,7 +456,8 @@ let # Detect writes to read-only module pages DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; }; RANDOMIZE_BASE = option yes; - STRICT_DEVMEM = option yes; # Filter access to /dev/mem + STRICT_DEVMEM = yes; # Filter access to /dev/mem + IO_STRICT_DEVMEM = whenAtLeast "4.5" yes; SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; From 0fefa7eb9d88d2e71fb39b35c6b04efb082d893c Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 10 Jan 2022 11:31:24 +0530 Subject: [PATCH 14/29] lychee: 0.8.1 -> 0.8.2 --- pkgs/tools/networking/lychee/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index 657fd108b9a0..d8376016bbfd 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "lycheeverse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TjjSysG4UCXVi5ytWaJVL31TFLHC3Ro5OEB56pzbn7s="; + sha256 = "sha256-zgIFJLdYHSDsO34KFK51g4nVlSkc9/TFdXx2yPJ7kRQ="; }; - cargoSha256 = "sha256-apRXxd7RBnNjhZb0xAUr5hSTafyMbg0k1wgHT93Z66g="; + cargoSha256 = "sha256-r4a+JkaXVYsynBiWUHaleATXvfxyhRHfR/qcooD0FmI="; nativeBuildInputs = [ pkg-config ]; From 7a5855272e640578cd731592dd28a65c1a8a9192 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Jan 2022 06:57:53 +0000 Subject: [PATCH 15/29] python310Packages.css-parser: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/css-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/css-parser/default.nix b/pkgs/development/python-modules/css-parser/default.nix index 7791c2b9a237..2c795a39c90f 100644 --- a/pkgs/development/python-modules/css-parser/default.nix +++ b/pkgs/development/python-modules/css-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "css-parser"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "4ed448a8a5622edb1d30d616bbc4bd3d30f11be922343d7a92d7e418e324af2e"; + sha256 = "25e096c63262dd249010ce36dab4cacd9595783ee09b5ed699ef12ab864ebbd1"; }; # Test suite not included in tarball yet From d230a3fd7589475c324cedd95b203c543fdbab0f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 4 Jan 2022 11:27:32 +0100 Subject: [PATCH 16/29] symfony-cli: 4.26.9 -> 5.0.7 --- .../development/tools/symfony-cli/default.nix | 54 +++++-------------- 1 file changed, 14 insertions(+), 40 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 2eed473bb25a..9de3173ac8b6 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -1,50 +1,24 @@ -{ stdenvNoCC, fetchurl, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -let - version = "4.26.9"; - - srcs = { - x86_64-linux = fetchurl { - url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "0ivqqrpzbpyzp60bv25scarmvisj401rp7h2s3cxa7d17prja91v"; - }; - - i686-linux = fetchurl { - url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_386.gz"; - sha256 = "0ag5w70bkvj9wgp4yzzy824shj907sa5l20sqcgivi3r5gy0p277"; - }; - - aarch64-linux = fetchurl { - url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_arm64.gz"; - sha256 = "00325xz7xl3bprj5zbg5yhn36jf4n37zlyag10m8zcmq8asa6k51"; - }; - - x86_64-darwin = fetchurl { - url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_darwin_amd64.gz"; - sha256 = "00325xz7xl3bprj5zbg5yhn36jf4n37zlyag10m8zcmq8asa6k51"; - }; - }; -in stdenvNoCC.mkDerivation rec { - inherit version; +buildGoModule rec { pname = "symfony-cli"; + version = "5.0.7"; + vendorSha256 = "sha256-aTC84iA3/z/qhZbXPtOeZwDGn6BFCefCVlkUrbEtxUI="; - src = srcs.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); + src = fetchFromGitHub { + owner = "symfony-cli"; + repo = "symfony-cli"; + rev = "v${version}"; + sha256 = "sha256-Z3AIlN/s0uPE0OAlgSxbQPRoWPTHjDq4c8RlQ3SuIk8="; + }; - dontBuild = true; - - unpackPhase = '' - gunzip <$src >symfony - ''; - - installPhase = '' - install -D -t $out/bin symfony - ''; + # Tests requires network access + doCheck = false; meta = with lib; { description = "Symfony CLI"; - homepage = "https://symfony.com/download"; - license = licenses.unfree; + homepage = "https://github.com/symfony-cli/symfony-cli"; + license = licenses.agpl3Plus; maintainers = with maintainers; [ drupol ]; - platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ]; }; } From 9fe7556f72c23eeeb778ae28f674e00808c30bc0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 10:59:18 +0100 Subject: [PATCH 17/29] python3Packages.css-parser: add pythonImportsCheck --- pkgs/development/python-modules/css-parser/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/css-parser/default.nix b/pkgs/development/python-modules/css-parser/default.nix index 2c795a39c90f..c4d3b101c87d 100644 --- a/pkgs/development/python-modules/css-parser/default.nix +++ b/pkgs/development/python-modules/css-parser/default.nix @@ -1,8 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +}: buildPythonPackage rec { pname = "css-parser"; version = "1.0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -13,6 +17,10 @@ buildPythonPackage rec { # See https://github.com/ebook-utils/css-parser/pull/2 doCheck = false; + pythonImportsCheck = [ + "css_parser" + ]; + meta = with lib; { description = "A CSS Cascading Style Sheets library for Python"; homepage = "https://github.com/ebook-utils/css-parser"; From bfe256a8532ad6677e4816a6aafd785373e0b937 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Mon, 10 Jan 2022 12:02:13 +0100 Subject: [PATCH 18/29] maintainers: add julienmalka --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 48d8973e9224..4261714e4060 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5951,6 +5951,12 @@ githubId = 11947756; name = "Julien Dehos"; }; + julienmalka = { + email = "julien.malka@me.com"; + github = "JulienMalka"; + githubId = 1792886; + name = "Julien Malka"; + }; julm = { email = "julm+nixpkgs@sourcephile.fr"; github = "ju1m"; From d551a1ce219f19a70ebcc920e9d03346c6abb72c Mon Sep 17 00:00:00 2001 From: Benjamin Kober Date: Mon, 3 Jan 2022 18:31:36 +0100 Subject: [PATCH 19/29] tuhi: init at 0.5 --- pkgs/applications/misc/tuhi/default.nix | 63 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/applications/misc/tuhi/default.nix diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix new file mode 100644 index 000000000000..4bd0c914d3a1 --- /dev/null +++ b/pkgs/applications/misc/tuhi/default.nix @@ -0,0 +1,63 @@ +{ lib +, pkg-config +, python3Packages +, meson +, ninja +, appstream-glib +, desktop-file-utils +, glib +, gtk3 +, gobject-introspection +, wrapGAppsHook +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + name = "tuhi"; + version = "0.5"; + + format = "other"; + + src = fetchFromGitHub { + owner = "tuhiproject"; + repo = name; + rev = "${version}"; + sha256 = "17kggm9c423vj7irxx248fjc8sxvkp9w1mgawlx1snrii817p3db"; + }; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + nativeBuildInputs = [ + pkg-config meson ninja + appstream-glib desktop-file-utils + wrapGAppsHook + ]; + buildInputs = [ + gtk3 gobject-introspection + glib + ]; + checkInputs = with python3Packages; [ flake8 pytest ]; + propagatedBuildInputs = with python3Packages; [ + svgwrite pyxdg pycairo pygobject3 setuptools-scm + ]; + + strictDeps = false; + preConfigure = '' + substituteInPlace meson_install.sh \ + --replace "/usr/bin/env sh" "sh" + ''; + postFixup = '' + wrapPythonProgramsIn $out/libexec "$out $pythonPath" + ''; + + meta = with lib; { + description = "DBus daemon to access Wacom SmartPad devices"; + homepage = "https://github.com/tuhiproject/tuhi"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ lammermann ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c64fa5fe5757..17717640eff9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10393,6 +10393,8 @@ with pkgs; ipbt = callPackage ../tools/misc/ipbt { }; + tuhi = callPackage ../applications/misc/tuhi { }; + tuir = callPackage ../applications/misc/tuir { }; tunnelto = callPackage ../tools/networking/tunnelto { From 9968242e1e1e9b5180b3f6868aeb99637f078adf Mon Sep 17 00:00:00 2001 From: Las Safin Date: Sun, 19 Dec 2021 19:11:40 +0000 Subject: [PATCH 20/29] alsa-firmware: 1.2.1 -> 1.2.4 Thanks @sternenseemann and @collares ! --- .../alsa-project/alsa-firmware/cross.patch | 347 ------------------ .../alsa-project/alsa-firmware/default.nix | 21 +- 2 files changed, 9 insertions(+), 359 deletions(-) delete mode 100644 pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch b/pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch deleted file mode 100644 index 989ccea2b984..000000000000 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch +++ /dev/null @@ -1,347 +0,0 @@ ---- a/hdsploader/Makefile.am 2015-02-26 20:36:03.000000000 +0800 -+++ b/hdsploader/Makefile.am 2019-06-28 00:43:41.557803832 +0800 -@@ -32,5 +32,14 @@ - tobin.c - CLEANFILES = $(dsp_hex_files) - --$(dsp_hex_files): tobin -- ./tobin -+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) -+ -+$(tobin_OBJECTS) : CC=$(CC_FOR_BUILD) -+$(tobin_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) -+$(tobin_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+ -+tobin$(BUILD_EXEEXT): $(tobin_OBJECTS) -+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ -+ -+$(dsp_hex_files): tobin$(BUILD_EXEEXT) -+ ./$< ---- a/m4/ax_prog_cc_for_build.m4 2019-06-27 15:50:02.274134717 +0800 -+++ b/m4/ax_prog_cc_for_build.m4 2019-06-28 01:32:45.088117432 +0800 -@@ -0,0 +1,125 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_PROG_CC_FOR_BUILD -+# -+# DESCRIPTION -+# -+# This macro searches for a C compiler that generates native executables, -+# that is a C compiler that surely is not a cross-compiler. This can be -+# useful if you have to generate source code at compile-time like for -+# example GCC does. -+# -+# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything -+# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). -+# The value of these variables can be overridden by the user by specifying -+# a compiler with an environment variable (like you do for standard CC). -+# -+# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object -+# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if -+# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are -+# substituted in the Makefile. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Paolo Bonzini -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 9 -+ -+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) -+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_PROG_CPP])dnl -+AC_REQUIRE([AC_EXEEXT])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ -+dnl Use the standard macros, but make them use other variable names -+dnl -+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl -+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl -+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl -+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl -+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl -+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl -+pushdef([ac_cv_objext], ac_cv_build_objext)dnl -+pushdef([ac_exeext], ac_build_exeext)dnl -+pushdef([ac_objext], ac_build_objext)dnl -+pushdef([CC], CC_FOR_BUILD)dnl -+pushdef([CPP], CPP_FOR_BUILD)dnl -+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl -+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl -+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl -+pushdef([host], build)dnl -+pushdef([host_alias], build_alias)dnl -+pushdef([host_cpu], build_cpu)dnl -+pushdef([host_vendor], build_vendor)dnl -+pushdef([host_os], build_os)dnl -+pushdef([ac_cv_host], ac_cv_build)dnl -+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl -+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl -+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl -+pushdef([ac_cv_host_os], ac_cv_build_os)dnl -+pushdef([ac_cpp], ac_build_cpp)dnl -+pushdef([ac_compile], ac_build_compile)dnl -+pushdef([ac_link], ac_build_link)dnl -+ -+save_cross_compiling=$cross_compiling -+save_ac_tool_prefix=$ac_tool_prefix -+cross_compiling=no -+ac_tool_prefix= -+ -+AC_PROG_CC -+AC_PROG_CPP -+AC_EXEEXT -+ -+ac_tool_prefix=$save_ac_tool_prefix -+cross_compiling=$save_cross_compiling -+ -+dnl Restore the old definitions -+dnl -+popdef([ac_link])dnl -+popdef([ac_compile])dnl -+popdef([ac_cpp])dnl -+popdef([ac_cv_host_os])dnl -+popdef([ac_cv_host_vendor])dnl -+popdef([ac_cv_host_cpu])dnl -+popdef([ac_cv_host_alias])dnl -+popdef([ac_cv_host])dnl -+popdef([host_os])dnl -+popdef([host_vendor])dnl -+popdef([host_cpu])dnl -+popdef([host_alias])dnl -+popdef([host])dnl -+popdef([LDFLAGS])dnl -+popdef([CPPFLAGS])dnl -+popdef([CFLAGS])dnl -+popdef([CPP])dnl -+popdef([CC])dnl -+popdef([ac_objext])dnl -+popdef([ac_exeext])dnl -+popdef([ac_cv_objext])dnl -+popdef([ac_cv_exeext])dnl -+popdef([ac_cv_prog_cc_g])dnl -+popdef([ac_cv_prog_cc_cross])dnl -+popdef([ac_cv_prog_cc_works])dnl -+popdef([ac_cv_prog_gcc])dnl -+popdef([ac_cv_prog_CPP])dnl -+ -+dnl Finally, set Makefile variables -+dnl -+BUILD_EXEEXT=$ac_build_exeext -+BUILD_OBJEXT=$ac_build_objext -+AC_SUBST(BUILD_EXEEXT)dnl -+AC_SUBST(BUILD_OBJEXT)dnl -+AC_SUBST([CFLAGS_FOR_BUILD])dnl -+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl -+AC_SUBST([LDFLAGS_FOR_BUILD])dnl -+]) ---- a/configure.ac 2019-06-27 23:58:31.045413144 +0800 -+++ b/configure.ac 2019-06-28 01:45:36.511771656 +0800 -@@ -1,6 +1,8 @@ - AC_PREREQ(2.59) - AC_INIT(alsa-firmware, 1.0.29) -+AC_CONFIG_MACRO_DIR([m4]) - AC_PROG_CC -+AC_PROG_CC_FOR_BUILD - AC_PROG_INSTALL - AC_PROG_LN_S - AC_HEADER_STDC ---- a/vxloader/Makefile.am 2015-02-26 20:36:03.000000000 +0800 -+++ b/vxloader/Makefile.am 2019-06-28 01:55:19.525947146 +0800 -@@ -43,5 +43,14 @@ - hotplugfw_DATA = - endif - --%.xlx: %.rbt toxlx -- ./toxlx < $< > $@ -+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) -+ -+$(toxlx_OBJECTS) : CC=$(CC_FOR_BUILD) -+$(toxlx_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) -+$(toxlx_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+ -+toxlx$(BUILD_EXEEXT): $(toxlx_OBJECTS) -+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ -+ -+%.xlx: %.rbt toxlx$(BUILD_EXEEXT) -+ ./toxlx$(BUILD_EXEEXT) < $< > $@ ---- a/echoaudio/Makefile.am 2015-02-26 20:36:03.000000000 +0800 -+++ b/echoaudio/Makefile.am 2019-06-28 02:00:00.579426080 +0800 -@@ -74,33 +74,42 @@ - hotplugfw_DATA = - endif - --$(firmware_files): fw_writer -- ./fw_writer DSP/LoaderDSP.c loader_dsp.fw -- ./fw_writer DSP/Darla20DSP.c darla20_dsp.fw -- ./fw_writer DSP/Gina20DSP.c gina20_dsp.fw -- ./fw_writer DSP/Layla20DSP.c layla20_dsp.fw -- ./fw_writer ASIC/LaylaASIC.c layla20_asic.fw -- ./fw_writer DSP/Darla24DSP.c darla24_dsp.fw -- ./fw_writer DSP/Gina24DSP.c gina24_301_dsp.fw -- ./fw_writer ASIC/Gina24ASIC.c gina24_301_asic.fw -- ./fw_writer DSP/Gina24_361DSP.c gina24_361_dsp.fw -- ./fw_writer ASIC/Gina24ASIC_361.c gina24_361_asic.fw -- ./fw_writer DSP/Layla24DSP.c layla24_dsp.fw -- ./fw_writer ASIC/Layla24_1ASIC.c layla24_1_asic.fw -- ./fw_writer ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw -- ./fw_writer ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw -- ./fw_writer DSP/MonaDSP.c mona_301_dsp.fw -- ./fw_writer ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw -- ./fw_writer ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw -- ./fw_writer DSP/Mona361DSP.c mona_361_dsp.fw -- ./fw_writer ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw -- ./fw_writer ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw -- ./fw_writer ASIC/Mona2ASIC.c mona_2_asic.fw -- ./fw_writer DSP/MiaDSP.c mia_dsp.fw -- ./fw_writer DSP/Echo3gDSP.c echo3g_dsp.fw -- ./fw_writer ASIC/3G_ASIC.c 3g_asic.fw -- ./fw_writer DSP/IndigoDSP.c indigo_dsp.fw -- ./fw_writer DSP/IndigoIODSP.c indigo_io_dsp.fw -- ./fw_writer DSP/IndigoIOxDSP.c indigo_iox_dsp.fw -- ./fw_writer DSP/IndigoDJDSP.c indigo_dj_dsp.fw -- ./fw_writer DSP/IndigoDJxDSP.c indigo_djx_dsp.fw -+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) -+ -+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) -+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) -+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+ -+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) -+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ -+ -+$(firmware_files): fw_writer$(BUILD_EXEEXT) -+ ./fw_writer$(BUILD_EXEEXT) DSP/LoaderDSP.c loader_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/Darla20DSP.c darla20_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/Gina20DSP.c gina20_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/Layla20DSP.c layla20_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/LaylaASIC.c layla20_asic.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/Darla24DSP.c darla24_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/Gina24DSP.c gina24_301_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC.c gina24_301_asic.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/Gina24_361DSP.c gina24_361_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC_361.c gina24_361_asic.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/Layla24DSP.c layla24_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_1ASIC.c layla24_1_asic.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/MonaDSP.c mona_301_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/Mona361DSP.c mona_361_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona2ASIC.c mona_2_asic.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/MiaDSP.c mia_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/Echo3gDSP.c echo3g_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) ASIC/3G_ASIC.c 3g_asic.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDSP.c indigo_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIODSP.c indigo_io_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIOxDSP.c indigo_iox_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJDSP.c indigo_dj_dsp.fw -+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJxDSP.c indigo_djx_dsp.fw ---- a/emu/Makefile.am 2015-02-26 20:36:03.000000000 +0800 -+++ b/emu/Makefile.am 2019-06-28 02:01:37.856710042 +0800 -@@ -22,5 +22,14 @@ - hotplugfw_DATA = - endif - --$(firmware_files): fw_writer -- ./fw_writer -+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) -+ -+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) -+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) -+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+ -+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) -+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ -+ -+$(firmware_files): fw_writer$(BUILD_EXEEXT) -+ ./fw_writer$(BUILD_EXEEXT) ---- a/maestro3/Makefile.am 2015-02-26 20:36:03.000000000 +0800 -+++ b/maestro3/Makefile.am 2019-06-28 02:03:13.704828106 +0800 -@@ -17,5 +17,14 @@ - hotplugfw_DATA = - endif - --$(firmware_files): fw_writer -- ./fw_writer -+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) -+ -+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) -+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) -+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+ -+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) -+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ -+ -+$(firmware_files): fw_writer$(BUILD_EXEEXT) -+ ./fw_writer$(BUILD_EXEEXT) ---- a/sb16/Makefile.am 2015-02-26 20:36:03.000000000 +0800 -+++ b/sb16/Makefile.am 2019-06-28 02:04:37.121743871 +0800 -@@ -18,5 +18,14 @@ - hotplugfw_DATA = - endif - --$(firmware_files): fw_writer -- ./fw_writer -+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) -+ -+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) -+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) -+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+ -+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) -+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ -+ -+$(firmware_files): fw_writer$(BUILD_EXEEXT) -+ ./fw_writer$(BUILD_EXEEXT) ---- a/wavefront/Makefile.am 2019-06-28 02:07:27.003727160 +0800 -+++ b/wavefront/Makefile.am 2019-06-28 02:07:46.477947626 +0800 -@@ -17,5 +17,14 @@ - hotplugfw_DATA = - endif - --$(firmware_files): fw_writer -- ./fw_writer -+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) -+ -+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) -+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) -+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+ -+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) -+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ -+ -+$(firmware_files): fw_writer$(BUILD_EXEEXT) -+ ./fw_writer$(BUILD_EXEEXT) ---- a/ymfpci/Makefile.am 2015-02-26 20:36:03.000000000 +0800 -+++ b/ymfpci/Makefile.am 2019-06-28 02:09:02.487797826 +0800 -@@ -17,5 +17,14 @@ - hotplugfw_DATA = - endif - --$(firmware_files): fw_writer -- ./fw_writer -+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) -+ -+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) -+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) -+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+ -+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) -+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ -+ -+$(firmware_files): fw_writer$(BUILD_EXEEXT) -+ ./fw_writer$(BUILD_EXEEXT) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix index 8ad48c41408b..2ef971a8cf7f 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix @@ -1,20 +1,16 @@ -{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: +{ lib, buildPackages, stdenv, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { pname = "alsa-firmware"; - version = "1.2.1"; + version = "1.2.4"; src = fetchurl { url = "mirror://alsa/firmware/alsa-firmware-${version}.tar.bz2"; - sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; + sha256 = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs="; }; - patches = [ (fetchpatch { - url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch"; - sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78"; - }) ]; - - nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--with-hotplug-dir=$(out)/lib/firmware" @@ -32,10 +28,11 @@ stdenv.mkDerivation rec { rm -rf $out/bin ''; - meta = { + meta = with lib; { homepage = "http://www.alsa-project.org/"; description = "Soundcard firmwares from the alsa project"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ l-as ]; }; } From afdfec504f7557350479c26f8beee4a49b29b2fa Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Mon, 10 Jan 2022 13:54:46 +0100 Subject: [PATCH 21/29] cp2k: 8.2.0 -> 9.1.0 --- pkgs/applications/science/chemistry/cp2k/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 13efa2390ffa..26cf411cb78a 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "cp2k"; - version = "8.2.0"; + version = "9.1.0"; src = fetchFromGitHub { owner = "cp2k"; repo = "cp2k"; rev = "v${version}"; - sha256 = "0kykq5p318hxjzd4gzqjwv9gqshbdvbg0gnjbd9bdfjx1r6jkjn3"; + hash = "sha256-P9RwZmrE1E0UTQVasQxWAqa3LBLyJNGeJo8T6u5WWcw="; fetchSubmodules = true; }; @@ -50,7 +50,9 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs tools exts/dbcsr/tools/build_utils exts/dbcsr/.cp2k - substituteInPlace exts/dbcsr/.cp2k/Makefile --replace '/usr/bin/env python3' '${python3}/bin/python' + substituteInPlace exts/build_dbcsr/Makefile \ + --replace '/usr/bin/env python3' '${python3}/bin/python' \ + --replace 'SHELL = /bin/sh' 'SHELL = bash' ''; configurePhase = '' From edbf02ff4abf578c966a26d6f21e0911118addc7 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 10 Jan 2022 00:55:16 +0100 Subject: [PATCH 22/29] wireshark: add manpages need asciidoctors --- pkgs/applications/networking/sniffers/wireshark/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 293192908b2e..4e4db0e74e97 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -3,6 +3,7 @@ , libssh, nghttp2, zlib, cmake, makeWrapper , withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp +, asciidoctor }: assert withQt -> qt5 != null; @@ -33,7 +34,7 @@ in stdenv.mkDerivation { # Avoid referencing -dev paths because of debug assertions. NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; - nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook; + nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt From 40e761918d7b66cf3acb1bc50fdcdc6dc3fb76a0 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 10 Jan 2022 06:05:17 -0700 Subject: [PATCH 23/29] vmm_clock: init at 0.1.0 --- pkgs/os-specific/linux/vmm_clock/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/os-specific/linux/vmm_clock/default.nix diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix new file mode 100644 index 000000000000..a9cc266f6c53 --- /dev/null +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + name = "vmm_clock"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "voutilad"; + repo = "vmm_clock"; + rev = "${version}"; + sha256 = "0hg7ywznh6v11fywsz6f7w298bxph0wwm046zqaqncjvr4aizla4"; + }; + + hardeningDisable = [ "pic" "format" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + + extraConfig = '' + CONFIG_RTC_HCTOSYS yes + ''; + + makeFlags = kernel.makeFlags ++ [ + "DEPMOD=echo" + "INSTALL_MOD_PATH=$(out)" + "KERNELRELEASE=${kernel.modDirVersion}" + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + meta = with lib; { + description = + "Experimental implementation of a kvmclock-derived clocksource for Linux guests under OpenBSD's hypervisor"; + homepage = "https://github.com/voutilad/vmm_clock"; + license = licenses.gpl2; + maintainers = with maintainers; [ qbit ]; + platforms = platforms.linux; + }; + + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index efab7bdb04d0..edc1a89985b5 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -439,6 +439,8 @@ in { vm-tools = callPackage ../os-specific/linux/vm-tools { }; + vmm_clock = callPackage ../os-specific/linux/vmm_clock { }; + wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; From a4f9bd1118f25c865056d1228f3683b272660d25 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Mon, 10 Jan 2022 12:02:30 +0100 Subject: [PATCH 24/29] htpdate: 1.2.2 -> 1.3.1 --- pkgs/tools/networking/htpdate/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index cd2b3a18d421..dbf97e5ce71b 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,26 +1,25 @@ -{ lib, stdenv, fetchurl }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.2.2"; + version = "1.3.1"; pname = "htpdate"; - src = fetchurl { - url = "http://www.vervest.org/htp/archive/c/${pname}-${version}.tar.xz"; - sha256 = "0mgr350qwgzrdrwkb9kaj6z7l6hn6a2pwh7sacqvnal5fyc9a7sz"; + src = fetchFromGitHub { + owner = "twekkel"; + repo = pname; + rev = "v${version}"; + sha256 = "JPaxbu7LlGV+Bh5qxVxeNSPnMQNqLaLYWBRbpETSpQs="; }; makeFlags = [ - "INSTALL=install" - "STRIP=${stdenv.cc.bintools.targetPrefix}strip" "prefix=$(out)" ]; - enableParallelBuilding = true; - meta = with lib; { description = "Utility to fetch time and set the system clock over HTTP"; - homepage = "http://www.vervest.org/htp/"; + homepage = "https://github.com/twekkel/htpdate"; platforms = platforms.linux; license = licenses.gpl2Plus; + maintainers = with maintainers; [ julienmalka ]; }; } From c1376aedd7243c9887fd192a4e6420da3c99104a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 10 Jan 2022 11:11:49 -0300 Subject: [PATCH 25/29] linuxKernel.kernels: also enable SND_SOC_SOF_INTEL_SOUNDWIRE_LINK between 5.10-5.11 --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4e963133773e..347f7b2802e7 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -304,6 +304,7 @@ let versionAtLeast version "5.5") { SND_SOC_INTEL_SOUNDWIRE_SOF_MACH = whenAtLeast "5.10" module; SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES = whenAtLeast "5.10" yes; # dep of SOF_MACH + SND_SOC_SOF_INTEL_SOUNDWIRE_LINK = whenBetween "5.10" "5.11" yes; # dep of SOF_MACH SND_SOC_SOF_TOPLEVEL = yes; SND_SOC_SOF_ACPI = module; SND_SOC_SOF_PCI = module; From d72a2e7baf39f6683005e66ffcaa9f5e93aaa9da Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 9 Jan 2022 13:36:20 -0300 Subject: [PATCH 26/29] firmwareLinuxNonfree -> linux-firmware This renames our `firmwareLinuxNonfree` package to `linux-firmware`. There is prior art for this in multiple other distros[1][2][3]. Besides making the package more discoverable by those searching for the usual name, this also brings it in-line with the `kebab-case` we normally see in `nixpkgs` pnames, and removes the `Nonfree` information from the name, which I consider redundant given it's present in `meta.license`. The corresponding alias has been added, so this shouldn't break anything. [1]: https://archlinux.org/packages/core/any/linux-firmware/ [2]: https://src.fedoraproject.org/rpms/linux-firmware [3]: https://packages.gentoo.org/packages/sys-kernel/linux-firmware --- .../doc/manual/from_md/release-notes/rl-2205.section.xml | 6 ++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ nixos/modules/hardware/all-firmware.nix | 3 +-- .../default.nix | 2 +- pkgs/os-specific/linux/microcode/amd.nix | 8 ++++---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 16 insertions(+), 8 deletions(-) rename pkgs/os-specific/linux/firmware/{firmware-linux-nonfree => linux-firmware}/default.nix (96%) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 1cfef8254891..67c5a13421b0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -374,6 +374,12 @@ pkgs.theLoungePlugins.themes. + + + The firmwareLinuxNonfree package has been + renamed to linux-firmware. + + diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 181630263217..35316a283190 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -134,3 +134,5 @@ In addition to numerous new and upgraded packages, this release has the followin is set to `true`. - The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`. + +- The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`. diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index ce87f9e8be8a..24d5b7bc2b29 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -31,7 +31,6 @@ in { type = types.bool; description = '' Turn on this option if you want to enable all the firmware with a license allowing redistribution. - (i.e. free firmware and firmware-linux-nonfree) ''; }; @@ -51,7 +50,7 @@ in { config = mkMerge [ (mkIf (cfg.enableAllFirmware || cfg.enableRedistributableFirmware) { hardware.firmware = with pkgs; [ - firmwareLinuxNonfree + linux-firmware intel2200BGFirmware rtl8192su-firmware rt5677-firmware diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix similarity index 96% rename from pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix rename to pkgs/os-specific/linux/firmware/linux-firmware/default.nix index ebe9b733e3d0..439cfb03a3b1 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -1,7 +1,7 @@ { stdenvNoCC, fetchgit, lib }: stdenvNoCC.mkDerivation rec { - pname = "firmware-linux-nonfree"; + pname = "linux-firmware"; version = "20211216"; src = fetchgit { diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 72f413f9cb66..cdb2912c4af6 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, firmwareLinuxNonfree, libarchive }: +{ lib, stdenv, linux-firmware, libarchive }: stdenv.mkDerivation { - name = "amd-ucode-${firmwareLinuxNonfree.version}"; + name = "amd-ucode-${linux-firmware.version}"; - src = firmwareLinuxNonfree; + src = linux-firmware; sourceRoot = "."; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildPhase = '' mkdir -p kernel/x86/microcode - find ${firmwareLinuxNonfree}/lib/firmware/amd-ucode -name \*.bin \ + find ${linux-firmware}/lib/firmware/amd-ucode -name \*.bin \ -exec sh -c 'cat {} >> kernel/x86/microcode/AuthenticAMD.bin' \; ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a3edb07ffbbb..823e6976a02d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -262,6 +262,7 @@ mapAliases ({ firefoxWrapper = firefox; # 2015-09 firestr = throw "firestr has been removed."; # added 2019-12-08 + firmwareLinuxNonfree = linux-firmware; # added 2022-01-09 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 flameGraph = flamegraph; # added 2018-04-25 flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4342edbe07b8..0dadd8328b37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22786,7 +22786,7 @@ with pkgs; qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); - firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; + linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { }; qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { }; From a12bb274f915088f638168531cd8f9d85c0b5be5 Mon Sep 17 00:00:00 2001 From: "\"Bernardo Meurer\"" <"bernardo@meurer.org"> Date: Mon, 10 Jan 2022 12:37:44 -0300 Subject: [PATCH 27/29] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 588 ++++++++++++++-------------- 1 file changed, 294 insertions(+), 294 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 04f21f762425..123f17509857 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-01-03"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "0f26a8d2c63c7050aea9b19982b5402595126bd7"; - sha256 = "118vv5g918r9zcbjrlm9df6q4vban8jkc9xa40bbfkghgccadbjf"; + rev = "b14cf53385435c84457162a5c45a4248bd275f3b"; + sha256 = "1qxdl4fdfbbfpslx2sz9mnafrwnwp8q3rlm8ns38d24z7rgx81vv"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-12-28"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "48f68598cb49c5711f31d9ed204a4f0fdc390330"; - sha256 = "17rvfiwg3yvf4pmkni7xvlsyf0yjvcjmfrd1wj4nyyj1wkf1b1jf"; + rev = "5087246c8223712fa0097098e910951aba8603fb"; + sha256 = "0szp3iy0ljzxkahz7bwz1h135isaqngg4861zl1p22ddylnaxnwq"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -113,12 +113,12 @@ final: prev: ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2021-11-08"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "469e55b101d85ff82687d975349b356b362194a6"; - sha256 = "0z2iqb974drs0nc3cxk32z5xlbdl8bgbsc8564sz13ayqbdms4nk"; + rev = "f8c503ceb2d710b7a94814f56010dd3f5efe8ab1"; + sha256 = "1v9d1y7wk1zkd7wmj9lfqa448mlfw26yrbx6di5p7azhp60d21bi"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -401,24 +401,24 @@ final: prev: bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2021-04-20"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "99557c451ff6ed3bbb9b9f6215ad57e919740635"; - sha256 = "0grkkbvrdnkmvq7wfj0rf128fzlbi3m5z8k4fg66l6gfiyp86zyc"; + rev = "4d46f80734a1f6854942f78fcbf2163b959b8ab0"; + sha256 = "1hzbxpz3yz3z7fxj7imd4l3aznrxcx1fnhf39gg2xqzk8j1yspwx"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-01-02"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "17efb4c834daf4eea96f18753541485ed05baa6e"; - sha256 = "0wm7dl8f5ng9g7xz593dxnadc7wg46ggdrmjy4d9vg8yl62rzsmc"; + rev = "29b29df893693342005a65869a4c53eea7835462"; + sha256 = "04420jfdkxj9kmisvrlqmvkh0iaqzj2ibfq1m19ag9sxywlafs96"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -473,12 +473,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-01-04"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "09fb16e9c07c45f05951d939bb8b89e2e31dcea1"; - sha256 = "0acsac6wmyxhcgwav7gzgcjabqi37c9gcxph6x87xw8cmlbbpx81"; + rev = "2d1f9a9231147738238f2478a5a08bb5febe8643"; + sha256 = "0x1yql6bhhs4wirbfdxr6myh2d9aa34ss0srdl51794af7nw29f5"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -653,12 +653,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-11-10"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "134117299ff9e34adde30a735cd8ca9cf8f3db81"; - sha256 = "1jnspl08ilz9ggkdddk0saxp3wzf05lll5msdfb4770q3bixddwc"; + rev = "b4251f0fca1daeb6db5d60a23ca81507acf858c2"; + sha256 = "0qaz5rb062qyk1zn5ahx6f49yk0r0n0a4mnrlpdcil4kc9j6mfy6"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -689,12 +689,12 @@ final: prev: cmp-omni = buildVimPluginFrom2Nix { pname = "cmp-omni"; - version = "2021-11-30"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-omni"; - rev = "580d07d32242d542e365d2732eddd2dbb7374aff"; - sha256 = "1d6j1ddfb9xijsljskb04s3kan3sg8lmbv1qal5hmhrwi8x65dwg"; + rev = "7a457f0c4f9e0801fee777d955eb841659aa3b84"; + sha256 = "0f9mk0h3g1gg6lq9qnasi0liv8kvgc6rzfvgc9cflq5kkw97gjpw"; }; meta.homepage = "https://github.com/hrsh7th/cmp-omni/"; }; @@ -737,24 +737,24 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2021-12-28"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "4acff5b84d296e906d57a8ade54fa9b82029067e"; - sha256 = "1m6w4qz1m21hzk8jf0a12m4fmiwl0sjgxpr8x21pk6l3l23b7375"; + rev = "827274ac3238ba43474fdf1b047ec02111c90df8"; + sha256 = "14dy17qq1n35p46w9zrkxnmbrsl9qjf4msi5xlmlcfxsqwap24vn"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; cmp-tmux = buildVimPluginFrom2Nix { pname = "cmp-tmux"; - version = "2021-12-31"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "cmp-tmux"; - rev = "e2dbb3db4ebfb1075264bfb89b25109db346314b"; - sha256 = "0fna4040jrn9zqpxrh6yvsl71nw0ijljpaqyxa6mr1a80z62k638"; + rev = "3c16f7e73abee43b3ea3e919e8b34c24427d9530"; + sha256 = "1zc543zf3j09wlyka2srqp6zb0xf88m5jd2j0axmxb7rhl9sjhr4"; }; meta.homepage = "https://github.com/andersevenrud/cmp-tmux/"; }; @@ -845,12 +845,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-11-26"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "86a840a6512b3cda14aefbbb2779df1ea0160d5a"; - sha256 = "0vc7rkqkq9wvrgjcaazxp39mvr95ark8c7q30agim28n4963w900"; + rev = "a3c2be320d57216405d6fe06f2c4d1de3f0f1ca8"; + sha256 = "131l4dhd93yzsdaw8fbr7hvc1qrm3zfp231rgbhzsfbg47c44rkl"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1182,12 +1182,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-01-04"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "a43f8a467b091329ff59be52c06012a0c614fc9b"; - sha256 = "059h4fxx92rv78i1gpvvsnydkbr0fr1np0b7vkanhbqm37xz1b09"; + rev = "2998baf339d836d3b23a3d83096b2078caf838c3"; + sha256 = "062qa8nazpl5d5iiqs063sva7xsc9pwicjx2snxyg03m2hk6xhgr"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1628,12 +1628,12 @@ final: prev: diaglist-nvim = buildVimPluginFrom2Nix { pname = "diaglist.nvim"; - version = "2021-12-28"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "onsails"; repo = "diaglist.nvim"; - rev = "bda07cb7928b7b922a4dd178d3894eab80ceeda0"; - sha256 = "0xl4irkyczbb06s46wy202qgr39m88vqbbrvxq9fkzqyz9qwbkvp"; + rev = "2d4943598312e3baaa9e30062adbaa640d4d1413"; + sha256 = "0x71idyvhk0i5qld1z89y1jgcs1mvg7qbjkqh1wcv3czkyp3c8bz"; }; meta.homepage = "https://github.com/onsails/diaglist.nvim/"; }; @@ -1676,12 +1676,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2021-12-07"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "cea734282d7f2ea25d0ee6cb18224be8de25b24a"; - sha256 = "0hvrkzcfqi6zfwcm7np6qq9sxmisidzkqlj9bwf0qc4h34qd6b7q"; + rev = "5183d43fd2b3ccbb7747f85275a94aadc84c1b11"; + sha256 = "13mmc7wb4ngxwyjb7i990mf3lgvn2n90m0cy4y0zpmyghrxa2k9z"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1724,12 +1724,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-12-17"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "dfa64abfed4a5afde1ee11bfba2fbaaf7cc94fe1"; - sha256 = "0ghp633jkcvx5r5d9s63ga5cfapsdx4c8x10gqp0ni9a5ldajbxr"; + rev = "6030ccab62fe0ff8f9cf3271a24d9c026520ac13"; + sha256 = "16rqpw4kfpga1gkpibmh25zq7qpr9f9dkaym4xyhb086lf17zb7z"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1834,12 +1834,12 @@ final: prev: far-vim = buildVimPluginFrom2Nix { pname = "far.vim"; - version = "2021-10-14"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "9b6cc10650128a7830fb92425ad978ae8d6132bc"; - sha256 = "0kyjz4zq9rdyxvrs4l3ficrhpfwb5p01x84x17vcqbrc68kksw04"; + rev = "611d9c221c370a64f582c3dc4c38f9ea7b29f441"; + sha256 = "1gflszsbnabb9mbf0njzv2nwn5lsmb0ghhmzvnylfqcyll1ib44q"; }; meta.homepage = "https://github.com/brooth/far.vim/"; }; @@ -2159,12 +2159,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-01-03"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "dc20c97a8f9ee36cbcdcd824e3c42140059af759"; - sha256 = "0in5hryli9iiww4wvakd3q82m65zwplahnqxxfyppjps2q534dkm"; + rev = "0901c07f33164378cb9f21156d52661abc2158f5"; + sha256 = "11rzkw19m3nazsc202a8qrl11kb77nrhl8fbb076nf7s9l97lwkh"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -2195,12 +2195,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-01-03"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "f94cd83f7fd15805c3b145ff63fdb9390b18585a"; - sha256 = "1qdb3xg7fmb5fid288h3jyaj2rl6vbcc8d7pn0gk5bshli02bp4q"; + rev = "5c58d8dafa3144532ad03834410a33b4517ce45e"; + sha256 = "13am7ll0kxi4sjnlqwdkyd454wp1kj7fw083szrcmy6vx4hch790"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2243,12 +2243,12 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2021-12-23"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "bcfb3a07f57d131ad2cfe720c9ee551ece4086be"; - sha256 = "1x28gpkyx8nsc0ving8jx8fifkpgjy24cpcyprpsd5rdbyn39nqz"; + rev = "e83ebb3465fb224df394477a0d68a61094d3f7b9"; + sha256 = "0442yi5j1fdzh2wmyn59z9mzyzsja0j0dkialj4gzlsglg6ndbai"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; @@ -2291,12 +2291,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2021-12-14"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "d86281307ce2898d0fcd85ecb0865fc1dd2f2578"; - sha256 = "03idi3x531q213m3172w405yq2gsif0a4dkxy8b0y3k9ipcpbczf"; + rev = "42dcd3fff4052b41b241453880c6067dbfea55f6"; + sha256 = "140la8pli0jc3mi4zs91h8rvl989p2hw9gj12ag8zmizm1dic2il"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -2387,24 +2387,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-12-17"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "70bd495722e89d39ddb0d6dd353de119d415a9e4"; - sha256 = "0jpcmb4kshjm866pmc8mzk6vccsy3rz691zsgm1f47wvbad24c17"; + rev = "d6fc980b21b15b61174ac1c8f884b6695181bc5d"; + sha256 = "0cv6r06bqmr4ay2y666y24hb5mwd0nmwxlcrwarp3a56sn34rsp6"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2021-12-17"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "b0a1c4bd71aa58e02809632fbc00fa6dce6d1213"; - sha256 = "006r99is1x9k4z8y3gycrlczm964gl9gipri2qq7ihjnbsxbkjg3"; + rev = "ba2a3592174c19d6f3231d06723606f6ca33fc23"; + sha256 = "0qcc0f4lky8if91faw6923sdpgvr67nsfgfb1mqmhriwvq02l46y"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2519,12 +2519,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2021-12-26"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "235ca561e1074da53858fa6f9f706cb4bfff0dc3"; - sha256 = "1iyknaaq50myk28b3109b76zybbkp6mrrp96dxa137jj8iypc2ia"; + rev = "f418a3750ed3a7f321287a39d2c9a56d8ad630aa"; + sha256 = "0imscbnaw02cgxn1qh42zz8divnv43mgccaq4hrancnhixr44lw9"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2832,12 +2832,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2021-12-31"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "6913a25c53917e6c610a976b1258ddea7bfb8431"; - sha256 = "0w0wraqak3wyfwsw7rllp8985shbyr2jaiv8584ki1b0lzdkrq7q"; + rev = "4b454c1d261ee1ba89d60d3ab87c4ccd4e1714fe"; + sha256 = "1gc0dgwpwmrlilkbpji5v0iiz4cwh1mf66zq0q322g72v7pi360z"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -2928,12 +2928,12 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2021-11-21"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "497ef5578e15f6c79deef1cad71adedd1c80abd4"; - sha256 = "1slmx1c3v2l49vnv5kxivgygla2wa7dvl47wf0xxshlsz2gml7y7"; + rev = "95f223c84393886c263a5c34b42abb8410db8fc5"; + sha256 = "1d3bx35gpgmd7n62lc3zvmvqpld41z412zqnwmjiz1sx1w3cfxvd"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -2952,12 +2952,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-01-04"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "a99fc6963510dd481953f71683e98a4559518825"; - sha256 = "1826ixb15k9s0rqiw1ynhf6j6w9cxxciskvyiyp7wgd2i6rwf42g"; + rev = "45b336e1a2f2a50e2ec6ee8a8c96906113505be5"; + sha256 = "0alvlkmpy26y8vzvb4s5ybkanggx58isv51s6piyr1fy9y27a2q5"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3000,12 +3000,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2021-12-28"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "3de56f1b0cbd44aed584bf3c2d2d9c0cd087ac84"; - sha256 = "1p6dk4qw4ffdc0gdmi6kdsr94dh61fmc25v3y26bfcxz1zz2v2p2"; + rev = "c80b31213a3b1c6191e575bf62ace32ee08b203b"; + sha256 = "1aja9qcparm36kzcchmbvdk4f5m20gkm160ml625v0h04kj9l3c3"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -3096,12 +3096,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-12-22"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "9fddb6ebf4007eaa26f44cd31b5140cbd3bbb820"; - sha256 = "0d78fi1vch4frnkni2znqdj109igb4v1x24xlzr1k0yhz9gybh9y"; + rev = "2cc567615b4889a7fd3db502b42f9207e8cab6f1"; + sha256 = "0as8i3sff236sfwdw8y1jp516y06slhxl8r3kn6wqc07jav07q5i"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3132,12 +3132,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2021-12-23"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "b4bc9ed23c9d71fc57ad6505d6c1cb4af1643051"; - sha256 = "11l50bkvfamq95jhw566iih5z5nrlypj8jrccmm05p3zwdzyvvy5"; + rev = "2018ee28c892abc9084bcda6057386bc2f47c32e"; + sha256 = "0vml28dqsipkc8wa06j2acayan26i3s17jhcbx7lja685s1hlx1q"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3156,48 +3156,48 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-01-03"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "518d9e9e82e8480a81cf3e76c46ba7880a0c0034"; - sha256 = "0ai2pj4ggjcrl3z0azwrjashqazim51crzk1f5gsbpd4j1r572iv"; + rev = "e02cbd623193185240694ec4f734bf53d9865c2e"; + sha256 = "1n223h3637slf9sgqd2qa963lzdi88p3prrq16fsy3n70x02pgar"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-01-03"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "fe7e87130ac73c60247c61d71a7479a696766c22"; - sha256 = "0scak2xdcq0vxhb21d7sm59b3hhccwwkrn5wcl7cd0akxg5xpp3s"; + rev = "56bf4fd444964ea6bdf247dcb2cd86115b20ddd8"; + sha256 = "1jn3zbgify98h7w8f6c0jfqf1lbpg1k0mq6k7ysc4a230y6whh05"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-01-03"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "1c857aa75a0f011fa62cfc8ccd11a3d4e14fc552"; - sha256 = "19xl6yfnyc30mgqqg15mfawj1cw78h59amb32r7zhwxsh1p4qvsg"; + rev = "99f9831d4561d192e13d75238459e0fda2cccb46"; + sha256 = "19xl9k9acpb7xkc90xrxvijzvsp7sdvj9y8x858y4rib3ncx8ibv"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-01-03"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "db4bbde5f90c3a9ca82ffe5e5dca63ecf5a8bd7c"; - sha256 = "0d5dlnxn0swrvj7i2kn6nxc8msl6z632ichabls53y1b3xps20jw"; + rev = "6ff631a849f343d44f074d648f43fa6528edbee1"; + sha256 = "0viy7wd9557nf2qv7bmrf3pxib5hjg4fdn6ds0hfi7sdvlvqkps4"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3252,12 +3252,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-01-04"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "44a5bde409922a0019f3c25011be11fb20705f47"; - sha256 = "0g93khmivnrr02avd3nb88hh8bcyj9y7gq5l8fgjjq2cppbw03a1"; + rev = "88d727c368fe315b16b04785987551683caaf5f5"; + sha256 = "0sy70j01hha3m5advnhpl1jgnp4lwmp4blhbxsnpgzv31lb2i5g3"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3312,12 +3312,12 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-01-04"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "4b68b8dd2aa5bb74fe8cd058797322d81df1f455"; - sha256 = "17csrd2hbqdrim9aq948zd5vy6babjh9c8z4zw2q8xskvkkbiww8"; + rev = "bc5c2f5658821f98e55013eb3bec9d540c420470"; + sha256 = "01isgvl59d8fg903ykasfjyw323jksqkyhbicj86bszc7sv2sh49"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; @@ -3444,24 +3444,24 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2021-12-24"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "ff25e21888bc8cd7b2981a0964d91057e552674f"; - sha256 = "1cpsmw785hys8d1l86yikc01l26893fbn3vmykss9ypz87zpknmf"; + rev = "95a5846005b6dc57fe3ef36c15ff5705d11660b8"; + sha256 = "1gq5r7a1i2f4vx5qaw22xd74f0f9acnky36pvm2zyp2y32qciqrf"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; minsnip-nvim = buildVimPluginFrom2Nix { pname = "minsnip.nvim"; - version = "2022-01-03"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "minsnip.nvim"; - rev = "190eefab6335d8d803e49c14a15c9dd0a947f972"; - sha256 = "083yskdn9jhzk1qpyhak4rdm5r0ryjr9swscxp77df6sfnbixvf5"; + rev = "6ae2f3247b3a2acde540ccef2e843fdfcdfebcee"; + sha256 = "1db5az5civ2bnqg7v3g937mn150ys52258c3glpvdvyyasxb4iih"; }; meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; }; @@ -3792,12 +3792,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-12-02"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "0ff8e0c53092a9cb3a2bf138b05f7efd1f6d2481"; - sha256 = "08mdpgc6rmyldh9sfm4sic2shs69aln5jrgdx75amblcm0p42g1j"; + rev = "46ee1c5bbbc6aee521ff6f912fb72e8a6b333812"; + sha256 = "0q27zgzj90kx4jbsrxj5xwidvmrbp4mjfdsdqdnjnza5c7l339fr"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3852,12 +3852,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-01-03"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "ff085fbaf095ea07f5e35404747281ad3d40772e"; - sha256 = "1l0lmhm4wdc5b30vbc4715gggm9xx6y5hkvzb1xrrvkx0dp6kj0c"; + rev = "420cbdb8365595eff0749cd362e00da9ccf9f627"; + sha256 = "0y1qjcw1fw3sh46h0nlc9lwpbbn5jgm9m1sb7k37c3ql3cjvzhnv"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4044,12 +4044,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-01-01"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "3b0483f6440e4f72ae58a8e1730df518f00b70df"; - sha256 = "0agzq1xilrzm58xrwni976iwbi6iy81jdjnvxkqvzj6ngv288i8k"; + rev = "9c536aa95f80dd9f5eb08da8499fc5f6145407aa"; + sha256 = "1hcbzwyqr5zypl6v9q6b2c2y7zjvql84mc2ip07066090v6l3qx7"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4104,12 +4104,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2021-12-01"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "3df247377b292ed084c3bc0ef300db473c1c8254"; - sha256 = "1li8h2lf7pyy51hm81pnnc9d9wa9yazrkqskd0jpz7vlxi1sd3ah"; + rev = "ab4ae54c932a3f1b16b63e727265cfca70be8d65"; + sha256 = "1l5wcb6zr46wggdlnl3zcvgvgajrncs43r59a36kvvjbia7ggbdn"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -4140,24 +4140,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-01-01"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "bba179f420b32d6898bcdc2292e7f76f6ac5f5e3"; - sha256 = "0mkcfirl7qv62idg2i6i81avggd4hsijl30j8s7i4sm6437dwpx7"; + rev = "fc9cf4984478ff88414292ed5efa4aeb8cf63c34"; + sha256 = "1ki1zl7gmfz99b7qnrn1y4rnlas1sqig2niqfb47wi0p24zglmaa"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-01-04"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "8c59fd5ec84e1c90c3982a40d699ebe62b243592"; - sha256 = "0lix5ambsmldvajb5dcwcyb8cy2g6v1iq92dbw0v11l5wcddr75f"; + rev = "c62050977ca017ba9dc252ca82532ef94105b096"; + sha256 = "0vbjn2sb2np03cnhyzx5aisfgh27m0wbigvd0x0319z0gz04h5z6"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4200,12 +4200,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-01-04"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "96858723f1cba6a3eb004373a20c315d90584ea6"; - sha256 = "11zmf2dwd9fxgdargjbkh70d89ii7qf00mh3v8v8dm89fd6ap0xy"; + rev = "5348e4a778ebdf42126a54fb5a933a98612df6cb"; + sha256 = "0vdz4j3dvl0n04sjf67cf7iqby15g894h38vvcaavsc00ri9hsmk"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4224,24 +4224,24 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-12-27"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "f7842f8fd62b17b9229a861598abfdaa9910b8c9"; - sha256 = "1w3sgc93gd3lq22ym2kqp54gs189wgik4f8gm3cymnsdxcis363p"; + rev = "5aca44fd316002e65ecd277d6a8a3120e2354a14"; + sha256 = "07bw1is4v1kmmvc2d7lzi8zdwgab8vrdy1pfsp8iwrsxvqki4ji0"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufdel = buildVimPluginFrom2Nix { pname = "nvim-bufdel"; - version = "2021-07-28"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-bufdel"; - rev = "17d17a4b16e5b5a7403470a8b5afc10772d4e84a"; - sha256 = "1x14kiwklrnd264ihib84x2l3xgdshnv7yxvjdia5rdsvxny4kvb"; + rev = "af537a915b8c60c6dcb6416e0e9382a5bed94bb3"; + sha256 = "1k242j2gzpv82cpccmiai6k50rfmnhxx6kyxbs1h1zwzyb0s2gxz"; }; meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; @@ -4260,12 +4260,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-01-02"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "1b94aacada96d2a33fef2ecf87748b27a2f50630"; - sha256 = "0ignbissria29ch9mdv1fsgg8cr77qwbnmzxhxsd6spyn5vbxlhv"; + rev = "ef5bdb43fabb98a7dd82775acf28d0a361f2bb9e"; + sha256 = "124lsz5b77ak5lmaj5w36hsprx0qgk9ga9fmpjlaq31091s50g1k"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4332,24 +4332,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-12-22"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "a6fa644f9de62c594a8a9cf6f2aaf324b5a6108b"; - sha256 = "1ncl9f4vx382pma5x3siywc132hmns6nwj54w03b387129k25wky"; + rev = "3f1514d020f9d73a458ac04f42d27e5b284c0e48"; + sha256 = "19yiah00jfw061156hki4g014fgcxyf3g1jdvs9y1rk924648a7v"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-12-27"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "34071e235c07f694861ec585bb3c7c55a07e345b"; - sha256 = "198pk6lxg5p3w4cqagrrw5n54qwmvzjhlm2kxm5mrb4bi344kafq"; + rev = "f03c0bdcf8e2f71e78be89d1e45c2eab0e95965f"; + sha256 = "0l0g5qila51xhgznhnl73qk8rafzbjqwb2a00ww8w4mli7vlfdng"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -4416,36 +4416,36 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-12-27"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "06e4bc4a3b1c522638e6f18fefc22eef3830bd85"; - sha256 = "075y12pa03y2rmg8fc26b9nnwrdhqkdsbdg3ikby7pns0ghgkjch"; + rev = "529e7403d76fcb1b1b4d398c47900d8bffed402e"; + sha256 = "0xkgja7xdw7zx52yx31zywy93yiq28scacpdwnlydr9bl3dfnz8k"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-01-03"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "03f0100dd52125a968e3bda4dacc3ab2003049d9"; - sha256 = "0wqlsys0z2hq9mlqb631v84fd35fznvkkq3nbzq6xyr3d8wmp0fk"; + rev = "1c52ff7e3dcc2b89897a16bea7b9903888656154"; + sha256 = "03x39hdnnf81qmlhwg9czd9dda6j2df6w685n2x15x01ghg86h1h"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-12-15"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "8119b7b846a21e87b2d6c2168f57d79540b2d304"; - sha256 = "0mjakd4d4w680qn82s59352w275k40nimxs2g2x0b0gzqlk3wlwg"; + rev = "d18fbcd9be71ff85e0d6f5beadbeda5339774269"; + sha256 = "1l2s8k3b24a2niamfib4fzs50zl8jf7snw2v2bc8n8kxcw18x4xg"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4464,12 +4464,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-12-12"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "47d7a9caec7338a0d038031812c4734d0c306b59"; - sha256 = "1867cara40sjz8ph32i3kl61s8z8fbj2nib73q1hppa3lxbff9k5"; + rev = "eda96facfd46abdae960a4040840124a40664903"; + sha256 = "1w7a7gx2gsdjmwkqi0kihc5hasnxi27iq2q7wwb790k6m9swsnps"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4500,36 +4500,36 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-01-02"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "e6121ec32c729da793f6f73a864a7d3a685b58d1"; - sha256 = "0i7dsaqli0nkjyffwncy7hkp0z9i2hsyzyvp703a3m68hjcapms5"; + rev = "a6afa54161f9382919ac2ec3dd71fb5e6b545bd5"; + sha256 = "1k9312a8nqf5g7r1gvxxaw45fyc7rdjrv7b7z74fylc58p76kwl0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2021-12-31"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "fd608d99e2a5727591a0d4a8e3e5b61c5372abbc"; - sha256 = "1iaf2x7dbf84ji6rnlzy0jsz6fy39vri2s4103d66p1gigmryx8i"; + rev = "99e126db47512d89f7af8e787aabdd3126a12527"; + sha256 = "04axn31x7x292jgcskjgyzxw083d686aymylmra7cya9i4yrhxdi"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-01-04"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "1917a52a7ccb517f76d6a6e732fb349f381fc927"; - sha256 = "0s4wcnn4d0wjr02307fbwz2f0yp77ibzadp4lcvsd7im9kxiczna"; + rev = "d285f720ed2b26b687a06e9c7d5d41353dd2b743"; + sha256 = "1s3snvsbggl58rqbvvhfrxvwljdrivhs3f3z0gvjhq8gs7p9ps95"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4560,12 +4560,12 @@ final: prev: nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2021-12-20"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "4b9c7c54d3f132ea39cac7a31143bc730f962453"; - sha256 = "07gwp7bcpnpkir8lmcsxscyv41dac9ph5fdavz1xq5xr686c0m6k"; + rev = "bfd6503ce5e2949e17e4053ca00b9e6836fe94e7"; + sha256 = "07qw00rk087p2ipp4p6k2wanqca0zhwd050n103lld42kd1lqci0"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -4608,12 +4608,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-01-03"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "4313cbb75a966aa461ef179fbcda23ba21d64c65"; - sha256 = "15zwii6bwz488xwj9397fgbxv723vxvmqhkx3kfq412rlb5aadx5"; + rev = "dcd836ef5b39c3db468c6722ddc14f97a719f673"; + sha256 = "0w0gxf0nfymmnriwq8vi4534v8q85n0kx6x44rc034l5hinqj744"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4632,12 +4632,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2021-12-11"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "e2510d32dc80d6b5eea4df057762bbc6b2482e05"; - sha256 = "1606wf7yhmhaksg45dz043apgxqhvkchsrj275qa6j80r31j7da6"; + rev = "4a4cf2c981b077055ef7725959d13007e366ba23"; + sha256 = "1aa062r2p69kn2xr9d2mbbrs8qdlv0q86lah2q9h6jhzxfi5ccdp"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -4668,24 +4668,24 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-01-04"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "479fde3471ad6833d950abf645c0ebece15eaea4"; - sha256 = "072l6m04z83rb9f6sp4rvziyk3i2r20i5vhn0c9djkdhy7x2bj9h"; + rev = "0d53066533643fac8d9a1a247bde3cf9132077ad"; + sha256 = "1c7zb4k9zi1yi6kzi0p07d00pfmrgzmh3cs9flc3nxn7sp4qmp9n"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-10-05"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "e1f54e1627176337b3803a11403ac0e9d09de818"; - sha256 = "0xg3c8msd9fsmwlxgpxwbz2h9aizc3f7jn9p1q23pjlpcxr8xwll"; + rev = "81f434a441605f419d9f96dc902552d90b874891"; + sha256 = "1qy0hnqqzk00pamq305hnshg8qrg5ldmq998xfdq6fngpr7cniip"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -4716,24 +4716,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-12-22"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "6ee11ac62681eb2eb8104a4ce509a9a861672cb5"; - sha256 = "0hgay8d4lja4fk3d6xhq08n1j9ic6flzq1w003b3fpxzr6l2b0vl"; + rev = "99600641de75419f7729698acf9dc3d79117ff70"; + sha256 = "0y2w2ld90ly0mrrq3cx3j84sry78wq4izhv15idyyjbxs7zsif2k"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2021-12-19"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "0ceb4ef342bf1fdbb082ad4fa1fcfd0f864e1cba"; - sha256 = "0bbjhjngn0wv6f28z437bx9743w366665ygz6pz81059whfp93g7"; + rev = "32bc46ee8b21f88f87d97b976ae6674595b311b5"; + sha256 = "1daqlkr7a53g3rcmjdw2z2fnaqb0iz6dh5g1laddv4ni27ifm5rg"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -4800,12 +4800,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-01-03"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "fe87d9e406281fcb3cff11552820868d545c20e8"; - sha256 = "1nscikfnx2skjzaj8qak0b31zk7y378kxvhj7sj7nwrxfp8kb7dk"; + rev = "fcb633426eb197c0569f4640bee98972c4a7d65c"; + sha256 = "1rm1yf0aa3wll1j02ifcjdb9mjzii8s3dvrdkmpwxgbcdyyawx5n"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -4860,12 +4860,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2021-11-30"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "ce49cf36dc839564e95290e2cdace396c148bca1"; - sha256 = "1q7y7vhgk8r28nq4q3aamvkg2hfylfxq25i2avj45prap23b73zy"; + rev = "7f5196a21e6dfd672f070ecef3521933561e8d77"; + sha256 = "1g09zpn7xsgn8xnf45rrmfvr26j90vc4k77gw6zdw5ddpmdn2nbw"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -4884,12 +4884,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2021-12-29"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "30bf6f3da963cefd84b38a021572381ae0e8d10f"; - sha256 = "10xaz0nm7456y6l2s8q3gw3wnn94qrhyk3m8ikpdj90zlk69hjjq"; + rev = "4ab30ef201780b8e1b087c3a04256e54a560f597"; + sha256 = "0b9631h17zcr48hbhm2zvna6hiymyyh2ns0f2ijz5k47013z0zs0"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -4932,24 +4932,24 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-01-03"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "159db459f4495802a98401952d9ff441919c0a4b"; - sha256 = "02w9qn5q9zalg3gnfhhlyja9v85j53zpx50qzfzgjm4l8kyh1zkh"; + rev = "2fdc13ebc9bfd904d26991ac02ea29fde973b24c"; + sha256 = "0k73wkia0mfrwyc6hny3m8rsrk2lpvpcf98c91r4hbwv6zya8nps"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2021-12-30"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "eb0f6398e2a931ac1ae1436613951e6dd3d5e324"; - sha256 = "1kml694a4c9wmv13fgs3rs4c2alidwmlafa6hnkrarhv7npa5nw5"; + rev = "c862335f303c631f53a642a1ea60f15634c720fa"; + sha256 = "05n17r2grh25d6srb5lwazj790xp00l3jsyjc0drf4npyd1m424r"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -5076,12 +5076,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2021-12-15"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a672e11c816d4a91ef01253ba1a2567d20e08e55"; - sha256 = "1kqzspclkx7mpcpm2xb0fvzhv02wj7vms7xh9fjh64hvg2r2q21v"; + rev = "563d9f6d083f0514548f2ac4ad1888326d0a1c66"; + sha256 = "1i4sj56fral52xa2wqzx331a6xza4ksi0n6092g6q93kxx202xwq"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5378,12 +5378,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-12-31"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "2e11e0542da61783c02c44f70c45c70a51ac6823"; - sha256 = "007rln47y1krmc87skivirhx28hcqbbs676y43qwdkfgr464gc18"; + rev = "241bd87f2de35f954f6e3fc05ff707280dcf96c1"; + sha256 = "1vn3nlkpywpdddlz6ddg4r0x1c31d3m7z541nnzq71fhvf2fw8c5"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5450,12 +5450,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-01-04"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "b876914f4c0fef926bed50876c3da16c15adc81c"; - sha256 = "0n5y4ysm0inki1sxxa7w59b682xjy7ykflydiphwf5m1w0fhpkin"; + rev = "2c7da8bd43500f160b1f330c180c1efbabb09a68"; + sha256 = "082p82iy8fqm66nxdwixfy9c2jg35mwkxn287pimhznsaa0dzz47"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -5558,12 +5558,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-01-03"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "8cec6ac01fbeba4efd91ab9f991bbd56fb5002a7"; - sha256 = "069hn6px0a83bpj6332n9gwn82145d98pdvadhsnj89dkmf4gdcj"; + rev = "51fc74a33bcca6dcd75e0dcfd7ccff7ebb73a8bf"; + sha256 = "178xyishqz51cng297my5858klyxf01h5f9x7fqkwpz61pim70q7"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5775,12 +5775,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-12-30"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "868b92a8b64e6423adf2d6a8e33d6028ca8e6894"; - sha256 = "04spsqf6w4pjz4hha5pc08g8ddwg7027p80pgbn6sk2nmzf354xd"; + rev = "c4dfd15a2202eeeabefc13028af652c8322f2c49"; + sha256 = "0apxhc6ml46lh4ardmr4pxdhz4jn6pzndzdyb92diq8fzxm1jqh6"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5883,12 +5883,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2022-01-03"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "ed71635666356d9dc8950ecc177ed7eaa0d939ec"; - sha256 = "1fjg1zxl4sbibr658962iqk0lgcrggxwffmscr5v4n3x41v0xnrd"; + rev = "452d1359fb14731a316be49fb446a05d2c7d2f71"; + sha256 = "0idp98hm8qbamfdav97c94b1fj6an9vha5rpkc4727n47fj5hvlq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -5908,12 +5908,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-11-29"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "fca1c02b29d5f54f063122270f3e5ea8777ca958"; - sha256 = "0a5rra4al18m3f175awz118gilg3cqx8i3k1mr0657n5hvkxbs9d"; + rev = "824de25ed4b115922190838d7ad40e2f933f8392"; + sha256 = "0p03535njy5c3cik2l8ajfrrmi8pjr0vj53ydbay9bjb97mrnxfg"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -6004,12 +6004,12 @@ final: prev: surround-nvim = buildVimPluginFrom2Nix { pname = "surround.nvim"; - version = "2021-12-29"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "blackCauldron7"; repo = "surround.nvim"; - rev = "81f997bd71590f21f717e24bae72edf8e8b7b0f6"; - sha256 = "06mdbpka2z17hyi3p7b9ksyz79ppwybhr4h9829qba8xr2gpd465"; + rev = "8b05e7c7119031c8e5ecb61a3013af42fd439c7c"; + sha256 = "0kka6gq19hx1isq6h8ip7m9asv7amq3nrhpcsq5xss5888wi4b4m"; }; meta.homepage = "https://github.com/blackCauldron7/surround.nvim/"; }; @@ -6245,12 +6245,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2021-12-29"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "52170a89ea52a7a3b6131d19348642dbb60e5a84"; - sha256 = "1vfd9i96dy1mjhd86xcx8b2wg2sk063h3il2ngymdil55iv1x4yc"; + rev = "c4674fff199a01d0c476838427572fa3ee632373"; + sha256 = "1b5gnsgr0yblplbagji5h7dgz8xmcaah3kmazy1pbqa1sw79qwz1"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -6306,12 +6306,12 @@ final: prev: telescope-github-nvim = buildVimPluginFrom2Nix { pname = "telescope-github.nvim"; - version = "2021-08-25"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-github.nvim"; - rev = "004a224de1770bf8b2d7b147359a127dc323c8e6"; - sha256 = "0jizqlasmnsyfcjd9fqdc0zf6xfpbfrwcdywpvn52x5cdrjascp7"; + rev = "e25fda4f43c51b9af45370f4564a28b17ebe2570"; + sha256 = "1rhn1mjx4q6l14r7w46qbcv9b2xw7gh3d3dvxvipxhcr54gyw38l"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; @@ -6378,12 +6378,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-01-03"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "a01ebd2793999c11d727fd15b1e5979ba20c7503"; - sha256 = "1xj3nr3rvsd6gx39284swxyhiw6s0kpis6dvp9g6fnwiiz5mbi38"; + rev = "c54fc1733e440ebe730f68a838c54c7c7e70e6fd"; + sha256 = "0zkal6igprwvwp5f7xjm16m102j18xagi8pqxsqk17qf9zi1h8wn"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6535,12 +6535,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2021-11-24"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "265bbff68fbb8b2a5fb011272ec469850254ec9f"; - sha256 = "0xqnnd4wbcyd0akx8bk3dw5cghlg3bf255qiq0p8mbmlc5rixyzq"; + rev = "463843d1ba0288eedaf834872c3eca114d45bddf"; + sha256 = "0c6xz3xyfn1bw8qwz4y13y79mi4fzgrgng8qy3da9v4in13by5f9"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -7039,12 +7039,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-12-28"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "332d44948a3c737272172d0eae0bf5b940e72459"; - sha256 = "04sj3xhai33sfchsdqijn4cb2gchaihx6q4csrfphzskgjlngd9a"; + rev = "dd42c521ca88ad1d1d1099d014c6d0b1d88a8028"; + sha256 = "00rxadb4izxlh88i6919xnd0l3y9gx2sz8g0xpajcl5kw13qj31z"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7387,12 +7387,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-01-02"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "be4eb555d3a2d2d63dcc6140480b394bafbbbc89"; - sha256 = "1p0d04m768vxm3z7a8ga6mv2wb5pgj454d83hzi5ph9w7risdz0k"; + rev = "ec86b306aebcfbb455289252b66f5cf08f120c06"; + sha256 = "0bgaxi979r45a6azyb346y0n5w8gsmfbwswcfxh6jmbjgcyi17m6"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7723,12 +7723,12 @@ final: prev: vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-12-18"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "9252538fedd6bed5c7eff20ee6f9593676e2fed4"; - sha256 = "0r2shfwb9i62mxl254wc9zcq3z1nf72snd0ar8sxjll5iklnzw1k"; + rev = "a2258658661e42dd4cdba4958805dbad1fe29ef4"; + sha256 = "044aim36332ss5zlv8vxww8gqv0pldmn3nw08msldkfxmi86ybbd"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -8263,12 +8263,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-12-10"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "6562b4fcc1aa5e1fb3d77d009e3a1d2f985578db"; - sha256 = "0h4hmiyq9p9ywx601a5qr2ia8qgzl68qlzn85z2857pxmdv9s6w2"; + rev = "60b6fc735c198a17657b0bd04f257e59dff184ac"; + sha256 = "0i6qw7rmizrvrzzsccg50hvrhcz7z99r7ndxm9sh19ybhxndnjcw"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -9057,12 +9057,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-01-04"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "40b155512b142f2111195d85d4c19de2c424a4f2"; - sha256 = "1pxdc0f66hgikwnwddhlwriaribbsxddyki33a5pn7z2sbhd8c9g"; + rev = "c5e5ccc0283b5da3944d08fdbf43c4ebb93cb449"; + sha256 = "1mjvlwk2ai4xdg2093psm0iishjxbbysbkbi97rb4gbllanyp3mc"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -9141,12 +9141,12 @@ final: prev: vim-markdown-composer = buildVimPluginFrom2Nix { pname = "vim-markdown-composer"; - version = "2020-08-15"; + version = "2022-01-04"; src = fetchFromGitHub { owner = "euclio"; repo = "vim-markdown-composer"; - rev = "c0f98ec3d6c4cb49455c18f2aeb83c0dcbad1bc4"; - sha256 = "10vb3p8gksjy8zfzlkhirdsjwgvh1yv19plxwr404x87j393rs7n"; + rev = "010ae3667fb0cb4c63c99439d1a8f81ebdcc849e"; + sha256 = "1hz0xjq0srv3llb4i6n2sw0pi2s0k3qcwyk6az5icrvkfhbnc0kf"; fetchSubmodules = true; }; meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; @@ -9166,12 +9166,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-12-31"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "85c65f4594bb9689d4078df9913498837a02edf5"; - sha256 = "15yplz8v9l8pvirakwjd7jj2z5zna40gz0k22ck3y0vsnpqaicd3"; + rev = "0981e4d5e0ad25688362b875269499ce6de36101"; + sha256 = "04y182giixrmsm3c3q8nylbcdgkci978dwjh2qxpywvffrvz2gc8"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -10246,24 +10246,24 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2021-12-30"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "ca975211f668abd89c8a8490f9a182908fee6f17"; - sha256 = "170a02m0j0llmq9220wa6yzs3ss5m1x657b077v8g4v9kq7s70rg"; + rev = "5fab39c4f643fc8cad4efb10a793b3d9979115f1"; + sha256 = "0p2f8g3w4ixfj15aj5f6vd45havba5rbql57bhfd5nv1jb5y9wga"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2021-12-29"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "c1e51f85a09ee3756ec767ea8eeba46c654e30da"; - sha256 = "1673z71jc51li2mkj7rrzwx2hmimrksqjmqb0zidda04xss7iyi7"; + rev = "32f0c3dc627662e735fee78df29c7acec4e0365c"; + sha256 = "0gi16riib78l5gq74ixm1vvrzry6m6f64w2hnss1vypmh302b1p7"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -10583,12 +10583,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-12-30"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "c44be6765edb81834797e66ad206f83e190bdd49"; - sha256 = "1x1v38p7828zzsdasc7y1dan3lbbjxvgzw7b3l18bing1kmyw2ah"; + rev = "1efc3def36eff8ac12ddb1f25837ef6101531047"; + sha256 = "0cfx8wq6hq3kdd49vymqj595i5l16xfi55ngn8k2rq6wrd76y5f4"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -10811,12 +10811,12 @@ final: prev: vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2021-11-24"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "25399d85fc07054c534c7808476e763849cdcb02"; - sha256 = "14cqyjvhabiw4izmdh69mj8qvb65cw5q28frl2hmdqf492r7h98z"; + rev = "7a2161991722a811c4ff06b3ce0119dd180729fd"; + sha256 = "1fk3a14sickfkls4khkv2zykfy0093whsl020h61xf5c8g8byv6y"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; @@ -10919,12 +10919,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-12-16"; + version = "2022-01-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "fd13f3fb09823cdefb2c9bebb614a13afd1920cc"; - sha256 = "0npflxwclwcs72wk8kgsccqfh5783hvmxzirz3qf8yznllj8k8rs"; + rev = "7fde9c0b6878a62bcc6d2d29f9a85a6616032f02"; + sha256 = "1f0p9pk2a2fxcdf4p35vm0jyrxkkxkqgn1v8fyd622vmcrbrj860"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -10955,12 +10955,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-01-01"; + version = "2022-01-07"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "cfa4961cb7a6689456c77c02bda2f552d0690beb"; - sha256 = "0vdmmri6r2pagby6pxk82gvd7ykh11812qpcq0rfgg0ax665xm0f"; + rev = "441f5c7ce8adce1d30403bca26ea5e6a3a2b82e4"; + sha256 = "1zflwz70iqfdrzlq9lvyi2awbj5s9s0daqx4rf4lkp58jb0q6jqr"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -11243,12 +11243,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-01-03"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "9cb48789ade24615bc78459c331d9db7a0fc82f6"; - sha256 = "1radkmn3v7k4288zy9hxm9phk0qrm2fmzxwnnw5kx7k0sfr75y2l"; + rev = "bc57b1dd14214cf3e3a476ef75e9dcb56cf0c76d"; + sha256 = "0dc926dm2hq2qq5nbs0ljkbz316i8vz9ycfsp7yn1dhdnf3ajgzs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11256,12 +11256,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-01-04"; + version = "2022-01-08"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "d9fa252426343bd6f3e6cb134b41e674ad0e39d3"; - sha256 = "190kpl2ng8i1fkw6pzgx32aw6c1zw8w10aikwvdrz8f7g691kf7f"; + rev = "525db53991e5f51668c86e2359aa31c6b3a2a226"; + sha256 = "0xk9zyv0knm6djqsk4rxw1m82prj0jphqs48m0cbsk0jssvf39wl"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11376,12 +11376,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2021-10-31"; + version = "2022-01-09"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "f7071a649e8eff744b36b055f02bbb952efc4cbb"; - sha256 = "0f3r9l2brk75qs9m8rn6sxlbmg80n51cmh7j3ss66k7al52xpphc"; + rev = "f50d79a3f9ef07be3c0c8a0f49faaeea803a8c0c"; + sha256 = "0188kmh2ck1a5254i3gdk1p6p2z7wdq3prj66lslbhyard8gzxjq"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; @@ -11484,12 +11484,12 @@ final: prev: yats-vim = buildVimPluginFrom2Nix { pname = "yats.vim"; - version = "2021-11-02"; + version = "2022-01-05"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "7cf70a6c9ef0ce6657aede257e9c42a03b8f86a9"; - sha256 = "01insbxp68vxhcmqcajy7b6hzj6va4l8f5rqyflphh9pnxrc8pyp"; + rev = "3e6a46271fe307741dbd06507e36ec08f118263a"; + sha256 = "06aw72jpssi0ppadqw77cyfn6w9r87984h85f58bfffd8v0s9arg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -11497,12 +11497,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-01-03"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "bdcb798374b4ada441f1042b7f6360fb8d7146d3"; - sha256 = "1gk3x6w7566iv6jv6bpm8llq1xqhdzgc1i540l4pkl28bmja7fzr"; + rev = "401218a40fe8c55a934c257a9b0196158f992d2d"; + sha256 = "0gh306ns8fbrwqf31av06gyn2wmxjvhinfjgqkd73li7gjnp2yjb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; From 0a99fa0331b842cb75e942114de73b545ee71ed1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Jan 2022 03:01:54 +0000 Subject: [PATCH 28/29] linux_latest: 5.15.12 -> 5.16 --- pkgs/os-specific/linux/kernel/linux-5.16.nix | 18 ++++++++++++++++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 10 +++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-5.16.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix new file mode 100644 index 000000000000..9a7b5208d474 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.16"; + + # 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 = "1fq86dbx2p124vi4j8nan68gj4zyw4xnqh4jxq9aqsdvi24pwz82"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 823e6976a02d..47dd8f3e6cb0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -508,6 +508,7 @@ mapAliases ({ linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_15 = linuxKernel.packages.linux_5_15; + linuxPackages_5_16 = linuxKernel.packages.linux_5_16; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -523,6 +524,7 @@ mapAliases ({ linux_5_10 = linuxKernel.kernels.linux_5_10; linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; linux_5_15 = linuxKernel.kernels.linux_5_15; + linux_5_16 = linuxKernel.kernels.linux_5_16; # added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index edc1a89985b5..57aeb9d39986 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -166,6 +166,13 @@ in { ]; }; + linux_5_16 = callPackage ../os-specific/linux/kernel/linux-5.16.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -474,6 +481,7 @@ in { linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); + linux_5_16 = recurseIntoAttrs (packagesFor kernels.linux_5_16); }; rtPackages = { @@ -518,7 +526,7 @@ in { packageAliases = { linux_default = packages.linux_5_10; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_15; + linux_latest = packages.linux_5_16; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_10; From e2aab323796ef1854dbf1741200cffff6037b7cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Jan 2022 13:36:09 +0100 Subject: [PATCH 29/29] batman-adv: 2021.1 -> 2021.4 https://www.open-mesh.org/news/106 https://www.open-mesh.org/news/105 https://www.open-mesh.org/news/104 --- pkgs/os-specific/linux/batman-adv/version.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 71c7863cfa85..048318e3e33a 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2021.1"; + version = "2021.4"; sha256 = { - batman-adv = "1l1lk41h4chymrb41ihqrr3p80xdwhhp1kkksr157mzailyq8xxz"; - alfred = "122y92vqrpp3g6dbjfv8hkhwjlfa3skr91lbzicr0pw8mm6wzqll"; - batctl = "0xp1cqcw0g0irgw9yhkch01rbn39gzvfxv8b2yya32vbnkmqrcj4"; + batman-adv = "06zbyf8s7njn6wdm1fdq3kl8kx1vx4spxkgiy7dx0pq4c3qs5xyg"; + alfred = "15fbw80ix95zy8i4c6acm1631vxlz2hakjv4zv5wig74bp2bcyac"; + batctl = "1ryqz90av2p5pgmmpi1afmycd18zhpwz1i4f7r0s359jis86xndn"; }; }