From 44a9fdce36be4e6265bd0a88f5330155a1b15328 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Mon, 14 Oct 2024 11:50:10 -0300
Subject: [PATCH 1/2] stern: 1.30.0 -> 1.31.0

Release: https://github.com/stern/stern/releases/tag/v1.31.0

- nixfmt format
- add version test
- add meta.changelog
- replace sha256 with hash
- order attributes by alphabetical order and phases order
---
 .../networking/cluster/stern/default.nix      | 48 ++++++++++++++-----
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
index eeacf4c0fe3a..b12003f8008a 100644
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -1,27 +1,41 @@
-{ stdenv, lib, buildPackages, buildGoModule, fetchFromGitHub, installShellFiles }:
+{
+  buildGoModule,
+  buildPackages,
+  fetchFromGitHub,
+  installShellFiles,
+  lib,
+  stdenv,
+  stern,
+  testers,
+}:
 
 buildGoModule rec {
   pname = "stern";
-  version = "1.30.0";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "stern";
     repo = "stern";
     rev = "v${version}";
-    sha256 = "sha256-sqRPX+NC58mQi0wvs3u3Lb81LBntaY1FzzlY1TIiz18=";
+    hash = "sha256-1jwjd9enO2rQnC+04brzfJKSutnkWLMPyZD0wAqHBfg=";
   };
 
-  vendorHash = "sha256-RLcF7KfKtkwB+nWzaQb8Va9pau+TS2uE9AmJ0aFNsik=";
+  vendorHash = "sha256-IBOkx+y7EFQeQ0sumXiVRqKqHts4SOxB138Uz644cnc=";
 
   subPackages = [ "." ];
 
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/stern/stern/cmd.version=${version}"
+  ];
+
   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
+  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
@@ -29,11 +43,19 @@ buildGoModule rec {
       done
     '';
 
-  meta = with lib; {
+  passthru.tests.version = testers.testVersion {
+    package = stern;
+  };
+
+  meta = {
     description = "Multi pod and container log tailing for Kubernetes";
-    mainProgram = "stern";
+    changelog = "https://github.com/stern/stern/releases/tag/v${version}";
     homepage = "https://github.com/stern/stern";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ mbode preisschild ];
+    license = lib.licenses.asl20;
+    mainProgram = "stern";
+    maintainers = with lib.maintainers; [
+      mbode
+      preisschild
+    ];
   };
 }

From 049ee0417517497be8537edf77c488c01932cc32 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Mon, 14 Oct 2024 11:51:20 -0300
Subject: [PATCH 2/2] stern: move to pkgs/by-name

---
 .../cluster/stern/default.nix => by-name/st/stern/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/cluster/stern/default.nix => by-name/st/stern/package.nix} (100%)

diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/by-name/st/stern/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/stern/default.nix
rename to pkgs/by-name/st/stern/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 491f6c861dea..d6d18d1e978c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37921,8 +37921,6 @@ with pkgs;
 
   stepreduce = callPackage ../applications/misc/stepreduce { };
 
-  stern = callPackage ../applications/networking/cluster/stern { };
-
   streamripper = callPackage ../applications/audio/streamripper { };
 
   sqsh = callPackage ../development/tools/sqsh { };