From c9ec396da2a3937a916046b4eed21eaf5fba8194 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 5 Jul 2025 15:06:12 +0800 Subject: [PATCH 1/5] scion: use finalAttrs --- pkgs/by-name/sc/scion/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 6fd522c04f8b..9e66f15c08fa 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -4,19 +4,15 @@ fetchFromGitHub, nixosTests, }: -let - version = "0.12.0"; -in - -buildGoModule { +buildGoModule (finalAttrs: { pname = "scion"; - inherit version; + version = "0.12.0"; src = fetchFromGitHub { owner = "scionproto"; repo = "scion"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-J51GIQQhS623wFUU5dI/TwT2rkDH69518lpdCLZ/iM0="; }; @@ -57,4 +53,4 @@ buildGoModule { matthewcroughan ]; }; -} +}) From 984c34799d2f98e6afea6a98176eb9ed146c8e4d Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 5 Jul 2025 15:08:10 +0800 Subject: [PATCH 2/5] scion: replace rev with tag --- pkgs/by-name/sc/scion/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 9e66f15c08fa..622456c8552c 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "scionproto"; repo = "scion"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-J51GIQQhS623wFUU5dI/TwT2rkDH69518lpdCLZ/iM0="; }; From f99d15bc0825af73a478e092dabe8610848bf047 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 5 Jul 2025 15:09:47 +0800 Subject: [PATCH 3/5] scion: avoid with lib; --- pkgs/by-name/sc/scion/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 622456c8552c..406af5e24d4e 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -43,12 +43,12 @@ buildGoModule (finalAttrs: { inherit (nixosTests) scion-freestanding-deployment; }; - meta = with lib; { + meta = { description = "Future Internet architecture utilizing path-aware networking"; homepage = "https://scion-architecture.net/"; - platforms = platforms.unix; - license = licenses.asl20; - maintainers = with maintainers; [ + platforms = lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sarcasticadmin matthewcroughan ]; From db39dd031d3c42eee1cea418a19b8b4f7c158ef3 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 5 Jul 2025 15:10:19 +0800 Subject: [PATCH 4/5] scion: add ngi team --- pkgs/by-name/sc/scion/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 406af5e24d4e..362ca59147a6 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -52,5 +52,6 @@ buildGoModule (finalAttrs: { sarcasticadmin matthewcroughan ]; + teams = with lib.teams; [ ngi ]; }; }) From 44e45dd65fdedacd3a9cf6127d3678123fcb59b2 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 5 Jul 2025 15:11:38 +0800 Subject: [PATCH 5/5] scion: add updateScript --- pkgs/by-name/sc/scion/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 362ca59147a6..cad28b77aa4f 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, nixosTests, }: buildGoModule (finalAttrs: { @@ -39,8 +40,11 @@ buildGoModule (finalAttrs: { tags = [ "sqlite_mattn" ]; - passthru.tests = { - inherit (nixosTests) scion-freestanding-deployment; + passthru = { + tests = { + inherit (nixosTests) scion-freestanding-deployment; + }; + updateScript = nix-update-script { }; }; meta = {