diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/by-name/ca/cargo-msrv/package.nix similarity index 75% rename from pkgs/development/tools/rust/cargo-msrv/default.nix rename to pkgs/by-name/ca/cargo-msrv/package.nix index 4a1ff0908d59..4cd3c6b098fd 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/by-name/ca/cargo-msrv/package.nix @@ -6,24 +6,22 @@ rustup, openssl, stdenv, - libiconv, - Security, makeWrapper, gitUpdater, }: 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 { @@ -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 c692ea4871a1..58f4ab07d90a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6812,9 +6812,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; };