Merge master into staging-next

.envrc

@@ -1 +0,0 @@
-use nix

.github/CODEOWNERS

@@ -19,7 +19,6 @@
 # Develompent support
 /.editorconfig @Mic92 @zowoq
 /shell.nix @infinisil @NixOS/Security
-/.envrc @infinisil @NixOS/Security
 
 # Libraries
 /lib                        @infinisil

.gitignore

@@ -21,6 +21,7 @@ tags
 /source/
 .version-suffix
 .direnv
+.envrc
 
 .DS_Store
 .mypy_cache

nixos/modules/services/desktop-managers/plasma6.nix

@@ -254,6 +254,7 @@ in {
       extraPackages = with kdePackages; [
         breeze-icons
         kirigami
+        libplasma
         plasma5support
         qtsvg
         qtvirtualkeyboard

nixos/modules/services/home-automation/home-assistant.nix

@@ -192,7 +192,12 @@ in {
     };
 
     customComponents = mkOption {
-      type = types.listOf types.package;
+      type = types.listOf (
+        types.addCheck types.package (p: p.isHomeAssistantComponent or false) // {
+          name = "home-assistant-component";
+          description = "package that is a Home Assistant component";
+        }
+      );
       default = [];
       example = literalExpression ''
         with pkgs.home-assistant-custom-components; [

pkgs/applications/networking/browsers/firefox/packages.nix

@@ -5,10 +5,10 @@
 {
   firefox = buildMozillaMach rec {
     pname = "firefox";
-    version = "128.0.2";
+    version = "128.0.3";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "e5c38fa3adf26f5f072b6dfe5955004e67f576dc67ef68348d58fa0ac13bd3c7764e9289dfcadb2bbe034188bf296267d74fde13fb9b53beb5421245fee69da1";
+      sha512 = "52a0a1a6fa653f5a621a9e16e1937760c05a5ebc81a058ecc16b2c3d29d09d418dc5129deabed86ad2f82abdb3100969478a67f48b11616dc3b3e3698a1acf51";
     };
 
     extraPatches = [

pkgs/applications/virtualization/docker/default.nix

@@ -315,15 +315,15 @@ rec {
   };
 
   docker_27 = callPackage dockerGen rec {
-    version = "27.0.3";
+    version = "27.1.1";
     cliRev = "v${version}";
-    cliHash = "sha256-fpjSnUq3T6WZO/FLeT377FWxwevbULob9dPiSBxZdHI=";
+    cliHash = "sha256-r9figEMYHHSbMYVFiw7GUMzjZBhlF+jyZqKixyCpoQ0=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-xinRILDSuubAAJh/dmpaU3csTf0VgukJIfSUkcHpa28=";
+    mobyHash = "sha256-LuCEdQQ3eWt8VyzmWkQTxlxTok9h/UlACTVls5LcI7g=";
     runcRev = "v1.1.13";
     runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8=";
-    containerdRev = "v1.7.18";
-    containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ=";
+    containerdRev = "v1.7.20";
+    containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY=";
     tiniRev = "v0.19.0";
     tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
   };

pkgs/development/libraries/nss/latest.nix

@@ -5,6 +5,6 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
 
 import ./generic.nix {
-  version = "3.102";
-  hash = "sha256-Dl04bPMH7/IFyKktD6Ql9XZZRCnIoq7P+30Qo8j0eBQ=";
+  version = "3.102.1";
+  hash = "sha256-rHPDPLSatEk1ZVvtEM/Ct1V5MFpCiW9kwSBQzSz0lak=";
 }

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

@@ -1,10 +1,8 @@
 {
-  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
   glibcLocales,
-  nose,
   pylibmc,
   python-memcached,
   redis,
@@ -15,7 +13,8 @@
   pycrypto,
   cryptography,
   isPy27,
-  isPy3k,
+  pytestCheckHook,
+  setuptools,
   funcsigs ? null,
   pycryptopp ? null,
 }:
@@ -23,16 +22,19 @@
 buildPythonPackage rec {
   pname = "beaker";
   version = "1.13.0";
+  pyproject = true;
 
   # The pypy release do not contains the tests
   src = fetchFromGitHub {
     owner = "bbangert";
     repo = "beaker";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-HzjhOPXElwKoJLrhGIbVn798tbX/kaS1EpQIX+vXCtE=";
+    hash = "sha256-HzjhOPXElwKoJLrhGIbVn798tbX/kaS1EpQIX+vXCtE=";
   };
 
-  propagatedBuildInputs =
+  build-system = [ setuptools ];
+
+  dependencies =
     [
       sqlalchemy
       pycrypto
@@ -47,29 +49,19 @@ buildPythonPackage rec {
     glibcLocales
     python-memcached
     mock
-    nose
     pylibmc
     pymongo
     redis
     webtest
+    pytestCheckHook
   ];
 
-  # Can not run memcached tests because it immediately tries to connect
-  postPatch = ''
-    rm tests/test_memcached.py
-  '';
-
+  # Can not run memcached tests because it immediately tries to connect.
   # Disable external tests because they need to connect to a live database.
-  # Also disable a test in test_cache.py called "test_upgrade" because
-  # it currently fails on darwin.
-  # Please see issue https://github.com/bbangert/beaker/issues/166
-  checkPhase = ''
-    nosetests \
-      -e ".*test_ext_.*" \
-      -e "test_upgrade" \
-      ${lib.optionalString (!stdenv.isLinux) ''-e "test_cookie_expires_different_locale"''} \
-      -vv tests
-  '';
+  pytestFlagsArray = [
+    "--ignore=tests/test_memcached.py"
+    "--ignore-glob='tests/test_managers/test_ext_*'"
+  ];
 
   meta = {
     description = "Session and Caching library with WSGI Middleware";

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

@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  dahlia,
+  ixia
+}:
+
+buildPythonPackage rec {
+  pname = "oddsprout";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "trag1c";
+    repo = "oddsprout";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-k5/mBoW4PxGUbkwaZyHgS3MGI4533V/nNoGqEg+VXpM=";
+  };
+
+  build-system = [ poetry-core ];
+  dependencies = [ dahlia ixia ];
+
+  pythonImportsCheck = [ "oddsprout" ];
+
+  meta = with lib; {
+    changelog = "https://github.com/trag1c/oddsprout/blob/${src.rev}/CHANGELOG.md";
+    description = "Generate random JSON with no schemas involved";
+    license = licenses.mit;
+    homepage = "https://trag1c.github.io/oddsprout";
+    maintainers = with maintainers; [ sigmanificient ];
+  };
+}

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

@@ -59,6 +59,7 @@ buildPythonPackage {
         libcufft # libcufft.so.XX
         cudnn # libcudnn.soXX
         cuda_cudart # libcudart.so.XX
+        nccl # libnccl.so.XX
       ]
     );
 

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

@@ -0,0 +1,29 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pbar";
+  version = "2.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "darvil82";
+    repo = "PBar";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-FsEjfusk8isOD52xkjndGQdVC8Vc7N3spLLWQTi3Svc=";
+  };
+
+  build-system = [ setuptools ];
+  pythonImportsCheck = [ "pbar" ];
+
+  meta = with lib; {
+    description = "Display customizable progress bars on the terminal easily";
+    license = licenses.mit;
+    homepage = "https://darvil82.github.io/PBar";
+    maintainers = with maintainers; [ sigmanificient ];
+  };
+}

pkgs/development/python-modules/samarium/crossandra-2-fix.patch

@@ -0,0 +1,18 @@
+--- a/src/samarium/tokenizer.py	2024-06-07 13:07:38.731314161 +0200
++++ b/src/samarium/tokenizer.py	2024-06-07 13:08:11.674488226 +0200
+@@ -26,12 +26,12 @@
+     Token,
+     ignore_whitespace=True,
+     rules=[
+-        Rule(r"==<.*>==", converter=False, flags=re.M | re.S),
+-        Rule(r"==[^\n]*", converter=False, flags=re.M | re.S),
++        Rule(r"==<.*>==", flags=re.M | re.S, ignore=True),
++        Rule(r"==[^\n]*", flags=re.M | re.S, ignore=True),
+         Rule(
+             common.DOUBLE_QUOTED_STRING.pattern,
+             lambda x: x.replace("\n", r"\n"),
+-            re.S,
++            flags=re.S,
+         ),
+         Rule(rf"{SM_BIT}+`?{SM_BIT}*|`{SM_BIT}*", to_number),
+         Rule(r"\w+"),

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

@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  crossandra,
+  dahlia,
+  pythonRelaxDepsHook
+}:
+
+buildPythonPackage rec {
+  pname = "samarium";
+  version = "0.5.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "samarium-lang";
+    repo = "samarium";
+    rev = "refs/tags/${version}";
+    hash = "sha256-4WVkTLE6OboNJE/f+6zS3xT1jEHUwV4HSLjl/PBP0FU=";
+  };
+
+  build-system = [ poetry-core pythonRelaxDepsHook ];
+  dependencies = [ crossandra dahlia ];
+
+  patches = [ ./crossandra-2-fix.patch ];
+  pythonRelaxDeps = [ "crossandra" ];
+
+  meta = with lib; {
+    changelog = "https://github.com/samarium-lang/samarium/blob/${src.rev}/CHANGELOG.md";
+    description = "The Samarium Programming Language";
+    license = licenses.mit;
+    homepage = "https://samarium-lang.github.io/Samarium";
+    maintainers = with maintainers; [ sigmanificient ];
+  };
+}

pkgs/servers/home-assistant/build-custom-component/default.nix

@@ -39,5 +39,9 @@ home-assistant.python.pkgs.buildPythonPackage (
       packaging
     ] ++ (args.nativeCheckInputs or []);
 
-  } // builtins.removeAttrs args [ "nativeCheckInputs" ]
+    passthru = {
+      isHomeAssistantComponent = true;
+    } // args.passthru or { };
+
+  } // builtins.removeAttrs args [ "nativeCheckInputs" "passthru" ]
 )

pkgs/top-level/python-packages.nix

@@ -9287,6 +9287,8 @@ self: super: with self; {
 
   od = callPackage ../development/python-modules/od { };
 
+  oddsprout = callPackage ../development/python-modules/oddsprout { };
+
   odfpy = callPackage ../development/python-modules/odfpy { };
 
   odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { };
@@ -9789,6 +9791,8 @@ self: super: with self; {
 
   paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { };
 
+  pbar = callPackage ../development/python-modules/pbar { };
+
   pbkdf2 = callPackage ../development/python-modules/pbkdf2 { };
 
   pbr = callPackage ../development/python-modules/pbr { };
@@ -13867,6 +13871,8 @@ self: super: with self; {
 
   saneyaml = callPackage ../development/python-modules/saneyaml { };
 
+  samarium = callPackage ../development/python-modules/samarium { };
+
   sampledata = callPackage ../development/python-modules/sampledata { };
 
   samplerate = callPackage ../development/python-modules/samplerate {