From 5a9860d7ad24ef05b537c3ea832a53577b9c430d Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 20 Oct 2024 16:25:23 +0200 Subject: [PATCH 1/4] alice-lg: reformat according to RFC166 --- pkgs/servers/alice-lg/default.nix | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index 720dda3f61eb..8d91f488f479 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -1,12 +1,13 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, fetchYarnDeps -, stdenv -, yarn -, nodejs -, nixosTests -, fixup-yarn-lock +{ + lib, + fetchFromGitHub, + buildGoModule, + fetchYarnDeps, + stdenv, + yarn, + nodejs, + nixosTests, + fixup-yarn-lock, }: buildGoModule rec { @@ -32,7 +33,11 @@ buildGoModule rec { hash = "sha256-PwByNIegKYTOT8Yg3nDMDFZiLRVkbX07z99YaDiBsIY="; }; - nativeBuildInputs = [ nodejs yarn fixup-yarn-lock ]; + nativeBuildInputs = [ + nodejs + yarn + fixup-yarn-lock + ]; configurePhase = '' runHook preConfigure @@ -81,7 +86,7 @@ buildGoModule rec { description = "Looking-glass for BGP sessions"; changelog = "https://github.com/alice-lg/alice-lg/blob/main/CHANGELOG.md"; license = licenses.bsd3; - maintainers = [ ]; + maintainers = with maintainers; [ stv0g ]; mainProgram = "alice-lg"; }; } From a24980521229f4e53a746bbfd526ea4af30cdc49 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 20 Oct 2024 16:29:50 +0200 Subject: [PATCH 2/4] alice-lg: avoid 'with lib' usage --- pkgs/servers/alice-lg/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index 8d91f488f479..da96bcc87b30 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -38,6 +38,7 @@ buildGoModule rec { yarn fixup-yarn-lock ]; + configurePhase = '' runHook preConfigure @@ -81,12 +82,12 @@ buildGoModule rec { passthru.tests = nixosTests.alice-lg; - meta = with lib; { + meta = { homepage = "https://github.com/alice-lg/alice-lg"; description = "Looking-glass for BGP sessions"; changelog = "https://github.com/alice-lg/alice-lg/blob/main/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ stv0g ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ stv0g ]; mainProgram = "alice-lg"; }; } From d8ca7f6f4aa94d282f36a601e9188121434733e1 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 20 Oct 2024 16:32:22 +0200 Subject: [PATCH 3/4] alice-lg: migrate to by-name --- .../alice-lg/default.nix => by-name/al/alice-lg/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/alice-lg/default.nix => by-name/al/alice-lg/package.nix} (100%) diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/by-name/al/alice-lg/package.nix similarity index 100% rename from pkgs/servers/alice-lg/default.nix rename to pkgs/by-name/al/alice-lg/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bda58a57c3ec..a05e092a2662 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1603,8 +1603,6 @@ with pkgs; inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { })) akku akkuPackages; - alice-lg = callPackage ../servers/alice-lg{ }; - alice-tools = callPackage ../tools/games/alice-tools { withGUI = false; }; From a7dfd9f1dc018dc5126fbb0690ee8f64686d79dc Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 27 Oct 2024 10:32:37 +0100 Subject: [PATCH 4/4] alice-lg: add updateScript --- pkgs/by-name/al/alice-lg/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alice-lg/package.nix b/pkgs/by-name/al/alice-lg/package.nix index da96bcc87b30..500f41f39082 100644 --- a/pkgs/by-name/al/alice-lg/package.nix +++ b/pkgs/by-name/al/alice-lg/package.nix @@ -4,6 +4,7 @@ buildGoModule, fetchYarnDeps, stdenv, + gitUpdater, yarn, nodejs, nixosTests, @@ -80,7 +81,10 @@ buildGoModule rec { subPackages = [ "cmd/alice-lg" ]; doCheck = false; - passthru.tests = nixosTests.alice-lg; + passthru = { + tests = nixosTests.alice-lg; + updateScript = gitUpdater { }; + }; meta = { homepage = "https://github.com/alice-lg/alice-lg";