diff --git a/pkgs/by-name/go/gopher64/package.nix b/pkgs/by-name/go/gopher64/package.nix index 8254e920f1b8..38837227cdc4 100644 --- a/pkgs/by-name/go/gopher64/package.nix +++ b/pkgs/by-name/go/gopher64/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gopher64"; - version = "1.0.16"; + version = "1.0.17"; src = fetchFromGitHub { owner = "gopher64"; repo = "gopher64"; tag = "v${finalAttrs.version}"; - hash = "sha256-TduOmKK4OAmhP2VUT0eeoKHQHmsM8kptrxfgCdDFTRU="; + hash = "sha256-DDFtPISV17jQMECBIqYbbGhZpjYXuNnOq7EiEVtSzgc="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-9fZ7zFTqt1VNnmCqFzWrZFD1PQZ7paz7r2Mb+9+C9Rs="; + cargoHash = "sha256-31kEYwlDA6iYcwPZyQU4gM/VLfPNeYcDKhhBqzNp/QE="; env.ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch b/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch index 7db5ce5ea8ff..1eb8f968f8e2 100644 --- a/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch +++ b/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch @@ -1,8 +1,8 @@ diff --git a/Cargo.lock b/Cargo.lock -index 89bc1d0..72b65cd 100644 +index 81c7e20..6ae0a17 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -626,15 +626,6 @@ dependencies = [ +@@ -611,15 +611,6 @@ dependencies = [ "error-code", ] @@ -18,7 +18,7 @@ index 89bc1d0..72b65cd 100644 [[package]] name = "cobs" version = "0.2.3" -@@ -3245,12 +3236,6 @@ dependencies = [ +@@ -3243,12 +3234,6 @@ dependencies = [ "windows-sys 0.52.0", ] @@ -31,21 +31,21 @@ index 89bc1d0..72b65cd 100644 [[package]] name = "rustc-demangle" version = "0.1.24" -@@ -3380,21 +3365,13 @@ version = "1.2.0" +@@ -3370,21 +3355,13 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sdl3-src" --version = "3.2.10" +-version = "3.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e677fa126db179fb8f03c982163321496ddf57a6d8a1e41eeef4600f956038b1" +-checksum = "c5b5d192485408fa251477ea1dfb4778d864efaec72f730ce3a753deaffb27bb" - [[package]] name = "sdl3-sys" - version = "0.4.7+SDL3-3.2.10" + version = "0.5.2+SDL3-3.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f0d16a8a3623a4cb39a3661c81d9d4c5fd77ada27fc056e320b3651bf7bde1b1" + checksum = "f0a31799d7cbd36f2b187c32a56975fbdd371c200a91b01d4ed0faf0012bcf9c" dependencies = [ - "cmake", - "rpkg-config", @@ -55,20 +55,20 @@ index 89bc1d0..72b65cd 100644 [[package]] diff --git a/Cargo.toml b/Cargo.toml -index 1f41e04..9d9ea33 100644 +index 82d8e99..8b15aad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ serde-big-array = "0.5" eframe = { version = "0.31", default-features = false, features = ["wayland", "x11", "glow"] } sha2 = "0.10" ab_glyph = "0.2" --sdl3-sys = { version = "0.4", features = ["build-from-source-static"] } -+sdl3-sys = { version = "0.4", features = ["use-pkg-config"] } +-sdl3-sys = { version = "0.5", features = ["build-from-source-static"] } ++sdl3-sys = { version = "0.5", features = ["use-pkg-config"] } rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "tokio"] } - tokio = {version = "1.43", features = ["rt-multi-thread", "macros"] } + tokio = {version = "1.45", features = ["rt-multi-thread", "macros"] } spin_sleep = "1.3" diff --git a/build.rs b/build.rs -index 67a6e8d..6c9f63b 100644 +index f0c6d21..fa28e25 100644 --- a/build.rs +++ b/build.rs @@ -52,10 +52,7 @@ fn main() {