From 590d2c63e72baa4432d070480a2224fc8d27a620 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Dec 2020 06:57:36 +0000
Subject: [PATCH 01/41] pianobar: 2020.04.05 -> 2020.11.28

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

diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index 4cdf415d26b..68e41d5cadf 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }:
 
 stdenv.mkDerivation rec {
-  name = "pianobar-2020.04.05";
+  name = "pianobar-2020.11.28";
 
   src = fetchurl {
     url = "http://6xq.net/projects/pianobar/${name}.tar.bz2";
-    sha256 = "1034f9ilj9xjw12d6n4vadhl5jzrx0jv8gq1w0rg9hfc55mkn5vc";
+    sha256 = "1znlwybfpxsjqr1jmr8j0ci8wzmpzmk2yxb0qcx9w9a8nnbgnfv5";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From e922efa23e9723ea3b025fcfe7396307b8010524 Mon Sep 17 00:00:00 2001
From: mogria <m0gr14@gmail.com>
Date: Sun, 6 Dec 2020 20:42:56 +0100
Subject: [PATCH 02/41] razergenie: 0.8.1 -> 0.9.0

Upstream released a new version in september with new matrix layout
features & some fixes.
---
 pkgs/applications/misc/razergenie/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix
index ac0f373dc93..35ffb804c49 100644
--- a/pkgs/applications/misc/razergenie/default.nix
+++ b/pkgs/applications/misc/razergenie/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.8.1";
+  version = "0.9.0";
   pname = "razergenie";
 
 in stdenv.mkDerivation {
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
     owner = "z3ntu";
     repo = "RazerGenie";
     rev = "v${version}";
-    sha256 = "1ggxnaidxbbpkv1h3zwwyci6886sssgslk5adbikbhz9kc9qg239";
+    sha256 = "17xlv26q8sdbav00wdm043449pg2424l3yaf8fvkc9rrlqkv13a4";
   };
 
   nativeBuildInputs = [
@@ -35,7 +35,7 @@ in stdenv.mkDerivation {
     homepage = "https://github.com/z3ntu/RazerGenie";
     description = "Qt application for configuring your Razer devices under GNU/Linux";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ f4814n ];
+    maintainers = with maintainers; [ f4814n Mogria ];
     platforms = platforms.linux;
   };
 }

From 09d6b5400a9018afc267a548f68dd11320dc79fb Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Thu, 10 Dec 2020 20:48:10 +0100
Subject: [PATCH 03/41] molotov: 4.2.2 -> 4.4.0

---
 pkgs/applications/video/molotov/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/molotov/default.nix b/pkgs/applications/video/molotov/default.nix
index c4ee96cc246..3015bc1191b 100644
--- a/pkgs/applications/video/molotov/default.nix
+++ b/pkgs/applications/video/molotov/default.nix
@@ -2,11 +2,11 @@
 
 let
   pname = "molotov";
-  version = "4.2.2";
+  version = "4.4.0";
   name = "${pname}-${version}";
   src = fetchurl {
     url = "http://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage";
-    sha256 = "00p8srf4yswbihlsi3s7kfkav02h902yvrq99wys11is63n01x8z";
+    sha256 = "sha256-l4Il6i8uXSeJqH3ITC8ZUpKXPQb0qcW7SpKx1R46XDc=";
   };
   appimageContents = appimageTools.extractType2 { inherit name src; };
 in
@@ -15,7 +15,7 @@ appimageTools.wrapType2 {
   extraInstallCommands = ''
     mv $out/bin/${name} $out/bin/${pname}
     install -m 444 -D \
-      ${appimageContents}/${pname}.desktop \
+      ${appimageContents}/@molotovdesktop-wrapper.desktop \
       $out/share/applications/${pname}.desktop
     substituteInPlace $out/share/applications/${pname}.desktop \
       --replace 'Exec=AppRun' 'Exec=${pname}'

From 99b4c714e3ac87e3db45081a98cbadd3af363a3b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 Dec 2020 09:44:23 +0000
Subject: [PATCH 04/41] kdevelop-unwrapped: 5.6.0 -> 5.6.1

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

diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index d8f41664e66..8ca083a2d89 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -10,11 +10,11 @@
 
 mkDerivation rec {
   pname = "kdevelop";
-  version = "5.6.0";
+  version = "5.6.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "0cpmavxz5fi0f1rjinvn6id1nplvjwg00l0n36s0ybygqkacgb9q";
+    sha256 = "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y";
   };
 
   nativeBuildInputs = [

From ed99a16635886c386d2151c0ab1e4bf3ea99ff0f Mon Sep 17 00:00:00 2001
From: freezeboy <freezeboy@users.noreply.github.com>
Date: Fri, 11 Dec 2020 19:27:29 +0100
Subject: [PATCH 05/41] iannix: 0.9.20-b -> unstable-2020-12-09

It includes a few bug fixes.
This also allows to migrate to Qt5.15
---
 pkgs/applications/audio/iannix/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index 3765d2ca678..57d91a298ca 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "iannix";
-  version = "0.9.20-b";
+  version = "unstable-2020-12-09";
 
   src = fetchFromGitHub {
     owner = "iannix";
     repo = "IanniX";
-    rev = "v${version}";
-    sha256 = "6jjgMvD2VkR3ztU5LguqhtNd+4/ZqRy5pVW5xQ6K20Q=";
+    rev = "287b51d9b90b3e16ae206c0c4292599619f7b159";
+    sha256 = "AhoP+Ok78Vk8Aee/RP572hJeM8O7v2ZTvFalOZZqRy8=";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 970cdf7ad7e..d2d4970c4f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4757,7 +4757,7 @@ in
 
   iasl = callPackage ../development/compilers/iasl { };
 
-  iannix = libsForQt514.callPackage ../applications/audio/iannix { };
+  iannix = libsForQt5.callPackage ../applications/audio/iannix { };
 
   jamulus = libsForQt5.callPackage ../applications/audio/jamulus { };
 

From c6f113a3f4bdcd21aae126deaf0225b57352aaf2 Mon Sep 17 00:00:00 2001
From: "S. Nordin Abouzahra" <abouzahra.9@wright.edu>
Date: Wed, 9 Dec 2020 14:05:10 -0500
Subject: [PATCH 06/41] firefox: remove superfluous NIX_CFLAGS_COMPILE

It was added for nspr and nss back in the 55.0.3 to 56.0 upgrade. It
also served as a workaround for an undeclared gio-unix-2.0 dependency.
Sometime afterwards nspr was removed, leaving just the two. Since then,
upstream has added a declaration for gio-unix-2.0 (in FF62). As for the
nss include it seemingly has no purpose since current firefox builds
with it removed.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 70fde21823a..d335313df7b 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -186,11 +186,6 @@ buildStdenv.mkDerivation ({
     -rpath ${llvmPackages.libunwind.out}/lib
   '';
 
-  NIX_CFLAGS_COMPILE = toString [
-    "-I${glib.dev}/include/gio-unix-2.0"
-    "-I${nss_pkg.dev}/include/nss"
-  ];
-
   MACH_USE_SYSTEM_PYTHON = "1";
 
   postPatch = ''

From 96c34702e90dd4957aced6013886aed7d0eed0a7 Mon Sep 17 00:00:00 2001
From: "S. Nordin Abouzahra" <abouzahra.9@wright.edu>
Date: Wed, 9 Dec 2020 14:48:45 -0500
Subject: [PATCH 07/41] firefox: restrict system NSPR workaround

It only affected FF80 so place an upper bound restriction. See
bmo#1661096 for details.

This fixes substituteStream() warnings about missing patterns which
appeared in the logs.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index d335313df7b..c0822e478f3 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -197,7 +197,7 @@ buildStdenv.mkDerivation ({
     substituteInPlace \
       media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \
       --replace /usr/include ${pipewire.dev}/include
-  '' + lib.optionalString (lib.versionAtLeast ffversion "80") ''
+  '' + lib.optionalString (lib.versionAtLeast ffversion "80" && lib.versionOlder ffversion "81") ''
     substituteInPlace dom/system/IOUtils.h \
       --replace '#include "nspr/prio.h"'          '#include "prio.h"'
 

From 80e863c52c3cf2c838ad80ade5dfea89cce1cd2d Mon Sep 17 00:00:00 2001
From: "S. Nordin Abouzahra" <abouzahra.9@wright.edu>
Date: Wed, 9 Dec 2020 20:36:16 -0500
Subject: [PATCH 08/41] firefox: clean up optionals

Change `lib.optionals a [ b ]` to `lib.optional a b`.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index c0822e478f3..b98ff47984f 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -174,9 +174,9 @@ buildStdenv.mkDerivation ({
   ++ lib.optional  gtk3Support gtk3
   ++ lib.optional  gssSupport kerberos
   ++ lib.optional  ltoSupport llvmPackages.libunwind
-  ++ lib.optionals waylandSupport [ libxkbcommon ]
-  ++ lib.optionals pipewireSupport [ pipewire ]
-  ++ lib.optionals (lib.versionAtLeast ffversion "82") [ gnum4 ]
+  ++ lib.optional  waylandSupport libxkbcommon
+  ++ lib.optional  pipewireSupport pipewire
+  ++ lib.optional  (lib.versionAtLeast ffversion "82") gnum4
   ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos
                                           AVFoundation MediaToolbox CoreLocation
                                           Foundation libobjc AddressBook cups ];

From a277fca1c4bec931d4cec715ae029a5d99a1b23b Mon Sep 17 00:00:00 2001
From: "S. Nordin Abouzahra" <abouzahra.9@wright.edu>
Date: Wed, 9 Dec 2020 21:26:58 -0500
Subject: [PATCH 09/41] firefox: remove patchelf usage

Firefox has a number of optional dependencies that get dlopened.
Instead of using patchelf to set the RPATH use LD_LIBRARY_PATH.
The motivation for this is we already set LD_LIBRARY_PATH in the
wrapper on Linux.
---
 .../networking/browsers/firefox/common.nix      | 17 +++--------------
 .../networking/browsers/firefox/wrapper.nix     |  8 +++++---
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index b98ff47984f..0378d0dc859 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -4,7 +4,7 @@
 
 { lib, stdenv, pkgconfig, pango, perl, python2, python3, zip
 , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
-, freetype, fontconfig, file, nspr, nss, nss_3_53, libnotify
+, freetype, fontconfig, file, nspr, nss, nss_3_53
 , yasm, libGLU, libGL, sqlite, unzip, makeWrapper
 , hunspell, libXdamage, libevent, libstartup_notification
 , libvpx_1_8
@@ -157,7 +157,7 @@ buildStdenv.mkDerivation ({
     gtk2 perl zip libjpeg zlib bzip2
     dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
     xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
-    libnotify xorg.pixman yasm libGLU libGL
+    xorg.pixman yasm libGLU libGL
     xorg.xorgproto
     xorg.libXext unzip makeWrapper
     libevent libstartup_notification /* cairo */
@@ -336,18 +336,6 @@ buildStdenv.mkDerivation ({
     gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped")
   '';
 
-  postFixup = lib.optionalString buildStdenv.isLinux ''
-    # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712.
-    patchelf --set-rpath "${lib.getLib libnotify
-      }/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \
-        "$out"/lib/${binaryName}*/libxul.so
-    patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName}
-    ${lib.optionalString (pipewireSupport && lib.versionAtLeast ffversion "83") ''
-      patchelf --add-needed "${lib.getLib pipewire}/lib/libpipewire-0.3.so" \
-        "$out"/lib/${binaryName}/${binaryName}
-    ''}
-  '';
-
   doInstallCheck = true;
   installCheckPhase = ''
     # Some basic testing
@@ -360,6 +348,7 @@ buildStdenv.mkDerivation ({
     isFirefox3Like = true;
     gtk = gtk2;
     inherit alsaSupport;
+    inherit pipewireSupport;
     inherit nspr;
     inherit ffmpegSupport;
     inherit gssSupport;
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 88fb6af4b01..c083dbe873e 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -3,9 +3,9 @@
 
 ## various stuff that can be plugged in
 , flashplayer, hal-flash
-, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd
+, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify
 , gnome3/*.gnome-shell*/
-, browserpass, chrome-gnome-shell, uget-integrator, plasma5, bukubrow
+, browserpass, chrome-gnome-shell, uget-integrator, plasma5, bukubrow, pipewire
 , tridactyl-native
 , fx_cast_bridge
 , udev
@@ -51,6 +51,7 @@ let
       ffmpegSupport = browser.ffmpegSupport or false;
       gssSupport = browser.gssSupport or false;
       alsaSupport = browser.alsaSupport or false;
+      pipewireSupport = browser.pipewireSupport or false;
 
       plugins =
         let
@@ -80,7 +81,8 @@ let
           ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
           ++ extraNativeMessagingHosts
         );
-      libs =   lib.optionals stdenv.isLinux [ udev libva mesa ]
+      libs =   lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ]
+            ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire
             ++ lib.optional ffmpegSupport ffmpeg
             ++ lib.optional gssSupport kerberos
             ++ lib.optional useGlvnd libglvnd

From 40b4eb1c52f2a87f8f99ac193782c1c8b665fb7b Mon Sep 17 00:00:00 2001
From: "S. Nordin Abouzahra" <abouzahra.9@wright.edu>
Date: Wed, 9 Dec 2020 21:53:39 -0500
Subject: [PATCH 10/41] firefox: simplify NIX_LDFLAGS usage

This was required to solve the XPCOMGlueLoad error when building with
LTO. However, it turns out libxul.so is supposed to have some libraries
that are reported as not found by ldd. Setting the RPATH worked around
the error as it forced dependency resolution but failed to fix the real
issue of broken generation of dependentlibs.list.

The libraries that are reported as not found by ldd are supposed to be
dlopened through the logic found in nsXPCOMGlue.cpp. However since the
generation of dependentlibs.list is broken under LTO this did not
happen. Instead of pulling libwayland-client.so from the GTK libraries
it found the stub library first (libmozwayland.so). The stub library
causes (as it should) wl_display_connect to always return NULL which is
the cause of the segmentation fault and LTO breaking wayland support.

Remove the hardcoded path used for the XPCOMGlueLoad error workaround
in NIX_LDFLAGS. libunwind is still unfortunately needed. Once the issue
of the generation of dependentlibs.list being borked is fixed it should
remedy the wayland crash issue on LTO.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 0378d0dc859..4a356995cde 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -173,7 +173,6 @@ buildStdenv.mkDerivation ({
   ++ lib.optional  pulseaudioSupport libpulseaudio # only headers are needed
   ++ lib.optional  gtk3Support gtk3
   ++ lib.optional  gssSupport kerberos
-  ++ lib.optional  ltoSupport llvmPackages.libunwind
   ++ lib.optional  waylandSupport libxkbcommon
   ++ lib.optional  pipewireSupport pipewire
   ++ lib.optional  (lib.versionAtLeast ffversion "82") gnum4
@@ -182,7 +181,6 @@ buildStdenv.mkDerivation ({
                                           Foundation libobjc AddressBook cups ];
 
   NIX_LDFLAGS = lib.optionalString ltoSupport ''
-    -rpath ${placeholder "out"}/lib/${binaryName}
     -rpath ${llvmPackages.libunwind.out}/lib
   '';
 

From 7415d0589d596fd1b61f230e29761f138d46b756 Mon Sep 17 00:00:00 2001
From: "S. Nordin Abouzahra" <abouzahra.9@wright.edu>
Date: Wed, 9 Dec 2020 22:20:59 -0500
Subject: [PATCH 11/41] firefox: overhaul LTO

Enable LTO support on Linux by default again.

Add patch to fix dependentlibs.list generation under LTO. This is
necessary for fixing firefox-wayland crashing when built with LTO.

Add makeFlags which set ar, ranlib, and nm to be llvm-ar, llvm-ranlib
and llvm-nm when building with llvm-based LTO. (bmo#1480005)
---
 .../networking/browsers/firefox/common.nix    | 32 +++++++++----
 .../lto-dependentlibs-generation-ffx83.patch  | 45 +++++++++++++++++++
 2 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 4a356995cde..c031b9e7326 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -23,8 +23,7 @@
 , ffmpegSupport ? true
 , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
 , waylandSupport ? true, libxkbcommon
-# LTO is disabled since it caused segfaults on wayland see https://github.com/NixOS/nixpkgs/issues/101429
-, ltoSupport ? false, overrideCC, buildPackages
+, ltoSupport ? stdenv.isLinux, overrideCC, buildPackages
 , gssSupport ? true, kerberos
 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire
 
@@ -91,11 +90,19 @@ let
             then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS"
             else "/bin";
 
+  # 78 ESR won't build with rustc 1.47
+  inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
+    rustc cargo;
+
   # Darwin's stdenv provides the default llvmPackages version, match that since
   # clang LTO on Darwin is broken so the stdenv is not being changed.
+  # Target the LLVM version that rustc -Vv reports it is built with for LTO.
+  # rustPackages_1_45 -> LLVM 10, rustPackages -> LLVM 11
   llvmPackages = if stdenv.isDarwin
                  then buildPackages.llvmPackages
-                 else buildPackages.llvmPackages_10;
+                 else if lib.versionAtLeast rustc.llvm.version "11"
+                      then buildPackages.llvmPackages_11
+                      else buildPackages.llvmPackages_10;
 
   # When LTO for Darwin is fixed, the following will need updating as lld
   # doesn't work on it. For now it is fine since ltoSupport implies no Darwin.
@@ -103,10 +110,6 @@ let
                 then overrideCC stdenv llvmPackages.lldClang
                 else stdenv;
 
-  # 78 ESR won't build with rustc 1.47
-  inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
-    rustc cargo;
-
   nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss;
 in
 
@@ -121,13 +124,19 @@ buildStdenv.mkDerivation ({
   ] ++
   lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++
   lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++
+  lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++
+  lib.optional (ltoSupport && lib.versionAtLeast ffversion "84" && lib.versionOlder ffversion "86")
+    (fetchpatch {
+      url = "https://hg.mozilla.org/mozilla-central/raw-rev/fdff20c37be3";
+      sha256 = "135n9brliqy42lj3nqgb9d9if7x6x9nvvn0z4anbyf89bikixw48";
+    })
 
   # there are two flavors of pipewire support
   # The patches for the ESR release and the patches for the current stable
   # release.
   # Until firefox upstream stabilizes pipewire support we will have to continue
   # tracking multiple versions here.
-  lib.optional (pipewireSupport && lib.versionOlder ffversion "83")
+  ++ lib.optional (pipewireSupport && lib.versionOlder ffversion "83")
     (fetchpatch {
       # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch
       url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch";
@@ -316,6 +325,13 @@ buildStdenv.mkDerivation ({
     "MOZILLA_OFFICIAL=1"
     "BUILD_OFFICIAL=1"
   ]
+  ++ lib.optionals ltoSupport [
+    "AR=${llvmPackages.bintools}/bin/llvm-ar"
+    "LLVM_OBJDUMP=${llvmPackages.bintools}/bin/llvm-objdump"
+    "NM=${llvmPackages.bintools}/bin/llvm-nm"
+    "RANLIB=${llvmPackages.bintools}/bin/llvm-ranlib"
+    "STRIP=${llvmPackages.bintools}/bin/llvm-strip"
+  ]
   ++ extraMakeFlags;
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch b/pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch
new file mode 100644
index 00000000000..b6f1b81fa9f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch
@@ -0,0 +1,45 @@
+--- a/toolkit/library/build/dependentlibs.py
++++ b/toolkit/library/build/dependentlibs.py
+@@ -36,26 +36,17 @@ def dependentlibs_win32_objdump(lib):
+     proc.wait()
+     return deps
+ 
+-def dependentlibs_readelf(lib):
++def dependentlibs_elf_objdump(lib):
+     '''Returns the list of dependencies declared in the given ELF .so'''
+-    proc = subprocess.Popen([substs.get('TOOLCHAIN_PREFIX', '') + 'readelf', '-d', lib], stdout = subprocess.PIPE,
++    proc = subprocess.Popen([substs['LLVM_OBJDUMP'], '--private-headers', lib], stdout = subprocess.PIPE,
+                             universal_newlines=True)
+     deps = []
+     for line in proc.stdout:
+-        # Each line has the following format:
+-        #  tag (TYPE)          value
+-        # or with BSD readelf:
+-        #  tag TYPE            value
+-        # Looking for NEEDED type entries
+-        tmp = line.split(' ', 3)
+-        if len(tmp) > 3 and 'NEEDED' in tmp[2]:
+-            # NEEDED lines look like:
+-            # 0x00000001 (NEEDED)             Shared library: [libname]
+-            # or with BSD readelf:
+-            # 0x00000001 NEEDED               Shared library: [libname]
+-            match = re.search('\[(.*)\]', tmp[3])
+-            if match:
+-                deps.append(match.group(1))
++        # We are looking for lines with the format:
++        #   NEEDED             libname
++        tmp = line.split()
++        if len(tmp) == 2 and tmp[0] == 'NEEDED':
++            deps.append(tmp[1])
+     proc.wait()
+     return deps
+ 
+@@ -110,7 +101,7 @@ def gen_list(output, lib):
+     libpaths = [os.path.join(substs['DIST'], 'bin')]
+     binary_type = get_type(lib)
+     if binary_type == ELF:
+-        func = dependentlibs_readelf
++        func = dependentlibs_elf_objdump
+     elif binary_type == MACHO:
+         func = dependentlibs_mac_objdump
+     else:

From dbe008a52a25a039653f3dec295859d1566ddafc Mon Sep 17 00:00:00 2001
From: "S. Nordin Abouzahra" <abouzahra.9@wright.edu>
Date: Fri, 25 Dec 2020 21:02:01 -0500
Subject: [PATCH 12/41] firefox: remove python2 dependency

Python 2 is no longer required to build Firefox.
---
 pkgs/applications/networking/browsers/firefox/common.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index c031b9e7326..123c3cc08a6 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -2,7 +2,7 @@
 , src, unpackPhase ? null, patches ? []
 , extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }:
 
-{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip
+{ lib, stdenv, pkgconfig, pango, perl, python3, zip
 , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
 , freetype, fontconfig, file, nspr, nss, nss_3_53
 , yasm, libGLU, libGL, sqlite, unzip, makeWrapper
@@ -223,7 +223,6 @@ buildStdenv.mkDerivation ({
       nodejs
       perl
       pkgconfig
-      python2
       python3
       rust-cbindgen
       rustc

From 6cdbde2f0d0cc6b22b1fff9e6d3f3c63aecab171 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 13 Jan 2021 18:10:31 +0100
Subject: [PATCH 13/41] ffmpeg-full: disable rav1e by default (in favor of
 svt-av1)

Since c378a3370599 we have a patch to add svt-av1 support to
ffmpeg-full. The default AV1 encoder is still libaom but svt-av1 has a
higher priority than rav1e (see libavcodec/allcodecs.c). And since
svt-av1 is much faster than rav1e (which in turn should be faster than
libaom) we don't really need rav1e support by default anymore (I guess
it can be useful but overall svt-av1 should currently be the best
option).
And because rav1e's build did break a few times in the past and needs a
lot of Rust dependencies (including cargo-c to make it C-ABI
compatible) it might be best to simply disable it for now.

Benchmarks (though it is difficult to compare them that way):
- https://openbenchmarking.org/test/pts/svt-av1
- https://openbenchmarking.org/test/pts/rav1e
- https://openbenchmarking.org/test/pts/aom-av1
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3158d657fab..52d22c494d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13158,6 +13158,7 @@ in
 
   ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
     svt-av1 = if stdenv.isAarch64 then null else svt-av1;
+    rav1e = null; # We already have SVT-AV1 for faster encoding
     # The following need to be fixed on Darwin
     libjack2 = if stdenv.isDarwin then null else libjack2;
     libmodplug = if stdenv.isDarwin then null else libmodplug;

From 15bbb7deecf4de6c193947f07bbce7523d9a8834 Mon Sep 17 00:00:00 2001
From: Johannes Wienke <languitar@semipol.de>
Date: Tue, 5 Jan 2021 21:30:26 +0100
Subject: [PATCH 14/41] pass-git-helper: 1.1.0 -> 1.1.1

Bump package and add new test requirements.
---
 .../git-and-tools/pass-git-helper/default.nix             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
index 805afdf363c..5feb71c7931 100644
--- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
@@ -1,18 +1,18 @@
-{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest }:
+{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }:
 
 buildPythonApplication rec {
   pname   = "pass-git-helper";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner  = "languitar";
     repo   = "pass-git-helper";
     rev    = "v${version}";
-    sha256 = "18nvwlp0w4aqj268wly60rnjzqw2d8jl0hbs6bkwp3hpzzz5g6yd";
+    sha256 = "sha256-GdsFPpBdoEaOCmdKxw5xTuFOcGFH94w5q/lV891lCUs=";
   };
 
   propagatedBuildInputs = [ pyxdg ];
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest pytest-mock ];
   preCheck = ''
     export HOME=$(mktemp -d)
   '';

From 2345e374af7619987f33da98d1e9a4e559261db9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 9 Sep 2020 19:10:44 +0200
Subject: [PATCH 15/41] svt-av1: Extend the meta attributes

I've merged my local package definitions with the ones in Nixpkgs.
---
 pkgs/tools/video/svt-av1/default.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix
index 38c16fadcb8..69ded2307de 100644
--- a/pkgs/tools/video/svt-av1/default.nix
+++ b/pkgs/tools/video/svt-av1/default.nix
@@ -15,8 +15,23 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "AV1-compliant encoder/decoder library core";
-    homepage = "https://github.com/AOMediaCodec/SVT-AV1";
-    license = licenses.bsd2;
+    longDescription = ''
+      The Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder) is an
+      AV1-compliant encoder/decoder library core. The SVT-AV1 encoder
+      development is a work-in-progress targeting performance levels applicable
+      to both VOD and Live encoding / transcoding video applications. The
+      SVT-AV1 decoder implementation is targeting future codec research
+      activities.
+    '';
+    inherit (src.meta) homepage;
+    changelog = "https://github.com/AOMediaCodec/SVT-AV1/blob/v${version}/CHANGELOG.md";
+    license = with licenses; [
+      bsd2
+      {
+        fullName = "Alliance for Open Media Patent License 1.0";
+        url = "https://aomedia.org/license/patent-license/";
+      }
+    ];
     platforms = platforms.unix;
     broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init'
     maintainers = with maintainers; [ chiiruno ];

From 00dcba48bb7581d4b834bc680acdd1201462a99f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 16 Jan 2021 06:56:06 -0500
Subject: [PATCH 16/41] grpc: 1.34.0 -> 1.34.1

https://github.com/grpc/grpc/releases/tag/v1.34.1
---
 pkgs/development/libraries/grpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 346d04390c3..e24967eb30f 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.34.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+  version = "1.34.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
   pname = "grpc";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    sha256 = "0kipk26kg2x06mrkhb74k8vk5cn4mr89kw1f9mb04n616wkxjyxy";
+    sha256 = "0p6si9i0gg885ag2x87a7jyzhgd5lhx2bh2vjj2ra1jn6y3vg6qk";
     fetchSubmodules = true;
   };
   patches = [

From 096d5bf94d3f57a0e2b8b286553256e3d66c79fb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 16 Jan 2021 06:56:48 -0500
Subject: [PATCH 17/41] pythonPackages.grpcio-tools: 1.34.0 -> 1.34.1

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

diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index efae4b102d4..629c51071ab 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:
+{ lib, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:
 
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.34.0";
+  version = "1.34.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "db5a6f0130256d534cbe35eab37d37a448d96f4fd736e5051c6be1aee49cea1d";
+    sha256 = "b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08";
   };
 
   outputs = [ "out" "dev" ];
@@ -18,6 +18,8 @@ buildPythonPackage rec {
   # no tests in the package
   doCheck = false;
 
+  pythonImportsCheck = [ "grpc_tools" ];
+
   meta = with lib; {
     description = "Protobuf code generator for gRPC";
     license = licenses.asl20;

From 90ac27854d53a69ea85571dadbf9eafb3e6b7c1e Mon Sep 17 00:00:00 2001
From: Matej Urbas <matej.urbas@gmail.com>
Date: Sat, 16 Jan 2021 11:57:39 +0000
Subject: [PATCH 18/41] python3Packages.notebook: disable flaky
 KernelCullingTest

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

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 116fa153cda..bab3aa590ec 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -68,6 +68,7 @@ buildPythonPackage rec {
     "launch_socket"
     "sock_server"
     "test_list_formats" # tries to find python MIME type
+    "KernelCullingTest" # has a race condition failing on slower hardware
   ] ++ lib.optional stdenv.isDarwin [
     "test_delete"
     "test_checkpoints_follow_file"

From 154937e41532d3f875882b9204a73c97ee8d637c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 16 Jan 2021 07:07:43 -0500
Subject: [PATCH 19/41] nodejs-15_x: 15.5.1 -> 15.6.0

https://github.com/nodejs/node/releases/tag/v15.6.0
---
 pkgs/development/web/nodejs/v15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix
index 8687336c138..5f69cd59f54 100644
--- a/pkgs/development/web/nodejs/v15.nix
+++ b/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "15.5.1";
-    sha256 = "0qbb4dwgsy1a82ihjxl6r8bj7mwjzb21s720y1rahisd5p69l8ic";
+    version = "15.6.0";
+    sha256 = "1liqkh1gz1h37fln8xr5krbs2mqjn38n3sws2ydvk84wrpfq3prr";
   }

From e9abfbde62e32bfa408dae3fcd716ae8d7b7824d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Sat, 16 Jan 2021 13:17:21 +0100
Subject: [PATCH 20/41] nixos-rebuild: put some important dependencies in PATH

---
 pkgs/os-specific/linux/nixos-rebuild/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix
index 93500d2eaa3..9fb7e366465 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/default.nix
+++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix
@@ -1,8 +1,16 @@
-{ substituteAll, runtimeShell, jq, nix, lib }:
-
+{ substituteAll
+, runtimeShell
+, coreutils
+, gnused
+, gnugrep
+, jq
+, nix
+, lib
+}:
 let
   fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
-in substituteAll {
+in
+substituteAll {
   name = "nixos-rebuild";
   src = ./nixos-rebuild.sh;
   dir = "bin";
@@ -10,5 +18,5 @@ in substituteAll {
   inherit runtimeShell nix;
   nix_x86_64_linux = fallback.x86_64-linux;
   nix_i686_linux = fallback.i686-linux;
-  path = lib.makeBinPath [ jq ];
+  path = lib.makeBinPath [ coreutils jq gnused gnugrep ];
 }

From bb971b16de58628893d98e5840d2146843d76f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Sat, 16 Jan 2021 13:54:00 +0100
Subject: [PATCH 21/41] routino: 3.3.2 -> 3.3.3

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

diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix
index 8d948734460..64f4a260ab8 100644
--- a/pkgs/tools/misc/routino/default.nix
+++ b/pkgs/tools/misc/routino/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "routino";
-  version = "3.3.2";
+  version = "3.3.3";
 
   src = fetchurl {
     url = "https://routino.org/download/${pname}-${version}.tgz";
-    sha256 = "1ccx3s99j8syxc1gqkzsaqkmyf44l7h3adildnc5iq2md7bp8wab";
+    sha256 = "1xa7l2bjn832nk6bc7b481nv8hd2gj41jwhg0d2qy10lqdvjpn5b";
   };
 
   patchFlags = [ "-p0" ];

From 43f94415f9cc53d0d6bbc419a90ff2147dcbd33c Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Sat, 16 Jan 2021 14:31:23 +0100
Subject: [PATCH 22/41] sympa: 6.2.56 -> 6.2.60

Fixes: https://nvd.nist.gov/vuln/detail/CVE-2020-29668
       https://sympa-community.github.io/security/2020-003.html

ChangeLog: https://github.com/sympa-community/sympa/blob/6.2.60/NEWS.md
---
 pkgs/servers/mail/sympa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix
index b3b7c742d71..4bc969a851c 100644
--- a/pkgs/servers/mail/sympa/default.nix
+++ b/pkgs/servers/mail/sympa/default.nix
@@ -63,13 +63,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "sympa";
-  version = "6.2.56";
+  version = "6.2.60";
 
   src = fetchFromGitHub {
     owner = "sympa-community";
     repo = pname;
     rev = version;
-    sha256 = "13cs2azpskmp2hkfy5zqf4qb6sb9r8d4wwzc8mw74mg2kdjnvfpy";
+    sha256 = "0mnpmkvxf3bmrmahkf3d0i5r6sj7xb1yca5v7xdnwnh5wh9vlx7v";
   };
 
   configureFlags = [

From 86b83264cbca0a0fa0bd767d24619f9e263d114f Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Sat, 16 Jan 2021 07:34:32 -0800
Subject: [PATCH 23/41] babelfish: 0.1.3 -> 1.0.0

Notably, adds support for stdout redirections and fixes a failing test.
---
 pkgs/shells/fish/babelfish.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix
index bfe01740f14..5974eef8d71 100644
--- a/pkgs/shells/fish/babelfish.nix
+++ b/pkgs/shells/fish/babelfish.nix
@@ -1,16 +1,16 @@
 { lib, stdenv, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "babelfish";
-  version = "0.1.3";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "bouk";
     repo = "babelfish";
     rev = "v${version}";
-    sha256 = "08i4y4fw60ynamr1jz8nkfkidxj06vcyhi1v4wxpl2macn6n4skk";
+    sha256 = "A5FUnER25FDkL/K7RCqudZI6Xd5wg9B8aLbYUw6+7BA=";
   };
 
-  vendorSha256 = "0xjy50wciw329kq1nkd7hhaipcp4fy28hhk6cdq21qwid6g21gag";
+  vendorSha256 = "T70gnmmR4yBwY2ZCiIR35LIbFYSnTRvwTGLwyDgoXnY=";
 
   meta = with lib; {
     description = "Translate bash scripts to fish";

From cda449e23c2d209cdb46594a9f25f0084cf87d1d Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Sat, 16 Jan 2021 19:25:30 +0100
Subject: [PATCH 24/41] mycli: 1.23.0 -> 1.23.2

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

diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix
index 92752335d32..47c9aa7f5f8 100644
--- a/pkgs/tools/admin/mycli/default.nix
+++ b/pkgs/tools/admin/mycli/default.nix
@@ -7,11 +7,11 @@ with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "mycli";
-  version = "1.23.0";
+  version = "1.23.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-k1UHpEoszThUvoL4h59vGZ71bAx26VJ0iT/YuVQk/Lk=";
+    sha256 = "sha256-auGbFAvwLR7aDChhgeNZPZPNGJo+b9Q4TFDaOrmU2zI=";
   };
 
   propagatedBuildInputs = [

From ccdf2b2be6766f0866c675c1d8288e89f11e5440 Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Sat, 16 Jan 2021 18:46:39 +0100
Subject: [PATCH 25/41] elmPackages.*: add meta

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/compilers/elm/default.nix    | 92 +++++++++++++++++--
 .../compilers/elm/packages/elm-json.nix       |  8 --
 2 files changed, 84 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 0dbf1a3306f..6c4b1bd2d30 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -7,7 +7,7 @@ let
   fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
 
   hsPkgs = haskell.packages.ghc883.override {
-    overrides = self: super: with haskell.lib;
+    overrides = self: super: with haskell.lib; with lib;
       let elmPkgs = rec {
             elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
               # sadly with parallelism most of the time breaks compilation
@@ -23,6 +23,11 @@ let
                 wrapProgram $out/bin/elm \
                   --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
               '';
+
+              description = "A delightful language for reliable webapps";
+              homepage = "https://elm-lang.org/";
+              license = licenses.bsd3;
+              maintainers = with maintainers; [ domenkozar turbomack ];
             });
 
             /*
@@ -31,6 +36,11 @@ let
             */
             elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: {
               jailbreak = true;
+
+              description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide";
+              homepage = "https://github.com/avh4/elm-format";
+              license = licenses.bsd3;
+              maintainers = with maintainers; [ turbomack ];
             }));
 
             elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: {
@@ -39,6 +49,11 @@ let
                 hpack
               '';
               jailbreak = true;
+
+              description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler";
+              homepage = "https://github.com/stoeffel/elmi-to-json";
+              license = licenses.bsd3;
+              maintainers = [ maintainers.turbomack ];
             }));
 
             elm-instrument = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-instrument.nix {}) (drv: {
@@ -48,6 +63,11 @@ let
               jailbreak = true;
               # Tests are failing because of missing instances for Eq and Show type classes
               doCheck = false;
+
+              description = "Instrument Elm code as a preprocessing step for elm-coverage";
+              homepage = "https://github.com/zwilias/elm-instrument";
+              license = licenses.bsd3;
+              maintainers = [ maintainers.turbomack ];
             }));
 
             inherit fetchElmDeps;
@@ -74,9 +94,17 @@ let
     inherit (hsPkgs.elmPkgs) elm;
   };
 
-  elmRustPackages = {
+  elmRustPackages =  {
     elm-json = import ./packages/elm-json.nix {
       inherit rustPlatform fetchurl openssl stdenv pkg-config;
+    } // {
+      meta = with lib; {
+        description = "Install, upgrade and uninstall Elm dependencies";
+        homepage = "https://github.com/zwilias/elm-json";
+        license = licenses.mit;
+        maintainers = [ maintainers.turbomack ];
+        platforms = platforms.linux;
+      };
     };
   };
 
@@ -89,10 +117,24 @@ let
     in with hsPkgs.elmPkgs; {
 
       elm-test = patchBinwrap [elmi-to-json]
-        nodePkgs.elm-test;
+        nodePkgs.elm-test // {
+          meta = with stdenv.lib; {
+            description = "Runs elm-test suites from Node.js";
+            homepage = "https://github.com/rtfeldman/node-test-runner";
+            license = licenses.bsd3;
+            maintainers = [ maintainers.turbomack ];
+          };
+        };
 
       elm-verify-examples = patchBinwrap [elmi-to-json]
-        nodePkgs.elm-verify-examples;
+        nodePkgs.elm-verify-examples // {
+          meta = with stdenv.lib; {
+            description = "Verify examples in your docs";
+            homepage = "https://github.com/stoeffel/elm-verify-examples";
+            license = licenses.bsd3;
+            maintainers = [ maintainers.turbomack ];
+          };
+        };
 
       elm-coverage =
         let patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage);
@@ -111,17 +153,51 @@ let
             mkdir -p unpacked_bin
             ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument
           '';
+          meta = with stdenv.lib; {
+            description = "Work in progress - Code coverage tooling for Elm";
+            homepage = "https://github.com/zwilias/elm-coverage";
+            license = licenses.bsd3;
+            maintainers = [ maintainers.turbomack ];
+          };
         });
 
       create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json]
-        nodePkgs.create-elm-app);
+        nodePkgs.create-elm-app) // {
+          meta = with stdenv.lib; {
+            description = "Create Elm apps with no build configuration";
+            homepage = "https://github.com/halfzebra/create-elm-app";
+            license = licenses.mit;
+            maintainers = [ maintainers.turbomack ];
+          };
+        };
 
       elm-review = patchBinwrap [elmRustPackages.elm-json]
-        nodePkgs.elm-review;
+        nodePkgs.elm-review // {
+          meta = with stdenv.lib; {
+            description = "Analyzes Elm projects, to help find mistakes before your users find them";
+            homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}";
+            license = licenses.bsd3;
+            maintainers = [ maintainers.turbomack ];
+          };
+        };
 
-      elm-language-server = nodePkgs."@elm-tooling/elm-language-server";
+      elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // {
+        meta = with stdenv.lib; {
+          description = "Language server implementation for Elm";
+          homepage = "https://github.com/elm-tooling/elm-language-server";
+          license = licenses.mit;
+          maintainers = [ maintainers.turbomack ];
+        };
+      };
 
-      elm-optimize-level-2 = nodePkgs."elm-optimize-level-2";
+      elm-optimize-level-2 = nodePkgs."elm-optimize-level-2" // {
+        meta = with stdenv.lib; {
+          description = "A second level of optimization for the Javascript that the Elm Compiler produces";
+          homepage = "https://github.com/mdgriffith/elm-optimize-level-2";
+          license = licenses.bsd3;
+          maintainers = [ maintainers.turbomack ];
+        };
+      };
 
       inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse;
     };
diff --git a/pkgs/development/compilers/elm/packages/elm-json.nix b/pkgs/development/compilers/elm/packages/elm-json.nix
index 44d300d254b..7a8143174f9 100644
--- a/pkgs/development/compilers/elm/packages/elm-json.nix
+++ b/pkgs/development/compilers/elm/packages/elm-json.nix
@@ -18,12 +18,4 @@ rustPlatform.buildRustPackage rec {
 
   # Tests perform networking and therefore can't work in sandbox
   doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "Install, upgrade and uninstall Elm dependencies";
-    homepage = "https://github.com/zwilias/elm-json";
-    license = licenses.mit;
-    maintainers = [ maintainers.turbomack ];
-    platforms = platforms.linux;
-  };
 }

From ea6ae87eed766036977d5b38115fe4061d433f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 10 Jan 2021 12:22:33 +0100
Subject: [PATCH 26/41] pythonPackages.swaglyrics: Fix dependencies

---
 pkgs/tools/misc/swaglyrics/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/tools/misc/swaglyrics/default.nix
index 6831a05a3ed..c24b12f9539 100644
--- a/pkgs/tools/misc/swaglyrics/default.nix
+++ b/pkgs/tools/misc/swaglyrics/default.nix
@@ -17,7 +17,9 @@ python3.pkgs.buildPythonApplication rec {
 
   preConfigure = ''
     substituteInPlace setup.py \
-      --replace 'requests>=2.24.0' 'requests~=2.23'
+      --replace 'requests>=2.24.0' 'requests~=2.23' \
+      --replace 'beautifulsoup4==4.9.1' 'beautifulsoup4~=4.9' \
+      --replace 'colorama==0.4.3' 'colorama~=0.4'
   '';
 
   preBuild = "export HOME=$NIX_BUILD_TOP";

From 490a4b6ded492fafc2acb842aafb6e4aa2d6cae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 12 Jan 2021 01:42:13 +0100
Subject: [PATCH 27/41] botan: fix compilation on darwin

---
 pkgs/development/libraries/botan/generic.nix |  5 +++--
 pkgs/top-level/all-packages.nix              | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index f7d94f42469..173f074ead7 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -4,7 +4,8 @@
 , sourceExtension ? "tar.xz"
 , extraConfigureFlags ? ""
 , postPatch ? null
-, darwin
+, CoreServices
+, Security
 , ...
 }:
 
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
   inherit postPatch;
 
   buildInputs = [ python bzip2 zlib gmp openssl boost ]
-             ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
 
   configurePhase = ''
     python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 355df6b465f..0077960e622 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13002,8 +13002,14 @@ in
 
   boost_process = callPackage ../development/libraries/boost-process { };
 
-  botan = callPackage ../development/libraries/botan { openssl = openssl_1_0_2; };
-  botan2 = callPackage ../development/libraries/botan/2.0.nix { };
+  botan = callPackage ../development/libraries/botan {
+    openssl = openssl_1_0_2;
+    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
+  };
+
+  botan2 = callPackage ../development/libraries/botan/2.0.nix {
+    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
+  };
 
   box2d = callPackage ../development/libraries/box2d { };
 

From 6d38d5649ee8794e5b537a3eb65531d657d6c5b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 12 Jan 2021 09:05:48 +0100
Subject: [PATCH 28/41] python3Packages.cot: Disable failing tests on darwin

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

diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix
index 89e26545d79..0c2bb961290 100644
--- a/pkgs/development/python-modules/cot/default.nix
+++ b/pkgs/development/python-modules/cot/default.nix
@@ -35,9 +35,10 @@ buildPythonPackage rec {
     "TestQCOW2"
     "TestRAW"
     "TestVMDKConversion"
+  ] ++ lib.optionals stdenv.isDarwin [
+    "test_serial_fixup_invalid_host"
   ];
 
-
   # argparse is part of the standardlib
   prePatch = ''
     substituteInPlace setup.py --replace "'argparse'," ""

From 0edb15fd4d4c82a5a6950ce6a16f2be9b63b8f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 12 Jan 2021 11:24:21 +0100
Subject: [PATCH 29/41] pythonPackages.build: 0.0.3.1 -> 0.1.0

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

diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index 97a7f9a201b..3433dad0e77 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "build";
-  version = "0.0.3.1";
+  version = "0.1.0";
 
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "757b5542168326b6f1898a1ce1131bb2cf306ee4c7e54e39c815c5be217ff87d";
+    sha256 = "sha256-CLK1gJj/YX0RVAVsefinC+7Rj3z6cQvKI6ByGWkQ1bQ=";
   };
 
   nativeBuildInputs = [

From 740630e480198c4313a266015dc5e3a9ed72c3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 12 Jan 2021 11:24:44 +0100
Subject: [PATCH 30/41] pythonPackages.check-manifest: Fix dependencies

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

diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index 18ce078269a..bf847a48ae9 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }:
 
 buildPythonPackage rec {
   pname = "check-manifest";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist"
   '';
 
-  propagatedBuildInputs = [ pep517 toml ];
+  propagatedBuildInputs = [ build pep517 toml ];
 
   checkInputs = [ mock breezy git ];
 

From a257c1114859d3c31f9f968a823f4909ee871918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 12 Jan 2021 23:34:15 +0100
Subject: [PATCH 31/41] winpdb: no tests

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

diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix
index 4730ff676d1..b7eaabe8693 100644
--- a/pkgs/development/tools/winpdb/default.nix
+++ b/pkgs/development/tools/winpdb/default.nix
@@ -36,6 +36,9 @@ pythonPackages.buildPythonApplication rec {
     cp artwork/winpdb-icon.svg "$out"/share/icons/winpdb.svg
   '';
 
+  # no tests
+  doCheck = false;
+
   meta = with lib; {
     description = "Platform independent Python debugger";
     longDescription = ''

From 15905ed176f7771b0d8f47713ae2d38bcad7208e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 13 Jan 2021 18:55:53 +0100
Subject: [PATCH 32/41] pythonPackages.ufoprocessor: Disable tests

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

diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix
index db5b1400fe4..85b70833bd6 100644
--- a/pkgs/development/python-modules/ufoprocessor/default.nix
+++ b/pkgs/development/python-modules/ufoprocessor/default.nix
@@ -26,6 +26,10 @@ buildPythonPackage rec {
     mutatormath
   ];
 
+  # tests require custom commands to run
+  doCheck = false;
+  pythonImportsCheck = [ "ufoProcessor" ];
+
   meta = with lib; {
     description = "Read, write and generate UFOs with designspace data";
     homepage = "https://github.com/LettError/ufoProcessor";

From b153e63f07c9f88490c710bede0adc8c4e542774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 16 Jan 2021 14:08:47 +0100
Subject: [PATCH 33/41] pythonPackages.sphinxcontrib-bibtex: Disable tests, add
 maintainer, cleanups

---
 .../sphinxcontrib-bibtex/default.nix          | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index bc9a90efcf2..b429522f9d3 100644
--- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
@@ -1,5 +1,11 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
-, oset, pybtex, pybtex-docutils, sphinx
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, oset
+, pybtex
+, pybtex-docutils
+, sphinx
 }:
 
 buildPythonPackage rec {
@@ -15,10 +21,13 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ];
 
-  meta = {
+  doCheck = false;
+  pythonImportsCheck = [ "sphinxcontrib.bibtex" ];
+
+  meta = with lib; {
     description = "A Sphinx extension for BibTeX style citations";
     homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }

From 04da76396584bf757e3b4b7c65871d915dc3679b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 16 Jan 2021 20:29:07 +0100
Subject: [PATCH 34/41] google-chrome-dev: Add the new libxshmfence dependency

This is required to launch newer versions of Google Chrome:
/nix/store/XXX-google-chrome-dev-89.0.4385.0/share/google/chrome-unstable/google-chrome-unstable:
error while loading shared libraries: libxshmfence.so.1: cannot open
shared object file: No such file or directory
---
 .../networking/browsers/google-chrome/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 6e591dea310..c32652c8bfc 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -3,7 +3,7 @@
 # Linked dynamic libraries.
 , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
 , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
-, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
+, alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups
 , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
 , kerberos, libdrm, mesa
 , libxkbcommon, wayland # ozone/wayland
@@ -53,7 +53,7 @@ let
   deps = [
     glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
     libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
-    alsaLib libXdamage libXtst libXrandr expat cups
+    alsaLib libXdamage libXtst libXrandr libxshmfence expat cups
     dbus gdk-pixbuf gcc-unwrapped.lib
     systemd
     libexif

From c25e63ff9a952ce91a4f1f863129adfaba931219 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 16 Jan 2021 14:44:00 -0500
Subject: [PATCH 35/41] _3270font: 2.1.0 -> 2.2.1

https://github.com/rbanffy/3270font/releases/tag/v2.2.1
---
 pkgs/data/fonts/3270font/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/data/fonts/3270font/default.nix
index a972bd7c3d8..dacfdfbccea 100644
--- a/pkgs/data/fonts/3270font/default.nix
+++ b/pkgs/data/fonts/3270font/default.nix
@@ -1,24 +1,25 @@
 { lib, fetchzip }:
 let
-  version = "2.1.0";
+  version = "2.2.1";
 in
 fetchzip {
   name = "3270font-${version}";
 
-  url = "https://github.com/rbanffy/3270font/releases/download/v.${version}/3270_fonts_fba25eb.zip";
+  url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_70de9c7.zip";
 
-  sha256 = "04xqgiznd6d3c1rdbbdmd87rjy9bnhh00lm8xzmal1zidcr2g0n9";
+  sha256 = "0spz9abp87r3bncjim6hs47fmhg86qbgips4x6nfpqzg5qh2xd2m";
 
   postFetch = ''
     mkdir -p $out/share/fonts/
     unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
     unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
-    unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff
+    unzip -j $downloadedFile \*.afm -d $out/share/fonts/type1
   '';
 
   meta = with lib; {
     description = "Monospaced font based on IBM 3270 terminals";
     homepage = "https://github.com/rbanffy/3270font";
+    changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md";
     license = [ licenses.bsd3 licenses.ofl ];
     maintainers = [ maintainers.marsam ];
     platforms = platforms.all;

From 145cf67bbbe7afc10b9db8e6454828b64a975da5 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Sat, 16 Jan 2021 13:44:42 -0800
Subject: [PATCH 36/41] libvirt: correct localstatedir (#109415)

It was supposed to be '/var' rather than '/var/lib'. This fixes an issue
where some tools don't connect to the right socket (because they were
connecting to '$localstatedir/run/libvirt...' instead of
'$runstatedir/libvirt...').

Also change runstatedir to just be '/run' since it avoids a log line
complaining about that.
---
 pkgs/development/libraries/libvirt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 690f2f3cfe7..f8a8bec15d5 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -88,8 +88,8 @@ in stdenv.mkDerivation rec {
   in [
     "--sysconfdir=/var/lib"
     "-Dinstall_prefix=${placeholder "out"}"
-    "-Dlocalstatedir=/var/lib"
-    "-Drunstatedir=/var/run"
+    "-Dlocalstatedir=/var"
+    "-Drunstatedir=/run"
     "-Dlibpcap=enabled"
     "-Ddriver_qemu=enabled"
     "-Ddriver_vmware=enabled"

From 13c4bc8a98b95e4ab337d19334d14a2c5b402f36 Mon Sep 17 00:00:00 2001
From: Yevhen Shymotiuk <yevhenshymotiuk@gmail.com>
Date: Sat, 16 Jan 2021 15:52:28 +0200
Subject: [PATCH 37/41] python3Packages.pipx: 0.15.6.0 -> 0.16.0.0

---
 pkgs/development/python-modules/pipx/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix
index 122f34edb60..c29847c9f29 100644
--- a/pkgs/development/python-modules/pipx/default.nix
+++ b/pkgs/development/python-modules/pipx/default.nix
@@ -5,12 +5,13 @@
 , userpath
 , argcomplete
 , packaging
+, importlib-metadata
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "pipx";
-  version = "0.15.6.0";
+  version = "0.16.0.0";
 
   disabled = pythonOlder "3.6";
 
@@ -19,10 +20,16 @@ buildPythonPackage rec {
     owner = "pipxproject";
     repo = pname;
     rev = version;
-    sha256 = "1yffswayjfkmq86ygisja0mkg55pqj9pdml5nc0z05222sfnvn1a";
+    sha256 = "08mn7vm8iw20pg0gfn491y1jx8wcyjijps6f1hy7ipzd5ckynscn";
   };
 
-  propagatedBuildInputs = [ userpath argcomplete packaging ];
+  propagatedBuildInputs = [
+    userpath
+    argcomplete
+    packaging
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+  ];
 
   checkInputs = [ pytestCheckHook ];
 
@@ -31,6 +38,7 @@ buildPythonPackage rec {
   '';
 
   # disable tests, which require internet connection
+  pytestFlagsArray = [ "--ignore=tests/test_install_all_packages.py" ];
   disabledTests = [
     "install"
     "inject"
@@ -38,10 +46,12 @@ buildPythonPackage rec {
     "missing_interpreter"
     "cache"
     "internet"
+    "run"
     "runpip"
     "upgrade"
     "suffix"
     "legacy_venv"
+    "determination"
   ];
 
   meta = with lib; {

From a0bc5879f1a889af0a1c9d995a3682de7f30a20f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 16 Jan 2021 23:15:57 +0100
Subject: [PATCH 38/41] victoriametrics: 1.42.0 -> 1.52.0

Also move from buildGoPackage to buildGoModule.
---
 pkgs/servers/nosql/victoriametrics/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix
index a6c3e4c60d1..02fd7631518 100644
--- a/pkgs/servers/nosql/victoriametrics/default.nix
+++ b/pkgs/servers/nosql/victoriametrics/default.nix
@@ -1,19 +1,19 @@
-{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "VictoriaMetrics";
-  version = "1.42.0";
+  version = "1.52.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "10da15i3rn11dxnh82czaa2f9a4c3vf1d8kgfayp0dl7xs1xqhsd";
+    sha256 = "1sqzpr48sylgiy4zaf3f8hnwzv7imf57bxg6sin9lv291ybhxs68";
   };
 
-  goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics";
+  vendorSha256 = null;
 
-  buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/lib/buildinfo.Version=${version}" ];
+  buildFlagsArray = [ "-ldflags=-s -w -X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
 
   passthru.tests = { inherit (nixosTests) victoriametrics; };
 

From 721ea006a841176e6045b479e2d44ed2b47ed3d0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 15 Jan 2021 10:22:13 -0800
Subject: [PATCH 39/41] steam-fhsenv: don't unshare pid

Some applications such as Natron need access to MIT-SHM or other
shared memory mechanisms. Unsharing the pid namespace
breaks the ability for application to reference shared memory.
---
 pkgs/games/steam/fhsenv.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index 4c57ce9aeb0..b61eae6853b 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -284,6 +284,11 @@ in buildFHSUserEnv rec {
   # this fixes certain issues where they don't render correctly
   unshareIpc = false;
 
+  # Some applications such as Natron need access to MIT-SHM or other
+  # shared memory mechanisms. Unsharing the pid namespace
+  # breaks the ability for application to reference shared memory.
+  unsharePid = false;
+
   passthru.run = buildFHSUserEnv {
     name = "steam-run";
 

From c44acaaceb04ab149b805656eeffcdf2acf939e6 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 15 Jan 2021 13:12:22 -0800
Subject: [PATCH 40/41] steam-run: inherit bwrap namespace settings

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

diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index b61eae6853b..4fa8960726b 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -295,6 +295,8 @@ in buildFHSUserEnv rec {
     targetPkgs = commonTargetPkgs;
     inherit multiPkgs extraBuildCommands;
 
+    inherit unshareIpc unsharePid;
+
     runScript = writeScript "steam-run" ''
       #!${runtimeShell}
       run="$1"

From 2fbc36f3d891c86ae34dc0414bc78e74e8911218 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 17 Jan 2021 01:05:00 +0100
Subject: [PATCH 41/41] fluidsynth: update homepage permanent redirect to HTTPS

---
 pkgs/applications/audio/fluidsynth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 9d9772cde29..8c7a9775945 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation  {
 
   meta = with lib; {
     description = "Real-time software synthesizer based on the SoundFont 2 specifications";
-    homepage    = "http://www.fluidsynth.org";
+    homepage    = "https://www.fluidsynth.org";
     license     = licenses.lgpl21Plus;
     maintainers = with maintainers; [ goibhniu lovek323 ];
     platforms   = platforms.unix;