diff options
| -rw-r--r-- | .github/workflows/build-modpack.yml | 4 | ||||
| -rw-r--r-- | files/.packignore (renamed from nix/files/.packignore) | 0 | ||||
| -rw-r--r-- | files/instance.cfg (renamed from nix/files/instance.cfg) | 0 | ||||
| -rw-r--r-- | files/mmc-pack.json (renamed from nix/files/mmc-pack.json) | 0 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 13 | ||||
| -rw-r--r-- | nix/default.nix | 9 | ||||
| -rw-r--r-- | nix/files/.minecraft/packwiz-installer-bootstrap.jar | bin | 98989 -> 0 bytes |
8 files changed, 14 insertions, 18 deletions
diff --git a/.github/workflows/build-modpack.yml b/.github/workflows/build-modpack.yml index aace7f9..7efd3d0 100644 --- a/.github/workflows/build-modpack.yml +++ b/.github/workflows/build-modpack.yml @@ -4,7 +4,7 @@ on: push: paths: # only run when prismlauncher modpack files are changed - - nix/files/** + - files/** workflow_dispatch: jobs: @@ -23,4 +23,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: getchoo-modpack.zip - path: ${{ github.workspace }}/result/* + path: ${{ github.workspace }}/result/getchoo-modpack.zip diff --git a/nix/files/.packignore b/files/.packignore index 448001c..448001c 100644 --- a/nix/files/.packignore +++ b/files/.packignore diff --git a/nix/files/instance.cfg b/files/instance.cfg index 9e1afb7..9e1afb7 100644 --- a/nix/files/instance.cfg +++ b/files/instance.cfg diff --git a/nix/files/mmc-pack.json b/files/mmc-pack.json index 624eee3..624eee3 100644 --- a/nix/files/mmc-pack.json +++ b/files/mmc-pack.json @@ -17,11 +17,11 @@ }, "packwiz2nix": { "locked": { - "lastModified": 1683785033, - "narHash": "sha256-2j1kcX5A8rjUCYfoGXg/Nymb6S9kfn4dRRHkMM5hlBY=", + "lastModified": 1683887515, + "narHash": "sha256-eYxlzal5DNUvpv3F9W42wREdRi6h1hceOcgoiN6gvRg=", "owner": "getchoo", "repo": "packwiz2nix", - "rev": "a0c9b2378a0d1b3e57fda1d377b9914e3bc141b6", + "rev": "1c9c0ef2e40fbd1a921b446d8fe5884e645e4308", "type": "github" }, "original": { @@ -7,12 +7,10 @@ }; outputs = { - self, nixpkgs, packwiz2nix, ... }: let - version = self.lastModifiedDate; systems = [ "x86_64-linux" "aarch64-linux" @@ -22,17 +20,24 @@ forAllSystems = nixpkgs.lib.genAttrs systems; nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); + inherit (packwiz2nix.lib) mkChecksumsApp mkMultiMCPack mkPackwizPackages; in { apps = forAllSystems (s: let pkgs = nixpkgsFor.${s}; in { - generate-checksums = packwiz2nix.lib.mkChecksumsApp pkgs ./mods; + generate-checksums = mkChecksumsApp pkgs ./mods; }); packages = forAllSystems (s: let pkgs = nixpkgsFor.${s}; + mods = mkPackwizPackages pkgs ./checksums.json; in rec { - getchoo-modpack = pkgs.callPackage ./nix {inherit version;}; + getchoo-modpack = mkMultiMCPack { + inherit pkgs mods; + filesDir = ./files; + name = "getchoo-modpack"; + }; + default = getchoo-modpack; }); diff --git a/nix/default.nix b/nix/default.nix deleted file mode 100644 index bd61190..0000000 --- a/nix/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - runCommand, - zip, - ... -}: -runCommand "getchoo-modpack" {} '' - mkdir -p "$out" - ${zip}/bin/zip "$out"/getchoo-modpack.zip ${./files}/{*,.*} -'' diff --git a/nix/files/.minecraft/packwiz-installer-bootstrap.jar b/nix/files/.minecraft/packwiz-installer-bootstrap.jar Binary files differdeleted file mode 100644 index 84b934c..0000000 --- a/nix/files/.minecraft/packwiz-installer-bootstrap.jar +++ /dev/null |