Unverified Commit 311cb03d authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #315073 from Moraxyc/fix-stone-312 

python312Packages.stone: enable on python 3.12
parents a86b072d 5a11647e

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

+21 −4
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch,

  lib,

  mock,

  packaging,

  ply,

  pytestCheckHook,

  pythonAtLeast,

  pythonOlder,

  setuptools,

  six,
@@ -16,8 +17,23 @@ buildPythonPackage rec { 
  version = "3.3.6";

  pyproject = true;



  # distutils removal, https://github.com/dropbox/stone/issues/323

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

  disabled = pythonOlder "3.7";



  patches = [

    # fix distutils issue

    # fix versions in tests to conform pep 440

    # See https://github.com/dropbox/stone/pull/334

    (fetchpatch {

      name = "no-distutils.patch";

      url = "https://github.com/dropbox/stone/commit/f772d8d3b7e2ce62b14b4fb208a478bc8e54c7f2.patch";

      hash = "sha256-SH4gG5S13n/pXppm62LvH9poGfeQGGonW7bkzdYh73Q=";

    })

    (fetchpatch {

      name = "fix-test-pep-440.patch";

      url = "https://github.com/dropbox/stone/commit/f36de56b1f87eae61829258b2f16aa8319bbcc5c.patch";

      hash = "sha256-sBJukNk02RmQQza1qhLAkyx1OJRck0/zQOeRaXD9tkY=";

    })

  ];



  src = fetchFromGitHub {

    owner = "dropbox";
@@ -36,6 +52,7 @@ buildPythonPackage rec { 
  dependencies = [

    ply

    six

    packaging

  ];



  nativeCheckInputs = [