Merge pull request '➕ Add nix-minecraft module, packages' (#33) from nix-minecraft into master
Publish packages to Attic / publish (push) Successful in 8m20s

Reviewed-on: #33
This commit was merged in pull request #33.
This commit is contained in:
wymiller committed 2026-10-26 16:54:02 -05:00
commit 8ec05b20ce
2 files changed
+78 -4

No files matched your search

Generated
+54
View File
@@ -58,6 +58,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-schemas": { "flake-schemas": {
"locked": { "locked": {
"lastModified": 1780327564, "lastModified": 1780327564,
@@ -190,6 +206,28 @@
"type": "github" "type": "github"
} }
}, },
"nix-minecraft": {
"inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2"
},
"locked": {
"lastModified": 1792988509,
"narHash": "sha256-1Li/v57ePpV9t6E57w/XTu760H6hYHztwm1RSd6RA8k=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "931d87d3811cabc0277be27b94392d19291bd344",
"type": "github"
},
"original": {
"owner": "Infinidoge",
"repo": "nix-minecraft",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1792615934, "lastModified": 1792615934,
@@ -213,6 +251,7 @@
"go-overlay": "go-overlay", "go-overlay": "go-overlay",
"hildibrand": "hildibrand", "hildibrand": "hildibrand",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-minecraft": "nix-minecraft",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
} }
@@ -293,6 +332,21 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
+24 -4
View File
@@ -15,6 +15,10 @@
url = "github:purpleclay/go-overlay"; url = "github:purpleclay/go-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-minecraft = {
url = "github:Infinidoge/nix-minecraft";
inputs.nixpkgs.follows = "nixpkgs";
};
hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git"; hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git";
hildibrand.inputs.nixpkgs.follows = "nixpkgs"; hildibrand.inputs.nixpkgs.follows = "nixpkgs";
@@ -22,7 +26,16 @@
caitsith.inputs.nixpkgs.follows = "nixpkgs"; caitsith.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs@{ self, nixpkgs, home-manager, darwin, rust-overlay, go-overlay, ... }: outputs =
inputs@{
self,
nixpkgs,
home-manager,
darwin,
rust-overlay,
go-overlay,
...
}:
let let
supportedSystems = [ supportedSystems = [
"x86_64-linux" "x86_64-linux"
@@ -40,15 +53,18 @@
overlays = [ self.overlays.default ]; overlays = [ self.overlays.default ];
}; };
in in
import ./pkgs { inputs.nix-minecraft.packages.${system}
// (import ./pkgs {
inherit pkgs; inherit pkgs;
# packages that are already built with Nix go here # packages that are already built with Nix go here
hildibrand = inputs.hildibrand.packages.${system}.default; hildibrand = inputs.hildibrand.packages.${system}.default;
caitsith = inputs.caitsith.packages.${system}.default; caitsith = inputs.caitsith.packages.${system}.default;
} })
); );
legacyPackages = forAllSystems (system: inputs.nix-minecraft.legacyPackages.${system});
devShells = forAllSystems ( devShells = forAllSystems (
system: system:
let let
@@ -63,13 +79,17 @@
} }
); );
overlays.minecraft = inputs.nix-minecraft.overlays.default;
overlays.default = nixpkgs.lib.composeManyExtensions [ overlays.default = nixpkgs.lib.composeManyExtensions [
rust-overlay.overlays.default rust-overlay.overlays.default
go-overlay.overlays.default go-overlay.overlays.default
self.overlays.minecraft
(import ./overlays) (import ./overlays)
]; ];
homeManagerModules = import ./modules/home-manager self; homeManagerModules = import ./modules/home-manager self;
nixosModules.default = import ./modules/nixos; nixosModules = inputs.nix-minecraft.nixosModules // {
default = import ./modules/nixos;
};
darwinModules.default = import ./modules/darwin; darwinModules.default = import ./modules/darwin;
}; };
} }