Merge staging-next into staging

lib/licenses.nix

@@ -285,6 +285,11 @@ in mkLicense lset) ({
     fullName = "DOC License";
   };
 
+  drl10 = {
+    spdxId = "DRL-1.0";
+    fullName = "Detection Rule License 1.0";
+  };
+
   eapl = {
     fullName = "EPSON AVASYS PUBLIC LICENSE";
     url = "https://avasys.jp/hp/menu000000700/hpg000000603.htm";

maintainers/maintainer-list.nix

@@ -8799,10 +8799,10 @@
     githubId = 5047140;
     name = "Victor Collod";
   };
-  musfay = {
+  muscaln = {
-    email = "musfay@protonmail.com";
+    email = "muscaln@protonmail.com";
-    github = "musfay";
+    github = "muscaln";
-    githubId = 33374965;
+    githubId = 96225281;
     name = "Mustafa Çalışkan";
   };
   mupdt = {

pkgs/applications/science/electronics/fritzing/default.nix

@@ -78,7 +78,7 @@ mkDerivation rec {
     description = "An open source prototyping tool for Arduino-based projects";
     homepage = "https://fritzing.org/";
     license = with licenses; [ gpl3 cc-by-sa-30 ];
-    maintainers = with maintainers; [ robberer musfay ];
+    maintainers = with maintainers; [ robberer muscaln ];
     platforms = platforms.linux;
   };
 }

pkgs/development/compilers/vyper/default.nix

@@ -1,6 +1,19 @@
-{ lib, buildPythonPackage, fetchPypi, writeText, asttokens
+{ lib
-, pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx
+, buildPythonPackage
-, sphinx_rtd_theme, pytest-runner, setuptools-scm }:
+, fetchPypi
+, pythonOlder
+, pythonAtLeast
+, pythonRelaxDepsHook
+, writeText
+, asttokens
+, pycryptodome
+, recommonmark
+, semantic-version
+, sphinx
+, sphinx_rtd_theme
+, pytest-runner
+, setuptools-scm
+}:
 
 let
   sample-contract = writeText "example.vy" ''
@@ -10,18 +23,27 @@ let
     def __init__(foo: address):
         self.count = 1
   '';
-in
 
+in
 buildPythonPackage rec {
   pname = "vyper";
   version = "0.3.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7" || pythonAtLeast "3.10";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-fXug5v3zstz19uexMWokHBVsfcl2ZCdIOIXKeLVyh/Q=";
   };
 
-  nativeBuildInputs = [ pytest-runner setuptools-scm ];
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+    pytest-runner
+    setuptools-scm
+  ];
+
+  pythonRelaxDeps = [ "semantic-version" ];
 
   propagatedBuildInputs = [
     asttokens

pkgs/development/libraries/pico-sdk/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/raspberrypi/picotool";
     description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ musfay ];
+    maintainers = with maintainers; [ muscaln ];
     platforms = platforms.unix;
   };
 }

pkgs/development/python-modules/aws-lambda-builders/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "1.15.0";
+  version = "1.16.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "awslabs";
     repo = "aws-lambda-builders";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-kXglpj82e+LzUI6SW86wyfG2lGVnL/PsrTNsseg4VYk=";
+    sha256 = "sha256-XJDukyYTtnAHiHACi5gEJ9VPjqv8Y4V7oe4q3l5fpMA=";
   };
 
   propagatedBuildInputs = [

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

@@ -59,6 +59,8 @@ buildPythonPackage rec {
     "test_patcher_existing_locks_locked"
     # broken with pyopenssl 22.0.0
     "test_sendall_timeout"
+  ] ++ lib.optionals stdenv.isAarch64 [
+    "test_fork_after_monkey_patch"
   ];
 
   disabledTestPaths = [

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

@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "extractcode";
-  version = "30.0.0";
+  version = "31.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5a660d1b9e3bae4aa87828e6947dc3b31dc2fa6705acb28a514874602b40bc90";
+    sha256 = "sha256-gIGTkum8+BKfdNiQT+ipjA3+0ngjVoQnNygsAoMRPYg=";
   };
 
   dontConfigure = true;

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "oletools";
-  version = "0.60";
+  version = "0.60.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "decalage2";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-gatUVkf8iT1OGnahX1BzQLDypCqhS1EvkAgUHJ6myA4=";
+    hash = "sha256-H3oL8sk2r267wV0hoHOq9r9DY2Atxs+hZUVb6tmHy0w=";
   };
 
   propagatedBuildInputs = [
@@ -47,6 +47,7 @@ buildPythonPackage rec {
   disabledTests = [
     # Test fails with AssertionError: Tuples differ: ('MS Word 2007+...
     "test_all"
+    "test_xlm"
   ];
 
   pythonImportsCheck = [
@@ -54,7 +55,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    description = "Python tool to analyze MS OLE2 files and MS Office documents";
+    description = "Module to analyze MS OLE2 files and MS Office documents";
     homepage = "https://github.com/decalage2/oletools";
     license = with licenses; [ bsd2 /* and */ mit ];
     maintainers = with maintainers; [ fab ];

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pydeconz";
-  version = "91";
+  version = "92";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "Kane610";
     repo = "deconz";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ=";
+    hash = "sha256-qA7AgiiRBq1ekBcQDC8LlLnZLthA0QFZpxNUZdrMMIA=";
   };
 
   propagatedBuildInputs = [

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

@@ -28,7 +28,7 @@ buildPythonPackage rec {
   format = "setuptools";
 
   disabled = pythonOlder "3.7" ||
-    pythonAtLeast "3.10";  # see GHSA-7p79-6x2v-5h88
+    pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88
 
   src = fetchFromGitHub {
     owner = "sanic-org";
@@ -125,6 +125,13 @@ buildPythonPackage rec {
     "test_raw_headers"
     # noisy_exceptions sometimes missing from sanic stdout
     "test_noisy_exceptions"
+  ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
+    # test fail on aarch64
+    "test_tls_wrong_options"
+    "test_cookie_expires"
+    "test_gunicorn_worker"
+    "test_gunicorn_worker_no_logs"
+    "test_gunicorn_worker_with_logs"
   ];
 
   disabledTestPaths = [

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

@@ -25,6 +25,19 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
+  disabledTests = [
+    # AssertionError
+    "test_hello_world"
+    "test_extend_pythonpath"
+    "test_multiple_site_packages"
+    "test_no_entrypoint"
+    "test_results_are_binary_identical_with_env_and_build_id"
+    "test_preamble"
+    "test_preamble_no_pip"
+    "test_alternate_root"
+    "test_alternate_root_environment_variable"
+  ];
+
   meta = with lib; {
     description = "Command line utility for building fully self contained Python zipapps";
     homepage = "https://github.com/linkedin/shiv";

pkgs/development/tools/misc/hydra/common.nix

@@ -81,7 +81,6 @@ let
         TermSizeAny
         TermReadKey
         Test2Harness
-        TestMore
         TestPostgreSQL
         TextDiff
         TextTable

pkgs/development/tools/parsing/re2c/default.nix

@@ -4,6 +4,11 @@
 , autoreconfHook
 , nix-update-script
 , python3
+
+# for passthru.tests
+, ninja
+, php
+, spamassassin
 }:
 
 stdenv.mkDerivation rec {
@@ -33,6 +38,9 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script {
       attrPath = pname;
     };
+    tests = {
+      inherit ninja php spamassassin;
+    };
   };
 
   meta = with lib; {

pkgs/development/tools/picotool/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/raspberrypi/picotool";
     description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ musfay ];
+    maintainers = with maintainers; [ muscaln ];
     platforms = platforms.unix;
   };
 }

pkgs/os-specific/linux/microcode/intel.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "microcode-intel";
-  version = "20220207";
+  version = "20220419";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "Intel-Linux-Processor-Microcode-Data-Files";
     rev = "microcode-${version}";
-    sha256 = "sha256-yNHYAf8AX8C8iSaFWa6u7knUryaUgvI6nIH9jkD4jjw=";
+    sha256 = "sha256-i3OhOEqyK6gJfRIPewPGb4/6k6lO0atmedEqJ2e+66U=";
   };
 
   nativeBuildInputs = [ iucode-tool libarchive ];

pkgs/tools/cd-dvd/bootiso/default.nix

@@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Script for securely creating a bootable USB device from one image file";
     homepage = "https://github.com/jsamr/bootiso";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ musfay ];
+    maintainers = with maintainers; [ muscaln ];
     platforms = platforms.all;
   };
 }

pkgs/tools/graphics/adriconf/default.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.freedesktop.org/mesa/adriconf/";
     description = "A GUI tool used to configure open source graphics drivers";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ musfay ];
+    maintainers = with maintainers; [ muscaln ];
     platforms = platforms.linux;
   };
 }

pkgs/tools/misc/qdl/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     homepage    = "https://github.com/andersson/qdl";
     description = "Tool for flashing images to Qualcomm devices";
     license     = licenses.bsd3;
-    maintainers = with maintainers; [ musfay ];
+    maintainers = with maintainers; [ muscaln ];
     platforms   = platforms.linux;
   };
 }