Unverified Commit 597354df authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 1c1d0942 4e49fa42

default.nix

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ if !builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.n 


  abort ''



    This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade:

    This version of Nixpkgs requires Nix >= ${requiredVersion} but it is being

    evaluated with Nix ${builtins.nixVersion or "(too old to know)"}, please upgrade:



    - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.

doc/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ 
  recommendation](https://clickhouse.com/docs/faq/operations/production). Users

  can continue to use the `clickhouse-lts` package if desired.



- `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support.



## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

pkgs/applications/video/kodi/addons/jellyfin/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ in 
buildKodiAddon rec {

  pname = "jellyfin";

  namespace = "plugin.video.jellyfin";

  version = "1.0.7";

  version = "1.0.8";



  src = fetchFromGitHub {

    owner = "jellyfin";

    repo = "jellyfin-kodi";

    rev = "v${version}";

    sha256 = "sha256-7PgE1KrKmSBWzzi6tZp1Pou/82P1mPX8iE/IQlBi1Cc=";

    sha256 = "sha256-/kolXnYO+wo6z7ucCXvxwjsiflvusKJ3qTWxm1YZMfU=";

  };



  nativeBuildInputs = [ python ];

pkgs/by-name/es/esphome/dashboard.nix

+3 −3
Original line number Diff line number Diff line
@@ -13,19 +13,19 @@ 


buildPythonPackage rec {

  pname = "esphome-dashboard";

  version = "20250514.0";

  version = "20250814.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "esphome";

    repo = "dashboard";

    rev = "refs/tags/${version}";

    hash = "sha256-t0+YlITnxgnLrK/SN0bSmMIv3djR9DKMlnFrR9Btwx8=";

    hash = "sha256-WQsyv3s3LKKOwYEkX5GcAPnbH061q1ts7TU4HU6I8CI=";

  };



  npmDeps = fetchNpmDeps {

    inherit src;

    hash = "sha256-Uiz26kPxoz32t/GRppiYiVBVwWcQqUzPr0kScVUZak8=";

    hash = "sha256-ShuJPS7qP2XZ3lwJrFeKRkQwX7tvyiC/0L7sGn0cMn8=";

  };



  build-system = [ setuptools ];

pkgs/by-name/es/esphome/esp32-post-build-esptool-reference.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/esphome/components/esp32/post_build.py.script b/esphome/components/esp32/post_build.py.script

index c99521423..e29821d7e 100644

--- a/esphome/components/esp32/post_build.py.script

+++ b/esphome/components/esp32/post_build.py.script

@@ -88,8 +88,6 @@ def merge_factory_bin(source, target, env):

     output_path = firmware_path.with_suffix(".factory.bin")

     python_exe = f'"{env.subst("$PYTHONEXE")}"'

     cmd = [

-        python_exe,

-        "-m",

         "esptool",

         "--chip",

         chip,