From 37cab2f8e793e2038ea6019d5787482b09f01a37 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 24 Jan 2023 10:26:00 -0500 Subject: [PATCH] panamax: 1.0.3 -> 1.0.6 --- .../tools/rust/panamax/default.nix | 25 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 0d040afd421d..6dd1d5e32bd8 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -1,19 +1,34 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, openssl, stdenv, Security }: +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, libgit2 +, openssl +, zlib +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "panamax"; - version = "1.0.3"; + version = "1.0.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-w4waFdzd/Ps0whOp39QLBE/YF2eyc4t2Ili7FskUt1M="; + sha256 = "sha256-/JW2QB5PtwKo0TLU/QmkgsE6/ne+51EVmWyGn7Lljdw="; }; - cargoSha256 = "sha256-52snmkTFHI26xJo9qJkmqh1M5lLzhDxw8WT6uFd57aw="; + cargoSha256 = "sha256-aKdDismdPcExqznS6S2LvAij6gv9/Hw2FBvkhr9rJGo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71d2342c0224..f08278b93d2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15719,9 +15719,7 @@ with pkgs; maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; }; - panamax = callPackage ../development/tools/rust/panamax { - inherit (darwin.apple_sdk.frameworks) Security; - }; + panamax = callPackage ../development/tools/rust/panamax { }; ograc = callPackage ../development/tools/rust/ograc { };