From a953fba96484fa54ea1efdafcbae3b0a792be191 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Sat, 9 Dec 2023 01:10:44 +0530 Subject: [PATCH] use zs from nixpkgs --- flake.nix | 11 ++++------- zs.nix | 41 ----------------------------------------- 2 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 zs.nix diff --git a/flake.nix b/flake.nix index 54566ba..3b18a7f 100644 --- a/flake.nix +++ b/flake.nix @@ -19,17 +19,14 @@ inherit system; }; in - with pkgs; let - zs = callPackage ./zs.nix { }; - in { - formatter = nixpkgs-fmt; - devShells.default = mkShell { + formatter = pkgs.nixpkgs-fmt; + devShells.default = pkgs.mkShell { buildInputs = [ - zs + pkgs.zs ]; }; - packages.default = callPackage ./default.nix { inherit zs; }; + packages.default = pkgs.callPackage ./default.nix { }; } ); } diff --git a/zs.nix b/zs.nix deleted file mode 100644 index cb48788..0000000 --- a/zs.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, fetchFromGitea, buildGoModule, installShellFiles }: - -buildGoModule rec { - pname = "zs"; - version = "0.4.1"; - - src = fetchFromGitea { - domain = "git.mills.io"; - owner = "prologic"; - repo = "zs"; - rev = version; - hash = "sha256-V8+p19kvVh64yCreNVp4RVdkJkjrq8Q5VbjaJWekZHY="; - }; - - vendorHash = "sha256-KXcYTYO4wnWOup5uJ6T+XwthX5l2FL02JyOt1Nv51Sg="; - - ldflags = [ - "-w" - "-X=main.Version=${version}" - "-X=main.Commit=${src.rev}" - "-X=main.Build=1970-01-01T00:00:00+00:00" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --cmd zs \ - --bash <($out/bin/zs completion bash) \ - --fish <($out/bin/zs completion fish) \ - --zsh <($out/bin/zs completion zsh) - ''; - - meta = with lib; { - description = "An extremely minimal static site generator written in Go"; - homepage = "https://git.mills.io/prologic/zs"; - changelog = "https://git.mills.io/prologic/zs/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ adtya ]; - mainProgram = "zs"; - }; -}