Unverified Commit 3b188c7c authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #313652 from fabaff/thrift-py312 

python312Packages.thrift: disable on Python 3.12,  python311Packages.pins: 0.8.4 -> 0.8.6
parents e4db48a1 a6a4ba68

pkgs/development/python-modules/pins/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


buildPythonPackage rec {

  pname = "pins";

  version = "0.8.4";

  version = "0.8.6";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -37,15 +37,15 @@ buildPythonPackage rec { 
    owner = "rstudio";

    repo = "pins-python";

    rev = "refs/tags/v${version}";

    hash = "sha256-rNIjHwFELHoxDxC/T5vPzHA6Ifjz01rJpTK6kjUxOIM=";

    hash = "sha256-TRwdd0vxqXZgongjooJG5rzTnopUsjfl2I8z3nBocdg=";

  };



  nativeBuildInputs = [

  build-system = [

    setuptools

    setuptools-scm

  ];



  propagatedBuildInputs = [

  dependencies = [

    appdirs

    fsspec

    humanize

pkgs/development/python-modules/thrift/default.nix

+10 −2
Original line number Diff line number Diff line
@@ -2,20 +2,28 @@ 
  lib,

  buildPythonPackage,

  fetchPypi,

  pythonAtLeast,

  pythonOlder,

  setuptools,

  six,

}:



buildPythonPackage rec {

  pname = "thrift";

  version = "0.20.0";

  format = "setuptools";

  pyproject = true;



  # Still uses distutils

  disabled = pythonOlder "3.7" || pythonAtLeast "3.12";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-TdZi6t9riuvopBcpUnvWmt9s6qKoaBy+9k0Sc7Po/ro=";

  };



  propagatedBuildInputs = [ six ];

  build-system = [ setuptools ];



  dependencies = [ six ];



  # No tests. Breaks when not disabling.

  doCheck = false;