dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

zincsearch: 0.3.5 -> 0.4.5, rename from zinc (#218017)

Browse Source 
* 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>
This commit is contained in:
Mostly Void 2023-06-05 04:22:20 +05:30 committed by GitHub
parent b1efae4a9e
commit 03c6591905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/servers/search/zinc/default.nix → pkgs/servers/search/zincsearch/default.nix
View File

@ -3,13 +3,14 @@
, fetchFromGitHub , fetchFromGitHub
, buildNpmPackage , buildNpmPackage
}: }:
let let
version = "0.3.6"; version = "0.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zinclabs"; owner = "zinclabs";
repo = "zinc"; repo = "zincsearch";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-7pPVX/jdHN7EMss6/uRZqJO+zDfDLZv/iG5iboB+s64="; hash = "sha256-V4eI7cur+KI+PEcplQJdTBaT0czpN0ENN30W5rrzE+k=";
}; };
webui = buildNpmPackage { webui = buildNpmPackage {
@ -18,9 +19,11 @@ let
sourceRoot = "source/web"; 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 = '' installPhase = ''
mkdir -p $out/share mkdir -p $out/share
@ -28,28 +31,27 @@ let
''; '';
}; };
in in
buildGoModule rec { buildGoModule rec {
pname = "zinc"; pname = "zincsearch";
inherit src version; inherit src version;
preBuild = '' preBuild = ''
cp -r ${webui}/share/zinc-ui web/dist cp -r ${webui}/share/zinc-ui web/dist
''; '';
vendorHash = "sha256-akjb0cxHbITKS26c+7lVSHWO/KRoQVVKzAOra+tdAD8="; vendorHash = "sha256-TYs1iRUA4WC3iMS508c7jUC3Co86CKYjL5WFlnoyPhg=";
subPackages = [ "cmd/zinc" ]; subPackages = [ "cmd/zincsearch" ];
CGO_ENABLED = 0;
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
"-X github.com/zinclabs/zinc/pkg/meta.Version=${version}" "-X github.com/zinclabs/zincsearch/pkg/meta.Version=${version}"
]; ];
meta = with lib; { meta = with lib; {
description = "A lightweight alternative to elasticsearch that requires minimal resources, written in Go"; 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; license = licenses.asl20;
maintainers = with maintainers; [ dit7ya ]; maintainers = with maintainers; [ dit7ya ];
}; };

1
pkgs/top-level/aliases.nix
View File

@ -1833,6 +1833,7 @@ mapAliases ({
zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22 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 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. 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 zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06
# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03

2
pkgs/top-level/all-packages.nix
View File

@ -14371,7 +14371,7 @@ with pkgs;
zip = callPackage ../tools/archivers/zip { }; zip = callPackage ../tools/archivers/zip { };
zinc = callPackage ../servers/search/zinc { }; zincsearch = callPackage ../servers/search/zincsearch { };
zkfuse = callPackage ../tools/filesystems/zkfuse { }; zkfuse = callPackage ../tools/filesystems/zkfuse { };