recaf: init at 4.0-unstable-2024-12-11

[nartsisss]

Recaf - modern Java bytecode editor

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:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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/)
• 24.11 Release Notes (or backporting 23.11 and 24.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.

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4755

[pluiedev]

Does this still evaluate after #344544? If not, then you might need to do the same hacks as I did over in #354184

[nartsisss]

@pluiedev I tested it on aarch64 (both darwin & linux), and according to the logs from Ofborg, everything is fine on x86_64 as well.

[pluiedev]

I tested it on aarch64 (both darwin & linux), and according to the logs from Ofborg, everything is fine on x86_64 as well.

Try rebasing as you're about 10k commits behind master :p

[nartsisss]

I tested it on aarch64 (both darwin & linux), and according to the logs from Ofborg, everything is fine on x86_64 as well.

Try rebasing as you're about 10k commits behind master :p

You're right. Rebased and applied your java-23-instead-of-22.patch. Works fine now

[C0D3-M4513R]

Addresses: #267124

[FliegendeWurst]

Suggested change

	#Required for build info
	leaveDotGit = true;

This needs to be patched out of the gradle scripts.
The hash is not reproducible.

[FliegendeWurst]

Suggested change

git

[FliegendeWurst]

Try adding this patch:

diff --git a/recaf-core/build.gradle b/recaf-core/build.gradle
index eda3177..91e3ce7 100644
--- a/recaf-core/build.gradle
+++ b/recaf-core/build.gradle
@@ -49,7 +49,6 @@
 // Force generation of gversion data class when the version information is not up-to-date
 tasks.register('conditionalBuildConfigUpdate') {
     if (!isBuildConfigUpToDate()) {
-        finalizedBy createVersionFile
     }
 }
 
diff --git a/recaf-core/src/main/java/software/coley/recaf/RecafBuildConfig.java b/recaf-core/src/main/java/software/coley/recaf/RecafBuildConfig.java
new file mode 100644
index 0000000..bfe2657
--- /dev/null
+++ b/recaf-core/src/main/java/software/coley/recaf/RecafBuildConfig.java
@@ -0,0 +1,19 @@
+package software.coley.recaf;
+
+/**
+ * Automatically generated file containing build version information.
+ */
+public final class RecafBuildConfig {
+	public static final String MAVEN_GROUP = "software.coley";
+	public static final String MAVEN_NAME = "recaf-core";
+	public static final String VERSION = "@version@-SNAPSHOT";
+	public static final int GIT_REVISION = 1;
+	public static final String GIT_SHA = "@commit@";
+	public static final String GIT_DATE = "1970 01/01 00:00";
+	public static final String GIT_BRANCH = "master";
+	public static final String BUILD_DATE = "1970 01/01 00:00";
+	public static final long BUILD_UNIX_TIME = 1L;
+	public static final int DIRTY = 0;
+
+	private RecafBuildConfig(){}
+}

and these changes:

diff --git a/pkgs/by-name/re/recaf/package.nix b/pkgs/by-name/re/recaf/package.nix
index 9225c94ee95d..95fc95f4f46b 100644
--- a/pkgs/by-name/re/recaf/package.nix
+++ b/pkgs/by-name/re/recaf/package.nix
@@ -8,26 +8,25 @@
   makeWrapper,
   makeDesktopItem,
   copyDesktopItems,
+  substitute,
 }:
 let
   pname = "recaf";
+  version = "4.0-unstable-2025-02-20";
+  commit = "6e83f6a7d22aa95e8f4caaa13c84e8074b7373fa";
   jdk = jdk23.override { enableJavaFX = true; };
 in
 stdenv.mkDerivation {
-  inherit pname;
-  version = "4.0-unstable-2024-12-11";
+  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "Col-E";
     repo = "Recaf";
-    rev = "483b8004251e5c654090d2315af30913d724a083";
-    hash = "sha256-OKz9KSl1g0ddLm38f6E6Ee9X0Q53hngPZPFDtramunQ=";
-    #Required for build info
-    leaveDotGit = true;
+    rev = commit;
+    hash = "sha256-GyDGsdGO4Uq8L0CLc1falPDQE7W1xLaHCcasucqFxwQ=";
   };
 
   nativeBuildInputs = [
-    git
     jdk
     gradle
     makeWrapper
@@ -37,6 +36,10 @@ stdenv.mkDerivation {
   patches = [
     ./wrap-javafx.patch
     ./use-java-23.patch
+    (substitute {
+      src = ./create-version-file.patch;
+      inherit version commit;
+    })
   ];
 
   mitmCache = gradle.fetchDeps {
diff --git a/pkgs/by-name/re/recaf/wrap-javafx.patch b/pkgs/by-name/re/recaf/wrap-javafx.patch
index b0f865961fc0..3f1c4d062792 100644
--- a/pkgs/by-name/re/recaf/wrap-javafx.patch
+++ b/pkgs/by-name/re/recaf/wrap-javafx.patch
@@ -5,7 +5,7 @@ index 04d19ecc8..6f2af575f 100644
 @@ -5,11 +5,15 @@
  }
  
- def javaFxVersion = '22.0.1'
+ def javaFxVersion = '23.0.2'
 -def javaFxIncludeInDist = System.getProperty('skip_jfx_bundle') == null
 +def javaFxPlatform = System.getenv('FX_PLATFORM')