Merge pull request #318273 from TomaSajt/pyxel

pyxel: 2.0.7 -> 2.0.13

pkgs/by-name/py/pyxel/never-bundle-sdl2.patch

@@ -1,8 +1,8 @@
-diff --git a/crates/pyxel-platform/build.rs b/crates/pyxel-platform/build.rs
-index 35cdeef5..68a93ed9 100644
---- a/crates/pyxel-platform/build.rs
-+++ b/crates/pyxel-platform/build.rs
-@@ -30,7 +30,7 @@ impl SDL2BindingsBuilder {
+diff --git a/rust/pyxel-platform/build.rs b/rust/pyxel-platform/build.rs
+index 45eecae..f385eb9 100644
+--- a/rust/pyxel-platform/build.rs
++++ b/rust/pyxel-platform/build.rs
+@@ -31,7 +31,7 @@ impl SDL2BindingsBuilder {
      }
  
      fn should_bundle_sdl2(&self) -> bool {

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,29 +19,24 @@ 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
-  ];
-
-  cargoRoot = "crates/pyxel-wrapper";
-
-  # Lockfile is generated by applying patches with `git apply`
-  # and then running `cargo generate-lockfile` in `crates/pyxel-wrapper`
-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "bindgen-0.69.1" = "sha256-1967EmuyWgmrKmhwAcW49dlmuWPNuKjuRr5/u7ZKpXQ=";
-    };
-  };
+  patches = [ ./never-bundle-sdl2.patch ];
 
   postPatch = ''
-    cp ${./Cargo.lock} crates/pyxel-wrapper/Cargo.lock
+    cp ${./Cargo.lock} rust/Cargo.lock
   '';
 
+  cargoRoot = "rust";
+
+  cargoDeps = rustPlatform.importCargoLock {
+    # generated by running `cargo generate-lockfile` in the `rust` directory
+    lockFile = ./Cargo.lock;
+  };
+
+  buildAndTestSubdir = "python";
+
   nativeBuildInputs = with rustPlatform; [
     cargoSetupHook
     maturinBuildHook
@@ -55,7 +50,7 @@ python3.pkgs.buildPythonApplication rec {
 
   env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2";
 
-  # Tests can't use the display
+  # Tests want to use the display
   doCheck = false;
 
   pythonImportsCheck = [

pkgs/by-name/py/pyxel/update-bindgen-f16-support.patch

@@ -1,13 +0,0 @@
-diff --git a/crates/pyxel-platform/Cargo.toml b/crates/pyxel-platform/Cargo.toml
-index 01a87b68..088ffbdd 100644
---- a/crates/pyxel-platform/Cargo.toml
-+++ b/crates/pyxel-platform/Cargo.toml
-@@ -22,7 +22,7 @@ parking_lot = "0.12"
- paste = "1.0"
- 
- [build-dependencies]
--bindgen = "0.69"
-+bindgen = { git = "https://github.com/rust-lang/rust-bindgen.git", rev = "d77e53ed8398743bf68831d25063719fa0f4f136" }
- cmake = "0.1"
- flate2 = "1.0"
- tar = "0.4"