Skip to content

Commit

Permalink
Merge pull request #193150 from fgaz/minetest/5.6.1
Browse files Browse the repository at this point in the history
minetest: 5.6.0 -> 5.6.1, cleanup, add fgaz to maintainers
  • Loading branch information
fpletz authored Sep 27, 2022
2 parents 5836810 + 8c6f018 commit 4b59241
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/libraries/irrlichtmt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
}:
stdenv.mkDerivation rec {
pname = "irrlichtmt";
version = "1.9.0mt7";
version = "1.9.0mt8";

src = fetchFromGitHub {
owner = "minetest";
repo = "irrlicht";
rev = version;
sha256 = "sha256-Eu7zW3mXl7GPRmLnKjt/dPoZ64HPYulI7MO1dJfj+10=";
sha256 = "sha256-bwpALhBk16KugYqKuN57M3t5Ba7rdyrYWn/iBoi8hpg=";
};

nativeBuildInputs = [
Expand Down
14 changes: 6 additions & 8 deletions pkgs/games/minetest/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,16 @@ let
description = "Infinite-world block sandbox game";
license = licenses.lgpl21Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ pyrolagus fpletz ];
# never built on Hydra
# https://hydra.nixos.org/job/nixpkgs/trunk/minetestclient_4.x86_64-darwin
# https://hydra.nixos.org/job/nixpkgs/trunk/minetestserver_4.x86_64-darwin
broken = (lib.versionOlder version "5.0.0") && stdenv.isDarwin;
maintainers = with maintainers; [ pyrolagus fpletz fgaz ];
# https://github.com/NixOS/nixpkgs/pull/186160#issuecomment-1212635918
broken = stdenv.isDarwin;
};
};

v5 = {
version = "5.6.0";
sha256 = "sha256-wcbYcVHs4L0etOwUBjKvzsmZtnpOxpFgLV8nx3UfJQI=";
dataSha256 = "sha256-TVaDHYstFEuT0nBExwLE1PtM1CZh71t9CRxC9rEYTd4=";
version = "5.6.1";
sha256 = "sha256-1mUmtM09jqJhD2RcLCAjaI+JkqP52QYH3KLkY5MZ860=";
dataSha256 = "sha256-Ye8MihrOqjSoy+vNr/CM/C/sNXdexe08dxrmoMxsG/A=";
};

mkClient = version: generic (version // { buildClient = true; buildServer = false; });
Expand Down

0 comments on commit 4b59241

Please sign in to comment.