Commit b12e7df7 authored by figsoda's avatar figsoda
Browse files
parent d29d4921
Loading
Loading
Loading
Loading
+735 −32

File changed.

Preview size limit exceeded, changes collapsed.

+3 −17
Original line number Diff line number Diff line
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, makeWrapper
, pkg-config
, zstd
@@ -17,36 +16,23 @@

rustPlatform.buildRustPackage rec {
  pname = "jumpy";
  version = "0.6.1";
  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "fishfolk";
    repo = pname;
    rev = "v${version}";
    sha256 = "sha256-03VPfSIlGB8Cc1jWzZSj9MBFBBmMjyx+RdHr3r3oolU=";
    sha256 = "sha256-krO/iPGnzXeY3W8xSFerlKa1DvDl7ss00bGaAMkHUtw=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "bevy_simple_tilemap-0.10.1" = "sha256-Q/AsBZjsr+uTIh/oN0OsIJxntZ4nuc1AReo0Ronj930=";
      "bones_asset-0.1.0" = "sha256-YyY5OsbRLkpAgvNifRiXfmzfsgFw/oFV1nQVCkXG4j4=";
    };
  };

  patches = [
    # removes unused patch in patch.crates-io, which cases the build to fail
    # error: failed to load source for dependency `bevy_simple_tilemap`
    # Caused by: attempting to update a git repository, but --frozen was specified
    ./remove-unused-patch.patch

    # the crate version is outdated
    (fetchpatch {
      name = "bump-version-to-0-6-1.patch";
      url = "https://github.com/fishfolk/jumpy/commit/15081c425056cdebba1bc90bfcaba50a2e24829f.patch";
      hash = "sha256-dxLfy1HMdjh2VPbqMb/kwvDxeuptFi3W9tLzvg6TLsE=";
    })
  ];

  nativeBuildInputs = [
    makeWrapper
    pkg-config
+0 −22
Original line number Diff line number Diff line
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4977,8 +4977,3 @@ dependencies = [
  "libc",
  "pkg-config",
 ]
-
-[[patch.unused]]
-name = "bevy_simple_tilemap"
-version = "0.11.0"
-source = "git+https://github.com/forbjok/bevy_simple_tilemap.git#9a1d4332e961327443adb16aca306f837b6f4da5"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -94,8 +94,6 @@ codegen-units = 1    # Improved rapier physics perf, so it might help other stuf
 lto           = true
 
 [patch.crates-io]
-bevy_simple_tilemap = { git = "https://github.com/forbjok/bevy_simple_tilemap.git" }
-
 bones_lib = { git = "https://github.com/fishfolk/bones" }
 bones_bevy_asset = { git = "https://github.com/fishfolk/bones" }
 type_ulid = { git = "https://github.com/fishfolk/bones" }