From 7a84b04cedd9bb072f544aac3f9445b174f560e1 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 27 Sep 2022 09:46:46 +0200 Subject: [PATCH 1/4] irrlichtmt: 1.9.0mt7 -> 1.9.0mt8 --- pkgs/development/libraries/irrlichtmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/irrlichtmt/default.nix b/pkgs/development/libraries/irrlichtmt/default.nix index 752bdbe7b4b9..c5d2bcf17691 100644 --- a/pkgs/development/libraries/irrlichtmt/default.nix +++ b/pkgs/development/libraries/irrlichtmt/default.nix @@ -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 = [ From aee300a6b58daca255efda95ec40989cbf9a0d44 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 27 Sep 2022 09:47:21 +0200 Subject: [PATCH 2/4] minetest: 5.6.0 -> 5.6.1 --- pkgs/games/minetest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 36ab2bfe58d3..e767e07ee448 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -127,9 +127,9 @@ let }; 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; }); From 2819931e413b241fce9ef43647cc30a7a12f813e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 27 Sep 2022 09:47:40 +0200 Subject: [PATCH 3/4] minetest: add fgaz to maintainers --- pkgs/games/minetest/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index e767e07ee448..019dea456c6b 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -118,7 +118,7 @@ let description = "Infinite-world block sandbox game"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pyrolagus fpletz ]; + maintainers = with maintainers; [ pyrolagus fpletz fgaz ]; # 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 From 8c6f0187661ca49579f46d4642b8f3a82ef575fa Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 27 Sep 2022 09:48:24 +0200 Subject: [PATCH 4/4] minetest: update outdated broken expression --- pkgs/games/minetest/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 019dea456c6b..6191ba832630 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -119,10 +119,8 @@ let license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pyrolagus fpletz fgaz ]; - # 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; + # https://github.com/NixOS/nixpkgs/pull/186160#issuecomment-1212635918 + broken = stdenv.isDarwin; }; };