From b43f5f88dc3b3e0f12ce448b2e8add4cf5ed0a4e Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 7 Dec 2022 23:57:34 -0800 Subject: [PATCH 1/3] mdbook-admonish: 1.7.0 -> 1.8.0 --- pkgs/tools/text/mdbook-admonish/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index c7303fc2fd84..6f83659334c1 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -2,25 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-admonish"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tommilligan"; repo = pname; rev = "v${version}"; - hash = "sha256-AGOq05NevkRU8qHsJIWd2WfZ4i7w/wexf6c0fUAaoLg="; + hash = "sha256-jo5kR1fzSRQq8fvblJaK3IEHfxeN7h0ZdT6vvPBXTXM="; }; - 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="; + cargoHash = "sha256-N0zkdaVWas9jK9IXn9T85s18mNTjoEl8OUF2HA2CuHg="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From d060289faeed9d3a0f38545f1dab1ecc39e7deef Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 7 Dec 2022 23:58:04 -0800 Subject: [PATCH 2/3] mdbook-admonish: add Frostman to maintainers --- pkgs/tools/text/mdbook-admonish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index 6f83659334c1..80d9152af426 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A preprocessor for mdbook to add Material Design admonishments"; license = licenses.mit; - maintainers = with maintainers; [ jmgilman ]; + maintainers = with maintainers; [ jmgilman Frostman ]; homepage = "https://github.com/tommilligan/mdbook-admonish"; }; } From 955bbec005a9a405bca543e40fdb321998d3ad59 Mon Sep 17 00:00:00 2001 From: Sergei Lukianov Date: Wed, 4 Jan 2023 09:36:52 -0800 Subject: [PATCH 3/3] mdbook-admonish: remove unused fetchpatch from inputs --- pkgs/tools/text/mdbook-admonish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index 80d9152af426..c2f45425076f 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, CoreServices }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook-admonish";