From 8d5472026ddc4617d9ad33dcccb3de43cf133ee6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 16 Aug 2023 20:56:09 -0400 Subject: [PATCH] cargo-workspaces: 0.2.43 -> 0.2.44 Diff: https://diff.rs/cargo-workspaces/0.2.43/0.2.44 Changelog: https://github.com/pksunkara/cargo-workspaces/blob/v0.2.44/CHANGELOG.md --- .../tools/rust/cargo-workspaces/default.nix | 47 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index 0c5ded210275..ccbddf3706c1 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -1,39 +1,42 @@ -{ fetchCrate -, lib +{ lib , rustPlatform +, fetchCrate , pkg-config +, libgit2_1_6 +, libssh2 , openssl , zlib , stdenv -, libssh2 -, libgit2 -, IOKit -, Security -, CoreFoundation -, AppKit -, System +, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-workspaces"; - version = "0.2.43"; + version = "0.2.44"; src = fetchCrate { inherit pname version; - sha256 = "sha256-xLwDCXJ/Ab4H1U4M9z3Xx7WWCr0Po2mvbL6jWtU/4K4="; + hash = "sha256-5r5XRb/RWHv0Am58VPOxe+QSKn2QT4JZYp5LjTh20KM="; }; - cargoHash = "sha256-jia2n+rKIDewDLPZPvJ+7jdF9uT/afwDhu6aEgpX9Kc="; + cargoHash = "sha256-p+7CWvspYk1LRO2s8Sstlven/2edNe+JYFQHaDFlGkM="; - # needed to get libssh2/libgit2 to link properly - LIBGIT2_SYS_USE_PKG_CONFIG = true; - LIBSSH2_SYS_USE_PKG_CONFIG = true; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl zlib libssh2 libgit2 ] ++ ( - lib.optionals stdenv.isDarwin ([ IOKit Security CoreFoundation AppKit ] - ++ (lib.optionals stdenv.isAarch64 [ System ])) - ); + buildInputs = [ + libgit2_1_6 + libssh2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + env = { + LIBSSH2_SYS_USE_PKG_CONFIG = true; + }; meta = with lib; { description = "A tool for managing cargo workspaces and their crates, inspired by lerna"; @@ -43,7 +46,9 @@ rustPlatform.buildRustPackage rec { commands and more. ''; homepage = "https://github.com/pksunkara/cargo-workspaces"; + changelog = "https://github.com/pksunkara/cargo-workspaces/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ macalinao matthiasbeyer ]; + maintainers = with maintainers; [ figsoda macalinao matthiasbeyer ]; + mainProgram = "cargo-workspaces"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6b5a8bf8e3f..a0896f5ba810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17147,9 +17147,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreServices Foundation; }; cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; - cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { - inherit (darwin.apple_sdk.frameworks) IOKit Security CoreFoundation AppKit System; - }; + cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; cargo-generate = callPackage ../development/tools/rust/cargo-generate { }; cargo-bootimage = callPackage ../development/tools/rust/bootimage { };