From 1d12e6144db0a34c452c6ebc68a13adfc6f09fbd Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 31 Dec 2024 15:43:40 -0300
Subject: [PATCH 1/2] cargo-msrv: move to pkgs/by-name

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../default.nix => by-name/ca/cargo-msrv/package.nix} | 11 +----------
 pkgs/top-level/all-packages.nix                       |  3 ---
 2 files changed, 1 insertion(+), 13 deletions(-)
 rename pkgs/{development/tools/rust/cargo-msrv/default.nix => by-name/ca/cargo-msrv/package.nix} (88%)

diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/by-name/ca/cargo-msrv/package.nix
similarity index 88%
rename from pkgs/development/tools/rust/cargo-msrv/default.nix
rename to pkgs/by-name/ca/cargo-msrv/package.nix
index 4a1ff0908d59..4ce70db69e9c 100644
--- a/pkgs/development/tools/rust/cargo-msrv/default.nix
+++ b/pkgs/by-name/ca/cargo-msrv/package.nix
@@ -6,8 +6,6 @@
   rustup,
   openssl,
   stdenv,
-  libiconv,
-  Security,
   makeWrapper,
   gitUpdater,
 }:
@@ -35,14 +33,7 @@ rustPlatform.buildRustPackage rec {
   # Integration tests fail
   doCheck = false;
 
-  buildInputs =
-    if stdenv.hostPlatform.isDarwin then
-      [
-        libiconv
-        Security
-      ]
-    else
-      [ openssl ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 679e0a50c3a8..c8f55bed9b85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6820,9 +6820,6 @@ with pkgs;
     zig = buildPackages.zig_0_12;
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
-  cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
   cargo-ndk = callPackage ../development/tools/rust/cargo-ndk {
     inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation;
   };

From 7fb7b560d665dd4b8d19829163fc36a3fb8dc0cb Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 31 Dec 2024 18:24:07 +0000
Subject: [PATCH 2/2] cargo-msrv: 0.16.2 -> 0.17.1

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 pkgs/by-name/ca/cargo-msrv/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-msrv/package.nix b/pkgs/by-name/ca/cargo-msrv/package.nix
index 4ce70db69e9c..4cd3c6b098fd 100644
--- a/pkgs/by-name/ca/cargo-msrv/package.nix
+++ b/pkgs/by-name/ca/cargo-msrv/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-msrv";
-  version = "0.16.2";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "foresterre";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-pgSwyq5KK9PCsmMnquufaw2oW7VSm93xRmozi/uqzNc=";
+    tag = "v${version}";
+    sha256 = "sha256-cRdnx9K+EkVEKtPxQk+gXK6nkgkpWhpYij/5e7pFzMU=";
   };
 
-  cargoHash = "sha256-4eGoNKv76+3QVRUbTPiqTiLbQoOX6mVouJ3puxN6pMY=";
+  cargoHash = "sha256-Hs/bdDpJFQ0w+Ds2L5at06Sw3F+5bXu5HU798gR9/9Q=";
 
   passthru = {
     updateScript = gitUpdater {