From 3d6576089f783af356143bd262b7e30af110b2fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 04:45:02 +0000 Subject: [PATCH 1/6] python39Packages.inscriptis: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/inscriptis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix index 2fa224b3f210..b22a402c9e93 100644 --- a/pkgs/development/python-modules/inscriptis/default.nix +++ b/pkgs/development/python-modules/inscriptis/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "inscriptis"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; src = fetchFromGitHub { owner = "weblyzard"; repo = "inscriptis"; - rev = version; - sha256 = "sha256-an/FTbujN2VnTYa0wngM8ugV1LNHJWM32RVqIbaW0KY="; + rev = "refs/tags/${version}"; + sha256 = "sha256-grsyHqt7ahiNsYKcZN/c5cJaag/nTWTBcaHaXnW1SpU="; }; propagatedBuildInputs = [ From 33fd8fb8f35ecf2474744b35903bca6f90b856cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 14:09:36 +0100 Subject: [PATCH 2/6] zigbee2mqtt: 1.28.4 -> 1.29.0 https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.29.0 --- pkgs/servers/zigbee2mqtt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index aa33e081c3d2..8aacff0d58e4 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.28.4"; + version = "1.29.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-7eyCmgpbcjPrpFHscHTab6xRnL4ABvaYaaVcbUcynT8="; + hash = "sha256-WN8dLqHbx/NydGwYeksrfSHs9kpRWj1FY/t+/Noux+g="; }; - npmDepsHash = "sha256-qQPn2BwXwXyzyPYYRmgIvzJENZ/XKWATcludorlFEZw="; + npmDepsHash = "sha256-PAUdNCZ5YgEyz72rjUz3gdUkjDxLTC3yh3kv4Vtix3Q="; nativeBuildInputs = [ python3 From 066eb0f8c03dc71753c3f496cb4465e982337a23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 08:46:53 +0100 Subject: [PATCH 3/6] python39Packages.inscriptis: add changelog to meta --- .../python-modules/inscriptis/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix index b22a402c9e93..42de39b4ef4b 100644 --- a/pkgs/development/python-modules/inscriptis/default.nix +++ b/pkgs/development/python-modules/inscriptis/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , lxml , pytestCheckHook +, pythonOlder , requests }: @@ -11,11 +12,13 @@ buildPythonPackage rec { version = "2.3.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "weblyzard"; repo = "inscriptis"; rev = "refs/tags/${version}"; - sha256 = "sha256-grsyHqt7ahiNsYKcZN/c5cJaag/nTWTBcaHaXnW1SpU="; + hash = "sha256-grsyHqt7ahiNsYKcZN/c5cJaag/nTWTBcaHaXnW1SpU="; }; propagatedBuildInputs = [ @@ -27,11 +30,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "inscriptis" ]; + pythonImportsCheck = [ + "inscriptis" + ]; meta = with lib; { - description = "inscriptis - HTML to text converter"; + description = "HTML to text converter"; homepage = "https://github.com/weblyzard/inscriptis"; + changelog = "https://github.com/weblyzard/inscriptis/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From ab5a0dbfe94e0eeca60e3d510968ba78175af5de Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 20 Nov 2022 16:57:09 -0500 Subject: [PATCH 4/6] pkgsStatic.htop: fix build --- pkgs/tools/system/htop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 7e1d64942d57..e3dca89c4646 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -2,7 +2,8 @@ , ncurses , IOKit , sensorsSupport ? stdenv.isLinux, lm_sensors -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, systemd }: assert systemdSupport -> stdenv.isLinux; @@ -33,8 +34,7 @@ stdenv.mkDerivation rec { postFixup = let optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop"; - in - '' + in lib.optionalString (!stdenv.hostPlatform.isStatic) '' ${optionalPatch sensorsSupport "${lm_sensors}/lib/libsensors.so"} ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"} ''; From b442eab8e92c780bcc3aacea86efef80addeeef5 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 5 Jan 2023 20:47:16 -0800 Subject: [PATCH 5/6] libversion: 3.0.1 -> 3.0.2 --- pkgs/development/libraries/libversion/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index c8af82d04917..14d56c4d8ca2 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -2,19 +2,28 @@ stdenv.mkDerivation rec { pname = "libversion"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "repology"; repo = "libversion"; rev = version; - sha256 = "13x5djdpv6aryxsbw6a3b6vwzi9f4aa3gn9dqb7axzppggayawyk"; + hash = "sha256-P/ykRy+LgcfWls4Zw8noel/K9mh/PnKy3smoQtuSi00="; }; nativeBuildInputs = [ cmake ]; - doCheck = true; + cmakeFlags = [ + # https://github.com/NixOS/nixpkgs/issues/144170 + # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly + # (setting it to an absolute path causes include files to go to $out/$out/include, + # because the absolute path is interpreted with root at $out). + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + checkTarget = "test"; + doCheck = true; meta = with lib; { description = "Advanced version string comparison library"; From 6dc854f321185ecd66746ef6819ec5476c9ae7ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 11:14:42 +0000 Subject: [PATCH 6/6] firewalld: 1.2.2 -> 1.3.0 --- pkgs/applications/networking/firewalld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index f4b7feab5d7f..b11c3d60c908 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-RdkGwhSx/zluCtBj8hGjkvJ11ZgPRMM9wWoE+/ynnDc="; + sha256 = "sha256-UQ61do0f0bT3VNyZAx2ZuwQ+6SGvKUS6V5Y1B6EpJ5Q="; }; patches = [