Unverified Commit 6ce04193 authored by Matt Sturgeon's avatar Matt Sturgeon
Browse files
parent 39fa58b4
Loading
Loading
Loading
Loading
+1 −25
Original line number Diff line number Diff line
{
  python3,
  fetchFromGitHub,
}:

let
  python = python3.override {
    packageOverrides = self: super: {
      tree-sitter = super.tree-sitter.overrideAttrs {
        version = "0.24.0";
        src = fetchFromGitHub {
          owner = "tree-sitter";
          repo = "py-tree-sitter";
          tag = "v0.24.0";
          hash = "sha256-ZDt/8suteaAjGdk71l8eej7jDkkVpVDBIZS63SA8tsU=";
          fetchSubmodules = true;
        };
        # keymap-drawer only requires tree-sitter-devicetree grammer, and
        # the tests fail with numereous TREE_SITTER_LANGUAGE_VERSION
        # related failures related to other grammers. Hence we disable the
        # tests altogether, hoping that in the future this python3.override
        # won't be needed at all.
        doInstallCheck = false;
      };
    };
  };
in
python.pkgs.toPythonApplication python.pkgs.keymap-drawer
python3.pkgs.toPythonApplication python3.pkgs.keymap-drawer
+2 −7
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
  versionCheckHook,
}:
buildPythonPackage (finalAttrs: {
  version = "0.22.1";
  version = "0.23.0";
  pname = "keymap-drawer";
  pyproject = true;
  disabled = pythonOlder "3.12";
@@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: {
    owner = "caksoylar";
    repo = "keymap-drawer";
    tag = "v${finalAttrs.version}";
    hash = "sha256-X3O5yspEdey03YQ6JsYN/DE9NUiq148u1W6LQpUQ3ns=";
    hash = "sha256-yrZidTATnOPacAfdk0gFIgH/3MaZqVOjmzkWNnMa01s=";
  };

  build-system = [ poetry-core ];
@@ -68,10 +68,5 @@ buildPythonPackage (finalAttrs: {
      MattSturgeon
    ];
    mainProgram = "keymap";
    # keymap-drawer currently requires tree-sitter 0.24.0
    # See https://github.com/caksoylar/keymap-drawer/issues/183
    # top-level package `keymap-drawer` is not broken due to this
    # incompatibility, thanks to a Python override
    broken = lib.versionAtLeast tree-sitter.version "0.25.0";
  };
})