Merge staging-next into staging

.git-blame-ignore-revs

@@ -30,3 +30,6 @@
 
 # nixos: fix module paths in rename.nix
 d08ede042b74b8199dc748323768227b88efcf7c
+
+# fix indentation in mk-python-derivation.nix
+d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3

pkgs/development/interpreters/python/default.nix

@@ -234,9 +234,6 @@ in {
     # TODO(@Artturin): Add this to the main cpython expr
     strictDeps = true;
     pname = "python3-minimal";
-    meta = old.meta // {
-      maintainers = [];
-    };
   });
 
   pypy27 = callPackage ./pypy {

pkgs/development/python-modules/azure-mgmt-batch/default.nix

@@ -5,18 +5,20 @@
 , msrestazure
 , azure-common
 , azure-mgmt-core
-, azure-mgmt-nspkg
-, isPy3k
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-batch";
-  version = "16.1.0";
+  version = "16.2.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-9J0VQ3uAsi4kuEe9UG4xpcEV1Sc+nkjECgVfzG7j5jk=";
+    hash = "sha256-aWkQZs1aLIbo/arvu4DilAOBrO38gFPfGTtSFNLs5oI=";
   };
 
   propagatedBuildInputs = [
@@ -24,11 +26,9 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [
-    azure-mgmt-nspkg
   ];
 
-  # has no tests
+  # Module has no tests
   doCheck = false;
 
   meta = with lib; {

pkgs/development/python-modules/fastcore/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.4.3";
+  version = "1.4.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "fastai";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-3l5bELb5f/cvh4gF2kJZEX6kAK9achTerIIplMuesTk=";
+    sha256 = "sha256-2lV96QOlXfQ8PjSW45u9ZyXpssDgLyiUgmIC0VLOGus=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/greeneye-monitor/default.nix

@@ -22,6 +22,11 @@ buildPythonPackage rec {
     hash = "sha256-weZTOVFBlB6TxFs8pLWfyB7WD/bn3ljBjX2tVi1Zc/I=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "siobrultech_protocols==" "siobrultech_protocols>="
+  '';
+
   propagatedBuildInputs = [
     aiohttp
     siobrultech-protocols

pkgs/development/python-modules/mkdocs-material/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonApplication rec {
   pname = "mkdocs-material";
-  version = "8.3.1";
+  version = "8.3.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonApplication rec {
     owner = "squidfunk";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-p7pnacr3nw/UEavzVxt0QBpSjFazdWtbm3bFj9FIH1g=";
+    hash = "sha256-VcyBsIU2PJ2xh365kNAlO3wno3xushlaj43dIh1GkP8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/r2pipe/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "r2pipe";
-  version = "1.7.0";
+  version = "1.7.1";
 
   postPatch = let
     r2lib = "${lib.getOutput "lib" radare2}/lib";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-VUYJm3tFyv/ws4nDHLuDgPQSGbB09hi8zrpAPDqoVbA=";
+    sha256 = "sha256-7Qa8Jl7vX/acMhGSqWfaqvN9emA05RSubpseAwRSpG4=";
   };
 
   # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't

pkgs/development/python-modules/siobrultech-protocols/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "siobrultech-protocols";
-  version = "0.5.0";
+  version = "0.6.0";
 
   disabled = pythonOlder "3.8";
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "sdwilsh";
     repo = "siobrultech-protocols";
     rev = "v${version}";
-    hash = "sha256-bpWOfdwNHJXfKcANSu69YgXsxsfUhaH63/fXF6H+MNg=";
+    hash = "sha256-d4zAwcSCyC78dJZtxFkpdYurxDRon2cRgzInllP2qJQ=";
   };
 
   checkInputs = [

pkgs/development/python-modules/smbus2/default.nix

@@ -7,15 +7,15 @@
 
 buildPythonPackage rec {
   pname = "smbus2";
-  version = "0.4.1";
+  version = "0.4.2";
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "kplindegaard";
     repo = pname;
-    rev = version;
-    sha256 = "0xgqs7bzhr8y3irc9gq3dnw1l3f5gc1yv4r2v4qxj95i3vvzpg5s";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-6JzFbhUq8XR1nYkadPeYqItcLZDIFAwTe3BriEW2nVI=";
   };
 
   checkInputs = [

pkgs/misc/screensavers/xscreensaver/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, makeWrapper
 , pkg-config, intltool
-, perl, gettext, libX11, libXext, libXi, libXt
+, perl, perlPackages, gettext, libX11, libXext, libXi, libXt
 , libXft, libXinerama, libXrandr, libXxf86vm, libGL, libGLU, gle
 , gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam
 , systemd, coreutils
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     perl gettext libX11 libXext libXi libXt
     libXft libXinerama libXrandr libXxf86vm libGL libGLU gle
     gtk2 gdk-pixbuf gdk-pixbuf-xlib libxml2 pam
+    perlPackages.LWPProtocolHttps perlPackages.MozillaCA
   ] ++ lib.optional withSystemd systemd;
 
   preConfigure = ''
@@ -44,7 +45,8 @@ stdenv.mkDerivation rec {
     for bin in $out/bin/*; do
       wrapProgram "$bin" \
         --prefix PATH : "$out/libexec/xscreensaver" \
-        --prefix PATH : "${lib.makeBinPath [ coreutils ]}"
+        --prefix PATH : "${lib.makeBinPath [ coreutils perl ]}" \
+        --prefix PERL5LIB ':' $PERL5LIB
     done
   '' + lib.optionalString forceInstallAllHacks ''
     make -j$NIX_BUILD_CORES -C hacks/glx dnalogo

pkgs/os-specific/linux/rtl8814au/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation {
   pname = "rtl8814au";
-  version = "${kernel.version}-unstable-2022-02-21";
+  version = "${kernel.version}-unstable-2022-05-23";
 
   src = fetchFromGitHub {
     owner = "morrownr";
     repo = "8814au";
-    rev = "a538e3878c4b7b0b012f2d2fe7804390caaebd90";
-    sha256 = "sha256-xBGbcy/WonFrNflMlFCD/JQOFKhPrv0J3j2XcXWc6hk=";
+    rev = "687f05c73e22dc14d5f24f2bb92f2ecac3cc71d5";
+    sha256 = "08znnihk9rdrwgyzazxqcrzwdjnm5q8ah92bfb552wjv11r87zv1";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

pkgs/servers/soft-serve/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "soft-serve";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "soft-serve";
     rev = "v${version}";
-    sha256 = "sha256-FtWlE2CmUx9ric4yFItj7lc57259/BVINyUhSuBNapo=";
+    sha256 = "sha256-uzjcLLWo+67ayaSjAvk2ktBO3s1z0jDyGRj+Q9F6UVQ=";
   };
 
-  vendorSha256 = "sha256-MwbtrtfvQ1HimLjUCmk8Twr4tpfP4eFBUlDP15IZKto=";
+  vendorSha256 = "sha256-AQwd4N4uYEDCsrlxrrGiXAqLcsSA/2MBydHEnH1j+Do=";
 
   doCheck = false;
 
@@ -27,6 +27,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "A tasty, self-hosted Git server for the command line";
     homepage = "https://github.com/charmbracelet/soft-serve";
+    changelog = "https://github.com/charmbracelet/soft-serve/releases/tag/v${version}";
     mainProgram = "soft";
     license = licenses.mit;
     maintainers = with maintainers; [ penguwin ];

pkgs/tools/backup/percona-xtrabackup/generic.nix

@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
 
   patches = extraPatches;
 
+  # Workaround build failure on -fno-common toolchains:
+  #   ld: xbstream.c.o:(.bss+0x0): multiple definition of
+  #      `datasink_buffer'; ds_buffer.c.o:(.data.rel.local+0x0): first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   cmakeFlags = [
     "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
     "-DBUILD_CONFIG=xtrabackup_release"

pkgs/tools/security/dieharder/default.nix

@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
     ./stdint.patch
   ];
 
+  # Workaround build failure on -fno-common toolchains:
+  #   ld: include/dieharder/parse.h:21: multiple definition of `splitbuf';
+  #     include/dieharder/parse.h:21: first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   buildInputs = [ gsl ];
 
   passthru = {

pkgs/tools/security/yersinia/default.nix

@@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
       url = "https://github.com/tomac/yersinia/commit/d91bbf6f475e7ea39f131b77ce91b2de9646d5ca.patch";
       sha256 = "fl1pZKWA+nLtBm9+3FBFqaeuVZjszQCNkNl6Cf++BAI=";
     })
+
+    # Pull upstream fix for -fno-common toolchain support:
+    #   https://github.com/tomac/yersinia/pull/66
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/tomac/yersinia/commit/36247225dc7a6f38c4ba70537e20351f04762749.patch";
+      sha256 = "KHaN8gfgNROEico27gWnYiP9ZVhpWz0KjFYy2t5tPBo=";
+    })
   ];
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];