Merge staging-next into staging

pkgs/applications/misc/etesync-dav/default.nix

@@ -11,14 +11,14 @@ let
         version = "2.0.3";
         src = old.src.override {
           inherit version;
-          sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";
+          hash = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";
         };
       });
       flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec {
         version = "0.15.1";
         src = old.src.override {
           inherit version;
-          sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc";
+          hash = "sha256-/xdxhfiRMC3CU0N/5jCB56RqTpmsph3+CG+yPlT/8tw=";
         };
         disabledTests = [
           "test_outside_request"
@@ -33,7 +33,7 @@ let
         version = "2.0.3";
         src = old.src.override {
           inherit version;
-          sha256 = "b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c";
+          hash = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
         };
       });
     };
@@ -44,7 +44,7 @@ in python.pkgs.buildPythonApplication rec {
 
   src = python.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720";
+    hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA=";
   };
 
   propagatedBuildInputs = with python.pkgs; [

pkgs/applications/misc/haxor-news/default.nix

@@ -12,7 +12,7 @@ let
         version = "1.0.18";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "09h1153wgr5x2ny7ds0w2m81n3bb9j8hjb8sjfnrg506r01clkyx";
+          hash = "sha256-3U/KAsgGlJetkxotCZFMaw0bUBUc6Ha8Fb3kx0cJASY=";
         };
       });
       # Use click 7
@@ -20,7 +20,7 @@ let
         version = "7.1.2";
         src = old.src.override {
           inherit version;
-          sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
+          hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo=";
         };
       });
     };
@@ -37,7 +37,7 @@ buildPythonApplication rec {
     owner = "donnemartin";
     repo = pname;
     rev = "811a5804c09406465b2b02eab638c08bf5c4fa7f";
-    sha256 = "1g3dfsyk4727d9jh9w6j5r51ag07851cls7v7a7hmdvdixpvbzp6";
+    hash = "sha256-5v61b49ttwqPOvtoykJBBzwVSi7S8ARlakccMr12bbw=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/openwrt-luci-rpc/default.nix

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "openwrt-luci-rpc";
-  version = "1.1.12";
+  version = "1.1.16";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vLRmv8xxbjBp6TDFExfprqw3JGi8qCVZ5bV7AgVZnuA=";
+    hash = "sha256-ZvPMJbYCNKMXuTrHwXQvBZ/mMenYTsV1X4COiVxvJGY=";
   };
 
   propagatedBuildInputs = [

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

@@ -1,12 +1,16 @@
 { stdenv, lib, substituteAll, fetchFromGitHub, buildPythonPackage, python, pkg-config, libX11
 , SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype, fontconfig
 , AppKit
-, pythonAtLeast
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "pygame";
-  version = "2.1.2";
+  version = "2.2.0";
+
+  disabled = pythonOlder "3.6";
+
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = pname;
@@ -15,7 +19,7 @@ buildPythonPackage rec {
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The documentation
     # has such files and will be removed.
-    hash = "sha256-v1z6caEMJNXqbcbTmFXoy3KQewHiz6qK4vhNU6Qbukk=";
+    hash = "sha256-SMkY3uN3kAlb/pbm047W0G8MJ7G8mCsfGVSPhzd5aEo=";
     postFetch = "rm -rf $out/docs/reST";
   };
 
@@ -76,7 +80,5 @@ buildPythonPackage rec {
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ emilytrau ];
     platforms = platforms.unix;
-    # fatal error: longintrepr.h: No such file or directory.
-    broken = pythonAtLeast "3.11"; # At 2022-02-27
   };
 }

pkgs/development/python-modules/pygame/fix-dependency-finding.patch

@@ -1,11 +1,11 @@
 diff --git a/buildconfig/config_darwin.py b/buildconfig/config_darwin.py
-index c785e183..37d5cea4 100644
+index 9503ea70..d0d3ab6e 100644
 --- a/buildconfig/config_darwin.py
 +++ b/buildconfig/config_darwin.py
-@@ -146,16 +146,8 @@ def main():
+@@ -140,16 +140,8 @@ def main(auto_config=False):
      ])
  
-     print ('Hunting dependencies...')
+     print('Hunting dependencies...')
 -    incdirs = ['/usr/local/include', '/opt/homebrew/include']
 -    incdirs.extend(['/usr/local/include/SDL2', '/opt/homebrew/include/SDL2', '/opt/local/include/SDL2'])
 -
@@ -22,10 +22,10 @@ index c785e183..37d5cea4 100644
      for d in DEPS:
          if isinstance(d, (list, tuple)):
 diff --git a/buildconfig/config_unix.py b/buildconfig/config_unix.py
-index 5c50bcdc..2fd69e2d 100644
+index 3eba5b5c..53cc6233 100644
 --- a/buildconfig/config_unix.py
 +++ b/buildconfig/config_unix.py
-@@ -210,18 +210,8 @@ def main():
+@@ -240,11 +240,8 @@ def main(auto_config=False):
      if not DEPS[0].found:
          raise RuntimeError('Unable to run "sdl-config". Please make sure a development version of SDL is installed.')
  
@@ -34,13 +34,6 @@ index 5c50bcdc..2fd69e2d 100644
 -    for extrabase in extrabases:
 -        incdirs += [extrabase + d for d in origincdirs]
 -        libdirs += [extrabase + d for d in origlibdirs]
--    incdirs += ["/usr"+d for d in origincdirs]
--    libdirs += ["/usr"+d for d in origlibdirs]
--    incdirs += ["/usr/local"+d for d in origincdirs]
--    libdirs += ["/usr/local"+d for d in origlibdirs]
--    if localbase:
--        incdirs = [localbase+d for d in origincdirs]
--        libdirs = [localbase+d for d in origlibdirs]
 +    incdirs = @buildinputs_include@
 +    libdirs = @buildinputs_lib@
  

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

@@ -3,6 +3,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , gdb
+, pytest
 }:
 
 buildPythonPackage rec {
@@ -16,7 +17,7 @@ buildPythonPackage rec {
     hash = "sha256-JqEDN8Pg/JttyYQbwkxKkLYuxVnvV45VlClD23eaYyc=";
   };
 
-  nativeCheckInputs = [ gdb ];
+  nativeCheckInputs = [ gdb pytest ];
 
   # tests require gcc for some reason
   doCheck = !stdenv.hostPlatform.isDarwin;

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

@@ -1,9 +1,9 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , xorg
 , cffi
-, six
 , pytestCheckHook
 }:
 
@@ -16,12 +16,20 @@ buildPythonPackage rec {
     hash = "sha256-8yMCFEf55zB40hu5KMSPTavq6z87N+gDxta5hzXoFIM=";
   };
 
-  patchPhase = ''
+  patches = [
+    (fetchpatch {
+      name = "remove-leftover-six-import.patch";
+      url = "https://github.com/tych0/xcffib/commit/8a488867d30464913706376ca3a9f4c98ca6c5cf.patch";
+      hash = "sha256-wEms0gC7tVqtmKMjjpH/34kdQ6HUV0h67bUGbgijlqw=";
+    })
+  ];
+
+  postPatch = ''
     # Hardcode cairo library path
     sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py
   '';
 
-  propagatedBuildInputs = [ cffi six ];
+  propagatedBuildInputs = [ cffi ];
 
   propagatedNativeBuildInputs = [ cffi ];
 
@@ -31,6 +39,11 @@ buildPythonPackage rec {
     xorg.xorgserver
   ];
 
+  preCheck = ''
+    # import from $out
+    rm -r xcffib
+  '';
+
   pythonImportsCheck = [ "xcffib" ];
 
   meta = with lib; {

pkgs/tools/package-management/apkg/default.nix

@@ -14,6 +14,17 @@ python3Packages.buildPythonApplication rec {
     sha256 = "duZz2Kwjgek5pMJTDH8gMZAZ13uFwaIYT5E1brW7I7U=";
   };
 
+  # TODO: solve this properly.  Detection won't work anymore.
+  postPatch = ''
+    patch <<-EOF
+      --- a/setup.py
+      +++ b/setup.py
+      @@ -25,1 +25,1 @@
+      -    version=version,
+      +    version='${version}',
+    EOF
+  '';
+
   propagatedBuildInputs = with python3Packages; [
     # copy&pasted requirements.txt (almost exactly)
     beautifulsoup4   # upstream version detection

pkgs/tools/security/expliot/default.nix

@@ -10,7 +10,7 @@ let
         version = "1.5.0";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "0qiax309my534drk81lihq9ghngr96qnm40kbmgc9ay4fncqq6kh";
+          hash = "sha256-cBqMmXXEq8ReXROQarFJ+Vn4EoaRBjRzI6P4msDoKmI=";
         };
         doCheck = false;
       });