diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/by-name/co/containerlab/package.nix similarity index 68% rename from pkgs/tools/networking/containerlab/default.nix rename to pkgs/by-name/co/containerlab/package.nix index b0b639c8d718..e2a6ed418df5 100644 --- a/pkgs/tools/networking/containerlab/default.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 \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab46f6533c89..12e6e9565da0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -523,8 +523,6 @@ with pkgs; conserver = callPackage ../tools/misc/conserver { }; - containerlab = callPackage ../tools/networking/containerlab { }; - coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); confetty = callPackage ../applications/misc/confetty { };