From 03c659190515317c5164ae6239a9556b6c1ac12a Mon Sep 17 00:00:00 2001
From: Mostly Void <dit7ya@users.noreply.github.com>
Date: Mon, 5 Jun 2023 04:22:20 +0530
Subject: [PATCH] zincsearch: 0.3.5 -> 0.4.5, rename from zinc (#218017)

* zincsearch: 0.3.5 -> 0.4.5, rename from zinc

Renamed existing zinc package to zincsearch following upstream.

* Update pkgs/top-level/aliases.nix

---------

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../search/{zinc => zincsearch}/default.nix   | 26 ++++++++++---------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)
 rename pkgs/servers/search/{zinc => zincsearch}/default.nix (58%)

diff --git a/pkgs/servers/search/zinc/default.nix b/pkgs/servers/search/zincsearch/default.nix
similarity index 58%
rename from pkgs/servers/search/zinc/default.nix
rename to pkgs/servers/search/zincsearch/default.nix
index 3c844ee5eb8f..a6079b75d91c 100644
--- a/pkgs/servers/search/zinc/default.nix
+++ b/pkgs/servers/search/zincsearch/default.nix
@@ -3,13 +3,14 @@
 , fetchFromGitHub
 , buildNpmPackage
 }:
+
 let
-  version = "0.3.6";
+  version = "0.4.5";
   src = fetchFromGitHub {
     owner = "zinclabs";
-    repo = "zinc";
+    repo = "zincsearch";
     rev = "v${version}";
-    sha256 = "sha256-7pPVX/jdHN7EMss6/uRZqJO+zDfDLZv/iG5iboB+s64=";
+    hash = "sha256-V4eI7cur+KI+PEcplQJdTBaT0czpN0ENN30W5rrzE+k=";
   };
 
   webui = buildNpmPackage {
@@ -18,9 +19,11 @@ let
 
     sourceRoot = "source/web";
 
-    npmDepsHash = "sha256-clRijS+hxWc1LwlAKjEEk/6XPBYC6CcLq5g/ry4a04g=";
+    npmDepsHash = "sha256-2AjUaEOn2Tj+X4f42SvNq1kX07WxkB1sl5KtGdCjbdw=";
 
-    CYPRESS_INSTALL_BINARY = 0; # cypress tries to download binaries otherwise
+    env = {
+      CYPRESS_INSTALL_BINARY = 0; # cypress tries to download binaries otherwise
+    };
 
     installPhase = ''
       mkdir -p $out/share
@@ -28,28 +31,27 @@ let
     '';
   };
 in
+
 buildGoModule rec {
-  pname = "zinc";
+  pname = "zincsearch";
   inherit src version;
 
   preBuild = ''
     cp -r ${webui}/share/zinc-ui web/dist
   '';
 
-  vendorHash = "sha256-akjb0cxHbITKS26c+7lVSHWO/KRoQVVKzAOra+tdAD8=";
-  subPackages = [ "cmd/zinc" ];
-
-  CGO_ENABLED = 0;
+  vendorHash = "sha256-TYs1iRUA4WC3iMS508c7jUC3Co86CKYjL5WFlnoyPhg=";
+  subPackages = [ "cmd/zincsearch" ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/zinclabs/zinc/pkg/meta.Version=${version}"
+    "-X github.com/zinclabs/zincsearch/pkg/meta.Version=${version}"
   ];
 
   meta = with lib; {
     description = "A lightweight alternative to elasticsearch that requires minimal resources, written in Go";
-    homepage = "https://github.com/zinclabs/zinc";
+    homepage = "https://zinc.dev";
     license = licenses.asl20;
     maintainers = with maintainers; [ dit7ya ];
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7814932b07c3..06c031534a25 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1833,6 +1833,7 @@ mapAliases ({
   zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22
   zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions"; # Added 2021-03-28
   zimwriterfs = throw "zimwriterfs is now part of zim-tools"; # Added 2022-06-10.
+  zinc = zincsearch; # Added 2023-05-28
   zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06
 
   # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c0ac69253a3..fcca5d8cb83f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14371,7 +14371,7 @@ with pkgs;
 
   zip = callPackage ../tools/archivers/zip { };
 
-  zinc = callPackage ../servers/search/zinc { };
+  zincsearch = callPackage ../servers/search/zincsearch { };
 
   zkfuse = callPackage ../tools/filesystems/zkfuse { };