From f66b2432034f15a7580f4d69aa086d248c8179af Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 15:58:35 +0800 Subject: [PATCH 1/6] dae: use finalAttrs --- pkgs/by-name/da/dae/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 1d73bd57a9cc..5145554d73e8 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -6,14 +6,15 @@ nixosTests, nix-update-script, }: -buildGoModule rec { + +buildGoModule (finalAttrs: { pname = "dae"; version = "1.0.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-RpbWZEoGrCq3Py0hu6YDie6ErDTLS3oabqScPzhCtm0="; fetchSubmodules = true; }; @@ -33,7 +34,7 @@ buildGoModule rec { make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector -Wno-unused-command-line-argument" \ NOSTRIP=y \ - VERSION=${version} \ + VERSION=${finalAttrs.version} \ OUTPUT=$out/bin/dae runHook postBuild @@ -66,4 +67,4 @@ buildGoModule rec { platforms = platforms.linux; mainProgram = "dae"; }; -} +}) From 3d0db7f0f9998203ed927708fdf43dd8450c155a Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 15:59:56 +0800 Subject: [PATCH 2/6] dae: rev -> tag --- pkgs/by-name/da/dae/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 5145554d73e8..1086b4506532 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -14,7 +14,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RpbWZEoGrCq3Py0hu6YDie6ErDTLS3oabqScPzhCtm0="; fetchSubmodules = true; }; From 5d5dc61819caaf6c9cd1827e2860b064c51c2f75 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 16:00:44 +0800 Subject: [PATCH 3/6] dae: replace -> replace-fail --- pkgs/by-name/da/dae/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 1086b4506532..f22309b66d87 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -46,7 +46,7 @@ buildGoModule (finalAttrs: { postInstall = '' install -Dm444 install/dae.service $out/lib/systemd/system/dae.service substituteInPlace $out/lib/systemd/system/dae.service \ - --replace /usr/bin/dae $out/bin/dae + --replace-fail "/usr/bin/dae" "$out/bin/dae" ''; passthru.tests = { From f1eea15a950c0936d15f9dc749e169fc9cac6c68 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 16:01:12 +0800 Subject: [PATCH 4/6] dae: remove with lib --- pkgs/by-name/da/dae/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index f22309b66d87..3944819a984d 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -55,16 +55,16 @@ buildGoModule (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Linux high-performance transparent proxy solution based on eBPF"; homepage = "https://github.com/daeuniverse/dae"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ oluceps pokon548 luochen1990 ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "dae"; }; }) From e20629c39ff9bc60ab1653fc024f0a1c4a3b755d Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 16:10:37 +0800 Subject: [PATCH 5/6] dae: add versionCheckHook --- pkgs/by-name/da/dae/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 3944819a984d..826d1e265be1 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -3,6 +3,7 @@ clang, fetchFromGitHub, buildGoModule, + versionCheckHook, nixosTests, nix-update-script, }: @@ -49,6 +50,12 @@ buildGoModule (finalAttrs: { --replace-fail "/usr/bin/dae" "$out/bin/dae" ''; + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + passthru.tests = { inherit (nixosTests) dae; }; From ac2d3a0eee92d31ca0f0258058d9001e50608e76 Mon Sep 17 00:00:00 2001 From: mivorasu Date: Sun, 27 Jul 2025 16:11:34 +0800 Subject: [PATCH 6/6] dae: merge passthru --- pkgs/by-name/da/dae/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 826d1e265be1..67e802908d7a 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -56,12 +56,13 @@ buildGoModule (finalAttrs: { versionCheckProgramArg = "--version"; - passthru.tests = { - inherit (nixosTests) dae; + passthru = { + tests = { + inherit (nixosTests) dae; + }; + updateScript = nix-update-script { }; }; - passthru.updateScript = nix-update-script { }; - meta = { description = "Linux high-performance transparent proxy solution based on eBPF"; homepage = "https://github.com/daeuniverse/dae";