pyxel: 2.3.18 -> 2.8.10 (#503713)

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

@@ -1,13 +0,0 @@
-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 {
--        self.target_os.contains("windows") || self.target_os == "darwin"
-+        false
-     }
- 
-     fn download_sdl2(&self) {

pkgs/by-name/py/pyxel/package.nix

@@ -1,42 +1,58 @@
 {
   lib,
-  python3,
+  python3Packages,
+  cargo,
   fetchFromGitHub,
   rustPlatform,
+  rustc,
   SDL2,
 }:
 
-python3.pkgs.buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyxel";
-  version = "2.3.18";
+  version = "2.8.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kitao";
     repo = "pyxel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pw1ZDmQ7zGwfM98jjym34RbLmUbjuuUnCoPGczxdai8=";
+    hash = "sha256-+SitYe2HFA6rwqk5lipcKFdBy69zdAhw3Q+Nb0iBx6s=";
   };
 
-  patches = [ ./never-bundle-sdl2.patch ];
-
   postPatch = ''
-    cp ${./Cargo.lock} rust/Cargo.lock
+    cp ${./Cargo.lock} crates/Cargo.lock
+    chmod u+w crates/Cargo.lock
   '';
 
-  cargoRoot = "rust";
+  cargoRoot = "crates";
 
-  cargoDeps = rustPlatform.importCargoLock {
-    # generated by running `cargo generate-lockfile` in the `rust` directory
-    lockFile = ./Cargo.lock;
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs)
+      src
+      pname
+      version
+      cargoRoot
+      ;
+    postPatch = ''
+      cp ${./Cargo.lock} crates/Cargo.lock
+    '';
+    hash = "sha256-UEN66yygcyOJt8fROClfBi1V5F7/I7P4j4vkPzKJ7jY=";
   };
 
   buildAndTestSubdir = "python";
 
-  nativeBuildInputs = with rustPlatform; [
-    cargoSetupHook
-    maturinBuildHook
-    bindgenHook
+  maturinBuildFlags = [
+    "--features"
+    "sdl2_dynamic"
+  ];
+
+  nativeBuildInputs = [
+    cargo
+    rustc
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+    rustPlatform.bindgenHook
   ];
 
   buildInputs = [ SDL2 ];
@@ -48,7 +64,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   pythonImportsCheck = [
     "pyxel"
-    "pyxel.pyxel_wrapper"
+    "pyxel.pyxel_binding"
   ];
 
   meta = {
@@ -57,7 +73,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/kitao/pyxel";
     license = lib.licenses.mit;
     mainProgram = "pyxel";
-    maintainers = with lib.maintainers; [ tomasajt ];
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [
+      tomasajt
+      miniharinn
+    ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 })