From 9377b40c509bddf7ad2c1ee7ae51fcf4a76501af Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 4 Aug 2024 03:36:26 +0000 Subject: [PATCH 1/2] containerlab: move to by-name --- .../default.nix => by-name/co/containerlab/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/containerlab/default.nix => by-name/co/containerlab/package.nix} (100%) diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/by-name/co/containerlab/package.nix similarity index 100% rename from pkgs/tools/networking/containerlab/default.nix rename to pkgs/by-name/co/containerlab/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea869ed21a37..92d9cb16efef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -525,8 +525,6 @@ with pkgs; conserver = callPackage ../tools/misc/conserver { }; - containerlab = callPackage ../tools/networking/containerlab { }; - coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); confetty = callPackage ../applications/misc/confetty { }; From 3c9d0c6cbfb811d9bc868b7ee36b61f2377a1a08 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 23 Aug 2024 03:26:54 +0000 Subject: [PATCH 2/2] containerlab: 0.56.0 -> 0.57.0 --- pkgs/by-name/co/containerlab/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index b0b639c8d718..e2a6ed418df5 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -6,27 +6,32 @@ buildGoModule rec { pname = "containerlab"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-7jQvfEplGIwTtIAOBc6R5OfcxPQuEbBnzBoAI9mE+7E="; + hash = "sha256-dqREbTDRhSEQg8swZ5ljhAtu3Yv421/QNmpkWopPWbk="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-SPxpi9jG3Xtit9JOAv0xWd89qWJZXeIjMwoNTkVeDgk="; + vendorHash = "sha256-3ESz1wnbm6KfXSO5Fw4c7uUxL3K8Lsib5KAYoRD6vrw="; ldflags = [ "-s" "-w" - "-X" "github.com/srl-labs/containerlab/cmd.version=${version}" - "-X" "github.com/srl-labs/containerlab/cmd.commit=${src.rev}" - "-X" "github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z" + "-X github.com/srl-labs/containerlab/cmd.version=${version}" + "-X github.com/srl-labs/containerlab/cmd.commit=${src.rev}" + "-X github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z" ]; + preCheck = '' + # Fix failed TestLabelsInit test + export USER="runner" + ''; + postInstall = '' local INSTALL="$out/bin/containerlab" installShellCompletion --cmd containerlab \