Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5995b81686
28 changed files with 140 additions and 154 deletions
|
|
@ -671,7 +671,6 @@ in {
|
|||
uwsgi = handleTest ./uwsgi.nix {};
|
||||
v2ray = handleTest ./v2ray.nix {};
|
||||
varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
|
||||
varnish71 = handleTest ./varnish.nix { package = pkgs.varnish71; };
|
||||
varnish72 = handleTest ./varnish.nix { package = pkgs.varnish72; };
|
||||
vault = handleTest ./vault.nix {};
|
||||
vault-dev = handleTest ./vault-dev.nix {};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, fetchpatch
|
||||
, cmake
|
||||
, makeWrapper
|
||||
, wrapGAppsHook
|
||||
, pkg-config
|
||||
, python3
|
||||
, gettext
|
||||
|
|
@ -91,6 +92,7 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
python3
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
] ++ optionals stdenv.isLinux [
|
||||
linuxHeaders
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, halide
|
||||
, libpng, libjpeg, libtiff, libraw
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hdr-plus";
|
||||
version = "unstable-2021-12-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timothybrooks";
|
||||
repo = "hdr-plus";
|
||||
rev = "0ab70564493bdbcd5aca899b5885505d0c824435";
|
||||
sha256 = "sha256-QV8bGxkwFpbNzJG4kmrWwFQxUo2XzLPnoI1e32UmM6g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ halide libpng libjpeg libtiff libraw ];
|
||||
|
||||
installPhase = ''
|
||||
for bin in hdrplus stack_frames; do
|
||||
install -Dm755 $bin $out/bin/$bin
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Burst photography pipeline based on Google's HDR+";
|
||||
homepage = "https://www.timothybrooks.com/tech/hdr-plus/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -65,6 +65,9 @@ let
|
|||
# These are the providers that don't fall in line with the default model
|
||||
special-providers =
|
||||
{
|
||||
netlify = automated-providers.netlify.overrideAttrs (_: { meta.broken = stdenv.isDarwin; });
|
||||
pass = automated-providers.pass.overrideAttrs (_: { meta.broken = stdenv.isDarwin; });
|
||||
tencentcloud = automated-providers.tencentcloud.overrideAttrs (_: { meta.broken = stdenv.isDarwin; });
|
||||
# mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
|
||||
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
|
||||
};
|
||||
|
|
@ -77,6 +80,7 @@ let
|
|||
in
|
||||
lib.optionalAttrs config.allowAliases {
|
||||
b2 = removed "b2" "2022/06";
|
||||
checkpoint = removed "checkpoint" "2022/11";
|
||||
dome9 = removed "dome9" "2022/08";
|
||||
ncloud = removed "ncloud" "2022/08";
|
||||
opc = archived "opc" "2022/05";
|
||||
|
|
|
|||
|
|
@ -48,13 +48,13 @@
|
|||
"version": "3.0.0"
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-IP5TCFi4NEjnBa9rKCZI6TVFAAyjfsZbmc+PgkwgvIo=",
|
||||
"hash": "sha256-2ClWPe4sTt6rW9AamDH8td/W5/yDdD1qR4V1pzJm/0I=",
|
||||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.190.0",
|
||||
"rev": "v1.191.0",
|
||||
"vendorHash": null,
|
||||
"version": "1.190.0"
|
||||
"version": "1.191.0"
|
||||
},
|
||||
"ansible": {
|
||||
"hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",
|
||||
|
|
@ -148,22 +148,22 @@
|
|||
"version": "1.0.0"
|
||||
},
|
||||
"baiducloud": {
|
||||
"hash": "sha256-kG0tE929wtiuSIwT0r6t/odirvZpdnTgcPGFHXmLYYQ=",
|
||||
"hash": "sha256-O2DU47kabPleWr+HodOx+Canp1bFypAZ3UMJnC2mzqQ=",
|
||||
"owner": "baidubce",
|
||||
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.17.1",
|
||||
"rev": "v1.18.0",
|
||||
"vendorHash": null,
|
||||
"version": "1.17.1"
|
||||
"version": "1.18.0"
|
||||
},
|
||||
"bigip": {
|
||||
"hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=",
|
||||
"hash": "sha256-erJeg7KF3QUi85ueOQTrab2woIC1nkMXRIj/pFm0DGY=",
|
||||
"owner": "F5Networks",
|
||||
"provider-source-address": "registry.terraform.io/F5Networks/bigip",
|
||||
"repo": "terraform-provider-bigip",
|
||||
"rev": "v1.15.2",
|
||||
"rev": "v1.16.0",
|
||||
"vendorHash": null,
|
||||
"version": "1.15.2"
|
||||
"version": "1.16.0"
|
||||
},
|
||||
"bitbucket": {
|
||||
"hash": "sha256-0Sts826Yt6xVVwGpqTC1ZAiNB2+7S6z9rPXDGPNpmOk=",
|
||||
|
|
@ -202,17 +202,6 @@
|
|||
"vendorHash": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=",
|
||||
"version": "1.6.2"
|
||||
},
|
||||
"checkpoint": {
|
||||
"deleteVendor": true,
|
||||
"hash": "sha256-pErJcwpUGg2cGKWiagjfneUjSDtT+BxLy5JjZvwCUH0=",
|
||||
"owner": "CheckPointSW",
|
||||
"provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-checkpoint",
|
||||
"rev": "v2.1.0",
|
||||
"vendorHash": "sha256-6tH/U0qJ83w9qibuF8/TcRAsCke/VnRVRGfHaWsW9+4=",
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"ciscoasa": {
|
||||
"hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=",
|
||||
"owner": "CiscoDevNet",
|
||||
|
|
@ -433,13 +422,13 @@
|
|||
"version": "2.2.0"
|
||||
},
|
||||
"github": {
|
||||
"hash": "sha256-fPT7wqpwAKQKqe9fZZsdPqffIQ9N4Iz/kHpFbTkUTRQ=",
|
||||
"hash": "sha256-cLBBz5qPRY+TpcO0yfyTXOQLQYz58hB1l6ufThbBSuM=",
|
||||
"owner": "integrations",
|
||||
"provider-source-address": "registry.terraform.io/integrations/github",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v5.7.0",
|
||||
"rev": "v5.8.0",
|
||||
"vendorHash": null,
|
||||
"version": "5.7.0"
|
||||
"version": "5.8.0"
|
||||
},
|
||||
"gitlab": {
|
||||
"hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=",
|
||||
|
|
@ -580,13 +569,13 @@
|
|||
"version": "0.1.2"
|
||||
},
|
||||
"ibm": {
|
||||
"hash": "sha256-zxPl76D5ddw+7WowQf4LY9MYTGfX3CMEBQofXKwbowQ=",
|
||||
"hash": "sha256-VFJ86dMKOHzfq5W154+kmX9poRFjT+LlLRl3HNA52pc=",
|
||||
"owner": "IBM-Cloud",
|
||||
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.47.0",
|
||||
"vendorHash": "sha256-Ggiu+nGTABxK+HiBvY2l/l3+Gqg4GoczZJf69v3Ylfk=",
|
||||
"version": "1.47.0"
|
||||
"rev": "v1.47.1",
|
||||
"vendorHash": "sha256-9UIM6T6ceF6WXIbjhSuDv1lNn9rphcZoePPk11X2Olo=",
|
||||
"version": "1.47.1"
|
||||
},
|
||||
"icinga2": {
|
||||
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
|
||||
|
|
@ -634,13 +623,13 @@
|
|||
"version": "4.0.1"
|
||||
},
|
||||
"ksyun": {
|
||||
"hash": "sha256-xmBpDYN1MRQ9cyIOqHMAD7RucRkOKmwnmzjIsjxA7VQ=",
|
||||
"hash": "sha256-62ylxBt5F3J2n7BW8qD5ukE8OJa63E6Qyuuf8dPo9FQ=",
|
||||
"owner": "kingsoftcloud",
|
||||
"provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun",
|
||||
"repo": "terraform-provider-ksyun",
|
||||
"rev": "v1.3.56",
|
||||
"rev": "v1.3.57",
|
||||
"vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=",
|
||||
"version": "1.3.56"
|
||||
"version": "1.3.57"
|
||||
},
|
||||
"kubectl": {
|
||||
"hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=",
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.59.2";
|
||||
version = "0.59.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "sha256-qfetuy1Pa4kWu4ykuELVIE0iC9eAr6qAwVZkEbqqFi0=";
|
||||
sha256 = "sha256-HYzDenWicKbYTEWGaTtoEoruLrqPCxx64eLJBEHC+A0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,20 +7,33 @@
|
|||
, libuuid
|
||||
, openjdk11
|
||||
, gperftools
|
||||
, flatbuffers
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "surelog";
|
||||
version = "1.40";
|
||||
version = "1.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chipsalliance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5nhJilFIJJDCnJUEUgyPNtWSQUgWcvM6LDFgFatAl/k=";
|
||||
hash = "sha256-/SSKcEIhmWDOKN4v3djWTwZ5/nQvR8ibflzSVFDt/rM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# This prevents race conditions in unit tests that surface since we run
|
||||
# ctest in parallel.
|
||||
# This patch can be removed with the next version of surelog
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/chipsalliance/Surelog/commit/9a54efbd156becf65311a4272104810f36041fa6.patch";
|
||||
sha256 = "sha256-rU1Z/0wlVTgnPLqTN/87n+gI1iJ+6k/+sunVVd0ulhQ=";
|
||||
name = "parallel-test-running.patch";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
|
@ -34,6 +47,11 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
libuuid
|
||||
gperftools
|
||||
flatbuffers
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSURELOG_USE_HOST_FLATBUFFERS=On"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -3,26 +3,46 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, python3
|
||||
, gtest
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "UHDM";
|
||||
version = "0.9.1.40";
|
||||
version = "1.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chipsalliance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CliKU2WM8B9012aDcS/mTyIf+JcsVsc4uRRi9+FRWbM=";
|
||||
hash = "sha256-mxQRmI8yUUrSUYa4kUT9URgfqYvuz3V9e1IGjtiHyhc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Add ability to use local googletest provided from nix instead of
|
||||
# the version from the submodule in third_party/. The third_party/ version
|
||||
# is slightly older and does not work with our hydra Darwin builds that needs
|
||||
# to set a particular temp directory.
|
||||
# This patch allows to choose UHDM_USE_HOST_GTEST=On in the cflags.
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/chipsalliance/UHDM/commit/ad60fdb65a7c49fdc8ee3fffdca791f9364af4f5.patch";
|
||||
sha256 = "sha256-IkwnepWWmBychJ0mu+kaddUEc9jkldIRq+GyJkhrO8A=";
|
||||
name = "allow-local-gtest.patch";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
(python3.withPackages (p: with p; [ orderedmultidict ]))
|
||||
gtest
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUHDM_USE_HOST_GTEST=On"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
@ -33,12 +53,6 @@ stdenv.mkDerivation rec {
|
|||
rm -rf $out/lib/uhdm
|
||||
'';
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace \
|
||||
'capnp compile' \
|
||||
'capnp compile --src-prefix=''${GENDIR}/..'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Universal Hardware Data Model";
|
||||
homepage = "https://github.com/chipsalliance/UHDM";
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "14.0";
|
||||
version = "15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-G8oarWGx4DQ8ftmaWYpzV94cabDXbiJcVVgs70AG0Gs=";
|
||||
sha256 = "sha256-GjBIAir4xTWnc1VXe5CF+FPcZJTSyJpi8MqlJUpkyy4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,16 +9,17 @@
|
|||
, yosys-symbiflow
|
||||
, uhdm
|
||||
, surelog
|
||||
, flatbuffers
|
||||
}: let
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chipsalliance";
|
||||
repo = "yosys-f4pga-plugins";
|
||||
rev = "27208ce08200a5e89e3bd4f466bc68824df38c32";
|
||||
hash = "sha256-S7txjzlIp+idWIfp/DDOznluA3aMFfosMUt5dvi+g44=";
|
||||
rev = "e23ff6db487da9ceea576c53ac33853566c3a84e";
|
||||
hash = "sha256-HJ4br6lQwRrcnkLgV3aecr3T3zcPzA11MfxhRjwIb0I=";
|
||||
};
|
||||
|
||||
version = "2022.09.27";
|
||||
version = "2022.11.07";
|
||||
|
||||
# Supported symbiflow plugins.
|
||||
#
|
||||
|
|
@ -60,6 +61,7 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec {
|
|||
patches = lib.optional ( plugin == "ql-qlf" ) ./symbiflow-pmgen.patch;
|
||||
|
||||
preBuild = ''
|
||||
export LDFLAGS="-L${flatbuffers}/lib"
|
||||
mkdir -p ql-qlf-plugin/pmgen
|
||||
''
|
||||
+ lib.optionalString ( plugin == "ql-qlf" ) ''
|
||||
|
|
@ -68,8 +70,8 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec {
|
|||
|
||||
# Providing a symlink avoids the need for patching the test makefile
|
||||
postUnpack = ''
|
||||
mkdir -p source/third_party/googletest/googletest/build/
|
||||
ln -s ${static_gtest}/lib source/third_party/googletest/googletest/build/lib
|
||||
mkdir -p source/third_party/googletest/build/
|
||||
ln -s ${static_gtest}/lib source/third_party/googletest/build/lib
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catch2";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catchorg";
|
||||
repo = "Catch2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bp/KLTr754txVUTAauJFrsxGKgZicUEe40CZBDkxRwk=";
|
||||
hash = "sha256-l/bqW32c1vAzE3jN01VystZXuH2ZiOQGgXkh/Mcq2eI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rapidfuzz-cpp";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbachmann";
|
||||
repo = "rapidfuzz-cpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HhVkOPZ9LGoF5HSs0tOiZyUQWBwrfDTKJMc8WwGOdq8=";
|
||||
hash = "sha256-c9ESzsDcoUw5XAEZDHdG8jazjI5Oyqic1gaT0qGQsbI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "async-upnp-client";
|
||||
version = "0.32.1";
|
||||
version = "0.32.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = version;
|
||||
sha256 = "sha256-T/8AZU95eHl/AIVkG9tYhN19B8PLvTWRTBRJjbvfI+8=";
|
||||
sha256 = "sha256-KnbHQ/xHPNYQWk/EpdP6a0bEHvCXK/HrFGyGaeS79rc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -13,12 +15,21 @@ buildPythonPackage rec {
|
|||
sha256 = "79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-29063.patch";
|
||||
url = "https://github.com/fredrik-johansson/mpmath/commit/46d44c3c8f3244017fe1eb102d564eb4ab8ef750.patch";
|
||||
hash = "sha256-DaZ6nj9rEsjTAomu481Ujun364bL5E6lkXFvgBfHyeA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
# error: invalid command 'test'
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mpmath.org/";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyairvisual";
|
||||
version = "2022.07.0";
|
||||
version = "2022.11.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UzcKK0LJ/Xp5iVWsrDQ3nfhWgKAAxKmXrK1zPSoG/gY=";
|
||||
sha256 = "sha256-5o3iJEcpxiHvjEi6VZj39SelBtfeneg349hvFwJ2oQU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rapidfuzz";
|
||||
version = "2.13.0";
|
||||
version = "2.13.2";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "maxbachmann";
|
||||
repo = "RapidFuzz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IeH4Lk0WAQhZFBRuQobC8qOCZPJJiK5U09VYWOK9MOY=";
|
||||
hash = "sha256-a83Vww9dEh0nNylnZwCm6PJYmfKvw5RnMLerfKfN1dY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonAtLeast
|
||||
|
|
@ -38,6 +39,14 @@ buildPythonPackage rec {
|
|||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
# upstream issue https://github.com/pygraphviz/pygraphviz/issues/441
|
||||
pytestFlagsArray = lib.optionals stdenv.isDarwin [
|
||||
"--deselect=tests/test_pygraphviz.py::PygraphvizTest::test_binary_stream"
|
||||
"--deselect=tests/test_pygraphviz.py::PygraphvizTest::test_diagram"
|
||||
"--deselect=tests/test_pygraphviz.py::TestPygraphvizNested::test_binary_stream"
|
||||
"--deselect=tests/test_pygraphviz.py::TestPygraphvizNested::test_diagram"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"transitions"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.84";
|
||||
version = "0.0.85";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-x8DOUQjjOlLaIhsLLbGNEE+MYBcMD+VsmcCDU0XxxcE=";
|
||||
hash = "sha256-SRuKYu88AWHrSpmUBduWN+wPkYpANmJ+FawhsPRS09A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-audit";
|
||||
version = "0.17.3";
|
||||
version = "0.17.4";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8L2E8Gj34n0aVfP3XVdm5+zHbHw7Ayg9Ptb/igdVr2U=";
|
||||
sha256 = "sha256-tglBtgjhZmeZTE8X6wNGI9CS3OsbHxTlPJVN4wjXVgs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-h0MnJPD1zxkfAvcsrKuR5eJK68mXi+TIIZqutBiBEaM=";
|
||||
cargoSha256 = "sha256-THoV87GpTuFhO/Qo37n4oascQK/tCaFUa8G2MKxrz+k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.11.1";
|
||||
version = "2022.11.2";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
|
@ -1418,6 +1418,7 @@
|
|||
"iammeter" = ps: with ps; [
|
||||
]; # missing inputs: iammeter
|
||||
"iaqualink" = ps: with ps; [
|
||||
h2
|
||||
iaqualink
|
||||
];
|
||||
"ibeacon" = ps: with ps; [
|
||||
|
|
|
|||
|
|
@ -41,17 +41,6 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.2.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "allenporter";
|
||||
repo = "gcal_sync";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5PoKdJBrNhPfcDxmprc/1jX7weIs7HSxFzzvjKOjGbY=";
|
||||
};
|
||||
doCheck = false; # requires aiohttp>=1.0.0
|
||||
});
|
||||
|
||||
gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "4.0.0";
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -94,6 +83,9 @@ let
|
|||
aioopenexchangerates = super.aioopenexchangerates.overridePythonAttrs (oldAttrs: {
|
||||
doCheck = false; # requires aiohttp>=1.0.0
|
||||
});
|
||||
gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: {
|
||||
doCheck = false; # requires aiohttp>=1.0.0
|
||||
});
|
||||
hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {
|
||||
doCheck = false; # requires aiohttp>=1.0.0
|
||||
});
|
||||
|
|
@ -236,7 +228,7 @@ let
|
|||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.11.1";
|
||||
hassVersion = "2022.11.2";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -254,7 +246,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-2zpNrkRYsmJEq+4L0J6wJodmda5r8NWgYVtYwAHKSps=";
|
||||
hash = "sha256-LYO0SM75+e/4FoOONW+qel1AX/7qM9e+K729jR6PyUQ=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ buildPythonPackage rec {
|
|||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20221102.1";
|
||||
version = "20221108.0";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
|
|
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
|||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
sha256 = "sha256-HAFJxrBI6wB1XMe+71tF/bijuQAoyAw8LBQbfv+Vqco=";
|
||||
sha256 = "sha256-jwDKWDI5fhrQNtEqMMWQZJFjjJYSqjNZFOVRsQvI9pY=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
|
|
|||
|
|
@ -53,17 +53,12 @@ in
|
|||
{
|
||||
# EOL TBA
|
||||
varnish60 = common {
|
||||
version = "6.0.10";
|
||||
hash = "sha256-a4W/dI7jeaoI43UE+G6tS6fgzEDqsXI8CUv+Wh4HJus=";
|
||||
};
|
||||
# EOL 2023-03-15. TODO: remove ahead of 22.11 release? if not, remove for 23.05
|
||||
varnish71 = common {
|
||||
version = "7.1.1";
|
||||
hash = "sha256-LK++JZDn1Yp7rIrZm+kuRA/k04raaBbdiDbyL6UToZA=";
|
||||
version = "6.0.11";
|
||||
hash = "sha256-UVkA2+tH/9MOs5BlyuAzFnmD7Pm9A6lDWic2B+HRKNs=";
|
||||
};
|
||||
# EOL 2023-09-15
|
||||
varnish72 = common {
|
||||
version = "7.2.0";
|
||||
hash = "sha256-HaipftX3t9TV4E/FyW/JqFyzog0HbrorGJUfSzBsloY=";
|
||||
version = "7.2.1";
|
||||
hash = "sha256-TZN9FyCo7BnFM/ly2TA6HJiJt7/KdDeJOuXCfPIEqUA=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ callPackages, callPackage, varnish60, varnish71, varnish72, fetchFromGitHub }: {
|
||||
{ callPackages, callPackage, varnish60, varnish72, fetchFromGitHub }: {
|
||||
varnish60Packages = rec {
|
||||
varnish = varnish60;
|
||||
modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
|
||||
|
|
@ -13,20 +13,6 @@
|
|||
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
|
||||
};
|
||||
};
|
||||
varnish71Packages = rec {
|
||||
varnish = varnish71;
|
||||
modules = (callPackages ./modules.nix { inherit varnish; }).modules20;
|
||||
digest = callPackage ./digest.nix {
|
||||
inherit varnish;
|
||||
version = "6.6";
|
||||
sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn";
|
||||
};
|
||||
dynamic = callPackage ./dynamic.nix {
|
||||
inherit varnish;
|
||||
version = "2.4.0";
|
||||
sha256 = "1g53zblyxi1jivwppmpdqhi5xnzapsfib453sxyqbc5dfs7fijxr";
|
||||
};
|
||||
};
|
||||
varnish72Packages = rec {
|
||||
varnish = varnish72;
|
||||
modules = (callPackages ./modules.nix { inherit varnish; }).modules20;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "skim";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gC4/oQpK9m6/p1DY2Kabk5l7vsS9iafW3E5dgO723B8=";
|
||||
sha256 = "sha256-LkPkwYsaSLfaZktHF23Fgaks+fDlbB1S6SRgXtJRBqQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "vim" ];
|
||||
|
||||
cargoSha256 = "sha256-aNEfKHpNWDHebioUkEq6D0aL3Jf9NQXBuoWvpB7uO5U=";
|
||||
cargoSha256 = "sha256-lG26dgvjqCZ/4KgzurMrlhl+JKec+xLt/5uA6XcsSPk=";
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lychee";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lycheeverse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2osBY7hO0v6fnKrOCYTbO45Ja0UHMoaXZeR1QIp2fT8=";
|
||||
sha256 = "sha256-GePP4BvOxaLOyF+UNXqcbCtKWeeIcXYIs6zLi+7efVY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-j+Pykcg9ezLJl4wH31tiLqmAkvQd9go+6wyUmBRTgTs=";
|
||||
cargoSha256 = "sha256-QZDoZNY1ZyWRTeIxRdbTNg5NVDzBtEKGroTzaYRWt1w=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -601,6 +601,7 @@ mapAliases ({
|
|||
hardlink = throw "hardlink was merged into util-linux since 2019-06-14."; # Added 2022-08-12
|
||||
inherit (harePackages) hare harec; # Added 2022-08-10
|
||||
hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15
|
||||
hdr-plus = throw "hdr-plus has been removed because it is unmaintained, often breaks and no longer consumed as a dependency"; # Added 2022-11-08
|
||||
heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05
|
||||
heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22
|
||||
heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06
|
||||
|
|
@ -1527,6 +1528,7 @@ mapAliases ({
|
|||
varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26
|
||||
varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-09-15
|
||||
varnish70 = throw "varnish70 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-03-17
|
||||
varnish71 = throw "varnish71 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-11-08
|
||||
vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
|
||||
venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05
|
||||
vgo2nix = throw "vgo2nix has been removed, because it was deprecated. Consider using gomod2nix instead"; # added 2022-08-24
|
||||
|
|
|
|||
|
|
@ -12832,11 +12832,11 @@ with pkgs;
|
|||
valum = callPackage ../development/web/valum { };
|
||||
|
||||
inherit (callPackages ../servers/varnish { })
|
||||
varnish60 varnish71 varnish72;
|
||||
varnish60 varnish72;
|
||||
inherit (callPackages ../servers/varnish/packages.nix { })
|
||||
varnish60Packages varnish71Packages varnish72Packages;
|
||||
varnish60Packages varnish72Packages;
|
||||
|
||||
varnishPackages = varnish71Packages;
|
||||
varnishPackages = varnish72Packages;
|
||||
varnish = varnishPackages.varnish;
|
||||
|
||||
hitch = callPackage ../servers/hitch { };
|
||||
|
|
@ -29101,10 +29101,6 @@ with pkgs;
|
|||
|
||||
hdhomerun-config-gui = callPackage ../applications/video/hdhomerun-config-gui { };
|
||||
|
||||
hdr-plus = callPackage ../applications/graphics/hdr-plus {
|
||||
stdenv = clangStdenv;
|
||||
};
|
||||
|
||||
hedgedoc-cli = callPackage ../tools/admin/hedgedoc-cli { };
|
||||
|
||||
heimer = libsForQt5.callPackage ../applications/misc/heimer { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue