chore: nf-fmt-nix

This commit is contained in:
arcnmx 2024-05-13 15:13:58 -07:00
parent 7486517713
commit 9903866044
160 changed files with 4570 additions and 3019 deletions

View file

@ -1,4 +1,8 @@
{ lib, mkMinecraftBedrockServerAddon, fetchurl }: let
{
lib,
mkMinecraftBedrockServerAddon,
fetchurl,
}: let
inherit (lib.attrsets) mapAttrs;
true-tree-capitator = {
version = "1.2";
@ -7,61 +11,72 @@
sourceRoot = ".";
meta.homepage = "https://www.curseforge.com/minecraft-bedrock/addons/tree-capitator";
};
true-tree-capitator-bp = true-tree-capitator // {
pname = "true-tree-capitator-bp";
mcpackId = "4d0f6078-f2f9-415f-9848-b36b008127b4";
mcpackType = "behavior_packs";
src = fetchurl {
name = "Tree-capitator-BP-v1.2.mcpack";
url = "https://mediafilez.forgecdn.net/files/5237/589/Tree%20capitator%20%5BBP%5D%20v1.2.mcpack";
sha256 = "c4b702be4dd45707b66ef3cfda578695347caa6a43ead30c06dc17cd14a00040";
true-tree-capitator-bp =
true-tree-capitator
// {
pname = "true-tree-capitator-bp";
mcpackId = "4d0f6078-f2f9-415f-9848-b36b008127b4";
mcpackType = "behavior_packs";
src = fetchurl {
name = "Tree-capitator-BP-v1.2.mcpack";
url = "https://mediafilez.forgecdn.net/files/5237/589/Tree%20capitator%20%5BBP%5D%20v1.2.mcpack";
sha256 = "c4b702be4dd45707b66ef3cfda578695347caa6a43ead30c06dc17cd14a00040";
};
postPatch = ''
substituteInPlace manifest.json \
--replace "1.10.0-beta" "1.11.0-beta"
'';
};
postPatch = ''
substituteInPlace manifest.json \
--replace "1.10.0-beta" "1.11.0-beta"
'';
};
true-tree-capitator-rp = true-tree-capitator // {
pname = "true-tree-capitator-rp";
mcpackId = "811af5f4-929b-4d77-aed4-119486b6c0a0";
mcpackType = "resource_packs";
src = fetchurl {
name = "Tree-capitator-RP-v1.2.mcpack";
url = "https://mediafilez.forgecdn.net/files/5237/590/Tree%20capitator%20%5BRP%5D%20v1.2.mcpack";
sha256 = "66c850106c7fa1764b32f20c555c1bb5e7e6905f3cbea4b429ca076e7a4cc31f";
true-tree-capitator-rp =
true-tree-capitator
// {
pname = "true-tree-capitator-rp";
mcpackId = "811af5f4-929b-4d77-aed4-119486b6c0a0";
mcpackType = "resource_packs";
src = fetchurl {
name = "Tree-capitator-RP-v1.2.mcpack";
url = "https://mediafilez.forgecdn.net/files/5237/590/Tree%20capitator%20%5BRP%5D%20v1.2.mcpack";
sha256 = "66c850106c7fa1764b32f20c555c1bb5e7e6905f3cbea4b429ca076e7a4cc31f";
};
};
};
definitive-tree-capitator = {
version = "1.0.0";
mcpackVersion = "1.0.0";
meta.homepage = "https://www.curseforge.com/minecraft-bedrock/addons/definitive-tree-capitator-addon";
};
definitive-tree-capitator-bh = definitive-tree-capitator // {
pname = "definitive-tree-capitator-bh";
mcpackId = "b3538a6c-3e42-400a-9ed0-5ec1670b796c";
mcpackType = "behavior_packs";
mcVersion = "1.20.20";
src = fetchurl {
url = "https://mediafilez.forgecdn.net/files/5214/136/Definitive%20Tree%20Capitator%20BH.mcpack";
sha256 = "941564d65386fd2701dfe017408d8c1d5b6d6a90a017e60b7ef9f6ff6de7b51a";
definitive-tree-capitator-bh =
definitive-tree-capitator
// {
pname = "definitive-tree-capitator-bh";
mcpackId = "b3538a6c-3e42-400a-9ed0-5ec1670b796c";
mcpackType = "behavior_packs";
mcVersion = "1.20.20";
src = fetchurl {
url = "https://mediafilez.forgecdn.net/files/5214/136/Definitive%20Tree%20Capitator%20BH.mcpack";
sha256 = "941564d65386fd2701dfe017408d8c1d5b6d6a90a017e60b7ef9f6ff6de7b51a";
};
patches = [
./definitive-tree-capitator-bh.patch
];
};
patches = [
./definitive-tree-capitator-bh.patch
];
};
definitive-tree-capitator-rs = definitive-tree-capitator // {
pname = "definitive-tree-capitator-rs";
mcpackId = "e01dd561-a1d9-45d0-b6ad-cd3858b93fe7";
mcpackType = "resource_packs";
mcVersion = "1.13.0";
src = fetchurl {
url = "https://mediafilez.forgecdn.net/files/5214/134/Definitive%20Tree%20Capitator%20RS.mcpack";
sha256 = "22c8ff1c85720052d9f2a0af1c205b5457a9bb806d65125cff3751fdbe22b864";
definitive-tree-capitator-rs =
definitive-tree-capitator
// {
pname = "definitive-tree-capitator-rs";
mcpackId = "e01dd561-a1d9-45d0-b6ad-cd3858b93fe7";
mcpackType = "resource_packs";
mcVersion = "1.13.0";
src = fetchurl {
url = "https://mediafilez.forgecdn.net/files/5214/134/Definitive%20Tree%20Capitator%20RS.mcpack";
sha256 = "22c8ff1c85720052d9f2a0af1c205b5457a9bb806d65125cff3751fdbe22b864";
};
};
};
in mapAttrs (_: mkMinecraftBedrockServerAddon) {
inherit
true-tree-capitator-bp true-tree-capitator-rp
definitive-tree-capitator-bh definitive-tree-capitator-rs
;
}
in
mapAttrs (_: mkMinecraftBedrockServerAddon) {
inherit
true-tree-capitator-bp
true-tree-capitator-rp
definitive-tree-capitator-bh
definitive-tree-capitator-rs
;
}

View file

@ -1,20 +1,30 @@
{ lib, minecraft-bedrock-server, stdenv, autoPatchelfHook, curl, gcc-unwrapped, unzip, openssl }: let
{
lib,
minecraft-bedrock-server,
stdenv,
autoPatchelfHook,
curl,
gcc-unwrapped,
unzip,
openssl,
}: let
inherit (lib.strings) versionAtLeast;
in stdenv.mkDerivation {
pname = "${minecraft-bedrock-server.pname}-libcrypto";
inherit (minecraft-bedrock-server) version src sourceRoot;
nativeBuildInputs = [
autoPatchelfHook
curl
gcc-unwrapped
openssl
unzip
];
installPhase = ''
install -m755 -D libCrypto.so $out/lib/libCrypto.so
'';
fixupPhase = ''
autoPatchelf $out/lib/libCrypto.so
'';
meta.broken = versionAtLeast minecraft-bedrock-server.version "1.20";
}
in
stdenv.mkDerivation {
pname = "${minecraft-bedrock-server.pname}-libcrypto";
inherit (minecraft-bedrock-server) version src sourceRoot;
nativeBuildInputs = [
autoPatchelfHook
curl
gcc-unwrapped
openssl
unzip
];
installPhase = ''
install -m755 -D libCrypto.so $out/lib/libCrypto.so
'';
fixupPhase = ''
autoPatchelf $out/lib/libCrypto.so
'';
meta.broken = versionAtLeast minecraft-bedrock-server.version "1.20";
}

View file

@ -1,6 +1,11 @@
{ stdenvNoCC, unzip, writeText }: stdenvNoCC.mkDerivation {
{
stdenvNoCC,
unzip,
writeText,
}:
stdenvNoCC.mkDerivation {
name = "unzip-mcpack";
propagatedBuildInputs = [ unzip ];
propagatedBuildInputs = [unzip];
dontUnpack = true;
setupHook = writeText "mcpack-setup-hook.sh" ''
unpackCmdHooks+=(_tryUnzipMcpack)

View file

@ -1,42 +1,62 @@
{ stdenvNoCC, unzipMcpack, minecraft-bedrock-server, lib }:
{
stdenvNoCC,
unzipMcpack,
minecraft-bedrock-server,
lib,
}: {
src,
pname,
version,
mcpackVersion ? version,
mcVersion ? null,
mcpackId,
mcpackModules ? [ ],
mcpackModules ? [],
mcpackDir ? pname,
mcpackType, # "behavior_packs" or "resource_packs" etc
...
}@args: let
} @ args: let
inherit (lib.strings) optionalString splitString;
inherit (minecraft-bedrock-server) dataDir;
argNames = [ "mcpackModules" "mcpackVersion" "mcpackId" ];
in stdenvNoCC.mkDerivation (removeAttrs args argNames // {
inherit dataDir mcpackType mcpackDir;
version = version + optionalString (mcVersion != null) "-${mcVersion}";
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
unzipMcpack
];
installPhase = args.installPhase or ''
install -d "$out$dataDir/$mcpackType/$mcpackDir"
cp -a ./* "$out$dataDir/$mcpackType/$mcpackDir/"
argNames = ["mcpackModules" "mcpackVersion" "mcpackId"];
in
stdenvNoCC.mkDerivation (removeAttrs args argNames
// {
inherit dataDir mcpackType mcpackDir;
version = version + optionalString (mcVersion != null) "-${mcVersion}";
nativeBuildInputs =
args.nativeBuildInputs
or []
++ [
unzipMcpack
];
installPhase =
args.installPhase
or ''
install -d "$out$dataDir/$mcpackType/$mcpackDir"
cp -a ./* "$out$dataDir/$mcpackType/$mcpackDir/"
install ./manifest.json $manifest
'';
outputs = [ "out" "manifest" ];
passthru = args.passthru or { } // {
minecraft-bedrock = args.passthru.minecraft-bedrock or { } // {
pack = args.passthru.minecraft-bedrock.pack or { } // {
pack_id = mcpackId;
modules = mcpackModules;
version = splitString "." mcpackVersion;
type = mcpackType;
dir = mcpackDir;
subPath = "${dataDir}/${mcpackType}/${mcpackDir}";
};
};
};
})
install ./manifest.json $manifest
'';
outputs = ["out" "manifest"];
passthru =
args.passthru
or {}
// {
minecraft-bedrock =
args.passthru.minecraft-bedrock
or {}
// {
pack =
args.passthru.minecraft-bedrock.pack
or {}
// {
pack_id = mcpackId;
modules = mcpackModules;
version = splitString "." mcpackVersion;
type = mcpackType;
dir = mcpackDir;
subPath = "${dataDir}/${mcpackType}/${mcpackDir}";
};
};
};
})

View file

@ -1,7 +1,11 @@
{ lib, python3, writeTextFile }: let
{
lib,
python3,
writeTextFile,
}: let
# https://github.com/minecraft-linux/server-modloader/tree/master?tab=readme-ov-file#getting-mods-to-work-on-newer-versions-116
inherit (lib.meta) getExe;
python = python3.withPackages (p: [ p.lief ]);
python = python3.withPackages (p: [p.lief]);
script = ''
import lief
import sys
@ -12,13 +16,14 @@
lib_symbols.write(sys.argv[2])
'';
name = "minecraft-bedrock-server-patchdebug";
in writeTextFile {
name = "${name}.py";
destination = "/bin/${name}";
executable = true;
text = ''
#!${getExe python}
${script}
'';
meta.mainProgram = name;
}
in
writeTextFile {
name = "${name}.py";
destination = "/bin/${name}";
executable = true;
text = ''
#!${getExe python}
${script}
'';
meta.mainProgram = name;
}

View file

@ -1,4 +1,5 @@
{ patchelf }: patchelf.overrideDerivation (old: {
{patchelf}:
patchelf.overrideDerivation (old: {
postPatch = ''
substituteInPlace src/patchelf.cc \
--replace "32 * 1024 * 1024" "512 * 1024 * 1024"

View file

@ -1,48 +1,53 @@
{ stdenv
, fetchurl
, minecraft-bedrock-server-patchelf
, minecraft-bedrock-server-patchdebug
#, minecraft-bedrock-server-libCrypto
, autoPatchelfHook
, curl, gcc-unwrapped, openssl, unzip
, lib
{
stdenv,
fetchurl,
minecraft-bedrock-server-patchelf,
minecraft-bedrock-server-patchdebug,
#, minecraft-bedrock-server-libCrypto
autoPatchelfHook,
curl,
gcc-unwrapped,
openssl,
unzip,
lib,
}: let
inherit (lib) licenses;
in stdenv.mkDerivation rec {
pname = "minecraft-bedrock-server";
version = "1.20.80.05";
src = fetchurl {
url = "https://minecraft.azureedge.net/bin-linux/bedrock-server-${version}.zip";
sha256 = "sha256-6vZx29FOXRR7Rzx82Axo3a/Em+9cpK7Hj3cuDRnW9+8=";
};
sourceRoot = ".";
nativeBuildInputs = [
minecraft-bedrock-server-patchelf
minecraft-bedrock-server-patchdebug
autoPatchelfHook
curl
gcc-unwrapped
#minecraft-bedrock-server-libCrypto
openssl
unzip
];
buildPhase = ''
minecraft-bedrock-server-patchdebug bedrock_server_symbols.debug bedrock_server_symbols_patched.debug
'';
dataDir = "/var/lib/minecraft-bedrock";
installPhase = ''
install -m755 -D bedrock_server $out/bin/bedrock_server
install -d $out$dataDir
cp -a definitions behavior_packs resource_packs config env-vars *.json *.debug *.properties $out$dataDir/
'';
fixupPhase = ''
autoPatchelf $out/bin/bedrock_server
'';
dontStrip = true;
in
stdenv.mkDerivation rec {
pname = "minecraft-bedrock-server";
version = "1.20.80.05";
src = fetchurl {
url = "https://minecraft.azureedge.net/bin-linux/bedrock-server-${version}.zip";
sha256 = "sha256-6vZx29FOXRR7Rzx82Axo3a/Em+9cpK7Hj3cuDRnW9+8=";
};
sourceRoot = ".";
nativeBuildInputs = [
minecraft-bedrock-server-patchelf
minecraft-bedrock-server-patchdebug
autoPatchelfHook
curl
gcc-unwrapped
#minecraft-bedrock-server-libCrypto
openssl
unzip
];
buildPhase = ''
minecraft-bedrock-server-patchdebug bedrock_server_symbols.debug bedrock_server_symbols_patched.debug
'';
dataDir = "/var/lib/minecraft-bedrock";
installPhase = ''
install -m755 -D bedrock_server $out/bin/bedrock_server
install -d $out$dataDir
cp -a definitions behavior_packs resource_packs config env-vars *.json *.debug *.properties $out$dataDir/
'';
fixupPhase = ''
autoPatchelf $out/bin/bedrock_server
'';
dontStrip = true;
meta = {
platforms = [ "x86_64-linux" ];
license = licenses.unfree;
mainProgram = "bedrock_server";
};
}
meta = {
platforms = ["x86_64-linux"];
license = licenses.unfree;
mainProgram = "bedrock_server";
};
}