From 37bdc088ef06194353c0ebe7643267e3881afeb8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 27 Apr 2021 20:42:47 -0300 Subject: cargo-msrv: init at 0.4.0 Signed-off-by: Otavio Salvador --- pkgs/development/tools/rust/cargo-msrv/default.nix | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-msrv/default.nix (limited to 'pkgs/development/tools/rust/cargo-msrv/default.nix') diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix new file mode 100644 index 00000000000..32ce1464f82 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-msrv"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "foresterre"; + repo = pname; + rev = "v${version}"; + sha256 = "1ynv5d2rxlc1gzq93v8qjyl5063w7q42g9m95250yh2lmf9hdj5i"; + }; + + cargoSha256 = "03rphdps17gzcmf8n5w14x5i5rjnfznsl150s3cz5vzhbmnlpszf"; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + # Integration tests fail + doCheck = false; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ pkg-config ]; + + meta = with lib; { + description = "Cargo subcommand \"msrv\": assists with finding your minimum supported Rust version (MSRV)"; + homepage = "https://github.com/foresterre/cargo-msrv"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ otavio ]; + }; +} -- cgit 1.4.1 From 67e530be793dd3c9b1c9f6eb61b471ddb99b796d Mon Sep 17 00:00:00 2001 From: Stéphan Kochen Date: Tue, 11 May 2021 10:33:52 +0200 Subject: cargo-msrv: fix darwin build --- pkgs/development/tools/rust/cargo-msrv/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs/development/tools/rust/cargo-msrv/default.nix') diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 32ce1464f82..d5feba80d09 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -4,6 +4,9 @@ , nix-update-script , pkg-config , openssl +, stdenv +, libiconv +, Security }: rustPlatform.buildRustPackage rec { @@ -28,7 +31,9 @@ rustPlatform.buildRustPackage rec { # Integration tests fail doCheck = false; - buildInputs = [ openssl ]; + buildInputs = if stdenv.isDarwin + then [ libiconv Security ] + else [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c2237cc7a9..d7b52b65724 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11529,7 +11529,9 @@ in cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { }; + cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; -- cgit 1.4.1 From b99b9359e9419adb65c79c283731ec2773549ae4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 May 2021 02:21:35 +0000 Subject: cargo-msrv: 0.4.0 -> 0.5.0 --- pkgs/development/tools/rust/cargo-msrv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/tools/rust/cargo-msrv/default.nix') diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index d5feba80d09..c6a02a4dff2 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "1ynv5d2rxlc1gzq93v8qjyl5063w7q42g9m95250yh2lmf9hdj5i"; + sha256 = "sha256-7XOpK6+JVV/p+g/Lb/ORUC9msME0vtuDbmiCBmuOJ8w="; }; - cargoSha256 = "03rphdps17gzcmf8n5w14x5i5rjnfznsl150s3cz5vzhbmnlpszf"; + cargoSha256 = "sha256-KYITZHBcb5G+7PW8kwbHSsereVjH39cVLQjqNaCq2iU="; passthru = { updateScript = nix-update-script { -- cgit 1.4.1 From 37802cc29a38584d503ba401c34a08049ec01359 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 02:05:33 +0000 Subject: cargo-msrv: 0.5.0 -> 0.6.0 --- pkgs/development/tools/rust/cargo-msrv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/tools/rust/cargo-msrv/default.nix') diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index c6a02a4dff2..74c2d9e680f 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7XOpK6+JVV/p+g/Lb/ORUC9msME0vtuDbmiCBmuOJ8w="; + sha256 = "sha256-DpgZrKy2rEKnI0/t4l3sDtNUhAwwFFSzq4CdRFqAkzY="; }; - cargoSha256 = "sha256-KYITZHBcb5G+7PW8kwbHSsereVjH39cVLQjqNaCq2iU="; + cargoSha256 = "sha256-ny8EA3dkirxEiFYiSFRxHnjf3mVO2LCWVR8fPHX87Ek="; passthru = { updateScript = nix-update-script { -- cgit 1.4.1 From 9f695b8d1aa213571aa74f27369aed2aba7ae9fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jun 2021 02:11:32 +0000 Subject: cargo-msrv: 0.6.0 -> 0.7.0 --- pkgs/development/tools/rust/cargo-msrv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/tools/rust/cargo-msrv/default.nix') diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 74c2d9e680f..216e8362215 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DpgZrKy2rEKnI0/t4l3sDtNUhAwwFFSzq4CdRFqAkzY="; + sha256 = "sha256-yTUYMLVjzbuHqQxW68snxQ0CzoOwEBGXWFR/4yfDZ34="; }; - cargoSha256 = "sha256-ny8EA3dkirxEiFYiSFRxHnjf3mVO2LCWVR8fPHX87Ek="; + cargoSha256 = "sha256-WXvl+Xbu/oGTEFhbn6GuLoiNX+DxwhtT6cuucCOQsC4="; passthru = { updateScript = nix-update-script { -- cgit 1.4.1