Merge master into staging-next

2021-11-08 00:01:53 +00:00
parent 22e1ac869a f8de2aec85
commit cb91ac99e0
18 changed files with 91 additions and 52 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 = [
@@ -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