summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin <anisimovkosta19@gmail.com>2023-02-25 09:41:49 +0300
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-03-07 18:35:14 +0000
commit35451e12e6fac6d6270fd203477d1c722fd6f8c2 (patch)
tree91677a33802d9dcf92586a8c57a64558da6088f2
parentMerge pull request #219453 from angerman/backport-216956-to-release-22.11 (diff)
downloadnixpkgs-origin/backport-218173-to-release-22.11.tar.gz
(cherry picked from commit 27684f8832048988eecdced28f3879db396a9b7e)
-rw-r--r--maintainers/maintainer-list.nix9
-rw-r--r--pkgs/games/mindustry/default.nix10
2 files changed, 14 insertions, 5 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 58b59553a443..85f08f1ecc8b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13745,6 +13745,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";
diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix
index 520b90f5185d..45991d7c5518 100644
--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@@ -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