From f88a75731c8400830ef8236d81eca01270e47d18 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 5 Oct 2022 09:20:06 -0700 Subject: [PATCH] mdbook-admonish: patch to work with rust 1.64 --- pkgs/tools/text/mdbook-admonish/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index 2809eee1fb4..c7303fc2fd8 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -1,15 +1,26 @@ -{ lib, stdenv, fetchCrate, rustPlatform, CoreServices }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook-admonish"; version = "1.7.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-QvFHpAsQ+S7q/Ye0YEf0phZcVvAs1a80Hd3eIGZBsrI="; + src = fetchFromGitHub { + owner = "tommilligan"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AGOq05NevkRU8qHsJIWd2WfZ4i7w/wexf6c0fUAaoLg="; }; - cargoSha256 = "sha256-v7MGJlDm5nvydjFAZZS94afZY2OVUjJQ9eXYaY9JxBs="; + cargoPatches = [ + # https://github.com/tommilligan/mdbook-admonish/pull/33 + (fetchpatch { + name = "update-mdbook-for-rust-1.64.patch"; + url = "https://github.com/tommilligan/mdbook-admonish/commit/650123645b18a3f8ed170738c7c1813315095ed9.patch"; + hash = "sha256-8LMk+Dgz9k0g9fbGGC0X2byyJtfDDgvdGxO06mD6GDI="; + }) + ]; + + cargoHash = "sha256-5PWfze00/mWmzYqP5M1pAPt+SuknpU9dc0B7RSikuTE="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];