Merge master into staging-next

authored by

nixpkgs-ci[bot] and committed by
GitHub
85eb9562 88d208f7

+192 -44
+6
maintainers/maintainer-list.nix
··· 1475 1475 github = "an-empty-string"; 1476 1476 githubId = 681716; 1477 1477 }; 1478 + ananthb = { 1479 + name = "Ananth Bhaskararaman"; 1480 + email = "nixos-maint@devhuman.net"; 1481 + github = "ananthb"; 1482 + githubId = 3133350; 1483 + }; 1478 1484 anas = { 1479 1485 email = "anas.elgarhy.dev@gmail.com"; 1480 1486 github = "0x61nas";
+2 -2
pkgs/by-name/en/enzyme/package.nix
··· 7 7 }: 8 8 llvmPackages.stdenv.mkDerivation rec { 9 9 pname = "enzyme"; 10 - version = "0.0.188"; 10 + version = "0.0.189"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "EnzymeAD"; 14 14 repo = "Enzyme"; 15 15 rev = "v${version}"; 16 - hash = "sha256-CoImpu1Hwn11s+6GeYPIyaIHz7kdjrBMpbxAUzaJWZU="; 16 + hash = "sha256-fjKu8H24RuDGmMjN4SphdQw6g8FLS0Xc+STjgx7hiq4="; 17 17 }; 18 18 19 19 postPatch = ''
+20 -20
pkgs/by-name/es/esptool/package.nix
··· 7 7 8 8 python3Packages.buildPythonApplication rec { 9 9 pname = "esptool"; 10 - version = "4.9.0"; 10 + version = "5.0.2"; 11 11 pyproject = true; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "espressif"; 15 15 repo = "esptool"; 16 16 tag = "v${version}"; 17 - hash = "sha256-iIFjInqiqjeqiDYL7BU3vT99pCVnu8OhU7u9uKwe/SI="; 17 + hash = "sha256-oRvtEBp88tmgjjIuoQS5ySm4I0aD/Zs8VLRUZo0sh/I="; 18 18 }; 19 19 20 20 postPatch = '' ··· 29 29 ]; 30 30 31 31 dependencies = with python3Packages; [ 32 - argcomplete 33 32 bitstring 33 + click 34 34 cryptography 35 - ecdsa 36 35 intelhex 37 36 pyserial 37 + pyyaml 38 38 reedsolo 39 - pyyaml 39 + rich-click 40 40 ]; 41 41 42 42 optional-dependencies = with python3Packages; { ··· 48 48 [ 49 49 pyelftools 50 50 pytestCheckHook 51 + requests 51 52 softhsm 52 53 ] 53 54 ++ lib.flatten (lib.attrValues optional-dependencies); 54 55 55 - # tests mentioned in `.github/workflows/test_esptool.yml` 56 - checkPhase = '' 57 - runHook preCheck 56 + preCheck = '' 57 + export PATH="$out/bin:$PATH" 58 + ''; 58 59 60 + pytestFlags = [ 61 + "-m" 62 + "host_test" 63 + ]; 64 + 65 + postCheck = '' 59 66 export SOFTHSM2_CONF=$(mktemp) 60 67 echo "directories.tokendir = $(mktemp -d)" > "$SOFTHSM2_CONF" 61 68 ./ci/setup_softhsm2.sh 62 69 63 - pytest test/test_imagegen.py 64 - pytest test/test_espsecure.py 65 70 pytest test/test_espsecure_hsm.py 66 - pytest test/test_merge_bin.py 67 - pytest test/test_image_info.py 68 - pytest test/test_modules.py 69 - 70 - runHook postCheck 71 71 ''; 72 72 73 - meta = with lib; { 73 + meta = { 74 74 changelog = "https://github.com/espressif/esptool/blob/${src.tag}/CHANGELOG.md"; 75 75 description = "ESP8266 and ESP32 serial bootloader utility"; 76 76 homepage = "https://github.com/espressif/esptool"; 77 - license = licenses.gpl2Plus; 78 - maintainers = with maintainers; [ 77 + license = lib.licenses.gpl2Plus; 78 + maintainers = with lib.maintainers; [ 79 79 dezgeg 80 80 dotlambda 81 81 ]; 82 82 teams = [ lib.teams.lumiguide ]; 83 - platforms = with platforms; linux ++ darwin; 84 - mainProgram = "esptool.py"; 83 + platforms = with lib.platforms; linux ++ darwin; 84 + mainProgram = "esptool"; 85 85 }; 86 86 }
+38
pkgs/by-name/go/gow/package.nix
··· 1 + { 2 + lib, 3 + buildGoModule, 4 + fetchFromGitHub, 5 + makeWrapper, 6 + go, 7 + }: 8 + 9 + buildGoModule (finalAttrs: { 10 + pname = "gow"; 11 + version = "0-unstable-2025-08-13"; 12 + 13 + src = fetchFromGitHub { 14 + owner = "mitranim"; 15 + repo = "gow"; 16 + rev = "466e175ff6996eba082cb86ac7b43fc5f8f9c766"; 17 + hash = "sha256-vfJ6AFkCeyGKWF/a26ulyErCjCng+uHJlLyRfBmtLs0="; 18 + }; 19 + 20 + vendorHash = "sha256-L7H3tZQXfeDtWLMvxSMf4/Oez8OV5Q+NhKLkJ991sNA="; 21 + 22 + # This is required for wrapProgram. 23 + allowGoReference = true; 24 + 25 + nativeBuildInputs = [ makeWrapper ]; 26 + 27 + postFixup = '' 28 + wrapProgram $out/bin/gow --prefix PATH : ${lib.makeBinPath [ go ]} 29 + ''; 30 + 31 + meta = { 32 + homepage = "https://github.com/mitranim/gow"; 33 + description = "Missing watch mode for Go commands"; 34 + mainProgram = "gox"; 35 + license = lib.licenses.unlicense; 36 + maintainers = with lib.maintainers; [ baloo ]; 37 + }; 38 + })
+3 -3
pkgs/by-name/ha/harper/package.nix
··· 7 7 8 8 rustPlatform.buildRustPackage rec { 9 9 pname = "harper"; 10 - version = "0.57.0"; 10 + version = "0.58.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "Automattic"; 14 14 repo = "harper"; 15 15 rev = "v${version}"; 16 - hash = "sha256-w9nDvjAFPd2cVJhOigGW61RZAsqo64EN1AFdeAIiAQ0="; 16 + hash = "sha256-KGi/toi02JPDYdNvrhIg9hh+188C5jP41Zk3IKOgO/E="; 17 17 }; 18 18 19 19 buildAndTestSubdir = "harper-ls"; 20 20 21 - cargoHash = "sha256-Ljkrpk1O+WXL0GDBv7sJbSllJuhoLXMLgFfi4sI50fE="; 21 + cargoHash = "sha256-Er056RhUW33UrRMP412/tj+Qa878Jk+nIcFuF8Ytaes="; 22 22 23 23 passthru.updateScript = nix-update-script { }; 24 24
+2 -2
pkgs/by-name/ni/niriswitcher/package.nix
··· 11 11 12 12 python3Packages.buildPythonPackage rec { 13 13 pname = "niriswitcher"; 14 - version = "0.7.0"; 14 + version = "0.7.1"; 15 15 pyproject = true; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "isaksamsten"; 19 19 repo = "niriswitcher"; 20 20 tag = version; 21 - hash = "sha256-V3G4eKKEysCyjAFUW2a94lOo82TVaZVfRXv/dL+LHNo="; 21 + hash = "sha256-qsw2D9Q9ZJYBsRECzT+qoytYMda4uZxX321/YxNWk9o="; 22 22 }; 23 23 24 24 build-system = [ python3Packages.hatchling ];
+4 -4
pkgs/by-name/pk/pkgsite/package.nix
··· 7 7 8 8 buildGoModule { 9 9 pname = "pkgsite"; 10 - version = "0-unstable-2025-07-21"; 10 + version = "0-unstable-2025-08-14"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "golang"; 14 14 repo = "pkgsite"; 15 - rev = "d4de6668b91034bd7c6315aff98f232c1339335f"; 16 - hash = "sha256-H3yL82obJ/z8BDeyLdR1DVCxsPwrn0xxHLoMFHKhQn8="; 15 + rev = "ed9d06afb3a5d788c2bd4d6eef1b2a667cff4782"; 16 + hash = "sha256-HROCrvfpHiRmZSE+P9uL5mwqkcI9uwxFEI7fSjzOHiI="; 17 17 }; 18 18 19 - vendorHash = "sha256-sHpWI3oUuazFlWJhHB5uZ89z1GPbPfLoFQL12Jk3NP0="; 19 + vendorHash = "sha256-MUd0AGYDLx6o1uItjk3UVHBIXfPjN6AjjhYQCz5BIeQ="; 20 20 21 21 subPackages = [ "cmd/pkgsite" ]; 22 22
+3 -1
pkgs/by-name/ra/rapidjson/package.nix
··· 69 69 (lib.cmakeFeature "CMAKE_CXX_FLAGS_RELEASE" "-Wno-error") 70 70 ]; 71 71 72 - doCheck = !(stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isDarwin); 72 + doCheck = 73 + !(stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isDarwin) 74 + && lib.meta.availableOn stdenv.hostPlatform valgrind; 73 75 74 76 nativeCheckInputs = [ 75 77 valgrind
+19 -1
pkgs/by-name/re/rerun/package.nix
··· 6 6 # nativeBuildInputs 7 7 binaryen, 8 8 lld, 9 + llvmPackages, 9 10 pkg-config, 10 11 protobuf, 11 12 rustfmt, ··· 31 32 "map_view" 32 33 ], 33 34 }: 34 - 35 35 rustPlatform.buildRustPackage (finalAttrs: { 36 36 pname = "rerun"; 37 37 version = "0.24.0"; ··· 98 98 rustfmt 99 99 nasm 100 100 ]; 101 + 102 + # NOTE: Without setting these environment variables the web-viewer 103 + # preBuild step uses the nix wrapped CC which doesn't support 104 + # multiple targets including wasm32-unknown-unknown. These are taken 105 + # from the following issue discussion in the rust ring crate: 106 + # https://github.com/briansmith/ring/discussions/2581#discussioncomment-14096969 107 + env = 108 + let 109 + inherit (llvmPackages) clang-unwrapped; 110 + major-version = builtins.head (builtins.splitVersion clang-unwrapped.version); 111 + # resource dir + builtins from the unwrapped clang 112 + resourceDir = "${lib.getLib clang-unwrapped}/lib/clang/${major-version}"; 113 + includeDir = "${lib.getLib llvmPackages.libclang}/lib/clang/${major-version}/include"; 114 + in 115 + { 116 + CC_wasm32_unknown_unknown = lib.getExe clang-unwrapped; 117 + CFLAGS_wasm32_unknown_unknown = "-isystem ${includeDir} -resource-dir ${resourceDir}"; 118 + }; 101 119 102 120 buildInputs = [ 103 121 freetype
+2 -2
pkgs/development/python-modules/aioamazondevices/default.nix
··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "aioamazondevices"; 18 - version = "4.0.0"; 18 + version = "4.0.1"; 19 19 pyproject = true; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "chemelli74"; 23 23 repo = "aioamazondevices"; 24 24 tag = "v${version}"; 25 - hash = "sha256-Ch3IP7fMEDYYRFDk3eoZWjhjnkQY0qcAFJdmkoW4o/0="; 25 + hash = "sha256-FTIACTsDFg+TUvtQOI46ecOZxFmyeUSlOZm9xXAlkhY="; 26 26 }; 27 27 28 28 build-system = [ poetry-core ];
+2 -2
pkgs/development/python-modules/google-genai/default.nix
··· 20 20 21 21 buildPythonPackage rec { 22 22 pname = "google-genai"; 23 - version = "1.29.0"; 23 + version = "1.31.0"; 24 24 pyproject = true; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "googleapis"; 28 28 repo = "python-genai"; 29 29 tag = "v${version}"; 30 - hash = "sha256-EOwIXZ373hsEfGxCE6DRjPRuqPQQoFHTzIDGK1K9X6Q="; 30 + hash = "sha256-pzW0SYLlj7XjJSEqCY3uSYZI8asn451LANpcpr/lxI4="; 31 31 }; 32 32 33 33 build-system = [
+45
pkgs/development/python-modules/miraie-ac/default.nix
··· 1 + { 2 + lib, 3 + buildPythonPackage, 4 + fetchPypi, 5 + 6 + # build-system 7 + poetry-core, 8 + 9 + # dependencies 10 + aiomqtt, 11 + aiohttp, 12 + certifi, 13 + }: 14 + 15 + buildPythonPackage rec { 16 + pname = "miraie-ac"; 17 + version = "1.1.1"; 18 + pyproject = true; 19 + 20 + src = fetchPypi { 21 + inherit version; 22 + pname = "miraie_ac"; 23 + hash = "sha256-IiRDPz5IcD3Df+vw4YvR3zc0oThGjb7pBJfD4d98h/g="; 24 + }; 25 + 26 + build-system = [ poetry-core ]; 27 + 28 + dependencies = [ 29 + aiomqtt 30 + aiohttp 31 + certifi 32 + ]; 33 + 34 + pythonRemoveDeps = [ "asyncio" ]; 35 + 36 + pythonImportsCheck = [ "miraie_ac" ]; 37 + 38 + meta = { 39 + homepage = "https://github.com/rkzofficial/miraie-ac"; 40 + changelog = "https://github.com/rkzofficial/miraie-ac/releases"; 41 + description = "Python library for controlling Panasonic Miraie ACs"; 42 + license = lib.licenses.mit; 43 + maintainers = with lib.maintainers; [ ananthb ]; 44 + }; 45 + }
+2 -2
pkgs/development/python-modules/rocketchat-api/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "rocketchat-api"; 12 - version = "1.35.1"; 12 + version = "1.35.2"; 13 13 pyproject = true; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "jadolg"; 17 17 repo = "rocketchat_API"; 18 18 tag = version; 19 - hash = "sha256-8HGu/vkth6ofZD05Pc+IlTZlT+12jWTTYINLQzAHExk="; 19 + hash = "sha256-U5r7SKCKneBgCSwCJRm+Tl/wPmMOrj93K5VVCO/OPCk="; 20 20 }; 21 21 22 22 build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/tidalapi/default.nix
··· 12 12 }: 13 13 buildPythonPackage rec { 14 14 pname = "tidalapi"; 15 - version = "0.8.5"; 15 + version = "0.8.6"; 16 16 pyproject = true; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "EbbLabs"; 20 20 repo = "python-tidal"; 21 21 tag = "v${version}"; 22 - hash = "sha256-DI1EtjwHGsdneyW3Av6ZEWoKf0MzkXs0NJkD55W5pD0="; 22 + hash = "sha256-SsyO0bh2ayHfGzINBW1BTTPS/ICvIymIhQ1HUPRFOwU="; 23 23 }; 24 24 25 25 build-system = [
+4 -3
pkgs/misc/tmux-plugins/default.nix
··· 260 260 261 261 extrakto = mkTmuxPlugin { 262 262 pluginName = "extrakto"; 263 - version = "0-unstable-2024-08-25"; 263 + version = "0-unstable-2025-07-27"; 264 264 src = fetchFromGitHub { 265 265 owner = "laktak"; 266 266 repo = "extrakto"; 267 - rev = "bf9e666f2a6a8172ebe99fff61b574ba740cffc2"; 268 - hash = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk="; 267 + rev = "b04dcf14496ffda629d8aa3a2ac63e4e08d2fdc9"; 268 + hash = "sha256-lknfek9Fu/RDHbq5HMaiNqc24deni5phzExWOkYRS+o"; 269 269 }; 270 270 nativeBuildInputs = [ pkgs.makeWrapper ]; 271 271 buildInputs = [ pkgs.python3 ]; ··· 292 292 maintainers = with lib.maintainers; [ 293 293 kidd 294 294 fnune 295 + deejayem 295 296 ]; 296 297 }; 297 298 };
+36
pkgs/servers/home-assistant/custom-components/miraie/package.nix
··· 1 + { 2 + lib, 3 + buildHomeAssistantComponent, 4 + fetchFromGitHub, 5 + miraie-ac, 6 + aiomqtt, 7 + nix-update-script, 8 + }: 9 + 10 + buildHomeAssistantComponent rec { 11 + owner = "rkzofficial"; 12 + domain = "miraie"; 13 + version = "1.1.6"; 14 + 15 + src = fetchFromGitHub { 16 + owner = "rkzofficial"; 17 + repo = "ha-miraie-ac"; 18 + tag = "v${version}"; 19 + hash = "sha256-5VpLfTKOLdx8P693jaW4o79CH2NKkgkgl7ai+I6JRQs="; 20 + }; 21 + 22 + dependencies = [ 23 + miraie-ac 24 + aiomqtt 25 + ]; 26 + 27 + passthru.updateScript = nix-update-script { }; 28 + 29 + meta = { 30 + changelog = "https://github.com/rkzofficial/ha-miraie-ac/releases/tag/v${version}"; 31 + description = "Home Assistant component for Miraie ACs"; 32 + homepage = "https://github.com/rkzofficial/ha-miraie-ac"; 33 + maintainers = with lib.maintainers; [ ananthb ]; 34 + license = lib.licenses.asl20; 35 + }; 36 + }
+2
pkgs/top-level/python-packages.nix
··· 9282 9282 9283 9283 mir-eval = callPackage ../development/python-modules/mir-eval { }; 9284 9284 9285 + miraie-ac = callPackage ../development/python-modules/miraie-ac { }; 9286 + 9285 9287 mirakuru = callPackage ../development/python-modules/mirakuru { }; 9286 9288 9287 9289 misaka = callPackage ../development/python-modules/misaka { };