WIP Rewrite

flake.nix

@@ -2,28 +2,32 @@
   description = "Minecraft server in Nix";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
-    import-cargo.url = github:edolstra/import-cargo;
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    import-cargo.url = "github:edolstra/import-cargo";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, import-cargo, flake-utils }:
+  outputs = {
+    self,
+    nixpkgs,
+    import-cargo,
+    flake-utils,
+  }:
     {
       overlays = rec {
         mineflake = final: prev: {
           mineflake = import ./pkgs {
             pkgs = prev;
-            lib = prev.lib;
             inherit (import-cargo.builders) importCargo;
           };
         };
 
         mineflakeWithCustomAttrs = attrs: final: prev: {
           mineflake = import ./pkgs ({
-            pkgs = prev;
-            lib = prev.lib;
-            inherit (import-cargo.builders) importCargo;
-          } // attrs);
+              pkgs = prev;
+              inherit (import-cargo.builders) importCargo;
+            }
+            // attrs);
         };
 
         default = mineflake;
@@ -52,38 +56,34 @@
         };
         default = docker;
       };
-    } // flake-utils.lib.eachDefaultSystem (system:
-      let
+    }
+    // flake-utils.lib.eachDefaultSystem (
+      system: let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [ self.overlays.default ];
+          overlays = [self.overlays.default];
         };
         overlay = (self.overlays.default pkgs pkgs).mineflake;
-      in
-      {
-        devShells.default = import ./shell.nix { inherit pkgs; };
+      in {
+        devShells.default = import ./shell.nix {inherit pkgs;};
 
-        packages =
-          let
-            buildInputs = builtins.filter (p: p ? outPath) (builtins.attrValues overlay);
-            namedInputs =
-              builtins.listToAttrs
-                (builtins.map
-                  (p:
-                    {
-                      name = p;
-                      value = builtins.getAttr p overlay;
-                    })
-                  (builtins.filter
-                    (p: (builtins.getAttr p overlay) ? outPath)
-                    (builtins.attrNames overlay)
-                  )
-                );
-          in
-          (overlay // {
+        packages = let
+          buildInputs = builtins.filter (p: p ? outPath) (builtins.attrValues overlay);
+          namedInputs =
+            builtins.listToAttrs
+            (
+              map
+              (p: {
+                name = p.name;
+                value = p.outPath;
+              })
+              buildInputs
+            );
+        in (overlay
+          // {
             # This is a hack to get the buildInputs of the overlay
             # Used for caching on cachix
-            default = pkgs.stdenv.mkDerivation {
+            default = pkgs.stdenvNoCC.mkDerivation {
               name = "all";
               src = ./.;
               buildInputs = buildInputs;

pkgs/bungeecord/package.nix

@@ -0,0 +1,29 @@
+{
+  lib,
+  maven,
+  fetchgit,
+  mineflake,
+}:
+maven.buildMavenPackage rec {
+  pname = "bungeecord";
+  version = "1858";
+
+  src = fetchgit {
+    url = "https://github.com/SpigotMC/BungeeCord.git";
+    fetchSubmodules = true;
+    rev = "cd56fb32c207b39b9470d66d7c61f68d9f0c7e78";
+    sha256 = "sha256-pD0ZQRIYNJuohcnj6lKnOaALMiSB6yj/Arz/reu2qSM=";
+  };
+
+  mvnHash = "sha256-7vcVC/TZwiAQh38i7c9YK/ef1hj/v/d3mprFqiCYch4=";
+
+  nativeBuildInputs = [mineflake.installConfig];
+
+  installPhase = ''
+    install -Dm644 ./bootstrap/target/BungeeCord.jar $out/server.jar
+    ${lib.concatMapStrings (name: ''
+      install -Dm644 ./module/cmd-${name}/target/cmd_${name}.jar $out/modules/cmd_${name}.jar
+    '') ["alert" "find" "list" "send" "server"]}
+    install -Dm644 ./module/reconnect-yaml/target/reconnect_yaml.jar $out/modules/reconnect_yaml.jar
+  '';
+}