treewide reformat

This commit is contained in:
Gerg-L 2023-09-23 21:55:56 -04:00
parent de7683556e
commit fc21bf9436
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
42 changed files with 1012 additions and 876 deletions

View file

@ -1,4 +1,4 @@
{fetchFromGitHub}:
{ fetchFromGitHub }:
fetchFromGitHub {
owner = "Aloxaf";
repo = "fzf-tab";

View file

@ -3,19 +3,20 @@
runCommand,
imagemagick,
}:
runCommand "images" {
recursion = fetchurl {
url = "https://github.com/NixOS/nixos-artwork/raw/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-recursive.png";
sha256 = "sha256-YvFrlysNGMwJ7eMFOoz0KI8AjoPN3ao+AVOgnVZzkFE=";
};
logo = fetchurl {
url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/376ed4ba8dc2e611b7e8a62fdc680967ead5bd87/logo/nix-snowflake.svg";
sha256 = "sha256-SCuQlSPB14GFTq4XvExJ0QEuK2VIbrd5YYKHLRG/q5I=";
};
buildInputs = [imagemagick];
}
''
mkdir -p $out
cp $recursion $out/recursion.png
convert -background none -size 512x512 $logo $out/logo.png
''
runCommand "images"
{
recursion = fetchurl {
url = "https://github.com/NixOS/nixos-artwork/raw/bcdd2770f5f4839fddc9b503e68db2bc3a87ca4d/wallpapers/nix-wallpaper-recursive.png";
sha256 = "sha256-YvFrlysNGMwJ7eMFOoz0KI8AjoPN3ao+AVOgnVZzkFE=";
};
logo = fetchurl {
url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/376ed4ba8dc2e611b7e8a62fdc680967ead5bd87/logo/nix-snowflake.svg";
sha256 = "sha256-SCuQlSPB14GFTq4XvExJ0QEuK2VIbrd5YYKHLRG/q5I=";
};
buildInputs = [ imagemagick ];
}
''
mkdir -p $out
cp $recursion $out/recursion.png
convert -background none -size 512x512 $logo $out/logo.png
''

View file

@ -4,31 +4,37 @@
makeBinaryWrapper,
fetchurl,
jre,
}: let
}:
let
pname = "papermc";
version = "1.20.1.83";
in
runCommandNoCC "papermc" {
runCommandNoCC "papermc"
{
inherit pname version;
src = let
mcVersion = lib.versions.pad 3 version;
buildNum = builtins.elemAt (lib.versions.splitVersion version) 3;
in
src =
let
mcVersion = lib.versions.pad 3 version;
buildNum = builtins.elemAt (lib.versions.splitVersion version) 3;
in
fetchurl {
url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar";
hash = "sha256-HQpc3MOXa1wkXqgm9ciQj04FUIyuupnYiu+2RZ/sXE4=";
};
nativeBuildInputs = [makeBinaryWrapper];
nativeBuildInputs = [ makeBinaryWrapper ];
meta = {
description = "High-performance Minecraft Server";
homepage = "https://papermc.io/";
sourceProvenance = with lib.sourceTypes; [binaryBytecode];
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.gpl3Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [aaronjanse neonfuz];
maintainers = with lib.maintainers; [
aaronjanse
neonfuz
];
mainProgram = "minecraft-server";
};
}