diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix deleted file mode 100644 index eeacf4c0fe3a..000000000000 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, buildPackages, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "stern"; - version = "1.30.0"; - - src = fetchFromGitHub { - owner = "stern"; - repo = "stern"; - rev = "v${version}"; - sha256 = "sha256-sqRPX+NC58mQi0wvs3u3Lb81LBntaY1FzzlY1TIiz18="; - }; - - vendorHash = "sha256-RLcF7KfKtkwB+nWzaQb8Va9pau+TS2uE9AmJ0aFNsik="; - - subPackages = [ "." ]; - - nativeBuildInputs = [ installShellFiles ]; - - ldflags = [ "-s" "-w" "-X github.com/stern/stern/cmd.version=${version}" ]; - - postInstall = let - stern = if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else buildPackages.stern; - in - '' - for shell in bash zsh fish; do - ${stern}/bin/stern --completion $shell > stern.$shell - installShellCompletion stern.$shell - done - ''; - - meta = with lib; { - description = "Multi pod and container log tailing for Kubernetes"; - mainProgram = "stern"; - homepage = "https://github.com/stern/stern"; - license = licenses.asl20; - maintainers = with maintainers; [ mbode preisschild ]; - }; -} diff --git a/pkgs/by-name/st/stern/package.nix b/pkgs/by-name/st/stern/package.nix new file mode 100644 index 000000000000..b12003f8008a --- /dev/null +++ b/pkgs/by-name/st/stern/package.nix @@ -0,0 +1,61 @@ +{ + buildGoModule, + buildPackages, + fetchFromGitHub, + installShellFiles, + lib, + stdenv, + stern, + testers, +}: + +buildGoModule rec { + pname = "stern"; + version = "1.31.0"; + + src = fetchFromGitHub { + owner = "stern"; + repo = "stern"; + rev = "v${version}"; + hash = "sha256-1jwjd9enO2rQnC+04brzfJKSutnkWLMPyZD0wAqHBfg="; + }; + + vendorHash = "sha256-IBOkx+y7EFQeQ0sumXiVRqKqHts4SOxB138Uz644cnc="; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/stern/stern/cmd.version=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = + let + stern = if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else buildPackages.stern; + in + '' + for shell in bash zsh fish; do + ${stern}/bin/stern --completion $shell > stern.$shell + installShellCompletion stern.$shell + done + ''; + + passthru.tests.version = testers.testVersion { + package = stern; + }; + + meta = { + description = "Multi pod and container log tailing for Kubernetes"; + changelog = "https://github.com/stern/stern/releases/tag/v${version}"; + homepage = "https://github.com/stern/stern"; + license = lib.licenses.asl20; + mainProgram = "stern"; + maintainers = with lib.maintainers; [ + mbode + preisschild + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d9399cabb86..90ad501978a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37867,8 +37867,6 @@ with pkgs; stepreduce = callPackage ../applications/misc/stepreduce { }; - stern = callPackage ../applications/networking/cluster/stern { }; - streamripper = callPackage ../applications/audio/streamripper { }; sqsh = callPackage ../development/tools/sqsh { };