From d7e3b25dea27131def18db3b65930ec760e3c9a4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 10 Oct 2023 16:13:26 +0200 Subject: [PATCH 1/3] sonic-server: 1.4.0 -> 1.4.3 https://github.com/valeriansaliou/sonic/releases/tag/v1.4.3 https://github.com/valeriansaliou/sonic/releases/tag/v1.4.2 https://github.com/valeriansaliou/sonic/releases/tag/v1.4.1 --- pkgs/servers/search/sonic-server/default.nix | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix index 7d39d8cc759a..4b4d103f2f55 100644 --- a/pkgs/servers/search/sonic-server/default.nix +++ b/pkgs/servers/search/sonic-server/default.nix @@ -3,19 +3,20 @@ , fetchFromGitHub }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "sonic-server"; - version = "1.4.0"; + version = "1.4.3"; src = fetchFromGitHub { owner = "valeriansaliou"; repo = "sonic"; - rev = "f5302f5c424256648ba0be32b3c5909d846821fe"; - sha256 = "sha256-WebEluXijgJckZQOka2BDPYn7PqzPTsIcV2T380fxW8="; + rev = "refs/tags/v${version}"; + hash = "sha256-V97K4KS46DXje4qKA11O9NEm0s13aTUnM+XW8lGc6fo="; }; - cargoSha256 = "sha256-ObhKGjaIma6fUVUT3xadpy/GPYlnm0nKmRVxFmoePyQ="; + cargoHash = "sha256-vWAFWoscV0swwrBQoa3glKXMRgdGYa+QrPprlVCP1QM="; + # Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; nativeBuildInputs = [ @@ -27,19 +28,19 @@ rustPlatform.buildRustPackage { ''; postInstall = '' - mkdir -p $out/etc/ - mkdir -p $out/usr/lib/systemd/system/ - install -Dm444 -t $out/etc/sonic config.cfg - substitute \ - ./examples/config/systemd.service $out/usr/lib/systemd/system/sonic-server.service \ - --replace /bin/sonic $out/bin/sonic \ + install -Dm444 -t $out/lib/systemd/system debian/sonic.service + + substituteInPlace \ + $out/lib/systemd/system/sonic.service \ + --replace /usr/bin/sonic $out/bin/sonic \ --replace /etc/sonic.cfg $out/etc/sonic/config.cfg ''; meta = with lib; { description = "Fast, lightweight and schema-less search backend"; homepage = "https://github.com/valeriansaliou/sonic"; + changelog = "https://github.com/valeriansaliou/sonic/releases/tag/v${version}"; license = licenses.mpl20; platforms = platforms.unix; maintainers = with maintainers; [ pleshevskiy ]; From 37dfe0147f05f086d75eb40c09b02f51037f1868 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 10 Oct 2023 16:14:22 +0200 Subject: [PATCH 2/3] sonic-server: add passthru.tests and passthru.updateScript --- pkgs/servers/search/sonic-server/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix index 4b4d103f2f55..f5310d7e7f40 100644 --- a/pkgs/servers/search/sonic-server/default.nix +++ b/pkgs/servers/search/sonic-server/default.nix @@ -1,6 +1,9 @@ { lib , rustPlatform , fetchFromGitHub +, nix-update-script +, testers +, sonic-server }: rustPlatform.buildRustPackage rec { @@ -37,12 +40,23 @@ rustPlatform.buildRustPackage rec { --replace /etc/sonic.cfg $out/etc/sonic/config.cfg ''; + passthru = { + tests = { + version = testers.testVersion { + command = "sonic --version"; + package = sonic-server; + }; + }; + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Fast, lightweight and schema-less search backend"; homepage = "https://github.com/valeriansaliou/sonic"; changelog = "https://github.com/valeriansaliou/sonic/releases/tag/v${version}"; license = licenses.mpl20; platforms = platforms.unix; + mainProgram = "sonic"; maintainers = with maintainers; [ pleshevskiy ]; }; } From c66b09f77da62f5fe1dbbecdc4b1e230cc2d1de6 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 10 Oct 2023 16:14:38 +0200 Subject: [PATCH 3/3] sonic-server: add anthonyroussel to maintainers --- pkgs/servers/search/sonic-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix index f5310d7e7f40..81d56fcf0340 100644 --- a/pkgs/servers/search/sonic-server/default.nix +++ b/pkgs/servers/search/sonic-server/default.nix @@ -57,6 +57,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mpl20; platforms = platforms.unix; mainProgram = "sonic"; - maintainers = with maintainers; [ pleshevskiy ]; + maintainers = with maintainers; [ pleshevskiy anthonyroussel ]; }; }