diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 13fabf116258..72b3c65a1928 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1475,6 +1475,12 @@ github = "an-empty-string"; githubId = 681716; }; + ananthb = { + name = "Ananth Bhaskararaman"; + email = "nixos-maint@devhuman.net"; + github = "ananthb"; + githubId = 3133350; + }; anas = { email = "anas.elgarhy.dev@gmail.com"; github = "0x61nas"; diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index a4a325303032..30f2f62b16aa 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.188"; + version = "0.0.189"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-CoImpu1Hwn11s+6GeYPIyaIHz7kdjrBMpbxAUzaJWZU="; + hash = "sha256-fjKu8H24RuDGmMjN4SphdQw6g8FLS0Xc+STjgx7hiq4="; }; postPatch = '' diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix index b834089d6fd5..171d821d561b 100644 --- a/pkgs/by-name/es/esptool/package.nix +++ b/pkgs/by-name/es/esptool/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "esptool"; - version = "4.9.0"; + version = "5.0.2"; pyproject = true; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; tag = "v${version}"; - hash = "sha256-iIFjInqiqjeqiDYL7BU3vT99pCVnu8OhU7u9uKwe/SI="; + hash = "sha256-oRvtEBp88tmgjjIuoQS5ySm4I0aD/Zs8VLRUZo0sh/I="; }; postPatch = '' @@ -29,14 +29,14 @@ python3Packages.buildPythonApplication rec { ]; dependencies = with python3Packages; [ - argcomplete bitstring + click cryptography - ecdsa intelhex pyserial - reedsolo pyyaml + reedsolo + rich-click ]; optional-dependencies = with python3Packages; { @@ -48,39 +48,39 @@ python3Packages.buildPythonApplication rec { [ pyelftools pytestCheckHook + requests softhsm ] ++ lib.flatten (lib.attrValues optional-dependencies); - # tests mentioned in `.github/workflows/test_esptool.yml` - checkPhase = '' - runHook preCheck + preCheck = '' + export PATH="$out/bin:$PATH" + ''; + pytestFlags = [ + "-m" + "host_test" + ]; + + postCheck = '' export SOFTHSM2_CONF=$(mktemp) echo "directories.tokendir = $(mktemp -d)" > "$SOFTHSM2_CONF" ./ci/setup_softhsm2.sh - pytest test/test_imagegen.py - pytest test/test_espsecure.py pytest test/test_espsecure_hsm.py - pytest test/test_merge_bin.py - pytest test/test_image_info.py - pytest test/test_modules.py - - runHook postCheck ''; - meta = with lib; { + meta = { changelog = "https://github.com/espressif/esptool/blob/${src.tag}/CHANGELOG.md"; description = "ESP8266 and ESP32 serial bootloader utility"; homepage = "https://github.com/espressif/esptool"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ dezgeg dotlambda ]; teams = [ lib.teams.lumiguide ]; - platforms = with platforms; linux ++ darwin; - mainProgram = "esptool.py"; + platforms = with lib.platforms; linux ++ darwin; + mainProgram = "esptool"; }; } diff --git a/pkgs/by-name/go/gow/package.nix b/pkgs/by-name/go/gow/package.nix new file mode 100644 index 000000000000..0d6ffc81d47b --- /dev/null +++ b/pkgs/by-name/go/gow/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + makeWrapper, + go, +}: + +buildGoModule (finalAttrs: { + pname = "gow"; + version = "0-unstable-2025-08-13"; + + src = fetchFromGitHub { + owner = "mitranim"; + repo = "gow"; + rev = "466e175ff6996eba082cb86ac7b43fc5f8f9c766"; + hash = "sha256-vfJ6AFkCeyGKWF/a26ulyErCjCng+uHJlLyRfBmtLs0="; + }; + + vendorHash = "sha256-L7H3tZQXfeDtWLMvxSMf4/Oez8OV5Q+NhKLkJ991sNA="; + + # This is required for wrapProgram. + allowGoReference = true; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/gow --prefix PATH : ${lib.makeBinPath [ go ]} + ''; + + meta = { + homepage = "https://github.com/mitranim/gow"; + description = "Missing watch mode for Go commands"; + mainProgram = "gox"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ baloo ]; + }; +}) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 8a0cd15bf724..7b43bdab13f5 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.57.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-w9nDvjAFPd2cVJhOigGW61RZAsqo64EN1AFdeAIiAQ0="; + hash = "sha256-KGi/toi02JPDYdNvrhIg9hh+188C5jP41Zk3IKOgO/E="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-Ljkrpk1O+WXL0GDBv7sJbSllJuhoLXMLgFfi4sI50fE="; + cargoHash = "sha256-Er056RhUW33UrRMP412/tj+Qa878Jk+nIcFuF8Ytaes="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/niriswitcher/package.nix b/pkgs/by-name/ni/niriswitcher/package.nix index cf17593dcc6d..761a9d8f187a 100644 --- a/pkgs/by-name/ni/niriswitcher/package.nix +++ b/pkgs/by-name/ni/niriswitcher/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonPackage rec { pname = "niriswitcher"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchFromGitHub { owner = "isaksamsten"; repo = "niriswitcher"; tag = version; - hash = "sha256-V3G4eKKEysCyjAFUW2a94lOo82TVaZVfRXv/dL+LHNo="; + hash = "sha256-qsw2D9Q9ZJYBsRECzT+qoytYMda4uZxX321/YxNWk9o="; }; build-system = [ python3Packages.hatchling ]; diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index d521e16bb890..3218c9e426d0 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2025-07-21"; + version = "0-unstable-2025-08-14"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "d4de6668b91034bd7c6315aff98f232c1339335f"; - hash = "sha256-H3yL82obJ/z8BDeyLdR1DVCxsPwrn0xxHLoMFHKhQn8="; + rev = "ed9d06afb3a5d788c2bd4d6eef1b2a667cff4782"; + hash = "sha256-HROCrvfpHiRmZSE+P9uL5mwqkcI9uwxFEI7fSjzOHiI="; }; - vendorHash = "sha256-sHpWI3oUuazFlWJhHB5uZ89z1GPbPfLoFQL12Jk3NP0="; + vendorHash = "sha256-MUd0AGYDLx6o1uItjk3UVHBIXfPjN6AjjhYQCz5BIeQ="; subPackages = [ "cmd/pkgsite" ]; diff --git a/pkgs/by-name/ra/rapidjson/package.nix b/pkgs/by-name/ra/rapidjson/package.nix index b2cea36a49f1..44f01c91763e 100644 --- a/pkgs/by-name/ra/rapidjson/package.nix +++ b/pkgs/by-name/ra/rapidjson/package.nix @@ -69,7 +69,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_CXX_FLAGS_RELEASE" "-Wno-error") ]; - doCheck = !(stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isDarwin); + doCheck = + !(stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isDarwin) + && lib.meta.availableOn stdenv.hostPlatform valgrind; nativeCheckInputs = [ valgrind diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 952db5881c20..8bbebaa4fcd9 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -6,6 +6,7 @@ # nativeBuildInputs binaryen, lld, + llvmPackages, pkg-config, protobuf, rustfmt, @@ -31,7 +32,6 @@ "map_view" ], }: - rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; version = "0.24.0"; @@ -99,6 +99,24 @@ rustPlatform.buildRustPackage (finalAttrs: { nasm ]; + # NOTE: Without setting these environment variables the web-viewer + # preBuild step uses the nix wrapped CC which doesn't support + # multiple targets including wasm32-unknown-unknown. These are taken + # from the following issue discussion in the rust ring crate: + # https://github.com/briansmith/ring/discussions/2581#discussioncomment-14096969 + env = + let + inherit (llvmPackages) clang-unwrapped; + major-version = builtins.head (builtins.splitVersion clang-unwrapped.version); + # resource dir + builtins from the unwrapped clang + resourceDir = "${lib.getLib clang-unwrapped}/lib/clang/${major-version}"; + includeDir = "${lib.getLib llvmPackages.libclang}/lib/clang/${major-version}/include"; + in + { + CC_wasm32_unknown_unknown = lib.getExe clang-unwrapped; + CFLAGS_wasm32_unknown_unknown = "-isystem ${includeDir} -resource-dir ${resourceDir}"; + }; + buildInputs = [ freetype glib diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix index c7f7fdc0e987..817451a12539 100644 --- a/pkgs/development/python-modules/aioamazondevices/default.nix +++ b/pkgs/development/python-modules/aioamazondevices/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aioamazondevices"; - version = "4.0.0"; + version = "4.0.1"; pyproject = true; src = fetchFromGitHub { owner = "chemelli74"; repo = "aioamazondevices"; tag = "v${version}"; - hash = "sha256-Ch3IP7fMEDYYRFDk3eoZWjhjnkQY0qcAFJdmkoW4o/0="; + hash = "sha256-FTIACTsDFg+TUvtQOI46ecOZxFmyeUSlOZm9xXAlkhY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix index 7b1311e11bf8..d685b595b474 100644 --- a/pkgs/development/python-modules/google-genai/default.nix +++ b/pkgs/development/python-modules/google-genai/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "google-genai"; - version = "1.29.0"; + version = "1.31.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-genai"; tag = "v${version}"; - hash = "sha256-EOwIXZ373hsEfGxCE6DRjPRuqPQQoFHTzIDGK1K9X6Q="; + hash = "sha256-pzW0SYLlj7XjJSEqCY3uSYZI8asn451LANpcpr/lxI4="; }; build-system = [ diff --git a/pkgs/development/python-modules/miraie-ac/default.nix b/pkgs/development/python-modules/miraie-ac/default.nix new file mode 100644 index 000000000000..990535a947af --- /dev/null +++ b/pkgs/development/python-modules/miraie-ac/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + poetry-core, + + # dependencies + aiomqtt, + aiohttp, + certifi, +}: + +buildPythonPackage rec { + pname = "miraie-ac"; + version = "1.1.1"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "miraie_ac"; + hash = "sha256-IiRDPz5IcD3Df+vw4YvR3zc0oThGjb7pBJfD4d98h/g="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiomqtt + aiohttp + certifi + ]; + + pythonRemoveDeps = [ "asyncio" ]; + + pythonImportsCheck = [ "miraie_ac" ]; + + meta = { + homepage = "https://github.com/rkzofficial/miraie-ac"; + changelog = "https://github.com/rkzofficial/miraie-ac/releases"; + description = "Python library for controlling Panasonic Miraie ACs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ananthb ]; + }; +} diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix index eb49e8fff825..2fd6b8dd5cc1 100644 --- a/pkgs/development/python-modules/rocketchat-api/default.nix +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rocketchat-api"; - version = "1.35.1"; + version = "1.35.2"; pyproject = true; src = fetchFromGitHub { owner = "jadolg"; repo = "rocketchat_API"; tag = version; - hash = "sha256-8HGu/vkth6ofZD05Pc+IlTZlT+12jWTTYINLQzAHExk="; + hash = "sha256-U5r7SKCKneBgCSwCJRm+Tl/wPmMOrj93K5VVCO/OPCk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index 7fa8cb88f628..1170912f82a1 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { pname = "tidalapi"; - version = "0.8.5"; + version = "0.8.6"; pyproject = true; src = fetchFromGitHub { owner = "EbbLabs"; repo = "python-tidal"; tag = "v${version}"; - hash = "sha256-DI1EtjwHGsdneyW3Av6ZEWoKf0MzkXs0NJkD55W5pD0="; + hash = "sha256-SsyO0bh2ayHfGzINBW1BTTPS/ICvIymIhQ1HUPRFOwU="; }; build-system = [ diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 53edf5bb6a08..9eefc01cd093 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -260,12 +260,12 @@ in extrakto = mkTmuxPlugin { pluginName = "extrakto"; - version = "0-unstable-2024-08-25"; + version = "0-unstable-2025-07-27"; src = fetchFromGitHub { owner = "laktak"; repo = "extrakto"; - rev = "bf9e666f2a6a8172ebe99fff61b574ba740cffc2"; - hash = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk="; + rev = "b04dcf14496ffda629d8aa3a2ac63e4e08d2fdc9"; + hash = "sha256-lknfek9Fu/RDHbq5HMaiNqc24deni5phzExWOkYRS+o"; }; nativeBuildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.python3 ]; @@ -292,6 +292,7 @@ in maintainers = with lib.maintainers; [ kidd fnune + deejayem ]; }; }; diff --git a/pkgs/servers/home-assistant/custom-components/miraie/package.nix b/pkgs/servers/home-assistant/custom-components/miraie/package.nix new file mode 100644 index 000000000000..92d11cb020b0 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/miraie/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + miraie-ac, + aiomqtt, + nix-update-script, +}: + +buildHomeAssistantComponent rec { + owner = "rkzofficial"; + domain = "miraie"; + version = "1.1.6"; + + src = fetchFromGitHub { + owner = "rkzofficial"; + repo = "ha-miraie-ac"; + tag = "v${version}"; + hash = "sha256-5VpLfTKOLdx8P693jaW4o79CH2NKkgkgl7ai+I6JRQs="; + }; + + dependencies = [ + miraie-ac + aiomqtt + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/rkzofficial/ha-miraie-ac/releases/tag/v${version}"; + description = "Home Assistant component for Miraie ACs"; + homepage = "https://github.com/rkzofficial/ha-miraie-ac"; + maintainers = with lib.maintainers; [ ananthb ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 038ef18c9ce8..4de409fdf63a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9282,6 +9282,8 @@ self: super: with self; { mir-eval = callPackage ../development/python-modules/mir-eval { }; + miraie-ac = callPackage ../development/python-modules/miraie-ac { }; + mirakuru = callPackage ../development/python-modules/mirakuru { }; misaka = callPackage ../development/python-modules/misaka { };