From 5ab01bc3533747f5e1a8d5c22e8d3724b2d39a64 Mon Sep 17 00:00:00 2001 From: Sofi Date: Mon, 22 Aug 2022 11:21:54 +0200 Subject: [PATCH] packwiz: remove packwiz from packages Change reason: Packwiz is now properly packaged in nixpkgs, there is no longer a reason to be packaging it inside of nix-minecraft. --- README.org | 4 ---- flake.lock | 19 +------------------ flake.nix | 4 ---- pkgs/tools/packwiz.nix | 16 ---------------- 4 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/tools/packwiz.nix diff --git a/README.org b/README.org index 2f8634ee..0cececd1 100644 --- a/README.org +++ b/README.org @@ -104,10 +104,6 @@ pkgs.fetchModrinthMod { id = "versionid"; hash = "hash from above command"; } Not yet available, however planned for the future, assuming an elegant-enough method can be found. For now, you can use ~fetchurl~ with the file URL and file hash. -*** ~packwiz~ - -A package of [[https://packwiz.infra.link/][Packwiz]], tracking the master branch at its [[github:packwiz/packwiz][GitHub repository]] - * Modules ** ~services.minecraft-servers~ diff --git a/flake.lock b/flake.lock index d6be153d..24d88bed 100644 --- a/flake.lock +++ b/flake.lock @@ -31,27 +31,10 @@ "type": "github" } }, - "packwiz": { - "flake": false, - "locked": { - "lastModified": 1655740746, - "narHash": "sha256-3at3g5RhbH5dw643hXyseUk+aeiONpKFqP4WAFUc1Ps=", - "owner": "packwiz", - "repo": "packwiz", - "rev": "0d8c1762a373f9da9b14cb4b8156082bbbe14de8", - "type": "github" - }, - "original": { - "owner": "packwiz", - "repo": "packwiz", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "packwiz": "packwiz" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 740d43a3..4e80439e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - - # Packages - packwiz = { url = "github:packwiz/packwiz"; flake = false; }; }; outputs = diff --git a/pkgs/tools/packwiz.nix b/pkgs/tools/packwiz.nix deleted file mode 100644 index 11b04c88..00000000 --- a/pkgs/tools/packwiz.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib -, buildGo118Module -, fetchFromGitHub -, inputs -}: -buildGo118Module rec { - pname = "packwiz"; - version = "unstable-2022-06-05"; - src = inputs.packwiz; - vendorSha256 = "sha256-M9u7N4IrL0B4pPRQwQG5TlMaGT++w3ZKHZ0RdxEHPKk="; - - meta = with lib; { - license = licenses.mit; - maintainers = with maintainers; [ infinidoge ]; - }; -}