From 97ad77ba73dada18fccc1cbd14a1fbc34952034a Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Thu, 26 Sep 2024 18:57:24 -0400
Subject: [PATCH 1/2] nix-your-shell: move to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../ni/nix-your-shell/package.nix}                       | 9 +++++----
 pkgs/top-level/all-packages.nix                          | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename pkgs/{shells/nix-your-shell/default.nix => by-name/ni/nix-your-shell/package.nix} (91%)

diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/by-name/ni/nix-your-shell/package.nix
similarity index 91%
rename from pkgs/shells/nix-your-shell/default.nix
rename to pkgs/by-name/ni/nix-your-shell/package.nix
index 58190591e989..8219533474ce 100644
--- a/pkgs/shells/nix-your-shell/default.nix
+++ b/pkgs/by-name/ni/nix-your-shell/package.nix
@@ -1,7 +1,8 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, nix-update-script
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "nix-your-shell";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 565fab148e84..b08744b6deeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14315,8 +14315,6 @@ with pkgs;
 
   agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { };
 
-  nix-your-shell = callPackage ../shells/nix-your-shell { };
-
   bash = lowPrio (callPackage ../shells/bash/5.nix { });
   # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
   bashInteractive = callPackage ../shells/bash/5.nix {

From 0068504cf1e92524f7a5337ad3266c7f1786595e Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Thu, 26 Sep 2024 21:06:37 -0400
Subject: [PATCH 2/2] nix-your-shell: modernize & cleanup

---
 pkgs/by-name/ni/nix-your-shell/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix
index 8219533474ce..ed007d20a686 100644
--- a/pkgs/by-name/ni/nix-your-shell/package.nix
+++ b/pkgs/by-name/ni/nix-your-shell/package.nix
@@ -10,19 +10,20 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "MercuryTechnologies";
-    repo = pname;
+    repo = "nix-your-shell";
     rev = "v${version}";
     hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=";
   };
 
   cargoHash = "sha256-2NgN2/dr48ogkcjOq6UE4jDQBeewceWzdpRlXqi744s=";
 
-  meta = with lib; {
+  meta = {
     mainProgram = "nix-your-shell";
     description = "`nix` and `nix-shell` wrapper for shells other than `bash`";
     homepage = "https://github.com/MercuryTechnologies/nix-your-shell";
-    license = [ licenses.mit ];
-    maintainers = [ maintainers._9999years ];
+    changelog = "https://github.com/MercuryTechnologies/nix-your-shell/releases/tags/v${version}";
+    license = [ lib.licenses.mit ];
+    maintainers = with lib.maintainers; [ _9999years ];
   };
 
   passthru.updateScript = nix-update-script { };