From 5005449a6ed0451dbe6d976a254091445e984047 Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Fri, 18 Oct 2024 10:05:49 +0200 Subject: [PATCH 01/11] prisma-engines: 5.21.0 -> 5.21.1 --- pkgs/development/tools/database/prisma-engines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index c404bed3418da..a991bce5abc48 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -13,13 +13,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.21.0"; + version = "5.21.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-X5aBrnyZ/tMykJFifyY1LeR/nShBlxm9HazVE0L7RJk="; + hash = "sha256-zVGnAFvxBRh7YGXET8YjDI+qXay6StgG618mRfpc4kw="; }; # Use system openssl. From f8a1a35c65586403594c5b8be3171371603591c9 Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Fri, 18 Oct 2024 11:54:06 +0200 Subject: [PATCH 02/11] prisma: 5.21.0 -> 5.21.1 --- pkgs/by-name/pr/prisma/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix index ce95eb2469939..6b935d55642a9 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prisma"; - version = "5.21.0"; + version = "5.21.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; rev = finalAttrs.version; - hash = "sha256-i37Hiawmu/06Mv56FtYkvFGOtqW3x4Q2H1C0JW6/0pI="; + hash = "sha256-75TmTFl1EKLGE3kgghghary4Z2gjEjdguZ//ND3HAkc="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_8.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-o6m9Lxg+oqq15CtdA9RQRukdJWPPGtw/SwRyHDUf91A="; + hash = "sha256-fu2SJUn2xKm8lKNE8ncMRuNu6snj1J6cnHrJfzg+hJc="; }; patchPhase = '' From 924cf63ceb24f60d90e6dfd52510676a8e7f0f42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Oct 2024 12:20:38 +0000 Subject: [PATCH 03/11] art: 1.23 -> 1.24.1 --- pkgs/by-name/ar/art/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index 6181d49d4b06b..854fcaecce461 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "art"; - version = "1.23"; + version = "1.24.1"; src = fetchFromBitbucket { owner = "agriggio"; repo = "art"; rev = version; - hash = "sha256-OB/Rr4rHNJc40o6esNPDRbhN4EPGf2zhlzzM+mBpUUU="; + hash = "sha256-uvdqU509ri6CKCEGA8Ln5tMp0pe3r/bcJefbeZGjocE="; }; nativeBuildInputs = [ From a9e2aef0338d565bc4ebd901c56e477a00af7cd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Oct 2024 15:05:40 +0000 Subject: [PATCH 04/11] mapserver: 8.2.1 -> 8.2.2 --- pkgs/by-name/ma/mapserver/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index 5d1739d07c071..7e8820ba582f0 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "mapserver"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-kZEDC89yoQP0ma5avp6r+Hz8JMpErGlBVQkhlHO6UFw="; + hash = "sha256-tub0Jd1IUkONQ5Mqz8urihbrcFLlOQybLhOvzkcwW54="; }; nativeBuildInputs = From 82c8a151e37d2a26586a62e926790ecabc0c0eb9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Oct 2024 17:18:36 +0200 Subject: [PATCH 05/11] python312Packages.aioairzone: 0.9.4 -> 0.9.5 https://github.com/Noltari/aioairzone/releases/tag/0.9.5 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 306dd1aff433a..21d831c9e24e5 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-dcYp5lMN5twK1HQK/3PhBQ4nm/NKURC0x14ozkbzJ5A="; + hash = "sha256-LFMHueSz0ddZNYUL0uuC91dw1ppYcdE/EjKX0ikc+J0="; }; build-system = [ setuptools ]; From e8a263c190b61ab17f06bd5092d2d8eb8de095fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Oct 2024 17:18:57 +0200 Subject: [PATCH 06/11] python312Packages.solarlog-cli: 0.3.1 -> 0.3.2 https://github.com/dontinelli/solarlog_cli/releases/tag/v0.3.2 --- pkgs/development/python-modules/solarlog-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/solarlog-cli/default.nix b/pkgs/development/python-modules/solarlog-cli/default.nix index ef88f6db93635..b82b69d8c2f05 100644 --- a/pkgs/development/python-modules/solarlog-cli/default.nix +++ b/pkgs/development/python-modules/solarlog-cli/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "solarlog-cli"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "solarlog_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-67ZEval+cRvjFhQynFVYf5FFDw+zWrAfSC/2d6X+oh4="; + hash = "sha256-Oa2o4fuchW3ROtQFVhiWL6rhdUbzSFDegCkm8W7bCpE="; }; build-system = [ hatchling ]; From bd63b5fef27fe82cd6cd4d8b120d7e0681d19389 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Oct 2024 17:19:35 +0200 Subject: [PATCH 07/11] python312Packages.pyblu: 1.0.4 -> 1.0.4 https://github.com/LouisChrist/pyblu/releases/tag/v1.0.4 --- pkgs/development/python-modules/pyblu/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix index 867ca8ba31cb1..c149661969ea4 100644 --- a/pkgs/development/python-modules/pyblu/default.nix +++ b/pkgs/development/python-modules/pyblu/default.nix @@ -12,16 +12,18 @@ buildPythonPackage rec { pname = "pyblu"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "LouisChrist"; repo = "pyblu"; rev = "refs/tags/v${version}"; - hash = "sha256-1H7TqFPVstB+nCYwWOT8E2HcmkLQx9pekBq2WIAf8DQ="; + hash = "sha256-BDuptBC72XG+q/5MlbPMjYDIhWKg4gfEo2pLOflwQaM="; }; + pythonRelaxDeps = [ "aiohttp" ]; + build-system = [ poetry-core ]; dependencies = [ From f5a4fca45c5c13578b5de59d9a02d366fa890c7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Oct 2024 01:38:12 +0200 Subject: [PATCH 08/11] python312Packages.home-assistant-bluetooth: 1.12.2 -> 1.13.0 https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/v1.13.0/CHANGELOG.md --- .../python-modules/home-assistant-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index fc288114c374a..c289b781a5980 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.12.2"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "home-assistant-bluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-WAsgiOmYqmt/PCKp+vZA2To95YZAgnYCF8ysCn5N9nc="; + hash = "sha256-+2bw4im09TyjJ5/7ct42ZCFwU7yKWQnbSo7b+44VtpE="; }; postPatch = '' From 4f560da920d6a7d4042a12f68cf8fa13946e0b9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Oct 2024 02:10:16 +0200 Subject: [PATCH 09/11] python312Packages.pyipp: 0.16.0 -> 0.17.0 https://github.com/ctalkington/python-ipp/releases/tag/0.17.0 --- pkgs/development/python-modules/pyipp/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index 284fb8368ffd7..e3d051ab07d96 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -12,12 +12,13 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + syrupy, yarl, }: buildPythonPackage rec { pname = "pyipp"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-ipp"; rev = "refs/tags/${version}"; - hash = "sha256-ddI9K0lJDZbVgO+hptP4I+EH//5vOoFDYXWxGALF8Ik="; + hash = "sha256-B3x6WkTSTGlZWMAK2BTA2EVVz+IvB3QL+arZGBAkZsE="; }; postPatch = '' @@ -49,6 +50,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; __darwinAllowLocalNetworking = true; From 5f3bbf8a5dd2ef61db05d2793b04fd2e8b66646f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Oct 2024 17:35:42 +0200 Subject: [PATCH 10/11] home-assistant: 2024.10.2 -> 2024.10.3 https://github.com/home-assistant/core/releases/tag/2024.10.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 58dbbd5cc0a17..8fe00f2433a44 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.10.2"; + version = "2024.10.3"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6fc00b593afc2..94b9758dccb5a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -408,7 +408,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.10.2"; + hassVersion = "2024.10.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -426,13 +426,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-YHK6SJJok1FGtFfD2C2QFCtWzNK1ZiOGZe/kbQFkMvU="; + hash = "sha256-kxxa7FI2wIpE3bEifNyjtEHj7rsuImQvxGd6I46ySqM="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-mVKokL6EcvLMvOEKIw1dlEQeXaxMLO8ExMOzw6r1eCs="; + hash = "sha256-DhDdCvov5/Yf2MnY2veV8W/lYk3LTDzxYpbAsbjxWcg="; }; build-system = with python.pkgs; [ From 61ef66f8e7605fb8228cc6e9ceea0163d9b4a5b1 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 18 Oct 2024 20:17:26 +0400 Subject: [PATCH 11/11] mapserver: modernize --- pkgs/by-name/ma/mapserver/package.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index 7e8820ba582f0..43996b4c92d58 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -70,23 +70,24 @@ stdenv.mkDerivation rec { ] ++ lib.optional withPython python3; cmakeFlags = [ - "-DWITH_KML=ON" - "-DWITH_SOS=ON" - "-DWITH_RSVG=ON" - "-DWITH_CURL=ON" - "-DWITH_CLIENT_WMS=ON" - "-DWITH_CLIENT_WFS=ON" + (lib.cmakeBool "WITH_KML" true) + (lib.cmakeBool "WITH_SOS" true) + (lib.cmakeBool "WITH_RSVG" true) + (lib.cmakeBool "WITH_CURL" true) + (lib.cmakeBool "WITH_CLIENT_WMS" true) + (lib.cmakeBool "WITH_CLIENT_WFS" true) + (lib.cmakeBool "WITH_PYTHON" withPython) # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optional withPython "-DWITH_PYTHON=ON"; + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + ]; - meta = with lib; { + meta = { description = "Platform for publishing spatial data and interactive mapping applications to the web"; homepage = "https://mapserver.org/"; changelog = "https://mapserver.org/development/changelog/"; - license = licenses.mit; - maintainers = teams.geospatial.members; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + platforms = lib.platforms.unix; }; }