Unverified Commit bb12bc9c authored by melvyn's avatar melvyn
Browse files

python3Packages.xdis: 6.1.0 -> 6.1.1

parent f60e814d
Loading
Loading
Loading
Loading
+25 −5
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
  buildPythonPackage,
  click,
  fetchFromGitHub,
  fetchpatch,
  pytestCheckHook,
  pythonOlder,
  six,
@@ -10,7 +11,7 @@

buildPythonPackage rec {
  pname = "xdis";
  version = "6.1.0";
  version = "6.1.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@@ -19,9 +20,22 @@ buildPythonPackage rec {
    owner = "rocky";
    repo = "python-xdis";
    rev = "refs/tags/${version}";
    hash = "sha256-KgKTO99T2/be1sBs5rY3Oy7/Yl9WGgdG3hqqkZ7D7ZY=";
    hash = "sha256-Fn1cyUPMrn1SEXl4sdQwJiNHaY+BbxBDz3nKZY965/0=";
  };

  # Backport magics for newer newer python versions
  # 6.1.1 only supports up to 3.12.4 while nixpkgs is already on 3.12.5+
  patches = [
    (fetchpatch {
      url = "https://github.com/rocky/python-xdis/commit/fcba74a7f64c5e2879ca0779ff10f38f9229e7da.patch";
      hash = "sha256-D7eJ97g4G6pmYL/guq0Ndf8yKTVBD2gAuUCAKwvlYbE=";
    })
    (fetchpatch {
      url = "https://github.com/rocky/python-xdis/commit/b66976ff53a2c6e17a73fb7652ddd6c8054df8db.patch";
      hash = "sha256-KO1y0nDTPmEZ+0/3Pjh+CvTdpr/p4AYZ8XdH5J+XzXo=";
    })
  ];

  propagatedBuildInputs = [
    click
    six
@@ -41,6 +55,9 @@ buildPythonPackage rec {

    # Doesn't run on non-2.7 but has global-level mis-import
    "test_unit/test_dis27.py"

    # Has Python 2 style prints
    "test/decompyle/test_nested_scopes.py"
  ];

  disabledTests = [
@@ -50,11 +67,14 @@ buildPythonPackage rec {
    "test_basic"
  ];

  meta = with lib; {
  meta = {
    description = "Python cross-version byte-code disassembler and marshal routines";
    homepage = "https://github.com/rocky/python-xdis";
    changelog = "https://github.com/rocky/python-xdis/releases/tag/${version}";
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ onny ];
    license = lib.licenses.gpl2Plus;
    maintainers = with lib.maintainers; [
      onny
      melvyn2
    ];
  };
}