diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 95f33ca0ac53..55690c7f7b11 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7117,6 +7117,12 @@ githubId = 90563298; name = "Dovydas Kersys"; }; + dyegoaurelio = { + name = "Dyego Aurelio"; + email = "d@dyego.email"; + github = "dyegoaurelio"; + githubId = 42411160; + }; dylan-gonzalez = { email = "dylcg10@gmail.com"; github = "dylan-gonzalez"; diff --git a/pkgs/by-name/fo/forge-mtg/no-launch4j.patch b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch index a1bec7e67c7c..8d4524d43522 100644 --- a/pkgs/by-name/fo/forge-mtg/no-launch4j.patch +++ b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch @@ -1,7 +1,7 @@ diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml -@@ -71,62 +71,6 @@ +@@ -69,62 +69,6 @@ diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix index 30d32b82b259..dba8c1a69e88 100644 --- a/pkgs/by-name/fo/forge-mtg/package.nix +++ b/pkgs/by-name/fo/forge-mtg/package.nix @@ -14,13 +14,13 @@ }: let - version = "2.0.05"; + version = "2.0.06"; src = fetchFromGitHub { owner = "Card-Forge"; repo = "forge"; rev = "forge-${version}"; - hash = "sha256-71CZBI4FvN5X7peDjhv+0cdTYv8hWwzM8ePdvQSb6QI="; + hash = "sha256-/V8Ce1r68Svf4TQ/zgIqSWjqIFr1uJOmv+aRNLm1qE4="; }; # launch4j downloads and runs a native binary during the package phase. @@ -31,7 +31,7 @@ maven.buildMavenPackage { pname = "forge-mtg"; inherit version src patches; - mvnHash = "sha256-krPOUaJTo5i3imkDvEkBJH3W01y1KypdvitqmZ5JMMA="; + mvnHash = "sha256-DeYmCmsDdNOVMlD+SwvSB2VdqvCDwKghXlyaDuamHiY="; doCheck = false; # Needs a running Xorg @@ -129,6 +129,9 @@ maven.buildMavenPackage { description = "Magic: the Gathering card game with rules enforcement"; homepage = "https://card-forge.github.io/forge"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ eigengrau ]; + maintainers = with maintainers; [ + dyegoaurelio + eigengrau + ]; }; } diff --git a/pkgs/by-name/fo/forge-mtg/update.sh b/pkgs/by-name/fo/forge-mtg/update.sh index f46eb254df24..e7d00310c4b4 100755 --- a/pkgs/by-name/fo/forge-mtg/update.sh +++ b/pkgs/by-name/fo/forge-mtg/update.sh @@ -109,7 +109,7 @@ update_patch() { fi fi fi - done < <(find "$source_dir" -name "pom.xml" -print0) + done < <(find "$source_dir" -name "pom.xml" -print0 | sort -z) if [[ "$plugin_found" == "true" && -n "$patch_content" ]]; then echo "Updating $patch_file..."