From ab04d96f2c9dc32dacafbd18feec6bc22397a97e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jan 2021 14:07:49 +0000
Subject: [PATCH 01/41] openvswitch: 2.14.0 -> 2.14.1

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

diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index cbd1bbdf763..f90c7966190 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -8,12 +8,12 @@ let
   _kernel = kernel;
   pythonEnv = python3.withPackages (ps: with ps; [ six ]);
 in stdenv.mkDerivation rec {
-  version = "2.14.0";
+  version = "2.14.1";
   pname = "openvswitch";
 
   src = fetchurl {
     url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz";
-    sha256 = "0q52k6mq1jfsv0ix55mjd5ljlalhklhqfrma3l61dzhgihmfawa1";
+    sha256 = "sha256-GAttQsCrSybyH1i4vzszdiA9dHWqeo7xUTZVFMNQiP4=";
   };
 
   kernel = optional (_kernel != null) _kernel.dev;

From 04ee910d531e721022c15e317ee7305d68515675 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 23 Jan 2021 10:36:17 +0000
Subject: [PATCH 02/41] tridactyl-native: 1.20.3 -> 1.20.4

---
 pkgs/tools/networking/tridactyl-native/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix
index 2e17f753a5b..ce7325975fb 100644
--- a/pkgs/tools/networking/tridactyl-native/default.nix
+++ b/pkgs/tools/networking/tridactyl-native/default.nix
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
   pname = "tridactyl-native";
   # this is actually the version of tridactyl itself; the native messenger will
   # probably not change with every tridactyl version
-  version = "1.20.3";
+  version = "1.20.4";
 
   src = fetchFromGitHub {
     owner = "tridactyl";
     repo = "tridactyl";
     rev = version;
-    sha256 = "064cl9m4hdv69q1af0xjcf2rf30n3pvz6ym2l53w90aq3217amps";
+    sha256 = "sha256-BjjRB9VadQ/MSwNK2QLbcTDoRs6Ua+5MONHtmfq4xz0=";
   };
   sourceRoot = "source/native";
 

From 0cbbc2dfcd0f4a12981a073d6935aa85ef18ca9e Mon Sep 17 00:00:00 2001
From: Scriptkiddi <fritz@otlinghaus.it>
Date: Fri, 29 Jan 2021 13:01:42 +0100
Subject: [PATCH 03/41] nixos/hadoop: add types

---
 nixos/modules/services/cluster/hadoop/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix
index 171d4aced65..41ac46e538e 100644
--- a/nixos/modules/services/cluster/hadoop/default.nix
+++ b/nixos/modules/services/cluster/hadoop/default.nix
@@ -7,6 +7,7 @@ with lib;
   options.services.hadoop = {
     coreSite = mkOption {
       default = {};
+      type = types.attrsOf types.anything;
       example = literalExample ''
         {
           "fs.defaultFS" = "hdfs://localhost";
@@ -17,6 +18,7 @@ with lib;
 
     hdfsSite = mkOption {
       default = {};
+      type = types.attrsOf types.anything;
       example = literalExample ''
         {
           "dfs.nameservices" = "namenode1";
@@ -27,6 +29,7 @@ with lib;
 
     mapredSite = mkOption {
       default = {};
+      type = types.attrsOf types.anything;
       example = literalExample ''
         {
           "mapreduce.map.cpu.vcores" = "1";
@@ -37,6 +40,7 @@ with lib;
 
     yarnSite = mkOption {
       default = {};
+      type = types.attrsOf types.anything;
       example = literalExample ''
         {
           "yarn.resourcemanager.ha.id" = "resourcemanager1";

From 4a0a7ccb2a7e6125995c41b2abcf354ad693552f Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sun, 31 Jan 2021 12:43:37 -0800
Subject: [PATCH 04/41] nixosTests.installer: Increase memory allocated to the
 VM

Fixes #111223.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 nixos/tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 5fa4704d02b..789add331b7 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -76,8 +76,8 @@ let
       def assemble_qemu_flags():
           flags = "-cpu max"
           ${if system == "x86_64-linux"
-            then ''flags += " -m 768"''
-            else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"''
+            then ''flags += " -m 1024"''
+            else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"''
           }
           return flags
 

From e619018449617fec0e8b0f6e2be7cc300420e74e Mon Sep 17 00:00:00 2001
From: drsk <drsk@lavabit.com>
Date: Sun, 31 Jan 2021 21:07:29 +0100
Subject: [PATCH 05/41] flutter: added dev libraries for the emulator

Four additional libraries seem to be needed to start the emulator on my
machine.
---
 pkgs/development/compilers/flutter/flutter.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 8cac4a18fbe..4a7aa0d0146 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -25,6 +25,10 @@
 , libXcursor
 , libXdamage
 , libXfixes
+, libXrender
+, libXtst
+, libXi
+, libXext
 , libGL
 , nspr
 , nss
@@ -114,7 +118,11 @@ let
         libXcomposite
         libXcursor
         libXdamage
+        libXext
         libXfixes
+        libXi
+        libXrender
+        libXtst
         libGL
         nspr
         nss

From be212428d3813fbc7d95042fe6dd1610a45fa9d6 Mon Sep 17 00:00:00 2001
From: Sam Hofius <sam@samhofi.us>
Date: Sun, 31 Jan 2021 13:06:08 -0500
Subject: [PATCH 06/41] gomacro: init at 2.7

---
 pkgs/development/tools/gomacro/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/tools/gomacro/default.nix

diff --git a/pkgs/development/tools/gomacro/default.nix b/pkgs/development/tools/gomacro/default.nix
new file mode 100644
index 00000000000..e96fccd0a3b
--- /dev/null
+++ b/pkgs/development/tools/gomacro/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "gomacro";
+  rev = "b4c3ab9b218fd12f22759354f4f3e37635828d1f";
+  version = "20210131-${lib.strings.substring 0 7 rev}";
+
+  src = fetchFromGitHub {
+    owner = "cosmos72";
+    repo = "gomacro";
+    sha256 = "0ci486zqrhzvs3njn2ygaxsgjx3fn8bbj2q3sd80xvjiyjvq866g";
+    inherit rev;
+  };
+
+  vendorSha256 = "1ib4h57drikyy5aq4ms6vc1p29djlpjrh7xd3bgyykr9zmm2w1kx";
+  subPackages = [ "." ];
+
+  meta = with lib; {
+    description = "Interactive Go interpreter and debugger with generics and macros";
+    homepage = "https://github.com/cosmos72/gomacro";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ shofius ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9e45a90aea..5c7ce9a7af5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19575,6 +19575,8 @@ in
 
   go-migrate = callPackage ../development/tools/go-migrate { };
 
+  gomacro = callPackage ../development/tools/gomacro { };
+
   gomodifytags = callPackage ../development/tools/gomodifytags { };
 
   go-langserver = callPackage ../development/tools/go-langserver { };

From 96b59c6030a6787d4e4c3c06467009f0173c53a1 Mon Sep 17 00:00:00 2001
From: Sam Hofius <sam@samhofi.us>
Date: Sun, 31 Jan 2021 13:06:40 -0500
Subject: [PATCH 07/41] maintainers: add shofius

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 09279ac608f..9a1730fea67 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8417,6 +8417,12 @@
     githubId = 997855;
     name = "Narazaki Shuji";
   };
+  shofius = {
+    name = "Sam Hofius";
+    email = "sam@samhofi.us";
+    github = "kf5grd";
+    githubId = 18297490;
+  };
   shou = {
     email = "x+g@shou.io";
     github = "Shou";

From 03058d38bb4685cf5166436d3a0011a2fea21cd4 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 31 Jan 2021 21:05:14 +0000
Subject: [PATCH 08/41] pythonPackages.pysaml2: 5.0.0 -> 6.5.1

addressing CVE-2021-21238 & CVE-2021-21239
---
 .../python-modules/pysaml2/default.nix        | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index 2ffbb97223f..1bb096dc0c7 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -2,16 +2,15 @@
 , buildPythonPackage
 , isPy3k
 , fetchFromGitHub
-, fetchpatch
 , substituteAll
 , xmlsec
-, cryptography, defusedxml, future, pyopenssl, dateutil, pytz, requests, six
-, mock, pyasn1, pymongo, pytest, responses
+, cryptography, defusedxml, pyopenssl, dateutil, pytz, requests, six
+, mock, pyasn1, pymongo, pytest, responses, xmlschema, importlib-resources
 }:
 
 buildPythonPackage rec {
   pname = "pysaml2";
-  version = "5.0.0";
+  version = "6.5.1";
 
   disabled = !isPy3k;
 
@@ -20,7 +19,7 @@ buildPythonPackage rec {
     owner = "IdentityPython";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0hwhxz45h8l1b0615hf855z7valfcmm0nb7k31bcj84v68zp5rjs";
+    sha256 = "1gh74csjk6af23agyigk4id79s4li1xnkmbpp73aqyvlly2kd0b7";
   };
 
   patches = [
@@ -28,12 +27,6 @@ buildPythonPackage rec {
       src = ./hardcode-xmlsec1-path.patch;
       inherit xmlsec;
     })
-    # remove on next release
-    (fetchpatch {
-      name = "fix-test-dates.patch";
-      url = "https://github.com/IdentityPython/pysaml2/commit/1d97d2d26f63e42611558fdd0e439bb8a7496a27.patch";
-      sha256 = "0r6d6hkk6z9yw7aqnsnylii516ysmdsc8dghwmgnwvw6cm7l388p";
-    })
   ];
 
   postPatch = ''
@@ -41,7 +34,17 @@ buildPythonPackage rec {
     sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml
   '';
 
-  propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ];
+  propagatedBuildInputs = [
+    cryptography
+    dateutil
+    defusedxml
+    importlib-resources
+    pyopenssl
+    pytz
+    requests
+    six
+    xmlschema
+  ];
 
   checkInputs = [ mock pyasn1 pymongo pytest responses ];
 

From 31c95c1f79a48d2834bebdd1fd5b02ece609fb9e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 1 Feb 2021 21:53:32 +0100
Subject: [PATCH 09/41] =?UTF-8?q?flatpak:=201.8.2=20=E2=86=92=201.10.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes:
- https://github.com/flatpak/flatpak/releases/tag/1.9.1
- https://github.com/flatpak/flatpak/releases/tag/1.9.2
- https://github.com/flatpak/flatpak/releases/tag/1.8.4
- https://github.com/flatpak/flatpak/releases/tag/1.9.3
- https://github.com/flatpak/flatpak/releases/tag/1.8.5
- https://github.com/flatpak/flatpak/releases/tag/1.10.0
- https://github.com/flatpak/flatpak/releases/tag/1.10.1

Security advisories:
- https://github.com/flatpak/flatpak/security/advisories/GHSA-4ppf-fxf6-vxg2

Also:
- Clarify license.
- Re-enable zstd compression (seems to be fixed now).
- Stop introducing GTK to scope through wrapGAppsHook.
- Clean up the DTDs and build tools we managed to fix upstream.
---
 .../development/libraries/flatpak/default.nix | 47 +++++--------------
 1 file changed, 12 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 1480f42750d..36c946e06f7 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,12 +1,8 @@
 { lib, stdenv
 , fetchurl
-, fetchpatch
-, autoconf
-, automake
-, libtool
+, autoreconfHook
 , docbook_xml_dtd_412
-, docbook_xml_dtd_42
-, docbook_xml_dtd_43
+, docbook_xml_dtd_45
 , docbook-xsl-nons
 , which
 , libxml2
@@ -49,7 +45,7 @@
 , xorg
 , valgrind
 , glib-networking
-, wrapGAppsHook
+, wrapGAppsNoGuiHook
 , dconf
 , gsettings-desktop-schemas
 , librsvg
@@ -57,14 +53,14 @@
 
 stdenv.mkDerivation rec {
   pname = "flatpak";
-  version = "1.8.2";
+  version = "1.10.1";
 
   # TODO: split out lib once we figure out what to do with triggerdir
   outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "eSZiXffCKCpe4aizwxevU9QKZjsbxrGKLch0fiZQhbA=";
+    sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1";
   };
 
   patches = [
@@ -104,24 +100,15 @@ stdenv.mkDerivation rec {
 
     # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator.
     ./validate-icon-pixbuf.patch
-
-    # Fix `flatpak/test-oci-registry@{user,system}.wrap.test` installed tests.
-    # https://github.com/flatpak/flatpak/pull/3762
-    (fetchpatch {
-      url = "https://github.com/flatpak/flatpak/commit/c1447dadecd50f384b6d11dac18b014245267d00.patch";
-      sha256 = "UAA/wGr8/aMbx5MV+8Ilro2kgKkx2QOn88lDUjCgeDA=";
-    })
   ];
 
   nativeBuildInputs = [
-    autoconf
-    automake
-    libtool
+    autoreconfHook
     libxml2
-    # TODO: replace with docbook_xml_dtd_45 https://github.com/flatpak/flatpak/pull/3760
+    # Remove 4.1.2 again once the following is merged
+    # https://github.com/flatpak/flatpak/pull/4102
     docbook_xml_dtd_412
-    docbook_xml_dtd_42
-    docbook_xml_dtd_43
+    docbook_xml_dtd_45
     docbook-xsl-nons
     which
     gobject-introspection
@@ -132,7 +119,7 @@ stdenv.mkDerivation rec {
     xmlto
     appstream-glib
     yacc
-    wrapGAppsHook
+    wrapGAppsNoGuiHook
   ];
 
   buildInputs = [
@@ -147,7 +134,7 @@ stdenv.mkDerivation rec {
     libseccomp
     libsoup
     lzma
-    # zstd # TODO: broken paths in .pc file
+    zstd
     polkit
     python3
     systemd
@@ -199,16 +186,6 @@ stdenv.mkDerivation rec {
     PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler
   '';
 
-  preConfigure = ''
-    # TODO: remove the condition once autogen.sh is shipped in the tarball
-    # https://github.com/flatpak/flatpak/pull/3761
-    if [[ -f autogen.sh ]]; then
-        NOCONFIGURE=1 ./autogen.sh
-    else
-        autoreconf --install --force --verbose
-    fi
-  '';
-
   passthru = {
     tests = {
       installedTests = nixosTests.installed-tests.flatpak;
@@ -218,7 +195,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Linux application sandboxing and distribution framework";
     homepage = "https://flatpak.org/";
-    license = licenses.lgpl21;
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.linux;
   };

From 33db0f7686313d27e24a3028020be7cb8b5232b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 1 Feb 2021 23:24:49 +0100
Subject: [PATCH 10/41] python3Packages.watchdog: 0.10.4 -> 1.0.2

---
 pkgs/development/python-modules/watchdog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index 5cb8929b9db..b077b48493e 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "watchdog";
-  version = "0.10.4";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e38bffc89b15bafe2a131f0e1c74924cf07dcec020c2e0a26cccd208831fcd43";
+    sha256 = "sha256-N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin

From 44afe6bba161821ad2bb607e267f19565f7b2836 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 1 Feb 2021 23:32:12 +0100
Subject: [PATCH 11/41] python3Packages.watchdog: enable tests

---
 .../python-modules/watchdog/default.nix          | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index b077b48493e..693cfcce926 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -5,6 +5,8 @@
 , pathtools
 , pyyaml
 , pkgs
+, pytest-cov
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -18,9 +20,19 @@ buildPythonPackage rec {
 
   buildInputs = lib.optionals stdenv.isDarwin
     [ pkgs.darwin.apple_sdk.frameworks.CoreServices ];
-  propagatedBuildInputs = [ argh pathtools pyyaml ];
 
-  doCheck = false;
+  propagatedBuildInputs = [
+    argh
+    pathtools
+    pyyaml
+  ];
+
+  checkInputs = [
+    pytest-cov
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "watchdog" ];
 
   meta = with lib; {
     description = "Python API and shell utilities to monitor file system events";

From 16c29bb53ec85b7c5b3c0f71934e9e1def9112df Mon Sep 17 00:00:00 2001
From: Mrinal Purohit <github@mrinalpurohit.in>
Date: Tue, 2 Feb 2021 11:19:49 +0530
Subject: [PATCH 12/41] google-cloud-sdk: 323.0.0 -> 325.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 8830b0d7e04..36af063c448 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,18 +21,18 @@ let
   sources = name: system: {
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "0ziz7cipi3m4aiba6ljz8419w2rps20rii6nwv0pyq5j7qvlvnqp";
+      sha256 = "09pv1xvycgfai151z6kbsggyldcd3cx6x1p04dcim2xrawqvng6s";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "1a9mqhqzmn0zfc1ab6jmac15yn192cmqkijw34di3ld6syqvaziw";
+      sha256 = "1iybbvxjny33mw3h2f81fdvsvp65xa62c2qrzjv8hkrqkw69ckrp";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   pname = "google-cloud-sdk";
-  version = "323.0.0";
+  version = "325.0.0";
 
   src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
 

From a3d19ca1c6285f93a1b4290a084e14b53e419e51 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Mon, 1 Feb 2021 22:58:11 -0800
Subject: [PATCH 13/41] ccache: 4.1 -> 4.2

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

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 655807d9506..0cf98d651c5 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -13,13 +13,13 @@
 
 let ccache = stdenv.mkDerivation rec {
   pname = "ccache";
-  version = "4.1";
+  version = "4.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1az11q3wmr8wc7alx9l70wq9am41cm0y17g5gsaqmahws3dxfi8m";
+    sha256 = "1lr9804xyzbs72f9jbbzy1fjqxwrwpb4rp431wqialvms4251d8f";
   };
 
   patches = lib.optional stdenv.isDarwin (substituteAll {

From 9c06d17d95d928baac02d4bf862e7404d369660d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 2 Feb 2021 09:02:18 +0100
Subject: [PATCH 14/41] python3Packages.coconut: switch to pytestCheckHook

---
 .../python-modules/coconut/default.nix        | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix
index b75a82b6c2b..966546a7775 100644
--- a/pkgs/development/python-modules/coconut/default.nix
+++ b/pkgs/development/python-modules/coconut/default.nix
@@ -1,17 +1,15 @@
-{
-  lib,
-  buildPythonApplication,
-  fetchFromGitHub,
-  fetchpatch,
-
-  cpyparsing,
-  ipykernel,
-  mypy,
-  pygments,
-  pytest,
-  prompt_toolkit,
-  tkinter,
-  watchdog
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, fetchpatch
+, cpyparsing
+, ipykernel
+, mypy
+, pygments
+, pytestCheckHook
+, prompt_toolkit
+, tkinter
+, watchdog
 }:
 
 buildPythonApplication rec {
@@ -35,13 +33,19 @@ buildPythonApplication rec {
     })
   ];
 
-  checkInputs = [ pytest tkinter ];
+  checkInputs = [
+    pytestCheckHook
+    tkinter
+  ];
+
   # Currently most tests do not work on Hydra due to external fetches.
-  checkPhase = ''
-    pytest tests/constants_test.py
-    pytest tests/main_test.py::TestShell::test_compile_to_file
-    pytest tests/main_test.py::TestShell::test_convenience
-  '';
+  pytestFlagsArray = [
+    "tests/constants_test.py"
+    "tests/main_test.py::TestShell::test_compile_to_file"
+    "tests/main_test.py::TestShell::test_convenience"
+  ];
+
+  pythonImportsCheck = [ "coconut" ];
 
   meta = with lib; {
     homepage = "http://coconut-lang.org/";

From c0638b8591d1ef8360d45eea0159740156a8ceb8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 2 Feb 2021 09:43:21 +0100
Subject: [PATCH 15/41] python3Packages.coconut: add patch to fix build issue

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

diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix
index 966546a7775..55eadddaa1d 100644
--- a/pkgs/development/python-modules/coconut/default.nix
+++ b/pkgs/development/python-modules/coconut/default.nix
@@ -31,6 +31,11 @@ buildPythonApplication rec {
       url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch";
       sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q";
     })
+    (fetchpatch {
+      name = "support-python-3.9.patch";
+      url = "https://github.com/evhub/coconut/commit/5c724b4dd92fb62c614d8192e3cac3dd1d475790.patch";
+      sha256 = "04xmzyfmyv6gr2l2z6pdxlllwzcmwxvahxzqyxglr36hfl33ad71";
+    })
   ];
 
   checkInputs = [

From 9551604c381499a7610b5ef7e90a601f64906862 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Tue, 2 Feb 2021 10:31:45 +0000
Subject: [PATCH 16/41] vimPlugins: update

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 418399e0310..9e091b8c4a5 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2021-01-31";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "c747c277c2ead915b56be0f7e25a9f0c8b91b78e";
-      sha256 = "0nf8d3rry75lkn2acn94pnpgmimd0gpi4yrqkrv1n7cns8lrjd7j";
+      rev = "9b5c09047361f3ec2cf18afbb6d1e03047a59778";
+      sha256 = "0bdqr1k3cllgqclshxsmcd16ba63bw0ig3sqj46an3mgpvd6v4xd";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -377,12 +377,12 @@ let
 
   chadtree = buildVimPluginFrom2Nix {
     pname = "chadtree";
-    version = "2021-02-01";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "fa9ca44790510bca23a3b3f151b3cb7726e6d542";
-      sha256 = "0fg49aw5wkb2sv4sipvr9041hd0z0czfg5yn5z7rz1m52i5j3cwz";
+      rev = "addb3b3f9963b86b1d3626e4b1920b129148625b";
+      sha256 = "1fpws70lxa9vs4yv6wpgnvw0khxhavq23plnsil29j4xlfm3ivw9";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -473,12 +473,12 @@ let
 
   coc-explorer = buildVimPluginFrom2Nix {
     pname = "coc-explorer";
-    version = "2021-01-31";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "weirongxu";
       repo = "coc-explorer";
-      rev = "6d98eb18e2e11f7272fb4882e9d946da62322199";
-      sha256 = "0nfza3d7iji9ri3q0xvr38qdpp22j9is4djii95n8781l85fphay";
+      rev = "ee76911b1fa4a12833e53a1f56b03ada4fc3b6cf";
+      sha256 = "0n2za8f43gj9mjcjvwdrd2q17qn72fl1d7invnhrcyq44452y0z5";
     };
     meta.homepage = "https://github.com/weirongxu/coc-explorer/";
   };
@@ -846,12 +846,12 @@ let
 
   defx-nvim = buildVimPluginFrom2Nix {
     pname = "defx-nvim";
-    version = "2021-01-31";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "ff2b0af13c63fe22ea5653ee27e7b62716929623";
-      sha256 = "1kz77ab2i30ckz5kgf9bh8z92cn1kbrvmhcz8dbmlfyd7hmywm50";
+      rev = "fe855a14eaf4ede5c040704770202fe954addbda";
+      sha256 = "1f7gg77q8h227kbbf73d697v1x8w42szfckxmyskwb5wrvsxinpc";
     };
     meta.homepage = "https://github.com/Shougo/defx.nvim/";
   };
@@ -894,12 +894,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2021-01-31";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "ee807bee58aee7d8477ef7179451124cc344ea01";
-      sha256 = "1pzpw5x25aj87xm1jkw87siff06h1mf1pbq6dwj9xvjgwjb5lw2n";
+      rev = "b3c400c1d71a7451ce4c181e81d33373100ac4ac";
+      sha256 = "1k4qgdmpn5r8h8d3arq9zis6m0h8fagikrjb0v8lfhsz83zl1293";
     };
     meta.homepage = "https://github.com/Shougo/denite.nvim/";
   };
@@ -1306,12 +1306,12 @@ let
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2020-04-16";
+    version = "2021-02-01";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "da3468536410eb1ea59a0dd3054edf28d4577d8c";
-      sha256 = "1cvw3n8ysxnm3w0rvk1rks815ha5grca1p3c7bkas6klrplfhlsc";
+      rev = "e2efdb0d0827f7ec417583b25142f19714ece2ea";
+      sha256 = "1s4i9rv1kcpry1zldpml908xv1r5hn0darip701y14njbmk9fff8";
     };
     meta.homepage = "https://github.com/fenetikm/falcon/";
   };
@@ -1475,12 +1475,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2021-01-27";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "707f5b6269337ea5c19fc4054cd2574939f817f5";
-      sha256 = "1xb6zs7k8d815jzjs877ik6bp9bnyasv59jpnjv6fanxaaqas711";
+      rev = "02a192ea0bed22a015e005b281e55e0da2a8e496";
+      sha256 = "0znlzjni031vagj83d60nararb67cli5fpp2lc37k9p8xnff1mjv";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
   };
@@ -2232,12 +2232,12 @@ let
 
   lspsaga-nvim = buildVimPluginFrom2Nix {
     pname = "lspsaga-nvim";
-    version = "2021-02-01";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "glepnir";
       repo = "lspsaga.nvim";
-      rev = "4235966fcc6fcbd3245af8be2a53fbe4c69ae435";
-      sha256 = "0sk3bv4ijrw8ac9icq4yi8vc5054hmxs7j42nirqp3la2qac6g0j";
+      rev = "1a39791278d1ce53ffdbb9b455e5150d44b0b600";
+      sha256 = "0x0kanhpb1q4bzwsvv0288rh1gqgbq1j9r8a2f9q22nlppqr1by0";
     };
     meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
   };
@@ -2628,12 +2628,12 @@ let
 
   neogit = buildVimPluginFrom2Nix {
     pname = "neogit";
-    version = "2021-01-25";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "TimUntersberger";
       repo = "neogit";
-      rev = "f1ed542f846242e9cc052f43f730c1daf479dce6";
-      sha256 = "0xqy688h2kff2lp490qi9i7gmafy21bxx0dpq7j0bzy55ycw70q6";
+      rev = "c3c3d2aa860f2b4acbdb334ce0777e3ec25259d9";
+      sha256 = "1mxbpv9vv2mb0dgdyb97gw1c5nfjvzkbn7fkwvcvg996xhvap9cs";
     };
     meta.homepage = "https://github.com/TimUntersberger/neogit/";
   };
@@ -2760,12 +2760,12 @@ let
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2021-01-31";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "nerdcommenter";
-      rev = "898de2de1bf78c16768a188f5b1a26f6e3252fd1";
-      sha256 = "0jm4a79fwvi9agh0bq3h0wnz6nis71p3v4a898dd74d224y36l8g";
+      rev = "b83e9cdf835161b398e04e4c462103fd21801ee3";
+      sha256 = "15x4qw0l9j228rrfqnwzg13j7cr0k69xd46rcsa4886lw8nmpsak";
     };
     meta.homepage = "https://github.com/preservim/nerdcommenter/";
   };
@@ -2880,12 +2880,12 @@ let
 
   nvim-compe = buildVimPluginFrom2Nix {
     pname = "nvim-compe";
-    version = "2021-02-01";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-compe";
-      rev = "9dabee7364dfaf61091e80dc8574529e30ff7cc3";
-      sha256 = "0fr87v91p8smfdswm0f91ccna8awibnbx8240jdps17p6xr1ym55";
+      rev = "f2573c9dd52be7e7ced176a6375766758cf646be";
+      sha256 = "1c2xib3vqjc8z1z1v1b11iywimxrbawma3zn5kl5fzihnc67mxkd";
     };
     meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
   };
@@ -3048,12 +3048,12 @@ let
 
   nvim-treesitter = buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2021-01-31";
+    version = "2021-02-01";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "a077f61b675367bddf00fda86d980125495b7dba";
-      sha256 = "0scfa61cbswq1f4zmksasjih0vwb23wspwyz40k4crinxl1maxm7";
+      rev = "d3901e583389ef0c356203f056bad37ec81a888c";
+      sha256 = "033w6x6yg4p6dfqs753vbwyl22aar24jn87ya9l07nm4wkm7w7d9";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -3228,12 +3228,12 @@ let
 
   packer-nvim = buildVimPluginFrom2Nix {
     pname = "packer-nvim";
-    version = "2021-01-29";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "wbthomason";
       repo = "packer.nvim";
-      rev = "1d9eb05fb64b5b67a8599fce8687270949de87cb";
-      sha256 = "10169l3ysrqnrzzrkd1r2f0dcf2d1b97p3zxp21xanj98b9z4xjd";
+      rev = "8262aa68acb1b3e95f96bc66d70e92578fd82a6d";
+      sha256 = "1j0w71igl2icdmprl0krbv9ndda52dmmq9ijbz747x1g421d4rgn";
     };
     meta.homepage = "https://github.com/wbthomason/packer.nvim/";
   };
@@ -3854,12 +3854,12 @@ let
 
   sql-nvim = buildVimPluginFrom2Nix {
     pname = "sql-nvim";
-    version = "2021-01-27";
+    version = "2021-02-01";
     src = fetchFromGitHub {
       owner = "tami5";
       repo = "sql.nvim";
-      rev = "91b7138c0a766bfe3964507951ee39e2f38344da";
-      sha256 = "09mk4r7c5shbn34v1fkj312zp11f0yjp07ck7i6lijm7kcj77fmq";
+      rev = "b9fcca9444861b013c4de20f9e732f0bcd88a570";
+      sha256 = "03kmxargbsyasimgq6mq5i6795gjbxxdj237gvzfx4vjgaifm55c";
     };
     meta.homepage = "https://github.com/tami5/sql.nvim/";
   };
@@ -4034,12 +4034,12 @@ let
 
   telescope-frecency-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-frecency-nvim";
-    version = "2021-01-28";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-frecency.nvim";
-      rev = "7afdd3c32c222a359d6a906968dcbed5fbea2fb7";
-      sha256 = "0g8gb3agscp9g2dcmzqf77x2g7l4pm34k5s23laa7864jfjnpzvb";
+      rev = "93904dd90fd474e846d823901a1880e43e7177aa";
+      sha256 = "189a5jlirgzvx7pgij6jil2kl0qhgg2kzl9sqn5ay98gcvcl6adk";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
   };
@@ -4071,12 +4071,12 @@ let
 
   telescope-nvim = buildVimPluginFrom2Nix {
     pname = "telescope-nvim";
-    version = "2021-01-31";
+    version = "2021-02-01";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "ef3262f94ae95c8e91bcc79ff7ed149a420ba1b9";
-      sha256 = "17mkniwa1lic4clvfgw6hr823sir23nskb9kil06qakrwh7yakj7";
+      rev = "9e76b1613a25cc6f63d17eb73432523924662619";
+      sha256 = "1yr7a7z48nfm5c7mmblbpdp42kfyp14b2d1fg03pkb792dkcqk2a";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -4228,12 +4228,12 @@ let
 
   ultisnips = buildVimPluginFrom2Nix {
     pname = "ultisnips";
-    version = "2020-12-14";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
-      rev = "c270950492d71bac0317d47d42cd0884eefe6490";
-      sha256 = "1k58wp6y6i0xr4pnp2h7r31229ngp3zadyi374c5nlf2pa3zc1d8";
+      rev = "0e84f61b8184981012a32642f78ad88aafcf4258";
+      sha256 = "183y7bzc9lix536wla1p6niyl1w17jpjm2ild6pc593pl194qjm5";
     };
     meta.homepage = "https://github.com/SirVer/ultisnips/";
   };
@@ -4576,12 +4576,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2021-01-14";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "c7a633ce8f4547e680377efe8ea70493fcce1349";
-      sha256 = "10n70bk6nsc5sgd95d80jna4v77dlla6x0886kb5lwzmiflfq31x";
+      rev = "bffa7a4d23addaedc64075b06c00f1cbb5dec667";
+      sha256 = "0ghf7z6ras1jslirf9dxq8xxjksyaj6nlr0js385g5z8n9xv1chp";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
   };
@@ -4840,12 +4840,12 @@ let
 
   vim-clap = buildVimPluginFrom2Nix {
     pname = "vim-clap";
-    version = "2021-01-28";
+    version = "2021-02-01";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-clap";
-      rev = "d3536cae87fc9ac106f25f0a2d8d96c697bccb08";
-      sha256 = "1sag4018is0az3nvck592k4b6nl9ah82b55kr55p4y6wssgm7aak";
+      rev = "01d0a16456a5a3daeb88a66b12e160d4b8aec8e8";
+      sha256 = "1xmsp2rf5av9vfn8ynzm5kgxz0cv2wnnjmsmp4m2p5yjdwjxn669";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-clap/";
   };
@@ -5032,12 +5032,12 @@ let
 
   vim-css-color = buildVimPluginFrom2Nix {
     pname = "vim-css-color";
-    version = "2020-08-16";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
-      rev = "4694c6ea03a065a3f6ddbebce56797a21e8241ef";
-      sha256 = "12bzxrdvb9s0d8llkq6h63g86qxs0gv9x7401apl6qrs79prrb4a";
+      rev = "8dd7f1bf25acee493a5114e627ea90a9850c5fa8";
+      sha256 = "0pjq14i7w2snlbzsqhfdn0fkribjsyngg6fcmpgacm4jvx3iviql";
     };
     meta.homepage = "https://github.com/ap/vim-css-color/";
   };
@@ -5116,12 +5116,12 @@ let
 
   vim-devicons = buildVimPluginFrom2Nix {
     pname = "vim-devicons";
-    version = "2020-12-10";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
-      rev = "0d0bd57246b3285caec4737dc0f1c6b17ebb2787";
-      sha256 = "1kkc3hgfz0qr84r873gjmjhgwph0nhyan6v69b55ph5qqsksrl42";
+      rev = "0329d89c5114dc285939050fd5777dbcc450ddd7";
+      sha256 = "0g8pipayg643xjs3dmpbwp91ycyg8b20qgr0mnmxzll0nan8zjny";
     };
     meta.homepage = "https://github.com/ryanoasis/vim-devicons/";
   };
@@ -6294,12 +6294,12 @@ let
 
   vim-lsp = buildVimPluginFrom2Nix {
     pname = "vim-lsp";
-    version = "2021-01-26";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "0c77beb2eb99263e69a25b4d66e7ca2cd15cb0ef";
-      sha256 = "0r981drs6cikhbkabjr7r30hszmbwkz98c8ldraw984r2zhllw1y";
+      rev = "21a29936ed74b2212e1904cca6c22bff4e27b637";
+      sha256 = "11jlqri1fyh1mbxrkihg1jj7g8mllh9w6gy64ah8gvpw505fws4c";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -7027,12 +7027,12 @@ let
 
   vim-qf = buildVimPluginFrom2Nix {
     pname = "vim-qf";
-    version = "2020-11-18";
+    version = "2021-02-01";
     src = fetchFromGitHub {
       owner = "romainl";
       repo = "vim-qf";
-      rev = "23c9d67cdd0739c9d74ac9e4a494b7cb7351170c";
-      sha256 = "15kj1wvd3wlmn982l2v8sv2lc3q39bz3jw94jvmkh7nz51xvmfqc";
+      rev = "0da85ff4270c2be10e24729dd42fb749ad1b69b7";
+      sha256 = "0f8qnxy18qskbr3m8hn4vqv7bcvr2b0xqi64bxx078an5x8lbgx2";
     };
     meta.homepage = "https://github.com/romainl/vim-qf/";
   };
@@ -8181,12 +8181,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2021-01-31";
+    version = "2021-02-01";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "fae465c4f2d219b7794caacbcd5bd2c06fc17e97";
-      sha256 = "1lgsyjgpz4np74qp8xsmazp0rdsgprajms6nbgcsb7shn4ymc5rg";
+      rev = "0bc7c9c5f8376978ea2667f9fb54c293921183cc";
+      sha256 = "10k7265iwn7pr567g0kl159xwi7zjkjhal62c0n0d98akzdi4wbi";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -8229,12 +8229,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2021-01-17";
+    version = "2021-02-02";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "a648aab8b35401bea2b9192efe171b3787264abd";
-      sha256 = "15ib66lsx2wpbykv5pmr4ly2gkksml2dp6nmb2iv7zy70655whsf";
+      rev = "5e5f89f1c02579f1587475e0671cf0fe4b1bfeaf";
+      sha256 = "11h27vm0gi4lxf68dwnsr86ch6f0kyglfzg5a0i6av9mlsw7fj9z";
     };
     meta.homepage = "https://github.com/liuchengxu/vista.vim/";
   };

From b374e808fe1e3e1c7f2c58a3907b35153f41f9e4 Mon Sep 17 00:00:00 2001
From: "\"Andrey Kuznetsov\"" <"fear@loathing.in">
Date: Tue, 2 Feb 2021 10:32:09 +0000
Subject: [PATCH 17/41] vimPlugins.nvim-lightbulb: init at 2021-02-02

---
 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 9e091b8c4a5..6f0f6ffc24a 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2986,6 +2986,18 @@ let
     meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
   };
 
+  nvim-lightbulb = buildVimPluginFrom2Nix {
+    pname = "nvim-lightbulb";
+    version = "2021-02-02";
+    src = fetchFromGitHub {
+      owner = "kosayoda";
+      repo = "nvim-lightbulb";
+      rev = "3437cc5696f6c6f1a46b1ad1445d9c917d3fa4bc";
+      sha256 = "1i53c7wrbx52ybm9v1m6p8n8894gyb2hylv7iac063nkhnhl7v6h";
+    };
+    meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
+  };
+
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
     version = "2021-02-01";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 96a987a4b90..cded72abf29 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -263,6 +263,7 @@ kien/rainbow_parentheses.vim
 knubie/vim-kitty-navigator
 konfekt/fastfold
 konfekt/vim-DetectSpellLang
+kosayoda/nvim-lightbulb
 kristijanhusak/defx-git
 kristijanhusak/defx-icons
 kristijanhusak/deoplete-phpactor

From 627e47caa80754e0e0a60fbf9cb17c04aeb3e971 Mon Sep 17 00:00:00 2001
From: Christian Mainka <Christian.Mainka@rub.de>
Date: Tue, 2 Feb 2021 12:31:19 +0100
Subject: [PATCH 18/41] joplin-desktop: 1.6.7 -> 1.7.10

---
 pkgs/applications/misc/joplin-desktop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix
index 8433cc9c87f..f737470d53f 100644
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "joplin-desktop";
-  version = "1.6.7";
+  version = "1.7.10";
   name = "${pname}-${version}";
 
   inherit (stdenv.hostPlatform) system;
@@ -16,8 +16,8 @@ let
   src = fetchurl {
     url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
     sha256 = {
-      x86_64-linux = "0g1fac8l0w0b11bs4c9mi2k426hcqa7q4ks48fzxq0yl9ricjlrb";
-      x86_64-darwin = "1h5crdjzvjg30hdmh3fkygxi5gy714wpz4gwy5dn8s3xr12mmgka";
+      x86_64-linux = "1f8pfssfqigh0fl5r5wpvdpn48dx1q9qq4mfqi2s5z94h7ci2jxg";
+      x86_64-darwin = "0s29mhf88nlhaabmd32k21h1qiavgpqqksbdjxkx8bfg591s8jqb";
     }.${system} or throwSystem;
   };
 

From 10080ec0cf26ffd47bf16d9845a50dc9ea4f3a1b Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Tue, 2 Feb 2021 12:03:11 +0000
Subject: [PATCH 19/41] routinator: 0.8.2 -> 0.8.3

New

- Status information is now available in JSON format at /api/v1/status (449).
- Includes version 0.1.0 of routinator-ui, a UI for Route Origin Validation and Routinator status (449).
---
 pkgs/servers/routinator/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index 4a19932f23e..f1e705b0693 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "routinator";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-rxCgW4cuYNSJ9P+cBYWAYJsghz2bp9mpAh6AuwLoV5o=";
+    sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE=";
   };
 
-  cargoSha256 = "0fcp4b2b0mjddj4blr20gvp1ih3ldzzr04rm1m06i8d2lnl68i79";
+  cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ=";
 
   meta = with lib; {
     description = "An RPKI Validator written in Rust";

From c51d050d7cf0fc454fb1afb2784a8b6c9be03463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 28 Jan 2021 18:43:25 +0100
Subject: [PATCH 20/41] pythonPackages.pyslurm: Mark linux only

---
 pkgs/development/python-modules/pyslurm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index a113314aa40..abb85930e40 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -22,6 +22,7 @@ buildPythonPackage rec {
     description = "Python bindings to Slurm";
     license = licenses.gpl2;
     maintainers = with maintainers; [ bhipple ];
+    platforms = platforms.linux;
     broken = true;  # still needs slurm-19.05, but nixpkgs has slurm-20+ now
   };
 }

From 98ce12a8fe94c83b2760b95a6b13d1700a053001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 30 Jan 2021 23:00:55 +0100
Subject: [PATCH 21/41] pythonPackages.somajo: Disable tests on darwin because
 they are stuck

---
 pkgs/development/python-modules/somajo/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix
index 11d0c02dfc8..54cd9beede3 100644
--- a/pkgs/development/python-modules/somajo/default.nix
+++ b/pkgs/development/python-modules/somajo/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, fetchFromGitHub, buildPythonPackage, isPy3k, regex }:
+{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }:
 
 buildPythonPackage rec {
   pname = "SoMaJo";
@@ -14,6 +14,9 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ regex ];
 
+  # loops forever
+  doCheck = !stdenv.isDarwin;
+
   meta = with lib; {
     description = "Tokenizer and sentence splitter for German and English web texts";
     homepage = "https://github.com/tsproisl/SoMaJo";

From b3850ac9d43916baadae3cf45e831c889270b346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 30 Jan 2021 23:15:18 +0100
Subject: [PATCH 22/41] pythonPackages.exdown: Init at 0.7.1

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

diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix
new file mode 100644
index 00000000000..17cab3fe55f
--- /dev/null
+++ b/pkgs/development/python-modules/exdown/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
+, importlib-metadata }:
+
+buildPythonPackage rec {
+  pname = "exdown";
+  version = "0.7.1";
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-vnSso3vmPIjX7JX+NwoxguwqwPHocJACeh5H0ClPcUI=";
+  };
+
+  propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+
+  pythonImportsCheck = [ "exdown" ];
+
+  meta = with lib; {
+    description = "Extract code blocks from markdown";
+    homepage = "https://github.com/nschloe/exdown";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86bb0a3fc92..e50d1bbbd14 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2105,6 +2105,8 @@ in {
 
   ewmh = callPackage ../development/python-modules/ewmh { };
 
+  exdown = callPackage ../development/python-modules/exdown { };
+
   exchangelib = callPackage ../development/python-modules/exchangelib { };
 
   execnet = callPackage ../development/python-modules/execnet { };

From c1e35a4b63a379b3553fbd30855ed0c8098452bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 31 Jan 2021 04:06:08 +0100
Subject: [PATCH 23/41] gauche: mark broken on darwin

---
 pkgs/development/interpreters/gauche/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
index 75a931c5562..86dc7d666d2 100644
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, autoreconfHook, gaucheBootstrap, pkg-config, texinfo
-,  libiconv, gdbm, openssl, zlib, mbedtls, cacert }:
+, libiconv, gdbm, openssl, zlib, mbedtls, cacert }:
 
 stdenv.mkDerivation rec {
   pname = "gauche";
@@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ mnacamura ];
     license = licenses.bsd3;
     platforms = platforms.unix;
+    broken = stdenv.isDarwin;
   };
 }

From 6ad10c3bcd3638fa9166740d6a854100d98125a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 31 Jan 2021 19:02:56 +0100
Subject: [PATCH 24/41] treewide: Remove doBuild cause it does not exist

---
 pkgs/applications/networking/cluster/octant/default.nix  | 1 -
 pkgs/applications/science/misc/foldingathome/control.nix | 2 --
 pkgs/applications/video/vcs/default.nix                  | 1 -
 pkgs/development/python-modules/skein/skeinrepo.nix      | 2 --
 pkgs/servers/tautulli/default.nix                        | 2 --
 5 files changed, 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix
index 4eb2bf78b54..ebf3cb417d6 100644
--- a/pkgs/applications/networking/cluster/octant/default.nix
+++ b/pkgs/applications/networking/cluster/octant/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
     x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz";
   };
 
-  doBuild = false;
   doCheck = false;
 
   installPhase = ''
diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix
index 832c6311759..1430881a3f0 100644
--- a/pkgs/applications/science/misc/foldingathome/control.nix
+++ b/pkgs/applications/science/misc/foldingathome/control.nix
@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ fahviewer python ];
 
-  doBuild = false;
-
   unpackPhase = ''
     dpkg-deb -x ${src} ./
   '';
diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix
index 83b49c07578..4998797fcf3 100644
--- a/pkgs/applications/video/vcs/default.nix
+++ b/pkgs/applications/video/vcs/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation {
   unpackCmd = "mkdir src; cp $curSrc src/vcs";
   patches = [ ./fonts.patch ];
   nativeBuildInputs = [ makeWrapper ];
-  doBuild = false;
 
   inherit dejavu_fonts;
   installPhase = ''
diff --git a/pkgs/development/python-modules/skein/skeinrepo.nix b/pkgs/development/python-modules/skein/skeinrepo.nix
index 85b4f19c8f7..d7bdef56ebe 100644
--- a/pkgs/development/python-modules/skein/skeinrepo.nix
+++ b/pkgs/development/python-modules/skein/skeinrepo.nix
@@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook;
 
-  doBuild = false;
-
   installPhase = ''
     mkdir -p $out
 
diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index c7e88eb0c46..61f9c785185 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -15,8 +15,6 @@ buildPythonApplication rec {
     sha256 = "QHpVIOtGFzNqAEcBCv48YWO4pYatbTe/CWwcwjbj+34=";
   };
 
-  doBuild = false;
-
   installPhase = ''
     mkdir -p $out/bin $out/libexec/tautulli
     cp -R contrib data lib plexpy Tautulli.py $out/libexec/tautulli

From 8c16010b06c2beaaac537066726cca3e6d0e377f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 31 Jan 2021 22:53:54 +0100
Subject: [PATCH 25/41] pythonPackages.apache-airflow: Remove stale
 substituteInPlace

---
 pkgs/development/python-modules/apache-airflow/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index ca2cb03f967..705b7b721f8 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -143,11 +143,9 @@ buildPythonPackage rec {
       --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \
       --replace "flask-admin==1.5.3" "flask-admin" \
       --replace "flask-login>=0.3, <0.5" "flask-login" \
-      --replace "pendulum==1.4.4" "pendulum" \
       --replace "cached_property~=1.5" "cached_property" \
       --replace "dill>=0.2.2, <0.3" "dill" \
       --replace "configparser>=3.5.0, <3.6.0" "configparser" \
-      --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \
       --replace "colorlog==4.0.2" "colorlog" \
       --replace "funcsigs==1.0.0" "funcsigs" \
       --replace "flask-swagger==0.2.13" "flask-swagger" \

From fafb529dd7f76916e8fc704bf1a771d0b37aa29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 31 Jan 2021 22:54:50 +0100
Subject: [PATCH 26/41] fdroidserver: Disable tests

---
 pkgs/development/tools/fdroidserver/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix
index 1b0c44f5754..2cc5e6b7ca5 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/development/tools/fdroidserver/default.nix
@@ -49,6 +49,9 @@ python.pkgs.buildPythonApplication rec {
     ruamel_yaml
   ];
 
+  # no tests
+  doCheck = false;
+
   meta = with lib; {
     homepage = "https://f-droid.org";
     description = "Server and tools for F-Droid, the Free Software repository system for Android";

From 1674178ca14d8dfe4f95d1bd6c3401bb7207ba04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 31 Jan 2021 22:55:15 +0100
Subject: [PATCH 27/41] git-repo-update: Disable tests

---
 pkgs/development/tools/git-repo-updater/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/pkgs/development/tools/git-repo-updater/default.nix
index dbf83677999..d78972aa07b 100644
--- a/pkgs/development/tools/git-repo-updater/default.nix
+++ b/pkgs/development/tools/git-repo-updater/default.nix
@@ -12,6 +12,9 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [ colorama GitPython ];
 
+  # no tests
+  doCheck = false;
+
   meta = with lib; {
     description = "Easily update multiple Git repositories at once";
     homepage = "https://github.com/earwig/git-repo-updater";

From e08919c891846dc6c5492bdc57c3d1a8dff45afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 31 Jan 2021 22:55:46 +0100
Subject: [PATCH 28/41] legit: Disable tests

---
 .../version-management/git-and-tools/legit/default.nix      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/legit/default.nix b/pkgs/applications/version-management/git-and-tools/legit/default.nix
index 7dbdd6071a5..df286652711 100644
--- a/pkgs/applications/version-management/git-and-tools/legit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/legit/default.nix
@@ -16,10 +16,8 @@ python3Packages.buildPythonApplication rec {
     six
   ];
 
-  # Prevent tests from trying to create configuration in /homeless-shelter.
-  preCheck = ''
-    export HOME=$PWD/test-home
-  '';
+  # no tests
+  doCheck = false;
 
   meta = with lib; {
     homepage = "https://github.com/frostming/legit";

From b434939d39a427975406c0432d1f5632d8d64d4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 31 Jan 2021 22:56:09 +0100
Subject: [PATCH 29/41] pythonPackages.git-sweep: Disable tests

---
 pkgs/development/python-modules/git-sweep/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix
index 2b17a46190b..2d7da28535c 100644
--- a/pkgs/development/python-modules/git-sweep/default.nix
+++ b/pkgs/development/python-modules/git-sweep/default.nix
@@ -15,6 +15,11 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ GitPython ];
 
+  # no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "gitsweep" ];
+
   meta = with lib; {
     description = "A command-line tool that helps you clean up Git branches";
     homepage = "https://github.com/arc90/git-sweep";

From 4b9908322c02b8127aa6944a364d0f00656f0c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 1 Feb 2021 00:08:20 +0100
Subject: [PATCH 30/41] pythonPackages.nbdime: Fix test execution

---
 pkgs/development/python-modules/nbdime/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix
index 1de21f3511a..299cfc87024 100644
--- a/pkgs/development/python-modules/nbdime/default.nix
+++ b/pkgs/development/python-modules/nbdime/default.nix
@@ -12,7 +12,7 @@
 , tabulate
 , nbformat
 , jsonschema
-, pytest
+, pytestCheckHook
 , colorama
 , pygments
 , tornado
@@ -40,7 +40,16 @@ buildPythonPackage rec {
     jsonschema
     mock
     tabulate
-    pytest
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    "test_apply_filter_no_repo"
+    "test_diff_api_checkpoint"
+    "test_filter_cmd_invalid_filter"
+    "test_inline_merge"
+    "test_interrogate_filter_no_repo"
+    "test_merge_input_strategy_inline_source_conflict"
   ];
 
   nativeBuildInputs = [ setuptools_scm ];

From 07860aaab727a3b484ff4d87a0d8f39ba8576272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 1 Feb 2021 12:38:22 +0100
Subject: [PATCH 31/41] rocclr: Remove stale substituteInPlace

---
 pkgs/development/libraries/rocclr/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix
index 9337680f55c..278fdecc1a6 100644
--- a/pkgs/development/libraries/rocclr/default.nix
+++ b/pkgs/development/libraries/rocclr/default.nix
@@ -32,11 +32,8 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_CURRENT_BINARY_DIR}/amdrocclr_staticTargets.cmake")' \
-        'set(ROCCLR_EXPORTS_FILE "''${CMAKE_INSTALL_LIBDIR}/cmake/amdrocclr_staticTargets.cmake")' \
       --replace 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_CURRENT_BINARY_DIR}/lib)' \
-        'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})' \
-      --replace 'find_library( OpenCL REQUIRED' 'find_library( OpenCL'
+        'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})'
     substituteInPlace device/comgrctx.cpp \
       --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so"
   '';

From 6e3b60e2c960edb7ecbf2ddde9f66596b369ce82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 2 Feb 2021 13:08:55 +0100
Subject: [PATCH 32/41] pythonPackages.doit: Disable tests on darwin

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

diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix
index 36cd0b0ee18..4ceb8e71f64 100644
--- a/pkgs/development/python-modules/doit/default.nix
+++ b/pkgs/development/python-modules/doit/default.nix
@@ -25,6 +25,9 @@ buildPythonPackage rec {
     ++ lib.optional stdenv.isLinux pyinotify
     ++ lib.optional stdenv.isDarwin macfsevents;
 
+  # hangs on darwin
+  doCheck = !stdenv.isDarwin;
+
   checkInputs = [ mock pytestCheckHook ];
 
   disabledTests = [

From c320ca389b8dccf210fe131828637b2bdd94d74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 2 Feb 2021 13:17:11 +0100
Subject: [PATCH 33/41] keyfinder: Remove stale subsituteInPlace,
 enableParallelBuilding which is set by qmake

---
 pkgs/applications/audio/keyfinder/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 187d3a58b17..19433466ec3 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -16,13 +16,10 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace is_KeyFinder.pro \
-       --replace "keyfinder.0" "keyfinder" \
        --replace "-stdlib=libc++" "" \
        --replace "\$\$[QT_INSTALL_PREFIX]" "$out"
   '';
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     description = "Musical key detection for digital audio (graphical UI)";
     longDescription = ''

From 158626ad6f084f036c6ad580377a1239140016e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 2 Feb 2021 13:41:05 +0100
Subject: [PATCH 34/41] pythonPackages.dufte: Enable all tests

---
 pkgs/development/python-modules/dufte/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix
index dcf2896bba5..d1c9680cb7b 100644
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -6,6 +6,7 @@
 , importlib-metadata
 , matplotlib
 , numpy
+, exdown
 , pytestCheckHook
 }:
 
@@ -32,12 +33,9 @@ buildPythonPackage rec {
     mkdir -p $HOME/.matplotlib
     echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
   '';
-  checkInputs = [ pytestCheckHook ];
+
+  checkInputs = [ exdown pytestCheckHook ];
   pythonImportsCheck = [ "dufte" ];
-  pytestFlagsArray = [
-    # we don't have the "exdown" package (yet)
-    "--ignore=test/test_readme.py"
-  ];
 
   meta = with lib; {
     description = "Clean matplotlib plots";

From 56df259a7977d39bb3661c37ec1b273067f96b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 2 Feb 2021 13:53:05 +0100
Subject: [PATCH 35/41] archivy: Remove stale substituteInPlace

---
 pkgs/applications/misc/archivy/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix
index 4fa3d5cf419..56260fa4f70 100644
--- a/pkgs/applications/misc/archivy/default.nix
+++ b/pkgs/applications/misc/archivy/default.nix
@@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec {
     substituteInPlace requirements.txt \
       --replace 'WTForms ==' 'WTForms >=' \
       --replace 'attrs == 20.2.0' 'attrs' \
-      --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \
       --replace 'elasticsearch ==' 'elasticsearch >=' \
       --replace 'python_dotenv ==' 'python_dotenv >=' \
       --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \

From 19f0b1b09dfb978b646897d358176c2ff7ef54f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 2 Feb 2021 13:53:22 +0100
Subject: [PATCH 36/41] pythonPackages.deform: Remove stale substituteInPlace

---
 pkgs/development/python-modules/deform/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix
index bc84df26a27..5698dcbe491 100644
--- a/pkgs/development/python-modules/deform/default.nix
+++ b/pkgs/development/python-modules/deform/default.nix
@@ -11,11 +11,6 @@ buildPythonPackage rec {
     sha256 = "1e912937650c1dbb830079dd9c039950762a230223a567740fbf1b23f1090367";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "iso8601<=0.1.11" iso8601
-  '';
-
   propagatedBuildInputs = [
     chameleon
     colander

From e0961cb5f3616f3703a6c73d10b7ab49c325f5fc Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 2 Feb 2021 14:12:10 +0100
Subject: [PATCH 37/41] poetry2nix: 1.14.0 -> 1.15.2

---
 .../tools/poetry2nix/poetry2nix/default.nix   |  85 ++++++----
 .../tools/poetry2nix/poetry2nix/lib.nix       |  20 ++-
 .../poetry2nix/poetry2nix/mk-poetry-dep.nix   |   4 +-
 .../tools/poetry2nix/poetry2nix/overrides.nix | 149 ++++++++++++++++--
 .../tools/poetry2nix/poetry2nix/pep425.nix    |  19 ++-
 .../tools/poetry2nix/poetry2nix/pep508.nix    |   6 +-
 .../poetry2nix/poetry2nix/pkgs/poetry/update  |   1 +
 pkgs/development/tools/poetry2nix/update      |   2 +-
 8 files changed, 233 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index b0e65ed85a0..dbec90d8bf5 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> { }
 , lib ? pkgs.lib
 , poetry ? null
-, poetryLib ? import ./lib.nix { inherit lib pkgs; }
+, poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; }
 }:
 let
   inherit (poetryLib) isCompatible readTOML moduleName;
@@ -71,7 +71,40 @@ in
 lib.makeScope pkgs.newScope (self: {
 
   # Poetry2nix version
-  version = "1.14.0";
+  version = "1.15.2";
+
+  /* Returns a package of editable sources whose changes will be available without needing to restart the
+     nix-shell.
+     In editablePackageSources you can pass a mapping from package name to source directory to have
+     those packages available in the resulting environment, whose source changes are immediately available.
+
+  */
+  mkPoetryEditablePackage =
+    { projectDir ? null
+    , pyproject ? projectDir + "/pyproject.toml"
+    , python ? pkgs.python3
+    , pyProject ? readTOML pyproject
+      # Example: { my-app = ./src; }
+    , editablePackageSources
+    }:
+      assert editablePackageSources != { };
+      import ./editable.nix {
+        inherit pyProject python pkgs lib poetryLib editablePackageSources;
+      };
+
+  /* Returns a package containing scripts defined in tool.poetry.scripts.
+  */
+  mkPoetryScriptsPackage =
+    { projectDir ? null
+    , pyproject ? projectDir + "/pyproject.toml"
+    , python ? pkgs.python3
+    , pyProject ? readTOML pyproject
+    , scripts ? pyProject.tool.poetry.scripts
+    }:
+      assert scripts != { };
+      import ./shell-scripts.nix {
+        inherit lib python scripts;
+      };
 
   /*
      Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile.
@@ -84,11 +117,25 @@ lib.makeScope pkgs.newScope (self: {
     , python ? pkgs.python3
     , pwd ? projectDir
     , preferWheels ? false
+      # Example: { my-app = ./src; }
+    , editablePackageSources ? { }
     , __isBootstrap ? false  # Hack: Always add Poetry as a build input unless bootstrapping
     }@attrs:
     let
       poetryPkg = poetry.override { inherit python; };
       pyProject = readTOML pyproject;
+
+      scripts = pyProject.tool.poetry.scripts or { };
+      hasScripts = scripts != { };
+      scriptsPackage = self.mkPoetryScriptsPackage {
+        inherit python scripts;
+      };
+
+      hasEditable = editablePackageSources != { };
+      editablePackage = self.mkPoetryEditablePackage {
+        inherit pyProject python editablePackageSources;
+      };
+
       poetryLock = readTOML poetrylock;
       lockFiles =
         let
@@ -180,10 +227,13 @@ lib.makeScope pkgs.newScope (self: {
 
       inputAttrs = mkInputAttrs { inherit py pyProject; attrs = { }; includeBuildSystem = false; };
 
+      storePackages = builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs);
     in
     {
       python = py;
-      poetryPackages = builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs);
+      poetryPackages = storePackages
+        ++ lib.optional hasScripts scriptsPackage
+        ++ lib.optional hasEditable editablePackage;
       poetryLock = poetryLock;
       inherit pyProject;
     };
@@ -203,38 +253,17 @@ lib.makeScope pkgs.newScope (self: {
     , pwd ? projectDir
     , python ? pkgs.python3
     , preferWheels ? false
-      # Example: { my-app = ./src; }
     , editablePackageSources ? { }
     }:
     let
-      py = self.mkPoetryPackages (
-        {
-          inherit pyproject poetrylock overrides python pwd preferWheels;
-        }
-      );
-
-      inherit (py) pyProject;
-
-      # Add executables from tool.poetry.scripts
-      scripts = pyProject.tool.poetry.scripts or { };
-      hasScripts = scripts != { };
-      scriptsPackage = import ./shell-scripts.nix {
-        inherit scripts lib;
-        inherit (py) python;
+      poetryPython = self.mkPoetryPackages {
+        inherit pyproject poetrylock overrides python pwd preferWheels editablePackageSources;
       };
 
-      hasEditable = editablePackageSources != { };
-      editablePackage = import ./editable.nix {
-        inherit pkgs lib poetryLib editablePackageSources;
-        inherit (py) pyProject python;
-      };
+      inherit (poetryPython) poetryPackages;
 
     in
-    py.python.withPackages (
-      _: py.poetryPackages
-        ++ lib.optional hasEditable editablePackage
-        ++ lib.optional hasScripts scriptsPackage
-    );
+    poetryPython.python.withPackages (_: poetryPackages);
 
   /* Creates a Python application from pyproject.toml and poetry.lock
 
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index 6a0ee70f863..4626f7fec37 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs }:
+{ lib, pkgs, stdenv }:
 let
   inherit (import ./semver.nix { inherit lib ireplace; }) satisfiesSemver;
   inherit (builtins) genList length;
@@ -194,6 +194,23 @@ let
         inherit src;
       };
     };
+
+  # Maps Nixpkgs CPU values to target machines known to be supported for manylinux* wheels.
+  # (a.k.a. `uname -m` output from CentOS 7)
+  #
+  # This is current as of manylinux2014 (PEP-0599), and is a superset of manylinux2010 / manylinux1.
+  # s390x is not supported in Nixpkgs, so we don't map it.
+  manyLinuxTargetMachines = {
+    x86_64 = "x86_64";
+    i686 = "i686";
+    aarch64 = "aarch64";
+    armv7l = "armv7l";
+    powerpc64 = "ppc64";
+    powerpc64le = "ppc64le";
+  };
+
+  # Machine tag for our target platform (if available)
+  targetMachine = manyLinuxTargetMachines.${stdenv.targetPlatform.parsed.cpu.name} or null;
 in
 {
   inherit
@@ -207,5 +224,6 @@ in
     cleanPythonSources
     moduleName
     getPythonVersion
+    targetMachine
     ;
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
index c01f99c01d4..bb7b4e39b03 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
@@ -31,7 +31,7 @@ pythonPackages.callPackage
       inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName;
 
       inherit (import ./pep425.nix {
-        inherit lib python;
+        inherit lib poetryLib python;
         inherit (pkgs) stdenv;
       }) selectWheel
         ;
@@ -161,7 +161,7 @@ pythonPackages.callPackage
             builtins.fetchGit {
               inherit (source) url;
               rev = source.resolved_reference or source.reference;
-              ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD";
+              ref = sourceSpec.branch or sourceSpec.rev or (if sourceSpec?tag then "refs/tags/${sourceSpec.tag}" else "HEAD");
             }
           )
         else if isUrl then
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 5810d6d2a74..d400986d3d7 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -132,6 +132,18 @@ self: super:
     }
   );
 
+  datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: {
+    postPatch = ''
+      substituteInPlace setup.py --replace "setuptools==" "setuptools>="
+    '';
+    buildInputs = old.buildInputs ++ [ self.setuptools ];
+  });
+
+  ddtrace = super.ddtrace.overridePythonAttrs (old: {
+    buildInputs = old.buildInputs ++
+      (pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]) ++ [ self.cython ];
+  });
+
   dictdiffer = super.dictdiffer.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ self.pytest-runner ];
@@ -235,7 +247,7 @@ self: super:
     old:
     if old.format != "wheel" then rec {
       nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
-      buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkg-config self.cython ];
+      buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
       configure_flags = "--hdf5=${pkgs.hdf5}";
       postConfigure = ''
         ${self.python.executable} setup.py configure ${configure_flags}
@@ -407,7 +419,7 @@ self: super:
         export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
       '';
 
-      __impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
+      __impureHostDeps = lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
 
       passthru = old.passthru // { llvm = pkgs.llvm; };
     }
@@ -549,6 +561,12 @@ self: super:
     }
   );
 
+  mysqlclient = super.mysqlclient.overridePythonAttrs (
+    old: {
+      buildInputs = old.buildInputs ++ [ pkgs.libmysqlclient ];
+    }
+  );
+
   netcdf4 = super.netcdf4.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [
@@ -615,6 +633,13 @@ self: super:
     }
   );
 
+  osqp = super.osqp.overridePythonAttrs (
+    old: {
+      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ];
+      dontUseCmakeConfigure = true;
+    }
+  );
+
   parsel = super.parsel.overridePythonAttrs (
     old: rec {
       nativeBuildInputs = old.nativeBuildInputs ++ [ self.pytest-runner ];
@@ -642,6 +667,28 @@ self: super:
     }
   );
 
+  # Work around https://github.com/nix-community/poetry2nix/issues/244
+  # where git deps are not picked up as they should
+  pip =
+    if lib.versionAtLeast super.pip.version "20.3" then
+      super.pip.overridePythonAttrs
+        (old:
+          let
+            pname = "pip";
+            version = "20.2.4";
+          in
+          {
+            name = pname + "-" + version;
+            inherit version;
+            src = pkgs.fetchFromGitHub {
+              owner = "pypa";
+              repo = pname;
+              rev = version;
+              sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do=";
+              name = "${pname}-${version}-source";
+            };
+          }) else super.pip;
+
   poetry-core = super.poetry-core.overridePythonAttrs (old: {
     # "Vendor" dependencies (for build-system support)
     postPatch = ''
@@ -972,6 +1019,10 @@ self: super:
 
   pytest = super.pytest.overridePythonAttrs (
     old: {
+      # Fixes https://github.com/pytest-dev/pytest/issues/7891
+      postPatch = old.postPatch or "" + ''
+        sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg
+      '';
       doCheck = false;
     }
   );
@@ -996,6 +1047,28 @@ self: super:
     }
   );
 
+  # pytest-splinter seems to put a .marker file in an empty directory
+  # presumably so it's tracked by and can be installed with MANIFEST.in, see
+  # https://github.com/pytest-dev/pytest-splinter/commit/a48eeef662f66ff9d3772af618748e73211a186b
+  #
+  # This directory then gets used as an empty initial profile directory and is
+  # zipped up. But if the .marker file is in the Nix store, it has the
+  # creation date of 1970, and Zip doesn't work with such old files, so it
+  # fails at runtime!
+  #
+  # We fix this here by just removing the file after the installation
+  #
+  # The error you get without this is:
+  #
+  # E           ValueError: ZIP does not support timestamps before 1980
+  # /nix/store/55b9ip7xkpimaccw9pa0vacy5q94f5xa-python3-3.7.6/lib/python3.7/zipfile.py:357: ValueError
+  pytest-splinter = super.pytest-splinter.overrideAttrs (old: {
+    postInstall = old.postInstall or "" + ''
+      rm $out/${super.python.sitePackages}/pytest_splinter/profiles/firefox/.marker
+    '';
+  });
+
+
   ffmpeg-python = super.ffmpeg-python.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ self.pytest-runner ];
@@ -1168,14 +1241,16 @@ self: super:
           # is explicitly disabled with USE_CUDA=0.
           find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \;
         '';
-        buildInputs = old.buildInputs ++ lib.optionals enableCuda [
+        buildInputs = (old.buildInputs or [ ])
+          ++ [ self.typing-extensions ]
+          ++ lib.optionals enableCuda [
           pkgs.linuxPackages.nvidia_x11
           pkgs.nccl.dev
           pkgs.nccl.out
         ];
         propagatedBuildInputs = [
-          super.numpy
-          super.future
+          self.numpy
+          self.future
         ];
       })
     )
@@ -1257,15 +1332,15 @@ self: super:
         format = "wheel";
       };
       # If "wheel" is built from source
-      sourcePackage = (
+      sourcePackage = ((
         pkgs.python3.pkgs.override {
           python = self.python;
         }
-      ).wheel.overridePythonAttrs (
-        old: {
-          inherit (super.wheel) pname name version src;
-        }
-      );
+      ).wheel.override {
+        inherit (self) buildPythonPackage bootstrapped-pip setuptools;
+      }).overrideAttrs (old: {
+        inherit (super.wheel) pname name version src;
+      });
     in
     if isWheel then wheelPackage else sourcePackage;
 
@@ -1303,6 +1378,15 @@ self: super:
     }
   );
 
+  packaging = super.packaging.overridePythonAttrs (
+    old: {
+      buildInputs = old.buildInputs ++
+        # From 20.5 until 20.7, packaging used flit for packaging (heh)
+        # See https://github.com/pypa/packaging/pull/352 and https://github.com/pypa/packaging/pull/367
+        lib.optional (lib.versionAtLeast old.version "20.5" && lib.versionOlder old.version "20.8") [ self.flit-core ];
+    }
+  );
+
   supervisor = super.supervisor.overridePythonAttrs (
     old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ [
@@ -1317,4 +1401,47 @@ self: super:
       propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.toolz ];
     }
   );
+
+  # For some reason the toml dependency of tqdm declared here:
+  # https://github.com/tqdm/tqdm/blob/67130a23646ae672836b971e1086b6ae4c77d930/pyproject.toml#L2
+  # is not translated correctly to a nix dependency.
+  tqdm = super.tqdm.overrideAttrs (
+    old: {
+      buildInputs = [ super.toml ] ++ old.buildInputs;
+    }
+  );
+
+  watchdog = super.watchdog.overrideAttrs (
+    old: {
+      buildInputs = old.buildInputs or [ ]
+        ++ pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreServices;
+    }
+  );
+
+  # pyee cannot find `vcversioner` and other "setup requirements", so it tries to
+  # download them from the internet, which only works when nix sandboxing is disabled.
+  # Additionally, since pyee uses vcversioner to specify its version, we need to do this
+  # manually specify its version.
+  pyee = super.pyee.overrideAttrs (
+    old: {
+      postPatch = old.postPatch or "" + ''
+        sed -i setup.py \
+          -e '/setup_requires/,/],/d' \
+          -e 's/vcversioner={},/version="${old.version}",/'
+      '';
+    }
+  );
+
+  # nixpkgs has setuptools_scm 4.1.2
+  # but newrelic has a seemingly unnecessary version constraint for <4
+  # So we patch that out
+  newrelic = super.newrelic.overridePythonAttrs (
+    old: {
+      postPatch = old.postPatch or "" + ''
+        substituteInPlace setup.py --replace '"setuptools_scm>=3.2,<4"' '"setuptools_scm"'
+      '';
+    }
+  );
+
+
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
index edf556377b3..9e29c5301ab 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
@@ -1,6 +1,7 @@
-{ lib, stdenv, python, isLinux ? stdenv.isLinux }:
+{ lib, stdenv, poetryLib, python, isLinux ? stdenv.isLinux }:
 let
   inherit (lib.strings) hasSuffix hasInfix splitString removeSuffix;
+  inherit (poetryLib) targetMachine;
 
   # The 'cpxy" as determined by `python.version`
   #
@@ -72,12 +73,16 @@ let
       withPlatform =
         if isLinux
         then
-          (
-            x: x.platform == "manylinux1_${stdenv.hostPlatform.linuxArch}"
-              || x.platform == "manylinux2010_${stdenv.hostPlatform.linuxArch}"
-              || x.platform == "manylinux2014_${stdenv.hostPlatform.linuxArch}"
-              || x.platform == "any"
-          )
+          if targetMachine != null
+          then
+            (
+              x: x.platform == "manylinux1_${targetMachine}"
+                || x.platform == "manylinux2010_${targetMachine}"
+                || x.platform == "manylinux2014_${targetMachine}"
+                || x.platform == "any"
+            )
+          else
+            (x: x.platform == "any")
         else (x: hasInfix "macosx" x.platform || x.platform == "any");
       filterWheel = x:
         let
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
index e8d4159deee..dc9cd2936d0 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, poetryLib }: python:
 let
-  inherit (poetryLib) ireplace;
+  inherit (poetryLib) ireplace targetMachine;
 
   # Like builtins.substring but with stop being offset instead of length
   substr = start: stop: s: builtins.substring start (stop - start) s;
@@ -95,7 +95,7 @@ let
           else if stdenv.isDarwin then "darwin"
           else throw "Unsupported platform"
         );
-        platform_machine = stdenv.hostPlatform.linuxArch;
+        platform_machine = targetMachine;
         platform_python_implementation =
           let
             impl = python.passthru.implementation;
@@ -132,7 +132,7 @@ let
               mVal = ''[a-zA-Z0-9\'"_\. ]+'';
               mOp = "in|[!=<>]+";
               e = stripStr exprs.value;
-              m = builtins.map stripStr (builtins.match "^(${mVal}) *(${mOp}) *(${mVal})$" e);
+              m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e);
               m0 = processVar (builtins.elemAt m 0);
               m2 = processVar (builtins.elemAt m 2);
             in
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update
index d69878ad084..33a2823f360 100755
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update
@@ -3,6 +3,7 @@
 
 rev=$(curl -s https://api.github.com/repos/python-poetry/poetry/releases/latest | jq -r '.name')
 nix-prefetch-github --rev "$rev" python-poetry poetry > src.json
+echo >> src.json
 
 src=$(nix-build --no-out-link --expr 'with import <nixpkgs> {}; fetchFromGitHub (lib.importJSON ./src.json)')
 cp $src/pyproject.toml $src/poetry.lock .
diff --git a/pkgs/development/tools/poetry2nix/update b/pkgs/development/tools/poetry2nix/update
index f96763dbee3..41866437aa4 100755
--- a/pkgs/development/tools/poetry2nix/update
+++ b/pkgs/development/tools/poetry2nix/update
@@ -16,7 +16,7 @@ mv poetry2nix-master/* .
 mkdir build
 cp *.* build/
 cp -r pkgs hooks bin build/
-rm build/shell.nix build/generate.py build/overlay.nix build/flake.nix
+rm build/shell.nix build/generate.py build/overlay.nix build/flake.*
 
 cat > build/README.md << EOF
 Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix

From 35aed860a0cc9b7098e04ed816aa5008d7dbbc8e Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 2 Feb 2021 14:49:59 +0100
Subject: [PATCH 38/41] CODEOWNERS Add adisbladis as poetry2nix owner

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8491532ee38..7d0681a720c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -76,6 +76,7 @@
 /pkgs/development/interpreters/python   @FRidh
 /pkgs/development/python-modules        @FRidh @jonringer
 /doc/languages-frameworks/python.section.md     @FRidh
+/pkgs/development/tools/poetry2nix @adisbladis
 
 # Haskell
 /pkgs/development/compilers/ghc                       @cdepillabout

From fab6fcdceb2560a4ab943830a2b1632458c7a6ff Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 2 Feb 2021 15:31:19 +0000
Subject: [PATCH 39/41] =?UTF-8?q?sbt-extras:=202020-12-26=20=E2=86=92=2020?=
 =?UTF-8?q?21-02-01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/build-managers/sbt-extras/default.nix        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index f80d278c86d..ea737457ec4 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt-extras";
-  rev = "4db8d5c27413f69297adfffac57485d88d73c60e";
-  version = "2020-12-26";
+  rev = "562e2f74295f9c3ba2b3c8a87f6665b171dcdf47";
+  version = "2021-02-01";
 
   src = fetchFromGitHub {
     owner = "paulp";
     repo = "sbt-extras";
     inherit rev;
-    sha256 = "B8abzdohkw3aPhbENJ2vxZFLWhIpf0HF/uv+WJbVRYg=";
+    sha256 = "1787ghqc62wnhkhc6x2ly63bvkmprgifw497npx2l08d3s4q7kbk";
   };
 
   dontBuild = true;
@@ -25,9 +25,7 @@ stdenv.mkDerivation rec {
 
     install bin/sbt $out/bin
 
-    wrapProgram $out/bin/sbt --prefix PATH : ${
-      lib.makeBinPath [ which curl ]
-    }
+    wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]}
   '';
 
   passthru = {

From cfa16434c2acef56ec2f59760a8eb8d69265dfc7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 26 Jan 2021 13:35:04 +0000
Subject: [PATCH 40/41] weechatScripts.weechat-matrix: fix PYTHONPATH

matrix.py tries to import its dependencies, and its own code from
$out/${python.sitePackages}, and neither of these worked because
nothing was telling Python where to load that stuff from.

Using patchPythonScript made it so matrix.py could find its
dependencies, but it still wasn't able to find its own code, so that
had to be added to program_PYTHONPATH beforehand so patchPythonScript
would include it as well.

Fixes: https://github.com/NixOS/nixpkgs/issues/89499
---
 .../networking/irc/weechat/scripts/weechat-matrix/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index 07e4dd54e5e..20aebebf7da 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -70,6 +70,10 @@ in buildPythonPackage {
   '';
 
   dontPatchShebangs = true;
+  postFixup = ''
+    addToSearchPath program_PYTHONPATH $out/${python.sitePackages}
+    patchPythonScript $out/share/matrix.py
+  '';
 
   meta = with lib; {
     description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol";

From 8bad6906036d4f29d32f844a6914a3c7c97777fe Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 24 Jan 2021 23:21:34 +0000
Subject: [PATCH 41/41] autoreconfHook: make overridable

Some packages have specific autotools requirements that don't apply to
any other packages.  We want to be able to use autoreconfHook for
these packages with the required autotools versions, but we don't want
to have to makeSetupHook for each one, or have a top-level attribute
for every combination.

So, use callPackage around the makeSetupHook call so that the
autotools used by autoreconfHook can be overridden.  This way, a
custom autoreconfHook can be passed to a package like this:

    autoreconfHook = with buildPackages;
      autoreconfHook.override { automake = automake115x; };

And we can simplify the definitions of our existing autoreconfHook264
and autoreconfHook269 attributes.
---
 pkgs/top-level/all-packages.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a1fedf9f53..28417ff643a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -112,17 +112,21 @@ in
     { name = "auto-blas-hook"; deps = [ blas lapack ]; }
     ../build-support/setup-hooks/audit-blas.sh;
 
-  autoreconfHook = makeSetupHook
-    { deps = [ autoconf automake gettext libtool ]; }
-    ../build-support/setup-hooks/autoreconf.sh;
+  autoreconfHook = callPackage (
+    { makeSetupHook, autoconf, automake, gettext, libtool }:
+    makeSetupHook
+      { deps = [ autoconf automake gettext libtool ]; }
+      ../build-support/setup-hooks/autoreconf.sh
+  ) { };
 
-  autoreconfHook264 = makeSetupHook
-    { deps = [ autoconf264 automake111x gettext libtool ]; }
-    ../build-support/setup-hooks/autoreconf.sh;
+  autoreconfHook264 = autoreconfHook.override {
+    autoconf = autoconf264;
+    automake = automake111x;
+  };
 
-  autoreconfHook269 = makeSetupHook
-    { deps = [ autoconf269 automake gettext libtool ]; }
-    ../build-support/setup-hooks/autoreconf.sh;
+  autoreconfHook269 = autoreconfHook.override {
+    autoconf = autoconf269;
+  };
 
   autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; }
     ../build-support/setup-hooks/auto-patchelf.sh;