Merge pull request #218363 from figsoda/mdbook-graphviz

2 files changed, 4 insertions, 377 deletions

diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix
index 529009fa616b4..3660b45969013 100644
--- a/pkgs/tools/text/mdbook-graphviz/default.nix
+++ b/pkgs/tools/text/mdbook-graphviz/default.nix
@@ -2,21 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdbook-graphviz";
-  version = "0.1.4";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "dylanowen";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-HTHGb23wc10iAWXX/TNMXjTLWm+OSf1WWW1+/aQRcsk=";
+    hash = "sha256-WkjkQll5oETVADYpA8/CIZOJCBnfenGSy49sZ5nAQ+c=";
   };
 
-  cargoPatches = [
-    # Remove when updating mdbook-graphviz past 0.1.4.
-    ./update-mdbook-for-rust-1.64.patch
-  ];
-
-  cargoHash = "sha256-keDyfXooPU/GOx56OTq5psDohfZ0E478bnWn0bbC29o=";
+  cargoHash = "sha256-whBTPQGozPPTSdXuRx5wamc1yy/EC3wNShQGhRqdY9Y=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 
@@ -25,6 +20,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "A preprocessor for mdbook, rendering Graphviz graphs to HTML at build time.";
     homepage = "https://github.com/dylanowen/mdbook-graphviz";
+    changelog = "https://github.com/dylanowen/mdbook-graphviz/releases/tag/v${version}";
     license = [ licenses.mpl20 ];
     maintainers = with maintainers; [ lovesegfault ];
   };
diff --git a/pkgs/tools/text/mdbook-graphviz/update-mdbook-for-rust-1.64.patch b/pkgs/tools/text/mdbook-graphviz/update-mdbook-for-rust-1.64.patch
deleted file mode 100644
index 58f52cf00dc4d..0000000000000
--- a/pkgs/tools/text/mdbook-graphviz/update-mdbook-for-rust-1.64.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 292fb1f..ce66190 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -26,15 +26,6 @@ dependencies = [
-  "url",
- ]
- 
--[[package]]
--name = "ansi_term"
--version = "0.12.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
--dependencies = [
-- "winapi 0.3.9",
--]
--
- [[package]]
- name = "anyhow"
- version = "1.0.52"
-@@ -156,32 +147,36 @@ dependencies = [
- 
- [[package]]
- name = "clap"
--version = "2.34.0"
-+version = "3.2.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-+checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
- dependencies = [
-- "ansi_term",
-  "atty",
-  "bitflags",
-- "strsim 0.8.0",
-- "textwrap 0.11.0",
-- "unicode-width",
-- "vec_map",
-+ "clap_lex",
-+ "indexmap",
-+ "once_cell",
-+ "strsim",
-+ "termcolor",
-+ "textwrap",
- ]
- 
- [[package]]
--name = "clap"
--version = "3.0.4"
-+name = "clap_complete"
-+version = "3.2.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d01c9347757e131122b19cd19a05c85805b68c2352a97b623efdc3c295290299"
-+checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8"
-+dependencies = [
-+ "clap",
-+]
-+
-+[[package]]
-+name = "clap_lex"
-+version = "0.2.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
- dependencies = [
-- "atty",
-- "bitflags",
-- "indexmap",
-  "os_str_bytes",
-- "strsim 0.10.0",
-- "termcolor",
-- "textwrap 0.14.2",
- ]
- 
- [[package]]
-@@ -213,24 +208,21 @@ dependencies = [
- 
- [[package]]
- name = "elasticlunr-rs"
--version = "2.3.14"
-+version = "3.0.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "60eee99ae400fb1c4521ea3bd678994cb66572754d240449368e8ecd40281569"
-+checksum = "b94d9c8df0fe6879ca12e7633fdfe467c503722cc981fc463703472d2b876448"
- dependencies = [
-- "lazy_static",
-  "regex",
-  "serde",
-  "serde_derive",
-  "serde_json",
-- "strum",
-- "strum_macros",
- ]
- 
- [[package]]
- name = "env_logger"
--version = "0.7.1"
-+version = "0.9.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-+checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
- dependencies = [
-  "atty",
-  "humantime",
-@@ -465,7 +457,7 @@ dependencies = [
-  "log",
-  "pest",
-  "pest_derive",
-- "quick-error 2.0.1",
-+ "quick-error",
-  "serde",
-  "serde_json",
- ]
-@@ -501,15 +493,6 @@ dependencies = [
-  "http",
- ]
- 
--[[package]]
--name = "heck"
--version = "0.3.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
--dependencies = [
-- "unicode-segmentation",
--]
--
- [[package]]
- name = "hermit-abi"
- version = "0.1.19"
-@@ -569,12 +552,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
- 
- [[package]]
- name = "humantime"
--version = "1.3.0"
-+version = "2.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
--dependencies = [
-- "quick-error 1.2.3",
--]
-+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
- 
- [[package]]
- name = "hyper"
-@@ -763,14 +743,15 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
- 
- [[package]]
- name = "mdbook"
--version = "0.4.15"
-+version = "0.4.21"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6"
-+checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9"
- dependencies = [
-  "ammonia",
-  "anyhow",
-  "chrono",
-- "clap 2.34.0",
-+ "clap",
-+ "clap_complete",
-  "elasticlunr-rs",
-  "env_logger",
-  "futures-util",
-@@ -784,7 +765,6 @@ dependencies = [
-  "pulldown-cmark",
-  "regex",
-  "serde",
-- "serde_derive",
-  "serde_json",
-  "shlex",
-  "tempfile",
-@@ -798,7 +778,7 @@ dependencies = [
- name = "mdbook-graphviz"
- version = "0.1.4"
- dependencies = [
-- "clap 3.0.4",
-+ "clap",
-  "lazy_static",
-  "mdbook",
-  "pulldown-cmark",
-@@ -810,9 +790,9 @@ dependencies = [
- 
- [[package]]
- name = "memchr"
--version = "2.4.1"
-+version = "2.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
-+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
- 
- [[package]]
- name = "mime"
-@@ -968,6 +948,12 @@ dependencies = [
-  "libc",
- ]
- 
-+[[package]]
-+name = "once_cell"
-+version = "1.15.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
-+
- [[package]]
- name = "opaque-debug"
- version = "0.2.3"
-@@ -995,9 +981,6 @@ name = "os_str_bytes"
- version = "6.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
--dependencies = [
-- "memchr",
--]
- 
- [[package]]
- name = "parking_lot"
-@@ -1166,9 +1149,9 @@ dependencies = [
- 
- [[package]]
- name = "pulldown-cmark"
--version = "0.9.0"
-+version = "0.9.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "acd16514d1af5f7a71f909a44ef253cdb712a376d7ebc8ae4a471a9be9743548"
-+checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
- dependencies = [
-  "bitflags",
-  "getopts",
-@@ -1185,12 +1168,6 @@ dependencies = [
-  "pulldown-cmark",
- ]
- 
--[[package]]
--name = "quick-error"
--version = "1.2.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
--
- [[package]]
- name = "quick-error"
- version = "2.0.1"
-@@ -1308,9 +1285,9 @@ dependencies = [
- 
- [[package]]
- name = "regex"
--version = "1.5.4"
-+version = "1.6.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
-+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
- dependencies = [
-  "aho-corasick",
-  "memchr",
-@@ -1325,9 +1302,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
- 
- [[package]]
- name = "regex-syntax"
--version = "0.6.25"
-+version = "0.6.27"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
- 
- [[package]]
- name = "remove_dir_all"
-@@ -1370,6 +1347,9 @@ name = "serde"
- version = "1.0.133"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
-+dependencies = [
-+ "serde_derive",
-+]
- 
- [[package]]
- name = "serde_derive"
-@@ -1490,36 +1470,12 @@ dependencies = [
-  "quote",
- ]
- 
--[[package]]
--name = "strsim"
--version = "0.8.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
--
- [[package]]
- name = "strsim"
- version = "0.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
- 
--[[package]]
--name = "strum"
--version = "0.21.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
--
--[[package]]
--name = "strum_macros"
--version = "0.21.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
--dependencies = [
-- "heck",
-- "proc-macro2",
-- "quote",
-- "syn",
--]
--
- [[package]]
- name = "syn"
- version = "1.0.84"
-@@ -1567,18 +1523,9 @@ dependencies = [
- 
- [[package]]
- name = "textwrap"
--version = "0.11.0"
-+version = "0.15.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
--dependencies = [
-- "unicode-width",
--]
--
--[[package]]
--name = "textwrap"
--version = "0.14.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
-+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
- 
- [[package]]
- name = "thiserror"
-@@ -1793,12 +1740,6 @@ dependencies = [
-  "tinyvec",
- ]
- 
--[[package]]
--name = "unicode-segmentation"
--version = "1.8.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
--
- [[package]]
- name = "unicode-width"
- version = "0.1.9"
-@@ -1829,12 +1770,6 @@ version = "0.7.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
- 
--[[package]]
--name = "vec_map"
--version = "0.8.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
--
- [[package]]
- name = "version_check"
- version = "0.9.4"
-diff --git a/Cargo.toml b/Cargo.toml
-index 18b4b0e..3a88235 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -12,7 +12,7 @@ edition = "2018"
- # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
- 
- [dependencies]
--mdbook = "^0.4.15"
-+mdbook = "^0.4.21"
- clap = "3.0"
- serde_json = "1.0"
- pulldown-cmark = "0.9"