From e06ff86468cff72eaf4acca4b164d4b69f721d76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Dec 2020 09:22:52 +0000
Subject: [PATCH 01/30] metabase: 0.37.2 -> 0.37.3

---
 pkgs/servers/metabase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index fe16eae04c8..8e16a59452e 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "metabase";
-  version = "0.37.2";
+  version = "0.37.3";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "0rhwnma8p3lgdld9nslmnii2v83g8gac6ybgk58af9gpypivwpvr";
+    sha256 = "0ka0k0ficvw8srpaa89l0jdzpl4n7hjwz18r41kw1hzk2ydd3p5c";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ea7b8d5ce910018b60aa82c662e6aaa29afc1519 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Dec 2020 14:28:11 +0000
Subject: [PATCH 02/30] nsd: 4.3.3 -> 4.3.4

---
 pkgs/servers/dns/nsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 35f76943e14..f505bb786ee 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nsd";
-  version = "4.3.3";
+  version = "4.3.4";
 
   src = fetchurl {
     url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0lgdiqnkfvy245h6kkiqic586qjwmg51lsfs86vlc0kwjwddiijz";
+    sha256 = "0l4ba80ihwg3s2ifhnkmk7rjabrcy5zw6sz4hn0vm9sif6lk9s1v";
   };
 
   prePatch = ''

From 5ad05f8f1de3e34a3b90cdaa153fd372d3de0905 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 6 Dec 2020 22:23:55 +0000
Subject: [PATCH 03/30] python37Packages.azure-keyvault-keys: 4.3.0 -> 4.3.1

---
 .../python-modules/azure-keyvault-keys/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
index 46bd196a3d8..bbdc06d52d4 100644
--- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "azure-keyvault-keys";
-  version = "4.3.0";
+  version = "4.3.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "064a98791fe447a0e57850bb5ec1ec43e7d5fd39266319b5acc44a9704a3b966";
+    sha256 = "fbf67bca913ebf68b9075ee9d2e2b899dc3c7892cc40abfe1b08220a382f6ed9";
   };
 
   propagatedBuildInputs = [

From 924c4ebc08e270431664925c42da998d5d7a2616 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 6 Dec 2020 17:04:36 -0600
Subject: [PATCH 04/30] =?UTF-8?q?top-level/static.nix:=20Don=E2=80=99t=20a?=
 =?UTF-8?q?dd=20-static=20LDFLAGS=20in=20darwin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We can’t do fully static here, like "static" flag in libev does. I’m
not 100% sure if this is necessary for Linux (makeStaticBinaries
should set -static flag automatically), but leaving as is to avoid
breaking anything.
---
 pkgs/top-level/static.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index b3851ba20f0..caea8040620 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -281,8 +281,8 @@ in {
   python39 = super.python39.override { static = true; };
   python3Minimal = super.python3Minimal.override { static = true; };
 
-
-  libev = super.libev.override { static = true; };
+  # Note: -static doesn’t work on darwin
+  libev = super.libev.override { static = !super.stdenv.hostPlatform.isDarwin; };
 
   libexecinfo = super.libexecinfo.override { enableShared = false; };
 

From 399ac47521d80182668ecbb2360b13ff41e119de Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 6 Dec 2020 17:06:50 -0600
Subject: [PATCH 05/30] top-level/static.nix: also enable static for
 nixUnstable

---
 pkgs/top-level/static.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index caea8040620..82708d112f1 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -163,6 +163,7 @@ in {
   };
   mkl = super.mkl.override { enableStatic = true; };
   nix = super.nix.override { enableStatic = true; };
+  nixUnstable = super.nixUnstable.override { enableStatic = true; };
   openssl = (super.openssl_1_1.override { static = true; }).overrideAttrs (o: {
     # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.
     configureFlags = (removeUnknownConfigureFlags o.configureFlags);

From 805c9d4847b565784d6d00f4379ce6661fea7619 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 6 Dec 2020 17:09:07 -0600
Subject: [PATCH 06/30] top-level/static.nix: put makeStaticDarwin first in
 staticAdapters

This needs to go first since the .override will reset the mkDerivation
function, removing any other customisations done afterwards. Kind of
hacky, but seems to work correctly right now.
---
 pkgs/top-level/static.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index 82708d112f1..b8d0d16e97b 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -34,14 +34,18 @@ self: super: let
     });
   };
 
-  staticAdapters = [ makeStaticLibraries propagateBuildInputs ]
+  staticAdapters =
+    # makeStaticDarwin must go first so that the extraBuildInputs
+    # override does not recreate mkDerivation, removing subsequent
+    # adapters.
+    optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin
+
+    ++ [ makeStaticLibraries propagateBuildInputs ]
 
     # Apple does not provide a static version of libSystem or crt0.o
     # So we can’t build static binaries without extensive hacks.
     ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries
 
-    ++ optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin
-
     # Glibc doesn’t come with static runtimes by default.
     # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ])
   ;

From 1ecb8e72c216ff937e788e50506f0ae09f3088aa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Dec 2020 04:46:29 +0000
Subject: [PATCH 07/30] rednotebook: 2.20 -> 2.21

---
 pkgs/applications/editors/rednotebook/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index a6e69cf869e..698eca91a8b 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonApplication rec {
   pname = "rednotebook";
-  version = "2.20";
+  version = "2.21";
 
   src = fetchFromGitHub {
     owner = "jendrikseipp";
     repo = "rednotebook";
     rev = "v${version}";
-    sha256 = "1n0zwrzrjh6sg8vmb95mgscsqrylhgm51zsirblqmpvs392jxrk3";
+    sha256 = "07zm4q9h583sg82ayhn9d0ra3wbsfaqrl5sfw6a1kwhyxxkwp8ad";
   };
 
   # We have not packaged tests.

From 34318b7c424879c830621fe716fb839921aafa1f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Dec 2020 09:12:54 +0000
Subject: [PATCH 08/30] webhook: 2.7.0 -> 2.8.0

---
 pkgs/servers/http/webhook/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix
index fe428926704..0d9fb54396b 100644
--- a/pkgs/servers/http/webhook/default.nix
+++ b/pkgs/servers/http/webhook/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "webhook";
-  version = "2.7.0";
+  version = "2.8.0";
 
   goPackagePath = "github.com/adnanh/webhook";
   excludedPackages = [ "test" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "adnanh";
     repo = "webhook";
     rev = version;
-    sha256 = "1spiqjy0z84z96arf57bn6hyvfsd6l8w6nv874mbis6vagifikci";
+    sha256 = "0n03xkgwpzans0cymmzb0iiks8mi2c76xxdak780dk0jbv6qgp5i";
   };
 
   meta = with lib; {

From 9231ea93ca3c4770584df0caca8d480b02f16b60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Dec 2020 11:13:39 +0000
Subject: [PATCH 09/30] abcm2ps: 8.14.10 -> 8.14.11

---
 pkgs/tools/audio/abcm2ps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index 5088cdeb960..139d684fb67 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abcm2ps";
-  version = "8.14.10";
+  version = "8.14.11";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "0x20vmf94n9s4r2q45543yi39fkc0jg9wd1imihjcqmb2sz3x3vm";
+    sha256 = "0lzzr2nkfg27gljcrdxkmli1wp08vap3vgxq1zgkv7f43rbm0qnw";
   };
 
   configureFlags = [

From 374c3ff56382135dbdb6867ae14247ba3433d41d Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Tue, 8 Dec 2020 13:48:03 +0100
Subject: [PATCH 10/30] linux_zen: 5.9.12 -> 5.9.13

---
 pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index c4f08e568a0..04c6486c374 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, buildLinux, ... } @ args:
 
 let
-  version = "5.9.12";
+  version = "5.9.13";
 in
 
 buildLinux (args // {
@@ -13,7 +13,7 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     rev = "v${version}-zen1";
-    sha256 = "07cmcw8ib9wc4im08pbmxhj187lhsfxh2asn4jdxadxxq3f60h6w";
+    sha256 = "13sv794srmf1p13pb07pl6c4fxw2f1vjkxj8dkdgfhy03b0iasa2";
   };
 
   extraMeta = {

From ba44cf1c6e4259e3627fa7d218b5c1123a8f53ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Dec 2020 14:50:56 +0000
Subject: [PATCH 11/30] ckbcomp: 1.198 -> 1.199

---
 pkgs/tools/X11/ckbcomp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 2254cb4038e..275fe38611d 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ckbcomp";
-  version = "1.198";
+  version = "1.199";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "installer-team";
     repo = "console-setup";
     rev = version;
-    sha256 = "04ahnn8gi24x9kjz6q4nm6gswc4gcav87rvq9sajj4g2hkrxfn0c";
+    sha256 = "0jvnxmqhfmj4aywskr2bk1q5p5fl8s4k4bch89965vcwi9bplalf";
   };
 
   buildInputs = [ perl ];

From 72d2cb86fddcb2b2f9c35bb41a6edadf52880fba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Dec 2020 15:21:34 +0000
Subject: [PATCH 12/30] cppcheck: 2.2 -> 2.3

---
 pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 8858ac59ae6..91bcecbb43d 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cppcheck";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "1dcf053cqci2ha3yy817y02yz9mhrkgddcbnn6gj82j6k87a4rq4";
+    sha256 = "0mlw0z20qf0g9qrmdmbykzf87wlcgmah8bacmp4mk6dwfzr9g9n3";
   };
 
   buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ];

From c65495223536f62b88bc1801ec84b4733795b7dd Mon Sep 17 00:00:00 2001
From: SCOTT-HAMILTON <sgn.hamilton+github@protonmail.com>
Date: Tue, 8 Dec 2020 19:10:27 +0100
Subject: [PATCH 13/30] berry: fix missing libXext

---
 pkgs/applications/window-managers/berry/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix
index 367d0214129..64b7f2c1d2b 100644
--- a/pkgs/applications/window-managers/berry/default.nix
+++ b/pkgs/applications/window-managers/berry/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , libX11
+, libXext
 , libXft
 , libXinerama
 , fontconfig
@@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =[
     libX11
+    libXext
     libXft
     libXinerama
     fontconfig

From 163bd93f63af737e646dfbff48e6b62f693291b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Dec 2020 18:11:31 +0000
Subject: [PATCH 14/30] feh: 3.6 -> 3.6.1

---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 0c7f3e8fe10..a7d26f5300a 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -7,11 +7,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "feh";
-  version = "3.6";
+  version = "3.6.1";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
-    sha256 = "1n6gbyzlc3kx2cq9wfz7azn7mrjmcc9pq436k1n4mrh0lik5sxw7";
+    sha256 = "1a0ygdpyvpcsr0hdi9ai7ycbkgvacq8dpd8cacbppsds5k2xw7lv";
   };
 
   outputs = [ "out" "man" "doc" ];

From 9011356409e15983319985cc82bb151e3a03e8c3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 8 Dec 2020 12:36:28 -0600
Subject: [PATCH 15/30] less: 551 -> 563 (#101407)

http://greenwoodsoftware.com/less/news.563.html
---
 pkgs/tools/misc/less/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index 9b1aa0dc590..4ffbf8634a8 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "less";
-  version = "551";
+  version = "563";
 
   src = fetchurl {
     url = "http://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0ggyjl3yzn7c450zk1rixi9ls6asdhgqynhk34zsd0ckhmsm45pz";
+    sha256 = "16lsvk88vwjwp5ax1wnll44wxwnzs8lb2fn90xx2si64kwmnsnyf";
   };
 
   configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.

From 4a7bcab1d0a61d69688156376d5cdb38d81edff2 Mon Sep 17 00:00:00 2001
From: SCOTT-HAMILTON <sgn.hamilton+github@protonmail.com>
Date: Tue, 8 Dec 2020 19:00:47 +0100
Subject: [PATCH 16/30] flask-appbuilder: fix flask-babel dep

---
 pkgs/development/python-modules/flask-appbuilder/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix
index 5119d3c39ac..60dc18a9877 100644
--- a/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/pkgs/development/python-modules/flask-appbuilder/default.nix
@@ -67,7 +67,8 @@ buildPythonPackage rec {
       --replace "PyJWT>=1.7.1" "PyJWT" \
       --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \
       --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" \
-      --replace "Flask-Login>=0.3, <0.5" "Flask-Login"
+      --replace "Flask-Login>=0.3, <0.5" "Flask-Login" \
+      --replace "Flask-Babel>=1, <2" "Flask-Babel"
   '';
 
   # majority of tests require network access or mongo

From 0bb69986bd7839cfd7f63691891c50d9155c9e16 Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Mon, 7 Dec 2020 21:03:47 +0100
Subject: [PATCH 17/30] pythonPackages.llfuse: 1.3.6 -> 1.3.8

---
 .../python-modules/llfuse/default.nix         | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index e74a38a96e8..0480deb401c 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, buildPythonPackage, pkgconfig, pytest_5, fuse, attr, which
+{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest_5, fuse, attr, which
 , contextlib2, osxfuse
 }:
 
@@ -8,25 +8,13 @@ in
 
 buildPythonPackage rec {
   pname = "llfuse";
-  version = "1.3.6";
+  version = "1.3.8";
 
-  src = fetchurl {
-    url = "mirror://pypi/l/llfuse/${pname}-${version}.tar.bz2";
-    sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1g2cdhdqrb6m7655qp61pn61pwj1ql61cdzhr2jvl3w4i8877ddr";
   };
 
-  patches = [
-    # https://github.com/python-llfuse/python-llfuse/pull/23 (2 commits)
-    (fetchpatch {
-      url = "https://github.com/python-llfuse/python-llfuse/commit/7579b0e626da1a7882b13caedcdbd4a834702e94.diff";
-      sha256 = "0vpybj4k222h20lyn0q7hz86ziqlapqs5701cknw8d11jakbhhb0";
-    })
-    (fetchpatch {
-      url = "https://github.com/python-llfuse/python-llfuse/commit/438c00ab9e10d6c485bb054211c01b7f8524a736.diff";
-      sha256 = "1zhb05b7k3c9mjqshy9in8yzpbihy7f33x1myq5kdjip1k50cwrn";
-    })
-  ];
-
   nativeBuildInputs = [ pkgconfig ];
   buildInputs =
     optionals stdenv.isLinux [ fuse ]

From b445bc62b791e3a97321d7682931965c2bdcdfe7 Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Mon, 7 Dec 2020 21:07:49 +0100
Subject: [PATCH 18/30] pythonPackages.llfuse: fix tests with pytest 6

---
 pkgs/development/python-modules/llfuse/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index 0480deb401c..d82f35782c1 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -15,6 +15,14 @@ buildPythonPackage rec {
     sha256 = "1g2cdhdqrb6m7655qp61pn61pwj1ql61cdzhr2jvl3w4i8877ddr";
   };
 
+  patches = [
+    # fix tests with pytest 6
+    (fetchpatch {
+      url = "https://github.com/python-llfuse/python-llfuse/commit/1ed8b280d2544eedf8bf209761bef0d2519edd17.diff";
+      sha256 = "0wailfrr1i0n2m9ylwpr00jh79s7z3l36w7x19jx1x4djcz2hdps";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs =
     optionals stdenv.isLinux [ fuse ]

From 799e33084b6f4580278790d7335a004c4ac80d68 Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Mon, 7 Dec 2020 22:52:38 +0100
Subject: [PATCH 19/30] Revert "pythonPackages.llfuse: downgrade pytest
 version"

This reverts commit 42cfd52182cf0115cde8d291c1986ec45304538f.
---
 pkgs/development/python-modules/llfuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index d82f35782c1..ac9360cb02d 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest_5, fuse, attr, which
+{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
 , contextlib2, osxfuse
 }:
 
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   buildInputs =
     optionals stdenv.isLinux [ fuse ]
     ++ optionals stdenv.isDarwin [ osxfuse ];
-  checkInputs = [ pytest_5 which ] ++
+  checkInputs = [ pytest which ] ++
     optionals stdenv.isLinux [ attr ];
 
   propagatedBuildInputs = [ contextlib2 ];

From 925b70cd964ceaedee26fde9b19cc4c4f081196a Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 7 Dec 2020 20:35:18 +0100
Subject: [PATCH 20/30] pythonPackages.pyfuse3: init at 3.1.1

---
 .../python-modules/pyfuse3/default.nix        | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyfuse3/default.nix

diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix
new file mode 100644
index 00000000000..33479cc66e4
--- /dev/null
+++ b/pkgs/development/python-modules/pyfuse3/default.nix
@@ -0,0 +1,42 @@
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which }:
+
+buildPythonPackage rec {
+  pname = "pyfuse3";
+  version = "3.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9feb42a8639dc4815522ee6af6f7221552cfd2df1c7a7e9df96767be65e18667";
+  };
+
+  patches = [
+    # Fixes tests with pytest 6, to be removed in next stable version
+    (fetchpatch {
+      url = "https://github.com/libfuse/pyfuse3/commit/0070eddfc33fc2fba8eb4fe9353a2d2fa1ae575b.patch";
+      sha256 = "0lb4x1j31ihs3qkn61x41k2vqwcjl2fp1c2qx2jg9br6yqhjmg3b";
+    })
+  ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ fuse3 ];
+
+  propagatedBuildInputs = [ trio ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-trio
+    which
+    fuse3
+  ];
+
+  # Checks if a /usr/bin directory exists, can't work on NixOS
+  disabledTests = [ "test_listdir" ];
+
+  meta = with lib; {
+    description = "Python 3 bindings for libfuse 3 with async I/O support";
+    homepage = "https://github.com/libfuse/pyfuse3";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ nyanloutre ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a316cc2ce91..34165a22dec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5129,6 +5129,8 @@ in {
 
   pyfttt = callPackage ../development/python-modules/pyfttt { };
 
+  pyfuse3 = callPackage ../development/python-modules/pyfuse3 { };
+
   pyfxa = callPackage ../development/python-modules/pyfxa { };
 
   pygal = callPackage ../development/python-modules/pygal { };

From 2f109e7a60707ad6f822b97fdb93f69a27de701a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Dec 2020 20:58:23 +0000
Subject: [PATCH 21/30] fluent-bit: 1.6.7 -> 1.6.8

---
 pkgs/tools/misc/fluent-bit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index ec1a0072a55..60860c197e8 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.6.7";
+  version = "1.6.8";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "1rybz69yhjm1g8m6wmn6v143a65y69w2fvs62yr8n1r92cadzbia";
+    sha256 = "1k8ghz8xwy7v4y4r4xc690ig7qmn0mkvynplwn66j44fgdpg0v1s";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From 8d041d04fc53f5b3846d6f1fb7756c914c7895e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Dec 2020 21:12:38 +0000
Subject: [PATCH 22/30] fedora-coreos-config-transpiler: 0.7.0 -> 0.8.0

---
 .../tools/fedora-coreos-config-transpiler/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
index 0d9bad0e41f..b53b03d26e3 100644
--- a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
+++ b/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 buildGoModule rec {
   pname = "fcct";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "coreos";
     repo = "fcct";
     rev = "v${version}";
-    sha256 = "1ffjn0l38szpkgd11mfaiynf9n8ljndv122l8amwiwp5mrh3hsl6";
+    sha256 = "0w3vhfjpmpahb08fp6czixhlqhk6izglmwdpj2l19ksz8fc8aq54";
   };
 
   vendorSha256 = null;

From d9415d11d3ddd2311df88377d3d671cc467bf583 Mon Sep 17 00:00:00 2001
From: fruit-in <42092501+fruit-in@users.noreply.github.com>
Date: Wed, 9 Dec 2020 05:21:04 +0800
Subject: [PATCH 23/30] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 120 ++++++++++++++--------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 86098cce5f1..ef0ee886705 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -449,12 +449,12 @@ let
 
   coc-fzf = buildVimPluginFrom2Nix {
     pname = "coc-fzf";
-    version = "2020-11-30";
+    version = "2020-12-07";
     src = fetchFromGitHub {
       owner = "antoinemadec";
       repo = "coc-fzf";
-      rev = "d994439ace0be8033c85db99f23c4f909d8ee41f";
-      sha256 = "07pl2ccj5rn873j5y0ls5dwry80iahlicjdcz059rf12fmgym702";
+      rev = "94103981228454680736c2d728862ec4616cd3ac";
+      sha256 = "1cq2vklr2f8dnlaq5ld8i7cjyg4x130myia4ln0wh8n1zgsvgld0";
     };
     meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
   };
@@ -485,12 +485,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2020-12-05";
+    version = "2020-12-08";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "586790276ceeb4d6bda8a23e846177cbf6313897";
-      sha256 = "02libgk8nv4kc20fy9y5p6nq596rpcvg9wyy5z87hxgkhfgdndsa";
+      rev = "6b3056d42ff206db56336d583841b643994bf2f7";
+      sha256 = "05y2sgsj9qk701v23d6qi43nm9dk19pmin4srhsa6nq9mab98gqd";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -582,12 +582,12 @@ let
 
   completion-tabnine = buildVimPluginFrom2Nix {
     pname = "completion-tabnine";
-    version = "2020-10-31";
+    version = "2020-12-08";
     src = fetchFromGitHub {
       owner = "aca";
       repo = "completion-tabnine";
-      rev = "373b556ce383da4cd35eae87c615cc4806af96d8";
-      sha256 = "05n1vlyjis6wr08k11zfbz6lic8c9gmplsfq8h0zskq01n7gs044";
+      rev = "278a6c6ae65fa753f21add8d797572043d8315d5";
+      sha256 = "00a0bpjpnykr625dyavczg5ca4mbbw2j0g7l66v3kjn67r2wr18y";
     };
     meta.homepage = "https://github.com/aca/completion-tabnine/";
   };
@@ -846,12 +846,12 @@ let
 
   deol-nvim = buildVimPluginFrom2Nix {
     pname = "deol-nvim";
-    version = "2020-12-05";
+    version = "2020-12-08";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "af1094adf913538b1edd33e161a63a31d313b52d";
-      sha256 = "0hyrm3mbmgfsqacyjpmasp7jsjjw82a8r6fivvz3vr10wsl5w8w3";
+      rev = "60b40060377b4fe87656889a183292fe3ead6b5a";
+      sha256 = "0xlnp1fmiqa84nvnra59jqw81hxjivr01nnagg4d4bmfqzbjxddh";
     };
     meta.homepage = "https://github.com/Shougo/deol.nvim/";
   };
@@ -1282,12 +1282,12 @@ let
 
   ferret = buildVimPluginFrom2Nix {
     pname = "ferret";
-    version = "2020-05-15";
+    version = "2020-12-08";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "6218891a01418377c67b12ad57046ec78958ced2";
-      sha256 = "1sjia8bk9gmwymhdrc3bksax4msincychd96ar5bdmifr6p1klg4";
+      rev = "fbcd9de1e88391d8a1ab39adb520d6a5ac29792f";
+      sha256 = "068v0gj7vn3halj0mcjfnziklqcssyln61ip5zalnw7x6vm3yblk";
     };
     meta.homepage = "https://github.com/wincent/ferret/";
   };
@@ -1379,12 +1379,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2020-11-29";
+    version = "2020-12-07";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "cabfd44a8b1666e9b0c1b18f55646dd8ec25d0d9";
-      sha256 = "1wzh1jy4i86yyskmr3i600s6a20vs0dwxnyna8dy32jg8l962wkx";
+      rev = "8fa9cf052409bbadf6bf24711b63bdb52c15c786";
+      sha256 = "1hiabzz7gb3yd41ncgghcqkibl8x1ymc6zp3f85hjrg1aqc8ibgj";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
   };
@@ -1848,12 +1848,12 @@ let
 
   julia-vim = buildVimPluginFrom2Nix {
     pname = "julia-vim";
-    version = "2020-10-14";
+    version = "2020-12-07";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "a4bc8a2032e9da4dbfc5f527c2415b68fc09b9bd";
-      sha256 = "1ir0yj0f0ggndxfpg8119vcb1l7qagf5qsl9s94ghbka6qqvlia3";
+      rev = "e14fd34409de39025af93873adc6d26a831d70f9";
+      sha256 = "1s1n74dn53aww6mjb87jcjpmipk2k2ayimimss7kg9c6n15jkqkg";
     };
     meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
   };
@@ -2568,12 +2568,12 @@ let
 
   nerdtree-git-plugin = buildVimPluginFrom2Nix {
     pname = "nerdtree-git-plugin";
-    version = "2020-11-30";
+    version = "2020-12-05";
     src = fetchFromGitHub {
       owner = "Xuyuanp";
       repo = "nerdtree-git-plugin";
-      rev = "6b843d3742d01b98a229ed2e6d3782f6d3f21651";
-      sha256 = "10mc9ir2h9swbyqfvg4gl3qkyc95s478wfl449zypsjnfisq7526";
+      rev = "5fa0e3e1487b17f8a23fc2674ebde5f55ce6a816";
+      sha256 = "0nwb3jla0rsg9vb52n24gjis9k4fwn38iqk13ixxd6w5pnn8ax9j";
     };
     meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/";
   };
@@ -2700,24 +2700,24 @@ let
 
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
-    version = "2020-10-01";
+    version = "2020-12-08";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "9414e51689ee56253b55ba8ef01e5d63ec2e9d97";
-      sha256 = "1vfqf8krd0mxyf31lhgmdpg6p8b5zqbpc0gjijj9akzgs6fdhknk";
+      rev = "a0e6003548ae0f89101347b483a3df773d24e6ed";
+      sha256 = "1s1wsa3hmafdfh4zd97imr5a0yiqq9v82f6aih1ha9bz503q4mg2";
     };
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
   };
 
   nvim-highlite = buildVimPluginFrom2Nix {
     pname = "nvim-highlite";
-    version = "2020-12-05";
+    version = "2020-12-07";
     src = fetchFromGitHub {
       owner = "Iron-E";
       repo = "nvim-highlite";
-      rev = "2541117eb64f442bc801bbabd37750d5b0845791";
-      sha256 = "0jsaflrjmsh95bpkvval27vzs62sgy7c9gdr13792zba4k5ycw1d";
+      rev = "63ba9ddbfdad709d9cc0e800f10a87dfa8df7968";
+      sha256 = "0bq0gqh9swl7zp9hvsj65idimknncn5jilbzkifd5kpd1z36dyqp";
     };
     meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
   };
@@ -2784,12 +2784,12 @@ let
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2020-12-06";
+    version = "2020-12-08";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "939d2e574ee82e77e243efebc50b746ed417d4b3";
-      sha256 = "0zhccdxlavc45fqr1cckchmzkpyfmjvsvmsk76wh8xhpymsn9scn";
+      rev = "b090476aa4bab404b9cfedd5b142851719114950";
+      sha256 = "096j3hz0c5p9h9pln8x6yy2jwir5h9jbal0nhi8gixvwgl20jgbl";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -3709,12 +3709,12 @@ let
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2020-12-03";
+    version = "2020-12-07";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "655295ef64ebb0b769de45146dae65b89212a8f0";
-      sha256 = "1avmkzn5bfn1zricvgnic9jdaizbb0nh970jl5bdszw80qilc6sn";
+      rev = "d1c15dc2657c4bdec50f9cc7ad76c4dc182e8cc9";
+      sha256 = "0qpswp3fwmf27452aixpz5xsryvzzvkj494rri7hhhbzjpvqc91w";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -3842,12 +3842,12 @@ let
 
   typescript-vim = buildVimPluginFrom2Nix {
     pname = "typescript-vim";
-    version = "2020-09-09";
+    version = "2020-12-08";
     src = fetchFromGitHub {
       owner = "leafgarland";
       repo = "typescript-vim";
-      rev = "9f247d7693cd12171239c56c355ba863f559f424";
-      sha256 = "1m16rhvmymxps41s7f6nh6gnbfiw5qwkvl23jr9z91xsq58jzj9l";
+      rev = "67e81e4292186889a1a519e1bf3a600d671237eb";
+      sha256 = "1mpp4n7qgz3yq4vka8h5sbngc14w5bzd9s9c2csbv9ds8w0lpi0g";
     };
     meta.homepage = "https://github.com/leafgarland/typescript-vim/";
   };
@@ -4430,12 +4430,12 @@ let
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2020-12-06";
+    version = "2020-12-07";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "bd497eaf5eef009e2557d40e9dc56e8a6c551f10";
-      sha256 = "0v1yzaqr7nv14d71823iviikmq6sq6wrsjqryk59j5pd8nb1jcwl";
+      rev = "7fbe0ac17fc70a4929f73612c0c092e0378937fc";
+      sha256 = "0k5ic1dff90l5lc45zcahy7h28k837sc0mywsjjw9a3vdr2naqxd";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -4478,12 +4478,12 @@ let
 
   vim-codefmt = buildVimPluginFrom2Nix {
     pname = "vim-codefmt";
-    version = "2020-11-12";
+    version = "2020-12-07";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "d418de02d5a6225883b08466414e33e80a509685";
-      sha256 = "1lsl2xcsyjj7ri32p89d425bq1lhpkbfac72hnwc7k6xwq87ibgm";
+      rev = "6761a211eb8690e84167a1cb2efb11f31e07973d";
+      sha256 = "0fppgyrbn6yy9qwi0vffj34vmqc40sqrh1drlbn9493j4r27ffyz";
     };
     meta.homepage = "https://github.com/google/vim-codefmt/";
   };
@@ -4658,12 +4658,12 @@ let
 
   vim-dadbod = buildVimPluginFrom2Nix {
     pname = "vim-dadbod";
-    version = "2020-04-30";
+    version = "2020-12-08";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dadbod";
-      rev = "779e8d6efc89b68be951ac1419baae75541cf51c";
-      sha256 = "019k26g88y713wy3q06sbab82dgcgsj7f08g9xr2z2xsjmijp8g4";
+      rev = "4a2a8bc6dca50bc58885bdf2c0a153d0990d7872";
+      sha256 = "0algcf02i273wmkg9yqhrxy10vi3j6vf08v0rnxnhima70gr1m1c";
     };
     meta.homepage = "https://github.com/tpope/vim-dadbod/";
   };
@@ -5042,12 +5042,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2020-11-27";
+    version = "2020-12-07";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "7bcfe539beee5fe8c542092732b6fd3786c6080e";
-      sha256 = "06z5l59x30pqz5sqkrz1v9q739i48hahrxhqyfwvj4bydg52nv30";
+      rev = "7afa1cfaa62e7fc6f891d0d59f4b10d046b5fd8e";
+      sha256 = "1a2q4n9dk8p3j9d8nr8briszmmign4393sbmrdrjkg963ysfc63g";
     };
     meta.homepage = "https://github.com/tpope/vim-fugitive/";
   };
@@ -7206,12 +7206,12 @@ let
 
   vim-toml = buildVimPluginFrom2Nix {
     pname = "vim-toml";
-    version = "2020-07-06";
+    version = "2020-12-08";
     src = fetchFromGitHub {
       owner = "cespare";
       repo = "vim-toml";
-      rev = "897cb4eaa81a0366bc859effe14116660d4015cd";
-      sha256 = "0ps9kwclqfdydk4132255i9rzcic0sp6d217arjsk1w6gm7m9lm6";
+      rev = "3c5face8e8944a217af45bc5bb708ff7dfcf1a54";
+      sha256 = "0g3hj9lcwd2vzcfkdrydhga2n82144llkvrxcjdn6zl84pjcvgd2";
     };
     meta.homepage = "https://github.com/cespare/vim-toml/";
   };
@@ -7314,12 +7314,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2020-11-24";
+    version = "2020-12-08";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "aa66db40e6c765fd6293c69e71b38b6a87dd3a08";
-      sha256 = "048qir6djrbrpyg70b4scslc5scw3c3mxb1rvbmmnp4i3qmcmm4z";
+      rev = "20a59dd6b82fa838f92a333061f40c8db0e41ffb";
+      sha256 = "0kkldla4rjw0gk7nvrq5l08nvpfhf6hmsmp4z0k9z4hin3yiddav";
     };
     meta.homepage = "https://github.com/mg979/vim-visual-multi/";
   };
@@ -7615,12 +7615,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-12-05";
+    version = "2020-12-07";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "4236c7b0e390064f2df43a312386946d814d4664";
-      sha256 = "1zfgyk1k1ai3ip8jbrgj7mli5vw5q7ikgqyy6ddkfd4bkmp0shia";
+      rev = "eb4c21f969f39f4c68cff6a42a45024427e633ac";
+      sha256 = "00f1yvmg1qnq8xsqmlalamg2lf0l7hm57p2nsxrxysm9csrvayjf";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };

From 098c0152f5fac60e47ce794b3404fecd56f27156 Mon Sep 17 00:00:00 2001
From: fruit-in <42092501+fruit-in@users.noreply.github.com>
Date: Wed, 9 Dec 2020 05:22:12 +0800
Subject: [PATCH 24/30] vimPlugins.vim-nong-theme: init at 2020-12-03

---
 pkgs/misc/vim-plugins/generated.nix    | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index ef0ee886705..7652844a68c 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -6051,6 +6051,18 @@ let
     meta.homepage = "https://github.com/LnL7/vim-nix/";
   };
 
+  vim-nong-theme = buildVimPluginFrom2Nix {
+    pname = "vim-nong-theme";
+    version = "2020-12-03";
+    src = fetchFromGitHub {
+      owner = "fruit-in";
+      repo = "vim-nong-theme";
+      rev = "ea4c8558970b2c6e724483e3031940906420aa7e";
+      sha256 = "09ws0wj2zldyfn7752rzh0wx24271yi4c390gd9f60d33pkc0s80";
+    };
+    meta.homepage = "https://github.com/fruit-in/vim-nong-theme/";
+  };
+
   vim-numbertoggle = buildVimPluginFrom2Nix {
     pname = "vim-numbertoggle";
     version = "2017-10-26";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 94ffa17d111..878fef69c49 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -121,6 +121,7 @@ flazz/vim-colorschemes
 floobits/floobits-neovim
 freitass/todo.txt-vim
 frigoeu/psc-ide-vim
+fruit-in/vim-nong-theme
 fsharp/vim-fsharp
 fszymanski/deoplete-emoji
 garbas/vim-snipmate

From 35bab12ed08e2b9d3d1f9f32b5b4ea7ed534256a Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Sun, 22 Nov 2020 17:02:20 -0500
Subject: [PATCH 25/30] inchi: init at 1.05

---
 pkgs/development/libraries/inchi/default.nix | 51 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/libraries/inchi/default.nix

diff --git a/pkgs/development/libraries/inchi/default.nix b/pkgs/development/libraries/inchi/default.nix
new file mode 100644
index 00000000000..86901100759
--- /dev/null
+++ b/pkgs/development/libraries/inchi/default.nix
@@ -0,0 +1,51 @@
+{ pkgs, fetchurl, stdenv, unzip }:
+stdenv.mkDerivation {
+  pname = "inchi";
+  version = "1.05";
+  src = fetchurl {
+    url = "http://www.inchi-trust.org/download/105/INCHI-1-SRC.zip";
+    sha1 = "e3872a46d58cb321a98f4fd4b93a989fb6920b9c";
+  };
+
+  nativeBuildInputs = [ pkgs.unzip ];
+  outputs = [ "out" "doc" ];
+
+  enableParallelBuilding = true;
+
+  preBuild = ''
+    cd ./INCHI_API/libinchi/gcc
+  '';
+  installPhase = ''
+    cd ../../..
+    mkdir -p $out/lib
+    mkdir -p $out/include/inchi
+    mkdir -p $doc/share/
+
+    install -m 755 INCHI_API/bin/Linux/libinchi.so.1.05.00 $out/lib
+    ln -s $out/lib/libinchi.so.1.05.00 $out/lib/libinchi.so.1
+    ln -s $out/lib/libinchi.so.1.05.00 $out/lib/libinchi.so
+    install -m 644 INCHI_BASE/src/*.h $out/include/inchi
+
+    runHook postInstall
+  '';
+
+  postInstall =
+    let
+      src-doc = fetchurl {
+        url = "http://www.inchi-trust.org/download/105/INCHI-1-DOC.zip";
+        sha1 = "2f54y0san34v01c215kk0cigzsn76js5";
+      };
+    in
+    ''
+      unzip '${src-doc}'
+      install -m 644 INCHI-1-DOC/*.pdf $doc/share
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.inchi-trust.org/";
+    description = "IUPAC International Chemical Identifier library";
+    license = licenses.lgpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ rmcgibbo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e198d3ca5d1..cab1f950048 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2312,6 +2312,8 @@ in
 
   icdiff = callPackage ../tools/text/icdiff {};
 
+  inchi = callPackage ../development/libraries/inchi {};
+
   ifm = callPackage ../tools/graphics/ifm {};
 
   ink = callPackage ../tools/misc/ink { };

From f4679d33f83d22febc11dc5df58f4afb2343c4c1 Mon Sep 17 00:00:00 2001
From: Dmitry Kudriavtsev <dkudriavtsev@gmail.com>
Date: Mon, 30 Nov 2020 16:52:35 -0800
Subject: [PATCH 26/30] lc3tools: fix errors due to incorrect hardcoded paths

---
 .../tools/lc3tools/0002-lc3os-path.patch      | 21 +++++++++++++++++++
 .../tools/lc3tools/0003-lc3sim-tk-path.patch  | 13 ++++++++++++
 pkgs/development/tools/lc3tools/default.nix   |  9 ++++++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/lc3tools/0002-lc3os-path.patch
 create mode 100644 pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch

diff --git a/pkgs/development/tools/lc3tools/0002-lc3os-path.patch b/pkgs/development/tools/lc3tools/0002-lc3os-path.patch
new file mode 100644
index 00000000000..413c95e12f6
--- /dev/null
+++ b/pkgs/development/tools/lc3tools/0002-lc3os-path.patch
@@ -0,0 +1,21 @@
+diff --git a/lc3sim.c b/lc3sim.c
+index dac7f7a..736fd7c 100644
+--- a/lc3sim.c
++++ b/lc3sim.c
+@@ -665,14 +665,14 @@ init_machine ()
+     bzero (lc3_sym_hash, sizeof (lc3_sym_hash));
+     clear_all_breakpoints ();
+ 
+-    if (read_obj_file (INSTALL_DIR "/lc3os.obj", &os_start, &os_end) == -1) {
++    if (read_obj_file (INSTALL_DIR "/share/lc3tools/lc3os.obj", &os_start, &os_end) == -1) {
+ 	if (gui_mode)
+ 	    puts ("ERR {Failed to read LC-3 OS code.}");
+ 	else
+ 	    puts ("Failed to read LC-3 OS code.");
+ 	show_state_if_stop_visible ();
+     } else {
+-	if (read_sym_file (INSTALL_DIR "/lc3os.sym") == -1) {
++	if (read_sym_file (INSTALL_DIR "/share/lc3tools/lc3os.sym") == -1) {
+ 	    if (gui_mode)
+ 		puts ("ERR {Failed to read LC-3 OS symbols.}");
+ 	    else
diff --git a/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch b/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch
new file mode 100644
index 00000000000..38bc9daaf59
--- /dev/null
+++ b/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.def b/Makefile.def
+index 34f7df3..05dc86c 100644
+--- a/Makefile.def
++++ b/Makefile.def
+@@ -155,7 +155,7 @@ dist_lc3sim-tk: lc3sim-tk
+ 
+ lc3sim-tk: lc3sim-tk.def
+ 	${SED} -e 's @@WISH@@ ${WISH} g' \
+-		-e 's*@@LC3_SIM@@*"${INSTALL_DIR}/lc3sim"*g' \
++		-e 's*@@LC3_SIM@@*"${INSTALL_DIR}/bin/lc3sim"*g' \
+ 		-e 's!@@CODE_FONT@@!${CODE_FONT}!g' \
+ 		-e 's!@@BUTTON_FONT@@!${BUTTON_FONT}!g' \
+ 		-e 's!@@CONSOLE_FONT@@!${CONSOLE_FONT}!g' \
diff --git a/pkgs/development/tools/lc3tools/default.nix b/pkgs/development/tools/lc3tools/default.nix
index 25b476f68c0..122271c34a4 100644
--- a/pkgs/development/tools/lc3tools/default.nix
+++ b/pkgs/development/tools/lc3tools/default.nix
@@ -13,6 +13,12 @@ stdenv.mkDerivation {
     # the original configure looks for things in the FHS path
     # I have modified it to take environment vars
     ./0001-mangle-configure.patch
+
+    # lc3sim looks for the LC3 OS in $out/share/lc3tools instead of $out
+    ./0002-lc3os-path.patch
+
+    # lc3sim-tk looks for lc3sim in $out/bin instead of $out
+    ./0003-lc3sim-tk-path.patch
   ];
 
   nativeBuildInputs = [ unzip ];
@@ -27,10 +33,9 @@ stdenv.mkDerivation {
   prefixKey = "--installdir ";
 
   postInstall = ''
-    rm $out/{COPYING,NO_WARRANTY,README}
     mkdir -p $out/{bin,share/lc3tools}
 
-    mv -t $out/share/lc3tools $out/lc3os*
+    mv -t $out/share/lc3tools $out/{COPYING,NO_WARRANTY,README} $out/lc3os*
     mv -t $out/bin $out/lc3*
   '';
 

From d84bd749392097a976eda01896635e627254d648 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 8 Dec 2020 21:06:33 +0000
Subject: [PATCH 27/30] fd: 8.2.0 -> 8.2.1

---
 pkgs/tools/misc/fd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 56b3e770e82..ec5dda52a18 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fd";
-  version = "8.2.0";
+  version = "8.2.1";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
     rev = "v${version}";
-    sha256 = "1g9jnf9h2s33l5q9z892vmvj78phwd4hfvspvnraxj4lvjp707ia";
+    sha256 = "00vlifbri021z8nf7xvbaay8mqvnq58h19va9bqr5lhsqj1f82wq";
   };
 
-  cargoSha256 = "0yavp67fb4vqygww9kjzdi7gr7dj4aw47s03dkwlz526rhkhappw";
+  cargoSha256 = "0jyqnl6rski1vv2ah21xmwai3rfb542mv14laws4kc2wh63k68i4";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 3dd316723dcf77f1e45a0b0806e93384d18c309a Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Mon, 16 Nov 2020 23:16:58 +0100
Subject: [PATCH 28/30] mirrors: fix lua mirrors

Seems like urls in mirrors must end up with a / otherwise download fails.
---
 pkgs/build-support/fetchurl/mirrors.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 0eba8816b63..b61cd9a0d90 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -9,10 +9,10 @@
   # "sourceforge", "gnu", etc.
 
   luarocks = [
-    "https://luarocks.org"
+    "https://luarocks.org/"
     "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"
-    "http://luafr.org/moonrocks"
-    "http://luarocks.logiceditor.com/rocks"
+    "http://luafr.org/moonrocks/"
+    "http://luarocks.logiceditor.com/rocks/"
   ];
 
   # SourceForge.

From e6bf8328806f19f8025bba23732117f7c2fb262d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 8 Dec 2020 14:35:49 -0800
Subject: [PATCH 29/30] steamPackages.steam-runtime: add update script, fix
 pname

---
 pkgs/games/steam/runtime.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix
index 4f373b9be30..19ee34f5ca4 100644
--- a/pkgs/games/steam/runtime.nix
+++ b/pkgs/games/steam/runtime.nix
@@ -1,8 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl
+
+# for update script
+, writeShellScript, curl, nix-update
+}:
 
 stdenv.mkDerivation rec {
 
-  name = "steam-runtime";
+  pname = "steam-runtime";
   # from https://repo.steampowered.com/steamrt-images-scout/snapshots/
   version = "0.20200720.0";
 
@@ -17,6 +21,13 @@ stdenv.mkDerivation rec {
     tar -C $out --strip=1 -x -f $src
   '';
 
+  passthru = {
+    updateScript = writeShellScript "update.sh" ''
+      version=$(${curl}/bin/curl https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt)
+      ${nix-update}/bin/nix-update --version "$version" steamPackages.steam-runtime
+    '';
+  };
+
   meta = with stdenv.lib; {
     description = "The official runtime used by Steam";
     homepage = "https://github.com/ValveSoftware/steam-runtime";

From f3103fe2d1f087f36ba6d5b1787f3284a5f5781c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 8 Dec 2020 23:19:14 +0000
Subject: [PATCH 30/30] =?UTF-8?q?steamPackages.steam-runtime:=200.20200720?=
 =?UTF-8?q?.0=20=E2=86=92=200.20201203.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/games/steam/runtime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix
index 19ee34f5ca4..69e222ab0d6 100644
--- a/pkgs/games/steam/runtime.nix
+++ b/pkgs/games/steam/runtime.nix
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
 
   pname = "steam-runtime";
   # from https://repo.steampowered.com/steamrt-images-scout/snapshots/
-  version = "0.20200720.0";
+  version = "0.20201203.1";
 
   src = fetchurl {
     url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
-    sha256 = "03qdlr1xk84jb4c60ilis00vjhj70bxc0bbgk5g5b1883l2frljd";
+    sha256 = "sha256-hOHfMi0x3K82XM3m/JmGYbVk5RvuHG+m275eAC0MoQc=";
     name = "scout-runtime-${version}.tar.gz";
   };