Unverified Commit 03ea0168 authored by Francesco Gazzetta's avatar Francesco Gazzetta Committed by GitHub
Browse files

Merge pull request #218173 from TheKostins/mindustry-142 

mindustry: 141.2 -> 142
parents 19e81a92 27684f88

maintainers/maintainer-list.nix

+9 −0
Original line number Diff line number Diff line
@@ -14809,6 +14809,15 @@ 
      fingerprint = "38A0 29B0 4A7E 4C13 A4BB  86C8 7D51 0786 6B1C 6752";

    }];

  };

  thekostins = {

    name = "Konstantin";

    email = "anisimovkosta19@gmail.com";

    github = "TheKostins";

    githubId = 39405421;

    keys = [{

      fingerprint = "B216 7B33 E248 097F D82A  991D C94D 589A 4D0D CDD2";

    }];

  };

  thelegy = {

    email = "mail+nixos@0jb.de";

    github = "thelegy";

pkgs/games/mindustry/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -34,20 +34,20 @@ 


let

  pname = "mindustry";

  version = "141.2";

  version = "142";

  buildVersion = makeBuildVersion version;



  Mindustry = fetchFromGitHub {

    owner = "Anuken";

    repo = "Mindustry";

    rev = "v${version}";

    hash = "sha256-7olnyjkcT8OwokipDnLFW3rMOPljF6HvsU249SDvA3U=";

    hash = "sha256-xL1oy93ljAl1hdzsdEF9NHZL/yb11markUg271C++R4=";

  };

  Arc = fetchFromGitHub {

    owner = "Anuken";

    repo = "Arc";

    rev = "v${version}";

    hash = "sha256-JYM2/dkrLFZz+oqOs8e+iTRG5Vv4oUcmpAavRQ7NMMM=";

    hash = "sha256-CKcAnYAuHQb6wPkDUpinU83MVxhdvhYpjjuS3sEb6cg=";

  };

  soloud = fetchFromGitHub {

    owner = "Anuken";
@@ -126,7 +126,7 @@ let 
        | sh

    '';

    outputHashMode = "recursive";

    outputHash = "sha256-Eb+LyO1d2XwhAp9awgMlxs7dfZav0ja9kH7PaUJQOCo=";

    outputHash = "sha256-Fy2GXdB+cmRfiQFKnnz+UTUxT+LBTZa69BNwC23XD84=";

  };



in
@@ -229,7 +229,7 @@ stdenv.mkDerivation rec { 
      binaryBytecode  # deps

    ];

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ chkno fgaz ];

    maintainers = with maintainers; [ chkno fgaz thekostins ];

    platforms = platforms.x86_64;

    # Hash mismatch on darwin:

    # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293