Merge master into staging-next

2026-07-22 00:20:58 +00:00 · 2026-07-20 12:43:57 +00:00
parent 88ef9c0c2c 722299746c
commit 2164f85962
18 changed files with 486 additions and 463 deletions
--- a/pkgs/by-name/ar/arandr/package.nix
+++ b/pkgs/by-name/ar/arandr/package.nix
@@ -48,10 +48,6 @@ buildPythonApplication (finalAttrs: {
    wrapGAppsHook3
  ];

-  propagatedBuildInputs = [
-    xrandr
-  ];
-
  buildInputs = [
    gsettings-desktop-schemas
    gtk3
@@ -73,9 +69,13 @@ buildPythonApplication (finalAttrs: {

  dontWrapGApps = true;

-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ xrandr ])
+    "\${gappsWrapperArgs[@]}"
+  ];

  passthru.updateScript = nix-update-script {
    extraArgs = [
--- a/pkgs/by-name/cy/cyclonedx-python/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-python/package.nix
@@ -30,6 +30,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
    ]
    ++ cyclonedx-python-lib.optional-dependencies.validation;

+  pythonRelaxDeps = [
+    "chardet"
+  ];
+
  pythonImportsCheck = [ "cyclonedx" ];

  meta = {
--- a/pkgs/by-name/et/ethercat/package.nix
+++ b/pkgs/by-name/et/ethercat/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "ethercat";
-  version = "1.6.9";
+  version = "1.6.10";

  src = fetchFromGitLab {
    owner = "etherlab.org";
    repo = "ethercat";
    tag = finalAttrs.version;
-    hash = "sha256-Msx0i1SAwlSMD3+vjGRNe36Yx9qdUYokVekGytZptqk=";
+    hash = "sha256-ZlvlWSZz7oWMvl3XorS2lb4i33RRv8dBwOe2uLDeOjQ=";
  };

  separateDebugInfo = true;
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,13 +17,13 @@
 }:

 let
-  version = "0.312.0";
+  version = "0.312.1";

  src = fetchFromGitHub {
    owner = "evcc-io";
    repo = "evcc";
    tag = version;
-    hash = "sha256-GUHKrjCGm9LRQX5INdzSMPBV19FtaV8DTN3HIEUrxR4=";
+    hash = "sha256-gMEguCexIZlKayMVkY9w/C+dAem5mymzjaJs2qrmavk=";
  };

  vendorHash = "sha256-x4iwvzf7iv6TyLEkTnqztDQrBD+3lT1yycB7yTD4xO4=";
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -31,6 +31,8 @@
  nix-update-script,
  gmsh,
  which,
+  gtk3,
+  gsettings-desktop-schemas,
 }:
 let
  pythonDeps = with python3Packages; [
@@ -136,6 +138,7 @@ freecad-utils.makeCustomizable (
        "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1"
        "--prefix PATH : ${binPath}"
        "--prefix PYTHONPATH : ${python3Packages.makePythonPath pythonDeps}"
+        "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}"
      ];

    postFixup = ''
--- a/pkgs/by-name/i1/i18next-cli/package-lock.json
+++ b/pkgs/by-name/i1/i18next-cli/package-lock.json
--- a/pkgs/by-name/i1/i18next-cli/package.nix
+++ b/pkgs/by-name/i1/i18next-cli/package.nix
@@ -6,13 +6,13 @@
 }:
 buildNpmPackage rec {
  pname = "i18next-cli";
-  version = "1.65.0";
+  version = "1.66.2";

  src = fetchFromGitHub {
    owner = "i18next";
    repo = "i18next-cli";
    tag = "v${version}";
-    hash = "sha256-FsEzoMCw/4EXyLoSgk/RBkW9/MOBqI6kJQNQ6wDGUwc=";
+    hash = "sha256-R+TT7ehika2Q9TgCT+wRIBAB3sjDMw/FrJdN3Za9rMc=";
  };

  # NOTE: Generating lock-file
@@ -21,7 +21,7 @@ buildNpmPackage rec {
    cp ${./package-lock.json} package-lock.json
  '';

-  npmDepsHash = "sha256-66B60eeCPGTGX6KaZeTH/HIaISqVAYKFxhw6ikWSs64=";
+  npmDepsHash = "sha256-VHfL8feE3b5rK9o/QDbxdLIG8ew1YHfL0Y2HLV/Z9s4=";

  passthru.updateScript = nix-update-script {
    extraArgs = [ "--generate-lockfile" ];
--- a/pkgs/by-name/ss/sssd/package.nix
+++ b/pkgs/by-name/ss/sssd/package.nix
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch2,
  autoreconfHook,
  makeWrapper,
  glibc,
@@ -78,6 +79,13 @@ stdenv.mkDerivation (finalAttrs: {
    # Keep in mind to check /src/external/pac_responder.m4 for Kerberos compatibility before update Kerberos !!!
    # Fix Kerberos Support version for PAC responder
    #./fix-kerberos-version.patch
+
+    # Remove once a release containing this upstream fix is packaged.
+    (fetchpatch2 {
+      name = "CVE-2026-14476.patch";
+      url = "https://github.com/SSSD/sssd/commit/ba207eab76ff5253662a763b9b6e9ea42f03d31b.patch?full_index=1";
+      hash = "sha256-55V8RfIcGF49GGebg+pgCLPU9MGY2S/7PaOGIqwNL0w=";
+    })
  ];

  postPatch = ''
--- a/pkgs/by-name/st/stalwart_0_16/package.nix
+++ b/pkgs/by-name/st/stalwart_0_16/package.nix
@@ -16,6 +16,7 @@
  python3Packages,
  cacert,
  libredirect,
+  rust-jemalloc-sys,
  writeTextFile,
  withFoundationdb ? false,
  stalwartEnterprise ? false,
@@ -71,13 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    ZSTD_SYS_USE_PKG_CONFIG = true;
    ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
    ROCKSDB_LIB_DIR = "${rocksdb}/lib";
-  }
-  //
-    lib.optionalAttrs
-      (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isArmv7))
-      {
-        JEMALLOC_SYS_WITH_LG_PAGE = 16;
-      };
+  };

  depsBuildBuild = [
    pkg-config
@@ -92,6 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  buildInputs = [
    bzip2
    openssl
+    rust-jemalloc-sys
    sqlite
    zstd
  ]
@@ -298,7 +294,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
        redistributable = false;
      }
    ];
-
+    maxSilent = 14400; # 4 hours
    mainProgram = "stalwart";
    maintainers = with lib.maintainers; [
      happysalada
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "steamguard-cli";
-  version = "0.18.2";
+  version = "0.18.4";

  src = fetchFromGitHub {
    owner = "dyc3";
    repo = "steamguard-cli";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-+WqqByn15UBcZzNqNNxt1NjTH6cCeCIpaCOeTFR1XB0=";
+    hash = "sha256-zjkFVsc0ANXUYNH0tqFewz0xJSCm9Gyo5Ruy+sJJKrg=";
  };

-  cargoHash = "sha256-AKkMx0FzNGPHPTja1Hll1+qvHtCzSUI44sGpU3OEkpc=";
+  cargoHash = "sha256-wEnUCmFX+VGdkwE1ivoCI+BtOr7BI1qY9sQH4IVSiSY=";

  # disable update check
  buildNoDefaultFeatures = true;
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -33,14 +33,14 @@ let
 in
 llvmPackages_20.stdenv.mkDerivation {
  pname = "xenia-canary";
-  version = "0-unstable-2026-06-29";
+  version = "0-unstable-2026-07-19";

  src = fetchFromGitHub {
    owner = "xenia-canary";
    repo = "xenia-canary";
    fetchSubmodules = true;
-    rev = "9588ce244dc2684d1573736a717a5d234bf7c2bb";
-    hash = "sha256-nQuBh4XOSSeIX51KLXLyv+gTk51I4/VNgSBrV835mBI=";
+    rev = "a635ac64f5ca37c0b789e8b4166b53dc673b213f";
+    hash = "sha256-CJtmXMLNtfESjhm+6p2s1srw39Z1iQ+OUBrJQzf//0Y=";
  };

  dontConfigure = true;
--- a/pkgs/by-name/xf/xfr/package.nix
+++ b/pkgs/by-name/xf/xfr/package.nix
@@ -24,8 +24,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
    installShellFiles
    versionCheckHook
  ];
+
  doInstallCheck = true;

+  # opt ouf of default features to deselect the update-check feature
+  buildNoDefaultFeatures = true;
+
+  buildFeatures = [
+    "discovery"
+  ];
+
  postInstall = ''
    installShellCompletion --cmd xfr \
      --bash <($out/bin/xfr --completions bash) \
--- a/pkgs/applications/editors/your-editor/default.nix
+++ b/pkgs/applications/editors/your-editor/default.nix
@@ -1,20 +1,23 @@
 {
  lib,
-  stdenv,
+  gccStdenv,
  fetchFromGitHub,
 }:

-stdenv.mkDerivation (finalAttrs: {
+gccStdenv.mkDerivation (finalAttrs: {
  pname = "your-editor";
  version = "1601";

  src = fetchFromGitHub {
    owner = "your-editor";
    repo = "yed";
-    rev = finalAttrs.version;
-    sha256 = "sha256-pa9ibXyuWq7jRYsn3bGdqvLWbwQO2VYsP6Bk+BayQ8o=";
+    tag = finalAttrs.version;
+    hash = "sha256-pa9ibXyuWq7jRYsn3bGdqvLWbwQO2VYsP6Bk+BayQ8o=";
  };

+  strictDeps = true;
+  __structuredAttrs = true;
+
  installPhase = ''
    runHook preInstall
    patchShebangs install.sh
--- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
+++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
@@ -9,16 +9,16 @@
  pydantic,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "ha-mqtt-discoverable";
-  version = "0.24.2";
+  version = "0.25.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "unixorn";
    repo = "ha-mqtt-discoverable";
-    tag = "v${version}";
-    hash = "sha256-8UgYtWB6CsTF9yCpwwjeYIyjfFH8IM3M0sZpvrSqb3M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7MZDzaGJExEBjNjqjIyYWrnoGbt/dVbWlNkU33jvvU0=";
  };

  pythonRelaxDeps = [
@@ -44,8 +44,8 @@ buildPythonPackage rec {
  meta = {
    description = "Python module to create MQTT entities that are automatically discovered by Home Assistant";
    homepage = "https://github.com/unixorn/ha-mqtt-discoverable";
-    changelog = "https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/${src.tag}";
+    changelog = "https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ fab ];
  };
-}
+})
--- a/pkgs/development/python-modules/mitsubishi-comfort/default.nix
+++ b/pkgs/development/python-modules/mitsubishi-comfort/default.nix
@@ -11,14 +11,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "mitsubishi-comfort";
-  version = "0.3.2";
+  version = "0.4.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "nikolairahimi";
    repo = "mitsubishi-comfort";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-fdP2E6ICxuaOUlNJxAa7k0WICWmxKtRFfB2eKRdanG8=";
+    hash = "sha256-/JP9I5QZYRgQelsJzRyawsCO3xNc/lQu4m5j8CNDX5A=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/pydocket/default.nix
+++ b/pkgs/development/python-modules/pydocket/default.nix
@@ -25,7 +25,7 @@

 buildPythonPackage (finalAttrs: {
  pname = "pydocket";
-  version = "0.22.0";
+  version = "0.23.0";
  pyproject = true;
  __structuredAttrs = true;

@@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: {
    owner = "chrisguidry";
    repo = "docket";
    tag = finalAttrs.version;
-    hash = "sha256-WbOXUB6nYeD248K3pE5s1NIf+73dZcuqchQ/Nfw9AbA=";
+    hash = "sha256-CmdZiamJmhIVgHzntprcyOyVskSkdDH3kL9Lju7wvKw=";
  };

  build-system = [
--- a/pkgs/shells/fish/babelfish.nix
+++ b/pkgs/shells/fish/babelfish.nix
@@ -3,19 +3,21 @@
  buildGoModule,
  fetchFromGitHub,
 }:
-buildGoModule rec {
+buildGoModule (finalAttrs: {
  pname = "babelfish";
  version = "1.2.1";

  src = fetchFromGitHub {
    owner = "bouk";
    repo = "babelfish";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
    sha256 = "sha256-/rWX77n9wqWxkHG7gVOinCJ6ahuEfbAcGijC1oAxrno=";
  };

  vendorHash = "sha256-HY9ejLfT6gj3vUMSzbNZ4QlpB+liigTtNDBNWCy8X38=";

+  __structuredAttrs = true;
+
  meta = {
    description = "Translate bash scripts to fish";
    mainProgram = "babelfish";
@@ -26,4 +28,4 @@ buildGoModule rec {
      kevingriffin
    ];
  };
-}
+})
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9774,8 +9774,6 @@ with pkgs;

  ydiff = with python3.pkgs; toPythonApplication ydiff;

-  your-editor = callPackage ../applications/editors/your-editor { stdenv = gccStdenv; };
-
  youtube-dl = with python3Packages; toPythonApplication youtube-dl;

  youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light;