Unverified Commit 00ae4c7f authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #211210 from NixOS/home-assistant

home-assistant: 2023.1.4 -> 2023.1.5
parents ed8cab77 0ab7681f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@
buildPythonPackage rec {
  pname = "dask-gateway";
  # update dask-gateway lock step with dask-gateway-server
  version = "2022.6.1";
  version = "2023.1.1";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "dask";
    repo = "dask-gateway";
    rev = "refs/tags/${version}";
    hash = "sha256-PsagZdEPpeuZH9hFL98xB5z6zOdd4Cx/skGQ0eOYkCA=";
    hash = "sha256-+YCHIfNq8E2rXO8b91Q1D21dVzNWnJZIKZeY4AETa7s=";
  };

  sourceRoot = "source/dask-gateway";
+2 −10
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@

buildPythonPackage rec {
  pname = "dask";
  version = "2022.10.2";
  version = "2023.1.0";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@@ -36,17 +36,9 @@ buildPythonPackage rec {
    owner = "dask";
    repo = pname;
    rev = version;
    hash = "sha256-zHJR2WjHigUMWtRJW25+gk1fKGKedU53BBjwx5zaodA=";
    hash = "sha256-avyrKBAPyYZBNgItnkNCferqb6+4yeGpBAZhSkL/fFA=";
  };

  patches = [
    (fetchpatch {
      # Fix test_repartition_npartitions on platforms other than x86-64
      url = "https://github.com/dask/dask/commit/65f40ad461c57065f981e6213e33b1d13cc9bc8f.patch";
      hash = "sha256-KyTSms4ik1kYtL+I/huAxD+zK2AAuPkwmHA9FYk601Y=";
    })
  ];

  propagatedBuildInputs = [
    click
    cloudpickle
+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@

buildPythonPackage rec {
  pname = "dateparser";
  version = "1.1.5";
  version = "1.1.6";

  disabled = pythonOlder "3.7";

@@ -31,7 +31,7 @@ buildPythonPackage rec {
    owner = "scrapinghub";
    repo = "dateparser";
    rev = "refs/tags/v${version}";
    sha256 = "sha256-uA49pRlmSWWIOjXa1QDjjuTGMKi25GfokQo4VQsBMlc=";
    sha256 = "sha256-rn8RD1nnUi4MhK6QKLaP5eG6UAFrhlecimvn8sAsu6k=";
  };

  propagatedBuildInputs = [
+2 −2
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@

buildPythonPackage rec {
  pname = "distributed";
  version = "2022.12.1";
  version = "2023.1.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-h/7c+/ISbRTDhlyORFxB7Mq9Kwfq/4dSivKv2eIM7Ww=";
    hash = "sha256-xV3HQmmDtSIn+DM3Rcoyp3dqY9qSjB+8Con6+o6a/y0=";
  };

  postPatch = ''
+26 −10
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@
, buildPythonPackage
, fetchFromGitHub
, python
, cython
, setuptools
, substituteAll
, numba
, numpy
, pandas
@@ -15,8 +18,8 @@

buildPythonPackage rec {
  pname = "fastparquet";
  version = "0.8.1";
  format = "setuptools";
  version = "2022.12.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";

@@ -24,9 +27,29 @@ buildPythonPackage rec {
    owner = "dask";
    repo = pname;
    rev = version;
    hash = "sha256-rWrbHHcJMahaUV8+YuKkZUhdboNFUK9btjvdg74lCxc=";
    hash = "sha256-/DSe2vZwrHHTuAXWJh9M1wCes5c4/QAVUnJVEI4Evyw=";
  };

  nativeBuildInputs = [
    cython
    setuptools
  ];

  patches = [
    (substituteAll {
      src = ./version.patch;
      inherit version;
    })
  ];

  postPatch = ''
    substituteInPlace setup.py \
      --replace "'pytest-runner'," "" \
      --replace "oldest-supported-numpy" "numpy"

    sed -i '/"git", "status"/d' setup.py
  '';

  propagatedBuildInputs = [
    cramjam
    fsspec
@@ -46,13 +69,6 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

  postPatch = ''
    substituteInPlace setup.py \
      --replace "'pytest-runner'," "" \
      --replace "oldest-supported-numpy" "numpy"
  '';


  # Workaround https://github.com/NixOS/nixpkgs/issues/123561
  preCheck = ''
    mv fastparquet/test .
Loading