Skip to content

Conversation

@liberodark
Copy link
Contributor

@liberodark liberodark commented Jan 28, 2025

Fix: #355081

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 28, 2025
@nix-owners nix-owners bot requested a review from figsoda January 28, 2025 18:40
Copy link
Member

@teto teto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the homepage "https://fishfight.org/" doesn't look right, leads to a fishy website

EDIT: github references https://fishfolk.org/games/jumpy/ which certainly looks better

@teto
Copy link
Member

teto commented Jan 28, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 377607


x86_64-linux

❌ 1 package failed to build:
  • jumpy

@liberodark liberodark force-pushed the jumpy branch 5 times, most recently from 841a248 to 0e229fa Compare January 29, 2025 19:26
@griffi-gh
Copy link
Member

griffi-gh commented Feb 19, 2025

the homepage "https://fishfight.org/" doesn't look right, leads to a fishy website

EDIT: github references https://fishfolk.org/games/jumpy/ which certainly looks better

yea i noticed that a while ago too

closes #355079

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 16, 2025
@liberodark liberodark force-pushed the jumpy branch 2 times, most recently from f99da72 to 1b20f91 Compare April 28, 2025 09:37
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 28, 2025
@PhiliPdB
Copy link
Member

PhiliPdB commented May 1, 2025

For me it fails to build with the following error:

error: couldn't read `/build/jumpy-0.12.2-vendor/rapier2d-0.18.0/../../src/lib.rs`: No such file or directory (os error 2)

Digging into it, it looks like buildRustPackage cannot handle building a library definition, for which it needs to go up a directory (or 2 in this case). See also the relevant cargo.toml line.

I don´t know how this can be fixed...

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 9, 2025
@marcin-serwin
Copy link
Contributor

I have opened fishfolk/jumpy#1051 that addresses the problem with the rapier2d dependency. It builds and runs successfully on x86-64_linux when I add it to cargoPatches.

@liberodark liberodark marked this pull request as ready for review July 9, 2025 18:52
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 9, 2025
@liberodark liberodark changed the title jumpy: 0.8.0 -> 0.12.2 jumpy: 0.8.0 -> 0.12.2-unstable-2025-07-03 Jul 9, 2025
@liberodark liberodark requested a review from GaetanLepage July 9, 2025 18:53
@liberodark
Copy link
Contributor Author

For me have :

image

@PhiliPdB
Copy link
Member

PhiliPdB commented Jul 9, 2025

Wouldn't it be better to just bring in the relevant commit as a patch (with a comment to remove it in the next release) instead of switching to unstable? Or did that not work?

@liberodark
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 377607

Logs: https://github.com/liberodark/nixpkgs-review-gha/actions/runs/16177767768


x86_64-linux (sandbox = true)

✅ 1 package built:
  • jumpy

aarch64-linux (sandbox = true)

✅ 1 package built:
  • jumpy

x86_64-darwin (sandbox = true)

✅ 1 package built:
  • jumpy

aarch64-darwin (sandbox = true)

✅ 1 package built:
  • jumpy

@liberodark
Copy link
Contributor Author

Wouldn't it be better to just bring in the relevant commit as a patch (with a comment to remove it in the next release) instead of switching to unstable? Or did that not work?

Hi,

You can try if you want.

Best Regards

@phanirithvij
Copy link
Member

diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix
index e930e74da1d1..5b98d32b0721 100644
--- a/pkgs/by-name/ju/jumpy/package.nix
+++ b/pkgs/by-name/ju/jumpy/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  fetchpatch2,
   makeWrapper,
   pkg-config,
   zstd,
@@ -16,17 +17,24 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jumpy";
-  version = "0.12.2-unstable-2025-07-03";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "fishfolk";
     repo = "jumpy";
-    rev = "8234e6d2c0b33c75e2112596ded1734fdba50fb8";
-    hash = "sha256-mrOl2woi1KgO6eWQCkCGgqxhmgSnngiUx1w5efon5LA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-g/CpSycTCM1i6O7Mir+3huabvr4EXghDApquEUNny8c=";
   };
 
+  cargoPatches = [
+    (fetchpatch2 {
+      url = "https://github.com/fishfolk/jumpy/pull/1051.patch?full_index=1";
+      hash = "sha256-IWjBw1Wj/6CT/x6xm6vfpUMfk7A5/EsdbPDvWywRFc8=";
+    })
+  ];
+
   useFetchCargoVendor = true;
-  cargoHash = "sha256-I4Pw1uxES07IXXDRXWSrRLX/IGuE4GZnN7bzE1lBbDA=";
+  cargoHash = "sha256-2I9s1zH94GRqXGBxZYyXOQwNeYrpV1UhUSKGCs9Ce9Q=";
 
   nativeBuildInputs = [
     makeWrapper

@liberodark
Copy link
Contributor Author

liberodark commented Jul 11, 2025

Hi, @phanirithvij

Exactly what I did, but it didn't work. (but with commit directly)
I'll try again.
PS :
My comment might be harsh, but it wasn't meant to be; it's just that I'm working on another PR that's taking up a lot of my time.
Now that I'm done, I'll try to get back to jumpy.

Best Regards

@liberodark liberodark force-pushed the jumpy branch 2 times, most recently from 5d7c0f3 to e28ded7 Compare July 11, 2025 07:39
@liberodark liberodark changed the title jumpy: 0.8.0 -> 0.12.2-unstable-2025-07-03 jumpy: 0.8.0 -> 0.12.2 Jul 11, 2025
@liberodark
Copy link
Contributor Author

Same result :

image

@PhiliPdB
Copy link
Member

I'll have a look at it later today, but I remember testing your previous version that everything seemed to be working as expected. So the menu you screenshotted here had text for me.

@liberodark
Copy link
Contributor Author

I'll have a look at it later today, but I remember testing your previous version that everything seemed to be working as expected. So the menu you screenshotted here had text for me.

Hi,

Yes is probably issue on my side with AMD GPU or X11.

Best Regards

Copy link
Member

@PhiliPdB PhiliPdB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left some minor remarks, but LGTM.

Also, this is the main menu for me:
image
The game seems to play just fine (although I was not familiar with it).

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 11, 2025
@phanirithvij
Copy link
Member

phanirithvij commented Jul 12, 2025

I am on xfce and the version with the cargoPatch works, so x11 might not be the issue.

If the latest unstable version works for you I suggest packaging that instead of patching.

Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works fine on wayland.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jul 14, 2025
@phanirithvij
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 377607

Logs: https://github.com/phanirithvij/nixpkgs-review-gha/actions/runs/16263374530


x86_64-linux

✅ 1 package built:
  • jumpy

aarch64-linux

✅ 1 package built:
  • jumpy

x86_64-darwin (sandbox = true)

✅ 1 package built:
  • jumpy

aarch64-darwin (sandbox = true)

✅ 1 package built:
  • jumpy

@GaetanLepage GaetanLepage merged commit 6b33302 into NixOS:master Jul 14, 2025
24 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update request: jumpy 0.8.0 → 0.12.2

8 participants