Unverified Commit 7854cca1 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #274378 from rhendric/rhendric/maptool 

maptool: 1.13.2 -> 1.14.3
parents eda5bfce 1b2cc0d4

pkgs/games/maptool/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 
}:

let

  pname = "maptool";

  version = "1.13.2";

  version = "1.14.3";

  repoBase = "https://github.com/RPTools/maptool";

  src = fetchurl {

    url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst";

    hash = "sha256-Ntmro+t4qpP5BXW20t97ki0wt2NKaK5yQarsxDEKbb0=";

    hash = "sha256-KjP6zugQw9r1hvdxqOgTrt4hYMYg+lgjkgkj3tfb38s=";

  };



  meta = with lib; {

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -37911,8 +37911,8 @@ with pkgs; 
    # MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging

    # at launch in a class initialization deadlock. MapTool ships Temurin with

    # their pre-built releases so we might as well use it too.

    jre = temurin-bin-17;

    openjfx = openjfx17;

    jre = temurin-bin-21;

    openjfx = openjfx21;

  };















  mari0 = callPackage ../games/mari0 { };