Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-11-08 00:02:29 +00:00
committed by GitHub
190 changed files with 2722 additions and 2061 deletions
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "pyemby";
version = "1.7";
version = "1.8";
src = fetchFromGitHub {
owner = "mezz64";
repo = pname;
rev = version;
sha256 = "04fvpv3fz4q160s4ikldwxflxl1zbxgfgy9qs6grgpnd23p0ylk8";
sha256 = "sha256-EpmXdyKtfb/M8rTv6YrfNCpDmKei2AD5DBcdVvqCVWw=";
};
propagatedBuildInputs = [
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pyspnego";
version = "0.3.0";
version = "0.3.1";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "jborean93";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jBwLll3Qtw+CGZQ5QFosZfMGFzjm1Y0rsGx3POFUds8=";
sha256 = "sha256-f7CR7wMxHNNpxizV7MFCtWci3SSNvdx+W5i/rgOUSxY=";
};
propagatedBuildInputs = [
@@ -8,7 +8,6 @@
, catch2
, cmake
, cython
, fmt
, muparserx
, ninja
, nlohmann_json
@@ -66,7 +65,6 @@ buildPythonPackage rec {
buildInputs = [
blas
catch2
fmt
muparserx
nlohmann_json
spdlog