Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
commit
f5b80e7ebd
|
@ -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 = [
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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 ];
|
||||
};
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"}
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue