From 6cb1065d6e1016f849aac902206527a969ba62b3 Mon Sep 17 00:00:00 2001 From: Sofi Date: Thu, 25 Aug 2022 19:21:33 +0200 Subject: [PATCH 1/5] nixos/minecraft-server: optimize world generation inside test Due to how complex minecraft world generation has gotten in recent years, it now can take several minutes to complete the first generation of a world seed, even on relatively new and powerful hardware. We are testing if a minecraft server can run inside of a nix enviroment, and not so much about stress testing the CI. Test running before this change: > (finished: waiting for TCP port 43000, in 118.49 seconds) Test running with this change: > (finished: waiting for TCP port 43000, in 27.88 seconds) Choice of using `level-type` and `generate-structures` was made as they support almost every version of minecraft. These two also make it extremely clear what it does, compared to the more complex `generator-settings` and all its toggles. (cherry picked from commit aed32f226430b51deaf53e4d64be153539795b77) --- nixos/tests/minecraft-server.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/minecraft-server.nix b/nixos/tests/minecraft-server.nix index a51b36ff5308..6e733bb96c1c 100644 --- a/nixos/tests/minecraft-server.nix +++ b/nixos/tests/minecraft-server.nix @@ -18,6 +18,8 @@ in import ./make-test-python.nix ({ pkgs, ... }: { serverProperties = { enable-rcon = true; level-seed = seed; + level-type = "flat"; + generate-structures = false; online-mode = false; "rcon.password" = rcon-pass; "rcon.port" = rcon-port; From 2dad9728103ec0df542b68ff02e23ad818cfe6c0 Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 17 Aug 2022 22:38:51 -0400 Subject: [PATCH 2/5] dendrite: 0.8.5 -> 0.9.4 --- pkgs/servers/dendrite/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 71843ee8c763..29ddaa0ce956 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub +{ lib, stdenv, buildGoModule, fetchFromGitHub , nixosTests, postgresql, postgresqlTestHook }: buildGoModule rec { pname = "matrix-dendrite"; - version = "0.8.5"; + version = "0.9.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-MPWvBUI6Mqt3f5UY6lpTBwPpihW+QSNq1M3FnIff+mM="; + sha256 = "sha256-UB51Rd0AWEfj6qTfrRSWK/dq9MdLCqYoR/Gjwf65ZQk="; }; - vendorSha256 = "sha256-OXy2xuwTLPNvBnVB6wj/YRW/XMiekjTubRRPVX9bxdQ="; + vendorSha256 = "sha256-tgVImIfn1lPTYGXczoAxVta3L+VR0v13KowLIYQ7bwY="; checkInputs = [ postgresqlTestHook @@ -37,5 +37,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = teams.matrix.members; platforms = platforms.unix; + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 789f78948068..61787449d62d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21732,7 +21732,9 @@ with pkgs; dcnnt = python3Packages.callPackage ../servers/dcnnt { }; - dendrite = callPackage ../servers/dendrite { }; + dendrite = callPackage ../servers/dendrite { + buildGoModule = buildGo118Module; + }; dex-oidc = callPackage ../servers/dex { }; From 0252a6ee4c95a24ad860eed8ea11335c717f608a Mon Sep 17 00:00:00 2001 From: Winter Date: Fri, 19 Aug 2022 17:57:58 -0400 Subject: [PATCH 3/5] dendrite: disable tests --- pkgs/servers/dendrite/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 29ddaa0ce956..889b8bd83d12 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -14,6 +14,9 @@ buildGoModule rec { vendorSha256 = "sha256-tgVImIfn1lPTYGXczoAxVta3L+VR0v13KowLIYQ7bwY="; + # some tests are racy, re-enable once upstream has fixed them + doCheck = false; + checkInputs = [ postgresqlTestHook postgresql From 05951a56c2e2e2b25a7514e993728e5055b74140 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 20 Aug 2022 22:34:20 +0200 Subject: [PATCH 4/5] borgbackup: 1.2.1 -> 1.2.2 https://github.com/borgbackup/borg/releases/tag/1.2.2 (cherry picked from commit 5f609ee951f4414badf850c3fa0bfbb2b8979fec) --- pkgs/tools/backup/borgbackup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 28b4a9cbf96a..a59eb6290a1e 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -13,12 +13,12 @@ python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.2.1"; + version = "1.2.2"; format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-n5zi0ZI8szoUfubQgXfYYJdFZ3IbEUL8pnkUoC5kxjM="; + sha256 = "sha256-1zBodEPxvrYCsdcrrjYxj2+WVIGPzcUEWFQOxXnlcmA="; }; postPatch = '' From 0ba2543f8c855d7be8e90ef6c8dc89c1617e8a08 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Aug 2022 01:10:33 +0200 Subject: [PATCH 5/5] borgbackup: move manpages into man output By creating the man output the multiple-outputs hook will automatically move manpages in the correct path into it. (cherry picked from commit 237f49730588ac7dbd2606b776d3841b741f9f95) --- pkgs/tools/backup/borgbackup/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index a59eb6290a1e..e09b152c95b7 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -121,7 +121,7 @@ python3.pkgs.buildPythonApplication rec { inherit (nixosTests) borgbackup; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" "doc" "man" ]; meta = with lib; { description = "Deduplicating archiver with compression and encryption";