From 306c383644f04553c2feccc7c86cfd333b16ffca Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 5 Jul 2025 16:14:39 +0800 Subject: [PATCH 1/4] re-isearch: rm unused finalAttr --- pkgs/by-name/re/re-isearch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index ca799c160456..11f85c2a1715 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -8,7 +8,7 @@ writableTmpDirAsHomeHook, }: -stdenv.mkDerivation (finalAttr: { +stdenv.mkDerivation { pname = "re-Isearch"; version = "2.20220925.4.0a-unstable-2025-03-16"; @@ -79,4 +79,4 @@ stdenv.mkDerivation (finalAttr: { maintainers = [ lib.maintainers.astro ]; teams = [ lib.teams.ngi ]; }; -}) +} From a5e3edddf18d234fe424f868237272ee1012cbeb Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 5 Jul 2025 16:15:54 +0800 Subject: [PATCH 2/4] re-isearch: rm preInstall --- pkgs/by-name/re/re-isearch/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index 11f85c2a1715..bf3e5d0be3a5 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -56,10 +56,6 @@ stdenv.mkDerivation { ) ''; - preInstall = '' - mkdir -p $out/{bin,lib} - ''; - installPhase = '' runHook preInstall From 3c950e8f9b3e980c0e851202d2b2e16c822acb56 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 5 Jul 2025 16:18:49 +0800 Subject: [PATCH 3/4] re-isearch: add updateScript --- pkgs/by-name/re/re-isearch/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index bf3e5d0be3a5..2fe757559448 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -6,6 +6,7 @@ file, libnsl, writableTmpDirAsHomeHook, + nix-update-script, }: stdenv.mkDerivation { @@ -67,6 +68,10 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = { description = "Novel multimodal search and retrieval engine"; homepage = "https://nlnet.nl/project/Re-iSearch/"; From 03a6840c51d8ded07ea2b11c4a82cbfe089d4169 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 5 Jul 2025 16:26:57 +0800 Subject: [PATCH 4/4] re-isearch: sha256 -> hash --- pkgs/by-name/re/re-isearch/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index 2fe757559448..b0e1e1c9e810 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "re-Isearch"; repo = "re-Isearch"; rev = "56e0dfbe7468881b3958ca8e630f41a5354e9873"; - sha256 = "sha256-tI75D02/sFEkHDQX/BpDlu24WNP6Qh9G0MIfEvs8npM="; + hash = "sha256-tI75D02/sFEkHDQX/BpDlu24WNP6Qh9G0MIfEvs8npM="; }; # Upstream issue: https://github.com/re-Isearch/re-Isearch/issues/11