diff options
Diffstat (limited to 'pkgs/by-name/py/pyxel/package.nix')
| -rw-r--r-- | pkgs/by-name/py/pyxel/package.nix | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix index 4c9cd40682ff7..efdfdcc2c61b1 100644 --- a/pkgs/by-name/py/pyxel/package.nix +++ b/pkgs/by-name/py/pyxel/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pyxel"; - version = "2.0.7"; + version = "2.0.13"; pyproject = true; disabled = python3.pythonOlder "3.7"; @@ -19,28 +19,23 @@ python3.pkgs.buildPythonApplication rec { owner = "kitao"; repo = "pyxel"; rev = "v${version}"; - hash = "sha256-5Jrwfi79HbS4hh+eMwI49Rsk4jrAdAuDhNpUT2cEvDo="; + hash = "sha256-0pVeIYDt8sz3eIQU/mU443fVWYjhShTpFKoPpM/PFf0="; }; - patches = [ - ./never-bundle-sdl2.patch - ./update-bindgen-f16-support.patch # can be removed once rust-bindgen gets a new release - ]; + patches = [ ./never-bundle-sdl2.patch ]; + + postPatch = '' + cp ${./Cargo.lock} rust/Cargo.lock + ''; - cargoRoot = "crates/pyxel-wrapper"; + cargoRoot = "rust"; - # Lockfile is generated by applying patches with `git apply` - # and then running `cargo generate-lockfile` in `crates/pyxel-wrapper` cargoDeps = rustPlatform.importCargoLock { + # generated by running `cargo generate-lockfile` in the `rust` directory lockFile = ./Cargo.lock; - outputHashes = { - "bindgen-0.69.1" = "sha256-1967EmuyWgmrKmhwAcW49dlmuWPNuKjuRr5/u7ZKpXQ="; - }; }; - postPatch = '' - cp ${./Cargo.lock} crates/pyxel-wrapper/Cargo.lock - ''; + buildAndTestSubdir = "python"; nativeBuildInputs = with rustPlatform; [ cargoSetupHook @@ -55,8 +50,8 @@ python3.pkgs.buildPythonApplication rec { env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2"; - # Tests can't use the display - dontCheck = true; + # Tests want to use the display + doCheck = false; pythonImportsCheck = [ "pyxel" @@ -65,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { meta = { changelog = "https://github.com/kitao/pyxel/tree/${src.rev}/CHANGELOG.md"; - description = "A retro game engine for Python"; + description = "Retro game engine for Python"; homepage = "https://github.com/kitao/pyxel"; license = lib.licenses.mit; mainProgram = "pyxel"; |