Merge master into staging-next

nixos/modules/services/networking/atticd.nix

@@ -171,6 +171,7 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network-online.target" ] ++ lib.optionals hasLocalPostgresDB [ "postgresql.service" ];
       requires = lib.optionals hasLocalPostgresDB [ "postgresql.service" ];
+      wants = [ "network-online.target" ];
 
       serviceConfig = {
         ExecStart = "${lib.getExe cfg.package} -f ${checkedConfigFile} --mode ${cfg.mode}";

nixos/tests/sing-box.nix

@@ -44,13 +44,17 @@ import ./make-test-python.nix (
       type = "tun";
       tag = "inbound:tun";
       interface_name = "tun0";
-      inet4_address = "172.16.0.1/30";
-      inet6_address = "fd00::1/126";
+      address = [
+        "172.16.0.1/30"
+        "fd00::1/126"
+      ];
       auto_route = true;
-      inet4_route_address = [
+      iproute2_table_index = 2024;
+      iproute2_rule_index = 9001;
+      route_address = [
         "${hosts."${target_host}"}/32"
       ];
-      inet4_route_exclude_address = [
+      route_exclude_address = [
         "${hosts."${server_host}"}/32"
       ];
       strict_route = false;
@@ -513,9 +517,14 @@ import ./make-test-python.nix (
 
       with subtest("tun"):
         tun.wait_for_unit("sing-box.service")
-        tun.wait_for_unit("sys-devices-virtual-net-tun0.device")
-        tun.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev tun0'")
-        tun.succeed("ip addr show tun0")
+        tun.wait_for_unit("sys-devices-virtual-net-${tunInbound.interface_name}.device")
+        tun.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev ${tunInbound.interface_name}'")
+        tun.succeed("ip addr show ${tunInbound.interface_name}")
+        tun.succeed("ip route show table ${toString tunInbound.iproute2_table_index} | grep ${tunInbound.interface_name}")
+        assert (
+          tun.succeed("ip rule list table ${toString tunInbound.iproute2_table_index} | sort | head -1 | awk -F: '{print $1}' | tr -d '\n'")
+          == "${toString tunInbound.iproute2_rule_index}"
+        )
         test_curl(tun)
 
       with subtest("wireguard"):
@@ -530,8 +539,8 @@ import ./make-test-python.nix (
 
       with subtest("fakeip"):
         fakeip.wait_for_unit("sing-box.service")
-        fakeip.wait_for_unit("sys-devices-virtual-net-tun0.device")
-        fakeip.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev tun0'")
+        fakeip.wait_for_unit("sys-devices-virtual-net-${tunInbound.interface_name}.device")
+        fakeip.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev ${tunInbound.interface_name}'")
         fakeip.succeed("dig +short A ${target_host} @${target_host} | grep '^198.18.'")
     '';
 

pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix

@@ -245,7 +245,7 @@ let
     done
     cd ..
 
-    for i in var etc opt; do
+    for i in etc opt; do
       if [ -d "${staticUsrProfileTarget}/$i" ]; then
         cp -rsHf "${staticUsrProfileTarget}/$i" "$i"
       fi

pkgs/by-name/ma/matterircd/package.nix

@@ -20,6 +20,6 @@ buildGoModule rec {
     mainProgram = "matterircd";
     homepage = "https://github.com/42wim/matterircd";
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with maintainers; [ numinit ];
   };
 }

pkgs/by-name/ma/mattermost/package.nix

@@ -12,13 +12,13 @@ buildGoModule rec {
   # See https://docs.mattermost.com/upgrade/extended-support-release.html
   # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update
   # the version regex in passthru.updateScript as well.
-  version = "9.5.10";
+  version = "9.5.11";
 
   src = fetchFromGitHub {
     owner = "mattermost";
     repo = "mattermost";
     rev = "v${version}";
-    hash = "sha256-KUauFuRlOxBNNqE88pv5j0afEYQOZG6kWuyHnzg5qwQ=";
+    hash = "sha256-kPsBQjBMHxh5EGTFPNceE51nSEKSu6ieifIAV8PjpAc=";
   };
 
   # Needed because buildGoModule does not support go workspaces yet.
@@ -34,7 +34,7 @@ buildGoModule rec {
 
   webapp = fetchurl {
     url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-    hash = "sha256-psGNLmiT60HknrwESjztlr8NUPPnHsNmSTaRJ0RRqBE=";
+    hash = "sha256-dRB0CqUoEIkCDlH/vcn/S1TLlhz9iWp61WM2kk+ToZk=";
   };
 
   # Makes nix-update-script pick up the fetchurl for the webapp.

pkgs/by-name/ma/maven/package.nix

@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "maven";
-  version = "3.9.8";
+  version = "3.9.9";
 
   src = fetchurl {
     url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz";
-    hash = "sha256-BnZyYpB1t0Dj0Kko4hAh3WFaUyh6821MzKROh+CB0QI=";
+    hash = "sha256-epzfZ0/BcD1jgvXzMLPREOobUStR8WUoRtnk6KWI12Y=";
   };
 
   sourceRoot = ".";

pkgs/by-name/ml/mlx42/package.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mlx42";
-  version = "2.3.4";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "codam-coding-college";
     repo = "MLX42";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-c4LoTePHhQeZTx33V1K3ZyXmT7vjB6NdkGVAiSuJKfI=";
+    hash = "sha256-jYcBvvx0Xfc/wDWSUROfQeRvn+tWvSS0ymKO1iuzg8w=";
   };
 
   postPatch =

pkgs/by-name/vp/vpl-gpu-rt/package.nix

@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vpl-gpu-rt";
-  version = "24.2.5";
+  version = "24.3.3";
 
   outputs = [ "out" "dev" ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "intel";
     repo = "vpl-gpu-rt";
     rev = "intel-onevpl-${version}";
-    hash = "sha256-WYlA8+i8TTFHsU4+doLcv75F9MR2V/BEuNGGLgM4p1s=";
+    hash = "sha256-aTVSkkSQmcnRcx1J0zqdT6Z6f2GQVRTR8b2JFov6DFE=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

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

@@ -16,10 +16,7 @@
   pyqt5,
   pyperclip,
   pytestCheckHook,
-  mock,
   python-magic,
-  codecov,
-  coverage,
   qt5,
   # This is usually used as a library, and it'd be a shame to force the GUI
   # libraries to the closure if GUI is not desired.
@@ -73,9 +70,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    codecov
-    coverage
-    mock
     pyperclip
     pyqt5
     python-magic
@@ -88,10 +82,10 @@ buildPythonPackage rec {
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool and Python library to interact with Android Files";
     homepage = "https://github.com/androguard/androguard";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ pmiddend ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ pmiddend ];
   };
 }

pkgs/development/python-modules/androguard/fix-tests.patch

@@ -1,8 +1,21 @@
+diff --git a/tests/dataflow_test.py b/tests/dataflow_test.py
+index e9ac3cdb..edef8200 100644
+--- a/tests/dataflow_test.py
++++ b/tests/dataflow_test.py
+@@ -5,7 +5,7 @@ import sys
+ sys.path.append('.')
+ 
+ import collections
+-import mock
++from unittest import mock
+ import unittest
+ from androguard.decompiler.dad import dataflow
+ from androguard.decompiler.dad import graph
 diff --git a/tests/test_types.py b/tests/test_types.py
-index 127dfc20eb..f1c89f0712 100644
+index 127dfc20..f1c89f07 100644
 --- a/tests/test_types.py
 +++ b/tests/test_types.py
-@@ -182,7 +182,7 @@
+@@ -182,7 +182,7 @@ class TypesTest(unittest.TestCase):
              for i in filter(lambda x: 'const' in x.get_name(), method.get_instructions()):
                  i.show(0)
                  # ins should only have one literal

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

@@ -96,8 +96,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [
-    # Frequently fails when exiftool is updated and adds support for new metadata.
-    "test_all_parametred"
+    # libmat2.pdf.cairo.MemoryError: out of memory
+    "test_all"
   ];
 
   meta = with lib; {

pkgs/development/python-modules/sense-energy/default.nix

@@ -16,16 +16,16 @@
 
 buildPythonPackage rec {
   pname = "sense-energy";
-  version = "0.12.4";
+  version = "0.13.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "scottbonline";
     repo = "sense";
     rev = "refs/tags/${version}";
-    hash = "sha256-jHYXqlRV1JR95GtO9E6oYj69Jj8TsvLANcI1kl7/Gl4=";
+    hash = "sha256-HE0bMcxfzfaMLDepjwDwV8AXQ3Q/bQt6SqHt7m/UY9I=";
   };
 
   postPatch = ''
@@ -33,9 +33,9 @@ buildPythonPackage rec {
       --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}"
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     async-timeout
     kasa-crypt

pkgs/development/tools/database/sqlitebrowser/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sqlitebrowser";
-  version = "3.13.0";
+  version = "3.13.1";
 
   src = fetchFromGitHub {
     owner = "sqlitebrowser";
     repo = "sqlitebrowser";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-2U0jnL2hmrxynMxEiObl10bKFAFlCrY2hulZ/Ggqimw=";
+    sha256 = "sha256-bpZnO8i8MDgOm0f93pBmpy1sZLJQ9R4o4ZLnGfT0JRg=";
   };
 
   patches = lib.optional stdenv.hostPlatform.isDarwin ./macos.patch;

pkgs/os-specific/linux/lttng-modules/default.nix

@@ -1,14 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, kernel }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  kernel,
+}:
 
 stdenv.mkDerivation rec {
   pname = "lttng-modules-${kernel.version}";
-  version = "2.13.13";
+  version = "2.13.15";
 
   src = fetchFromGitHub {
     owner = "lttng";
     repo = "lttng-modules";
     rev = "v${version}";
-    hash = "sha256-iA3B838EUU5rFWCL8BAubkTrTO1itDFp5d1653OPnS0=";
+    hash = "sha256-cEiv1EjsEvyreRERrCGKKpJdA1IKvuyVmgA7S3EkEnU=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -29,9 +34,15 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Linux kernel modules for LTTng tracing";
     homepage = "https://lttng.org/";
-    license = with licenses; [ lgpl21Only gpl2Only mit ];
+    license = with licenses; [
+      lgpl21Only
+      gpl2Only
+      mit
+    ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
-    broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10" || (lib.versions.majorMinor kernel.modDirVersion) == "5.4";
+    broken =
+      (lib.versions.majorMinor kernel.modDirVersion) == "5.10"
+      || (lib.versions.majorMinor kernel.modDirVersion) == "5.4";
   };
 }

pkgs/tools/filesystems/stratisd/default.nix

@@ -28,18 +28,18 @@
 
 stdenv.mkDerivation rec {
   pname = "stratisd";
-  version = "3.7.1";
+  version = "3.7.2";
 
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = pname;
     rev = "refs/tags/stratisd-v${version}";
-    hash = "sha256-JevVIyNNkRuG1aH9yuBKwVlOgS67jJSoJDZQvpLsy/4=";
+    hash = "sha256-pxLf/YLd7vdAjGRQDvJvwhJXpMUiI3dge5Y5x895SPA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    hash = "sha256-n8gF8WuHwwPxZAggkJckBxfvb0r+jJDuTcj7KXjg4/Y=";
+    hash = "sha256-btSj69yBbnbK+jdWdMi3rQGKMOLWcwY5Zn3hmEWk/Hs=";
   };
 
   postPatch = ''

pkgs/tools/networking/sing-box/default.nix

@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "sing-box";
-  version = "1.9.7";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ZqcQe2d4IoF7fA2rMASFvGCuiTL+lqQqCpCt/IviClU=";
+    hash = "sha256-VCx9fxtyCEwcwDCvbeOsW/oafHSSRwVrwX/aaKzgauQ=";
   };
 
-  vendorHash = "sha256-/lp+3mPkGMABpvnxqpuC/7NiKrmcEWYQ80Wb7Ng1eBI=";
+  vendorHash = "sha256-zRGawshd+t1eN5CBSmWnyFPKPa8ClZv5k7xFG1qKeU4=";
 
   tags = [
     "with_quic"

pkgs/tools/security/pinentry-rofi/default.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pinentry-rofi";
-  version = "2.2.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "plattfot";
     repo = pname;
     rev = version;
-    sha256 = "sha256-E904PLYuIvlew2WHVEwU2bXp6Tc6+lTSVB/m9b9v+z8=";
+    sha256 = "sha256-GHpVO8FRphVW0+In7TtB39ewwVLU1EHOeVL05pnZdFQ=";
   };
 
   nativeBuildInputs = [

pkgs/top-level/all-packages.nix

@@ -24539,9 +24539,6 @@ with pkgs;
 
   matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { };
 
-  mattermost = callPackage ../servers/mattermost { };
-  matterircd = callPackage ../servers/mattermost/matterircd.nix { };
-
   mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };
 
   memcached = callPackage ../servers/memcached { };