diff options
Diffstat (limited to 'pkgs/tools')
44 files changed, 2171 insertions, 92 deletions
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index d2236dfe354..c16da204f2f 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { --replace 'LIBSEMA="CCC"' 'LIBSEMA=""' ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXext libXtst gtk2 - libXi pkg-config + libXi texinfo ]; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 549096ec0e4..724301854b4 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { --with-xkb-path=${xkeyboard_config}/share/X11/xkb \ --with-xkb-bin-directory=${xorg.xkbcomp}/bin \ --with-xkb-output=$out/share/X11/xkb/compiled - make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES + make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../.. -j$NIX_BUILD_CORES popd '' + lib.optionalString stdenv.isDarwin '' make dmg diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/tools/audio/midimonster/default.nix index 3792d997aa0..841704427c2 100644 --- a/pkgs/tools/audio/midimonster/default.nix +++ b/pkgs/tools/audio/midimonster/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { pname = "midimonster"; version = "0.6.0"; - buildInputs = [pkg-config gnumake gcc lua5_4 openssl jack1 python3 alsa-lib ncurses libevdev]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [gnumake gcc lua5_4 openssl jack1 python3 alsa-lib ncurses libevdev]; src = fetchFromGitHub { repo = "midimonster"; diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index 94ba5a56d03..924181608af 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -31,10 +31,9 @@ in stdenv.mkDerivation { sha256 = "0vdksf6lcgmizqr5mqp0bbci259k0dj7gpmhx32md41jlmw5skaw"; }; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ libtool - pkg-config glib libdaemon pandoc diff --git a/pkgs/tools/backup/dump/default.nix b/pkgs/tools/backup/dump/default.nix index 75a449a1276..f9e1b68ac39 100644 --- a/pkgs/tools/backup/dump/default.nix +++ b/pkgs/tools/backup/dump/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-0CGs3k+77T2T662YFCL2cfSNZrKeyI196DZC7Pv/T9A="; }; - buildInputs = [ e2fsprogs pkg-config ncurses readline ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ e2fsprogs ncurses readline ]; meta = with lib; { homepage = "https://dump.sourceforge.io/"; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index bd28ca63e80..771188a98cd 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -24,7 +24,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xz.bin ]; - makeFlags = [ "SHELL=/bin/sh" "GREP=grep" ]; + makeFlags = [ + "SHELL=/bin/sh" + "GREP=grep" + # gzip 1.12 doesn't build `zless` unless it can find `less`, but we + # can avoid having `less` as a build input if we just override these. + "ZLESS_MAN=zless.1" + "ZLESS_PROG=zless" + ]; # Many gzip executables are shell scripts that depend upon other gzip # executables being in $PATH. Rather than try to re-write all the diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 579ee9b2094..584b000a3e2 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -14,12 +14,10 @@ stdenv.mkDerivation rec { owner = pname; }; - patches = lib.optionals (!enableShared) [ - # This patch is already part of the `dev` branch. - # Remove when upgrading to the next version. - (fetchpatch { - name = "lz4-fix-BUILD_SHARED=no.patch"; - url = "https://github.com/lz4/lz4/commit/5ccbd38277989ae6a728171d59ae03bad6f2f4d5.patch"; + patches = [ + (fetchpatch { # https://github.com/lz4/lz4/pull/1162 + name = "build-shared-no.patch"; + url = "https://github.com/lz4/lz4/commit/851ef4b23c7cbf4ceb2ba1099666a8b5ec4fa195.patch"; sha256 = "sha256-P+/uz3m7EAmHgXF/1Vncc0uKKxNVq6HNIsElx0rGxpw="; }) ]; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 61843e4c65b..24233a8441d 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = - [ pkg-config fuse openssl + [ fuse openssl asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix index c1124880944..d3f8b74512a 100644 --- a/pkgs/tools/graphics/s2png/default.nix +++ b/pkgs/tools/graphics/s2png/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6"; }; - buildInputs = [ diffutils gd pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ diffutils gd ]; installFlags = [ "prefix=" "DESTDIR=$(out)" ]; meta = { diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index cc290ab0eca..ff3b0afad25 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, m17n_db, autoreconfHook, pkg-config }: +{ lib, stdenv, fetchurl, fetchpatch, m17n_db, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "m17n-lib"; version = "1.8.0"; @@ -8,6 +8,17 @@ stdenv.mkDerivation rec { sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"; }; + patches = [ + (fetchpatch { + # Patch pending upstream inclusion: + # https://savannah.nongnu.org/bugs/index.php?61377 + name = "parallel-build.patch"; + url = "https://savannah.nongnu.org/bugs/download.php?file_id=53704"; + hash = "sha256-1smKSIFVRJZSwCv0NiUsnndxKcPnJ/wqzH8+ka6nfNM="; + excludes = [ "src/ChangeLog" ]; + }) + ]; + strictDeps = true; # reconf needed to sucesfully cross-compile @@ -17,10 +28,7 @@ stdenv.mkDerivation rec { m17n_db ]; - # Fails parallel build due to missing intra-package depends: - # https://savannah.nongnu.org/bugs/index.php?61377 - # make[2]: *** No rule to make target '../src/libm17n-core.la', needed by 'libm17n.la'. Stop. - enableParallelBuilding = false; + enableParallelBuilding = true; meta = { homepage = "https://www.nongnu.org/m17n/"; diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 27bf0ec5374..eb7a73e469c 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { patchPhase = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null; - buildInputs = [ curl jansson autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ curl jansson ]; configureFlags = [ "CFLAGS=-O3" ]; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 5a792c040b3..45f45e89e82 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, tcl, makeWrapper, autoreconfHook, fetchpatch }: +{ lib, stdenv, buildPackages, fetchurl, tcl, makeWrapper, autoreconfHook, fetchpatch, substituteAll }: tcl.mkTclDerivation rec { pname = "expect"; @@ -14,6 +14,10 @@ tcl.mkTclDerivation rec { url = "https://raw.githubusercontent.com/buildroot/buildroot/c05e6aa361a4049eabd8b21eb64a34899ef83fc7/package/expect/0001-enable-cross-compilation.patch"; sha256 = "1jwx2l1slidvcpahxbyqs942l81jd62rzbxliyd9lwysk38c8b6b"; }) + (substituteAll { + src = ./fix-cross-compilation.patch; + tcl = "${buildPackages.tcl}/bin/tclsh"; + }) ]; postPatch = '' diff --git a/pkgs/tools/misc/expect/fix-cross-compilation.patch b/pkgs/tools/misc/expect/fix-cross-compilation.patch new file mode 100644 index 00000000000..8edc4bea39d --- /dev/null +++ b/pkgs/tools/misc/expect/fix-cross-compilation.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in 2022-09-07 21:46:37.090519258 +0200 ++++ b/Makefile.in 2022-09-07 21:46:21.462592279 +0200 +@@ -380,7 +380,7 @@ + cp $(DIST_ROOT)/$(PKG_DIR).tar.gz $(top_builddir) + + $(SCRIPTS): +- $(TCLSH) $(srcdir)/fixline1 $(SHORT_BINDIR) < $(srcdir)/example/$@ > $@ ++ @tcl@ $(srcdir)/fixline1 $(SHORT_BINDIR) < $(srcdir)/example/$@ > $@ + + ## We cannot use TCL_LIBS below (after TCL_LIB_SPEC) because its + ## expansion references the contents of LIBS, which contains linker diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index c906443b07c..22b5035da51 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1brcvl2fx0yzxj9mc8hzfl32zdka1f1bxpzsclcsjplyakyinr1a"; }; - buildInputs = [ dbus pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dbus ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/popsicle/default.nix b/pkgs/tools/misc/popsicle/default.nix index e9369270fcd..bae9465c7cb 100644 --- a/pkgs/tools/misc/popsicle/default.nix +++ b/pkgs/tools/misc/popsicle/default.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { postPatch = '' # Have to do this here instead of in preConfigure because # cargoDepsCopy gets unset after postPatch. - configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy") + configureFlagsArray+=("RUST_VENDORED_SOURCES=$cargoDepsCopy") ''; makeFlags = [ diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 76736912301..ebf2f082db0 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , rustPlatform , pkg-config , llvmPackages @@ -40,10 +41,28 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RfKg14r3B5Jx2vIa4gpJs5vXRqSXKOXKRFmmQmzQorQ="; + hash = "sha256-RfKg14r3B5Jx2vIa4gpJs5vXRqSXKOXKRFmmQmzQorQ="; }; - cargoSha256 = "sha256-l2rrT2SeeH4bYYlzSiFASNBxtg4TBm1dRA4cFRfvpkk="; + patches = [ + (fetchpatch { + name = "rust-1.64-part1.patch"; + url = "https://github.com/vectordotdev/vector/commit/e7437df97711b6a660a3532fe5026244472a900f.patch"; + hash = "sha256-EyheI3nngt72+ZZNNsjp3KV1CuRb9CZ7wUCHt0twFVs="; + }) + (fetchpatch { + name = "rust-1.64-part2.patch"; + url = "https://github.com/vectordotdev/vector/commit/e80c7afaf7601cf936c7c3468bd7b4b230ef6149.patch"; + hash = "sha256-pHcq7XLn+9PKs0DnBTK5FawN5KSF8BuJf7sBO9u5Gb8="; + excludes = [ + # There are too many conflicts to easily resolve patching this file, but + # the changes here do not block compilation. + "lib/lookup/src/lookup_v2/owned.rs" + ]; + }) + ]; + + cargoHash = "sha256-l2rrT2SeeH4bYYlzSiFASNBxtg4TBm1dRA4cFRfvpkk="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; @@ -111,3 +130,4 @@ rustPlatform.buildRustPackage { platforms = with platforms; all; }; } + diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 07483f24e22..b4903bdf022 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -8,22 +8,28 @@ rustPlatform.buildRustPackage rec { owner = "imsnif"; repo = pname; rev = version; - sha256 = "014blvrv0kk4gzga86mbk7gd5dl1szajfi972da3lrfznck1w24n"; + hash = "sha256-lggeJrPfZTpUEydFJ9XXgbbS3pmrGqTef2ROsPOmiwQ="; }; - cargoSha256 = "sha256-Vrd5DIfhUSb3BONaUG8RypmVF+HWrlM0TodlWjOLa/c="; + cargoHash = "sha256-kGRsF+THNQahEoD3vY+XcPrr9cHjchtg86tMvcIdHPk="; buildInputs = lib.optional stdenv.isDarwin Security; # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 doCheck = !stdenv.isDarwin; - # FIXME: remove when the linked-hash-map dependency is bumped upstream cargoPatches = [ + # FIXME: remove when the linked-hash-map dependency is bumped upstream + # https://github.com/imsnif/bandwhich/pull/222/ (fetchpatch { - url = "https://github.com/imsnif/bandwhich/pull/222/commits/be06905de2c4fb91afc22d50bf3cfe5a1e8003f5.patch"; - sha256 = "sha256-FyZ7jUXK7ebXq7q/lvRSe7YdPnpYWKZE3WrSKLMjJeA="; + name = "update-linked-hash-map.patch"; + url = "https://github.com/imsnif/bandwhich/commit/be06905de2c4fb91afc22d50bf3cfe5a1e8003f5.patch"; + hash = "sha256-FyZ7jUXK7ebXq7q/lvRSe7YdPnpYWKZE3WrSKLMjJeA="; }) + + # Tweaked https://github.com/imsnif/bandwhich/pull/245 so that it merges + # cleanly with the earlier patch. + ./update-socket2-for-rust-1.64.diff ]; meta = with lib; { diff --git a/pkgs/tools/networking/bandwhich/update-socket2-for-rust-1.64.diff b/pkgs/tools/networking/bandwhich/update-socket2-for-rust-1.64.diff new file mode 100644 index 00000000000..99921205e04 --- /dev/null +++ b/pkgs/tools/networking/bandwhich/update-socket2-for-rust-1.64.diff @@ -0,0 +1,160 @@ +diff --git a/Cargo.lock b/Cargo.lock +index bcaf9da..7d9c97e 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -76,7 +76,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" + dependencies = [ + "backtrace-sys", +- "cfg-if", ++ "cfg-if 0.1.9", + "libc", + "rustc-demangle", + ] +@@ -238,6 +238,12 @@ version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" + ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ + [[package]] + name = "chrono" + version = "0.4.9" +@@ -357,7 +363,7 @@ version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.9", + ] + + [[package]] +@@ -388,7 +394,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" + dependencies = [ + "autocfg 1.0.1", +- "cfg-if", ++ "cfg-if 0.1.9", + "crossbeam-utils", + "lazy_static", + "maybe-uninit", +@@ -403,7 +409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" + dependencies = [ + "autocfg 1.0.1", +- "cfg-if", ++ "cfg-if 0.1.9", + "lazy_static", + ] + +@@ -528,7 +534,7 @@ version = "1.0.17" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.9", + "crc32fast", + "libc", + "miniz_oxide", +@@ -683,7 +689,7 @@ version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.9", + "libc", + "wasi", + ] +@@ -894,7 +900,7 @@ version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.9", + ] + + [[package]] +@@ -960,7 +966,7 @@ version = "0.6.21" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.9", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", +@@ -1033,7 +1039,7 @@ version = "0.2.33" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.9", + "libc", + "winapi 0.3.8", + ] +@@ -1120,7 +1126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" + dependencies = [ + "bitflags 1.2.1", +- "cfg-if", ++ "cfg-if 0.1.9", + "foreign-types", + "lazy_static", + "libc", +@@ -1176,7 +1182,7 @@ version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.9", + "cloudabi", + "libc", + "redox_syscall", +@@ -1840,13 +1846,12 @@ checksum = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" + + [[package]] + name = "socket2" +-version = "0.3.11" ++version = "0.3.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" ++checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "libc", +- "redox_syscall", + "winapi 0.3.8", + ] + +@@ -1990,7 +1995,7 @@ version = "0.15.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "13816d558f404113dfdf855ed982f160cf697b3e573a68b2b798062032182212" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.9", + "doc-comment", + "libc", + "ntapi", +@@ -2005,7 +2010,7 @@ version = "3.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.9", + "libc", + "rand 0.7.2", + "redox_syscall", +@@ -2121,7 +2126,7 @@ version = "0.18.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "72d7df08b45f4d6d124cdae3c303f9908159a17b39e633e524349e91bc798d32" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.9", + "failure", + "futures", + "ipconfig", diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index afccd8376d8..f8d615b525e 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -1,19 +1,24 @@ -{ rustPlatform, lib, stdenv, fetchFromGitHub, Security }: +{ rustPlatform +, lib +, stdenv +, fetchFromGitHub +, Security +}: rustPlatform.buildRustPackage rec { pname = "MozWire"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "NilsIrl"; repo = pname; rev = "v${version}"; - sha256 = "01bj3c34x9ywxygsz4rdyw5gc9cz8x6zzl5fd7db8qy8bx2lhlr9"; + hash = "sha256-vC8HmwJCHMKQUsYBwRmr88tmZxPKNvI6hxlcjG2AV3Q="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0q27p2hyw6c1fh5x8kwsrw8a1hk6z90z0z3w86ga8ryz53xg4vdi"; + cargoHash = "sha256-9qXoMugmL6B9vC/yrMJxZ5p792ZJmrTzk/khRVTkHf4="; meta = with lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 238c0c364f9..f2af99a922f 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-iRaf9/gu9VkGi1VbGpxvC5q+0M8ivezCz/oAKEg5V1M="; }; - buildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; # Note: Although `nss-mdns' works by talking to `avahi-daemon', it # doesn't depend on the Avahi libraries. Instead, it contains # hand-written D-Bus code to talk to the Avahi daemon. diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 80e37782154..3733998c10b 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "1.34"; + version = "2.0"; outputs = [ "out" "dev" ]; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "sha256-mqltc+/RmQO8awP+J7p9fCVhNsEYA3SgxeV5Gkr1srg="; + sha256 = "sha256-T8rfReruvHGQCN9IDGIrFCoNjFKKMnUGPKzxo2HTZFQ="; }; patches = [ diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 668dc18f8ac..89a7d706ccd 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "sipsak"; version = "4.1.2.1"; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ - autoreconfHook openssl c-ares ]; diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 10dda6568fc..006e7161b19 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tdns-cli"; - version = "0.0.5"; + version = "unstable-2021-02-19"; src = fetchFromGitHub { owner = "rotty"; repo = pname; - rev = "v${version}"; - sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; + rev = "9a5455fe8a52f3f14dc55ef81511b479c8cd70ea"; + hash = "sha256-BGxkqlKg81izq4eOBEZFJ/MPb3UCSOo8ZTYTjtjierk="; }; - cargoSha256 = "sha256-O4n38dla2WgZ4949Ata6AYbZF9LMnXDyuFNoXRrTN7I="; + cargoHash = "sha256-uRny+l/LaQPjF5AnbxgKFLdjuAxcez1BqsL4g54KAwU="; meta = with lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 189cc14ff1b..25fcc1bcc39 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -48,20 +48,20 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.16.2"; + version = "1.16.3"; src = fetchurl { url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; - hash = "sha256-LjLyg4IMJMUcod2K/s/bdHxzhaE3q+hlyZ20sldANYE="; + hash = "sha256-6gxmZeLDMlt2nqwd/M1g/hgo1fz2YmUAOezLP2ftso4="; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - nativeBuildInputs = [ makeWrapper ] + nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optionals withPythonModule [ swig ]; buildInputs = [ openssl nettle expat libevent ] - ++ lib.optionals withSystemd [ pkg-config systemd ] + ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals withDoH [ libnghttp2 ] ++ lib.optionals withPythonModule [ python ]; diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 18104aa7710..8081c7ef6eb 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -11,7 +11,8 @@ mkDerivation rec { sha256 = "sha256-wKy/RVR7jx5AkMJgHXsuV+jlzyfH5nDRggcIUgh2ML4="; }; - buildInputs = [ qmake pcsclite pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ qmake pcsclite ]; dontUseQmakeConfigure = true; patchPhase = '' diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index cd90342738e..777aaea41ec 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ]; - nativeBuildInputs = [ pkg-config makeWrapper ] + nativeBuildInputs = [ pkg-config makeWrapper intltool ] # if python2 support is requested, it is needed at builtime as well as runtime. ++ lib.optionals (enablePython) [ python2 ] ; - buildInputs = [ perl nss nspr pam intltool ] + buildInputs = [ perl nss nspr pam ] ++ lib.optionals (enablePython) [ python2 ] ; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 15d5a5adcff..69e6c7f0281 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1lfzja3vzd6l6hfvw8gvg4qkl5iy6gra5pa8gjlps9l63k2bjfhz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gnupg gtk3 libxml2 intltool nettle ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gnupg gtk3 libxml2 nettle ]; meta = with lib; { description = "GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements"; diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index 1e46df40f85..22c11b3f2b1 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-Kb8p53gPkhxtOhH2COKwSDwbtRDFr6hHMJAkndV8Ukk="; }; - buildInputs = [ pkcs11helper pkg-config openssl ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pkcs11helper openssl ]; configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix index e4bae57b686..ccd510f63af 100644 --- a/pkgs/tools/security/metasploit/shell.nix +++ b/pkgs/tools/security/metasploit/shell.nix @@ -2,6 +2,7 @@ with import <nixpkgs> {}; stdenv.mkDerivation { name = "env"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bundix git @@ -9,7 +10,6 @@ stdenv.mkDerivation { libpcap libxml2 libxslt - pkg-config postgresql ruby.devEnv sqlite diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 329de10ff6b..249762781e7 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ intltool ]; - buildInputs = [ intltool gtk3 gobject-introspection ]; + buildInputs = [ gtk3 gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ stem distutils_extra pygobject3 ]; postFixup = '' diff --git a/pkgs/tools/security/tracee/default.nix b/pkgs/tools/security/tracee/default.nix index 48d102e619d..7d93e6d76f7 100644 --- a/pkgs/tools/security/tracee/default.nix +++ b/pkgs/tools/security/tracee/default.nix @@ -63,7 +63,7 @@ buildGoModule rec { buildPhase = '' runHook preBuild - make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES} + make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES runHook postBuild ''; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 5fc242d533b..eedb0f07d13 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 libxml2 intltool gettext ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 libxml2 gettext ]; patches = [ ./get_sensitive.patch ./set_flags.patch ]; 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 ]; diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index 353c2b99ee9..ec683072e1a 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, graphviz }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, CoreServices, graphviz }: rustPlatform.buildRustPackage rec { pname = "mdbook-graphviz"; @@ -8,10 +8,15 @@ rustPlatform.buildRustPackage rec { owner = "dylanowen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HTHGb23wc10iAWXX/TNMXjTLWm+OSf1WWW1+/aQRcsk="; + hash = "sha256-HTHGb23wc10iAWXX/TNMXjTLWm+OSf1WWW1+/aQRcsk="; }; - cargoSha256 = "sha256-7z/4brKY9vpic8mv1b4P/8DE+VyColYnPPoPmY9891M="; + cargoPatches = [ + # Remove when updating mdbook-graphviz past 0.1.4. + ./update-mdbook-for-rust-1.64.patch + ]; + + cargoHash = "sha256-keDyfXooPU/GOx56OTq5psDohfZ0E478bnWn0bbC29o="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; 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 new file mode 100644 index 00000000000..58f52cf00dc --- /dev/null +++ b/pkgs/tools/text/mdbook-graphviz/update-mdbook-for-rust-1.64.patch @@ -0,0 +1,369 @@ +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" diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index a97e7ca8948..5291b9e9f82 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -8,10 +8,15 @@ rustPlatform.buildRustPackage rec { owner = "lzanini"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5PzXX7icRxcHpzjp3x/9ssn2o0444uHrzBn1Ds1DEPM="; + hash = "sha256-5PzXX7icRxcHpzjp3x/9ssn2o0444uHrzBn1Ds1DEPM="; }; - cargoSha256 = "sha256-tqdpIBlKiyYSWFPYTnzVeDML2GM+mukbOHS3sNYUgdc="; + cargoPatches = [ + # Remove when https://github.com/lzanini/mdbook-katex/pull/35 is in a new release. + ./update-mdbook-for-rust-1.64.patch + ]; + + cargoHash = "sha256-lrEirKkGf9/8yLyLSON54UaeQ3Xtl7g7ezUc7e1KVHw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-katex/update-mdbook-for-rust-1.64.patch b/pkgs/tools/text/mdbook-katex/update-mdbook-for-rust-1.64.patch new file mode 100644 index 00000000000..ee90a307670 --- /dev/null +++ b/pkgs/tools/text/mdbook-katex/update-mdbook-for-rust-1.64.patch @@ -0,0 +1,1417 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 3ff0894..ffef44f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,10 +1,12 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "aho-corasick" +-version = "0.7.15" ++version = "0.7.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" ++checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" + dependencies = [ + "memchr", + ] +@@ -52,9 +54,9 @@ dependencies = [ + + [[package]] + name = "autocfg" +-version = "1.0.1" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + + [[package]] + name = "base64" +@@ -62,11 +64,17 @@ version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" + ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ + [[package]] + name = "bitflags" +-version = "1.2.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "block-buffer" +@@ -82,9 +90,9 @@ dependencies = [ + + [[package]] + name = "block-buffer" +-version = "0.9.0" ++version = "0.10.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" ++checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" + dependencies = [ + "generic-array 0.14.4", + ] +@@ -98,6 +106,17 @@ dependencies = [ + "byte-tools", + ] + ++[[package]] ++name = "bstr" ++version = "0.2.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" ++dependencies = [ ++ "lazy_static", ++ "memchr", ++ "regex-automata", ++] ++ + [[package]] + name = "byte-tools" + version = "0.3.1" +@@ -116,6 +135,12 @@ version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + ++[[package]] ++name = "bytes" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" ++ + [[package]] + name = "cc" + version = "1.0.62" +@@ -157,11 +182,45 @@ dependencies = [ + "atty", + "bitflags", + "strsim 0.8.0", +- "textwrap", ++ "textwrap 0.11.0", + "unicode-width", + "vec_map", + ] + ++[[package]] ++name = "clap" ++version = "3.2.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" ++dependencies = [ ++ "atty", ++ "bitflags", ++ "clap_lex", ++ "indexmap", ++ "once_cell", ++ "strsim 0.10.0", ++ "termcolor", ++ "textwrap 0.15.1", ++] ++ ++[[package]] ++name = "clap_complete" ++version = "3.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" ++dependencies = [ ++ "clap 3.2.22", ++] ++ ++[[package]] ++name = "clap_lex" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" ++dependencies = [ ++ "os_str_bytes", ++] ++ + [[package]] + name = "copy_dir" + version = "0.1.2" +@@ -172,10 +231,23 @@ dependencies = [ + ] + + [[package]] +-name = "cpuid-bool" +-version = "0.1.2" ++name = "cpufeatures" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "crypto-common" ++version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" ++checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" ++dependencies = [ ++ "generic-array 0.14.4", ++ "typenum", ++] + + [[package]] + name = "darling" +@@ -248,39 +320,31 @@ dependencies = [ + + [[package]] + name = "digest" +-version = "0.9.0" ++version = "0.10.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" ++checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" + dependencies = [ +- "generic-array 0.14.4", ++ "block-buffer 0.10.3", ++ "crypto-common", + ] + +-[[package]] +-name = "dtoa" +-version = "0.4.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" +- + [[package]] + name = "elasticlunr-rs" +-version = "2.3.9" ++version = "3.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "35622eb004c8f0c5e7e2032815f3314a93df0db30a1ce5c94e62c1ecc81e22b9" ++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", +@@ -368,25 +432,11 @@ dependencies = [ + "new_debug_unreachable", + ] + +-[[package]] +-name = "futures" +-version = "0.3.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" +-dependencies = [ +- "futures-channel", +- "futures-core", +- "futures-io", +- "futures-sink", +- "futures-task", +- "futures-util", +-] +- + [[package]] + name = "futures-channel" +-version = "0.3.8" ++version = "0.3.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" ++checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" + dependencies = [ + "futures-core", + "futures-sink", +@@ -394,23 +444,16 @@ dependencies = [ + + [[package]] + name = "futures-core" +-version = "0.3.8" ++version = "0.3.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" +- +-[[package]] +-name = "futures-io" +-version = "0.3.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" ++checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" + + [[package]] + name = "futures-macro" +-version = "0.3.8" ++version = "0.3.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" ++checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" + dependencies = [ +- "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +@@ -418,33 +461,28 @@ dependencies = [ + + [[package]] + name = "futures-sink" +-version = "0.3.8" ++version = "0.3.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" ++checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" + + [[package]] + name = "futures-task" +-version = "0.3.8" ++version = "0.3.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" +-dependencies = [ +- "once_cell", +-] ++checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" + + [[package]] + name = "futures-util" +-version = "0.3.8" ++version = "0.3.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" ++checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" + dependencies = [ + "futures-core", + "futures-macro", + "futures-sink", + "futures-task", +- "pin-project 1.0.1", ++ "pin-project-lite", + "pin-utils", +- "proc-macro-hack", +- "proc-macro-nested", + "slab", + ] + +@@ -468,23 +506,25 @@ dependencies = [ + ] + + [[package]] +-name = "getopts" +-version = "0.2.21" ++name = "getrandom" ++version = "0.1.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" ++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" + dependencies = [ +- "unicode-width", ++ "cfg-if 0.1.10", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", + ] + + [[package]] + name = "getrandom" +-version = "0.1.15" ++version = "0.2.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" ++checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "libc", +- "wasi 0.9.0+wasi-snapshot-preview1", ++ "wasi 0.11.0+wasi-snapshot-preview1", + ] + + [[package]] +@@ -504,11 +544,11 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + + [[package]] + name = "h2" +-version = "0.2.7" ++version = "0.3.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" ++checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" + dependencies = [ +- "bytes", ++ "bytes 1.2.1", + "fnv", + "futures-core", + "futures-sink", +@@ -519,21 +559,20 @@ dependencies = [ + "tokio", + "tokio-util", + "tracing", +- "tracing-futures", + ] + + [[package]] + name = "handlebars" +-version = "3.5.1" ++version = "4.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2764f9796c0ddca4b82c07f25dd2cb3db30b9a8f47940e78e1c883d9e95c3db9" ++checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" + dependencies = [ + "log", + "pest", + "pest_derive", +- "quick-error 2.0.0", + "serde", + "serde_json", ++ "thiserror", + ] + + [[package]] +@@ -548,9 +587,9 @@ version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" + dependencies = [ +- "base64", ++ "base64 0.12.3", + "bitflags", +- "bytes", ++ "bytes 0.5.6", + "headers-core", + "http", + "mime", +@@ -567,15 +606,6 @@ dependencies = [ + "http", + ] + +-[[package]] +-name = "heck" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +-dependencies = [ +- "unicode-segmentation", +-] +- + [[package]] + name = "hermit-abi" + version = "0.1.17" +@@ -605,19 +635,20 @@ version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" + dependencies = [ +- "bytes", ++ "bytes 0.5.6", + "fnv", +- "itoa", ++ "itoa 0.4.6", + ] + + [[package]] + name = "http-body" +-version = "0.3.1" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" ++checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" + dependencies = [ +- "bytes", ++ "bytes 1.2.1", + "http", ++ "pin-project-lite", + ] + + [[package]] +@@ -634,20 +665,17 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" + + [[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" +-version = "0.13.9" ++version = "0.14.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" ++checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" + dependencies = [ +- "bytes", ++ "bytes 1.2.1", + "futures-channel", + "futures-core", + "futures-util", +@@ -656,8 +684,8 @@ dependencies = [ + "http-body", + "httparse", + "httpdate", +- "itoa", +- "pin-project 1.0.1", ++ "itoa 0.4.6", ++ "pin-project", + "socket2", + "tokio", + "tower-service", +@@ -712,15 +740,6 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "input_buffer" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" +-dependencies = [ +- "bytes", +-] +- + [[package]] + name = "iovec" + version = "0.1.4" +@@ -736,6 +755,12 @@ version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" + ++[[package]] ++name = "itoa" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" ++ + [[package]] + name = "katex" + version = "0.3.2" +@@ -771,9 +796,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "libc" +-version = "0.2.80" ++version = "0.2.134" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" ++checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" + + [[package]] + name = "libquickjs-sys" +@@ -843,14 +868,15 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + + [[package]] + name = "mdbook" +-version = "0.4.4" ++version = "0.4.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "714a3ac362b9b32eef9468ecfe604cb8e2204d50793602e9d49fee44781230e7" ++checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9" + dependencies = [ + "ammonia", + "anyhow", + "chrono", +- "clap", ++ "clap 3.2.22", ++ "clap_complete", + "elasticlunr-rs", + "env_logger", + "futures-util", +@@ -860,16 +886,16 @@ dependencies = [ + "log", + "memchr", + "notify", +- "open", ++ "opener", + "pulldown-cmark", + "regex", + "serde", +- "serde_derive", + "serde_json", + "shlex", + "tempfile", + "tokio", + "toml", ++ "topological-sort", + "warp", + ] + +@@ -877,7 +903,7 @@ dependencies = [ + name = "mdbook-katex" + version = "0.2.10" + dependencies = [ +- "clap", ++ "clap 2.33.3", + "katex", + "mdbook", + "serde_json", +@@ -886,9 +912,9 @@ dependencies = [ + + [[package]] + name = "memchr" +-version = "2.3.4" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + + [[package]] + name = "mime" +@@ -925,6 +951,18 @@ dependencies = [ + "winapi 0.2.8", + ] + ++[[package]] ++name = "mio" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" ++dependencies = [ ++ "libc", ++ "log", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++ "windows-sys", ++] ++ + [[package]] + name = "mio-extras" + version = "2.0.6" +@@ -933,7 +971,7 @@ checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" + dependencies = [ + "lazycell", + "log", +- "mio", ++ "mio 0.6.22", + "slab", + ] + +@@ -978,7 +1016,7 @@ dependencies = [ + "fsevent-sys", + "inotify", + "libc", +- "mio", ++ "mio 0.6.22", + "mio-extras", + "walkdir 2.3.1", + "winapi 0.3.9", +@@ -1004,32 +1042,43 @@ dependencies = [ + ] + + [[package]] +-name = "once_cell" +-version = "1.5.2" ++name = "num_cpus" ++version = "1.13.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" ++checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] + + [[package]] +-name = "opaque-debug" +-version = "0.2.3" ++name = "once_cell" ++version = "1.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" ++checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" + + [[package]] + name = "opaque-debug" +-version = "0.3.0" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" ++checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + + [[package]] +-name = "open" +-version = "1.4.0" ++name = "opener" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7c283bf0114efea9e42f1a60edea9859e8c47528eae09d01df4b29c1e489cc48" ++checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952" + dependencies = [ ++ "bstr", + "winapi 0.3.9", + ] + ++[[package]] ++name = "os_str_bytes" ++version = "6.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" ++ + [[package]] + name = "percent-encoding" + version = "2.1.0" +@@ -1105,7 +1154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" + dependencies = [ + "phf_shared", +- "rand", ++ "rand 0.7.3", + ] + + [[package]] +@@ -1117,33 +1166,13 @@ dependencies = [ + "siphasher", + ] + +-[[package]] +-name = "pin-project" +-version = "0.4.27" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" +-dependencies = [ +- "pin-project-internal 0.4.27", +-] +- + [[package]] + name = "pin-project" + version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841" + dependencies = [ +- "pin-project-internal 1.0.1", +-] +- +-[[package]] +-name = "pin-project-internal" +-version = "0.4.27" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn", ++ "pin-project-internal", + ] + + [[package]] +@@ -1159,9 +1188,9 @@ dependencies = [ + + [[package]] + name = "pin-project-lite" +-version = "0.1.11" ++version = "0.2.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" ++checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + + [[package]] + name = "pin-utils" +@@ -1181,18 +1210,6 @@ version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +-[[package]] +-name = "proc-macro-hack" +-version = "0.5.19" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +- +-[[package]] +-name = "proc-macro-nested" +-version = "0.1.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" +- + [[package]] + name = "proc-macro2" + version = "1.0.24" +@@ -1204,28 +1221,15 @@ dependencies = [ + + [[package]] + name = "pulldown-cmark" +-version = "0.7.2" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca36dea94d187597e104a5c8e4b07576a8a45aa5db48a65e12940d3eb7461f55" ++checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" + dependencies = [ + "bitflags", +- "getopts", + "memchr", + "unicase", + ] + +-[[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.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" +- + [[package]] + name = "quick-js" + version = "0.4.0" +@@ -1251,14 +1255,25 @@ version = "0.7.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" + dependencies = [ +- "getrandom", ++ "getrandom 0.1.15", + "libc", +- "rand_chacha", +- "rand_core", ++ "rand_chacha 0.2.2", ++ "rand_core 0.5.1", + "rand_hc", + "rand_pcg", + ] + ++[[package]] ++name = "rand" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" ++dependencies = [ ++ "libc", ++ "rand_chacha 0.3.1", ++ "rand_core 0.6.4", ++] ++ + [[package]] + name = "rand_chacha" + version = "0.2.2" +@@ -1266,7 +1281,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" + dependencies = [ + "ppv-lite86", +- "rand_core", ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.6.4", + ] + + [[package]] +@@ -1275,7 +1300,16 @@ version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" + dependencies = [ +- "getrandom", ++ "getrandom 0.1.15", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" ++dependencies = [ ++ "getrandom 0.2.7", + ] + + [[package]] +@@ -1284,7 +1318,7 @@ version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" + dependencies = [ +- "rand_core", ++ "rand_core 0.5.1", + ] + + [[package]] +@@ -1293,7 +1327,7 @@ version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" + dependencies = [ +- "rand_core", ++ "rand_core 0.5.1", + ] + + [[package]] +@@ -1304,21 +1338,26 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + + [[package]] + name = "regex" +-version = "1.4.2" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" + dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +- "thread_local", + ] + ++[[package]] ++name = "regex-automata" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" ++ + [[package]] + name = "regex-syntax" +-version = "0.6.21" ++version = "0.6.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + + [[package]] + name = "remove_dir_all" +@@ -1329,6 +1368,15 @@ dependencies = [ + "winapi 0.3.9", + ] + ++[[package]] ++name = "rustls-pemfile" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" ++dependencies = [ ++ "base64 0.13.0", ++] ++ + [[package]] + name = "ryu" + version = "1.0.5" +@@ -1355,6 +1403,9 @@ name = "serde" + version = "1.0.117" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" ++dependencies = [ ++ "serde_derive", ++] + + [[package]] + name = "serde_derive" +@@ -1373,21 +1424,21 @@ version = "1.0.59" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" + dependencies = [ +- "itoa", ++ "itoa 0.4.6", + "ryu", + "serde", + ] + + [[package]] + name = "serde_urlencoded" +-version = "0.6.1" ++version = "0.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" ++checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" + dependencies = [ +- "dtoa", +- "itoa", ++ "form_urlencoded", ++ "itoa 1.0.3", ++ "ryu", + "serde", +- "url", + ] + + [[package]] +@@ -1399,27 +1450,25 @@ dependencies = [ + "block-buffer 0.7.3", + "digest 0.8.1", + "fake-simd", +- "opaque-debug 0.2.3", ++ "opaque-debug", + ] + + [[package]] + name = "sha-1" +-version = "0.9.2" ++version = "0.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" ++checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" + dependencies = [ +- "block-buffer 0.9.0", + "cfg-if 1.0.0", +- "cpuid-bool", +- "digest 0.9.0", +- "opaque-debug 0.3.0", ++ "cpufeatures", ++ "digest 0.10.5", + ] + + [[package]] + name = "shlex" +-version = "0.1.1" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" ++checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + + [[package]] + name = "siphasher" +@@ -1435,13 +1484,11 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + + [[package]] + name = "socket2" +-version = "0.3.16" ++version = "0.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d" ++checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" + dependencies = [ +- "cfg-if 0.1.10", + "libc", +- "redox_syscall", + "winapi 0.3.9", + ] + +@@ -1483,28 +1530,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + + [[package]] +-name = "strum" +-version = "0.18.0" ++name = "strsim" ++version = "0.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" +- +-[[package]] +-name = "strum_macros" +-version = "0.18.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" +-dependencies = [ +- "heck", +- "proc-macro2", +- "quote", +- "syn", +-] ++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + + [[package]] + name = "syn" +-version = "1.0.48" ++version = "1.0.67" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" ++checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" + dependencies = [ + "proc-macro2", + "quote", +@@ -1519,7 +1554,7 @@ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" + dependencies = [ + "cfg-if 0.1.10", + "libc", +- "rand", ++ "rand 0.7.3", + "redox_syscall", + "remove_dir_all", + "winapi 0.3.9", +@@ -1538,9 +1573,9 @@ dependencies = [ + + [[package]] + name = "termcolor" +-version = "1.1.0" ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" ++checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" + dependencies = [ + "winapi-util", + ] +@@ -1554,35 +1589,32 @@ dependencies = [ + "unicode-width", + ] + ++[[package]] ++name = "textwrap" ++version = "0.15.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" ++ + [[package]] + name = "thiserror" +-version = "1.0.22" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" ++checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.22" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" ++checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" + dependencies = [ + "proc-macro2", + "quote", + "syn", + ] + +-[[package]] +-name = "thread_local" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +-dependencies = [ +- "lazy_static", +-] +- + [[package]] + name = "time" + version = "0.1.44" +@@ -1611,58 +1643,68 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + + [[package]] + name = "tokio" +-version = "0.2.23" ++version = "1.21.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" ++checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" + dependencies = [ +- "bytes", +- "fnv", +- "futures-core", +- "iovec", +- "lazy_static", ++ "autocfg", ++ "bytes 1.2.1", ++ "libc", + "memchr", +- "mio", ++ "mio 0.8.4", ++ "num_cpus", + "pin-project-lite", +- "slab", ++ "socket2", + "tokio-macros", ++ "winapi 0.3.9", + ] + + [[package]] + name = "tokio-macros" +-version = "0.2.6" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" ++checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" + dependencies = [ + "proc-macro2", + "quote", + "syn", + ] + ++[[package]] ++name = "tokio-stream" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" ++dependencies = [ ++ "futures-core", ++ "pin-project-lite", ++ "tokio", ++] ++ + [[package]] + name = "tokio-tungstenite" +-version = "0.11.0" ++version = "0.17.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d9e878ad426ca286e4dcae09cbd4e1973a7f8987d97570e2469703dd7f5720c" ++checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" + dependencies = [ + "futures-util", + "log", +- "pin-project 0.4.27", + "tokio", + "tungstenite", + ] + + [[package]] + name = "tokio-util" +-version = "0.3.1" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" ++checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" + dependencies = [ +- "bytes", ++ "bytes 1.2.1", + "futures-core", + "futures-sink", +- "log", + "pin-project-lite", + "tokio", ++ "tracing", + ] + + [[package]] +@@ -1674,6 +1716,12 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "topological-sort" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c" ++ + [[package]] + name = "tower-service" + version = "0.3.0" +@@ -1682,11 +1730,11 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" + + [[package]] + name = "tracing" +-version = "0.1.21" ++version = "0.1.35" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" ++checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" + dependencies = [ +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "log", + "pin-project-lite", + "tracing-core", +@@ -1694,21 +1742,11 @@ dependencies = [ + + [[package]] + name = "tracing-core" +-version = "0.1.17" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +-dependencies = [ +- "lazy_static", +-] +- +-[[package]] +-name = "tracing-futures" +-version = "0.2.4" ++version = "0.1.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" ++checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" + dependencies = [ +- "pin-project 0.4.27", +- "tracing", ++ "once_cell", + ] + + [[package]] +@@ -1719,28 +1757,28 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + + [[package]] + name = "tungstenite" +-version = "0.11.1" ++version = "0.17.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" ++checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" + dependencies = [ +- "base64", ++ "base64 0.13.0", + "byteorder", +- "bytes", ++ "bytes 1.2.1", + "http", + "httparse", +- "input_buffer", + "log", +- "rand", +- "sha-1 0.9.2", ++ "rand 0.8.5", ++ "sha-1 0.10.0", ++ "thiserror", + "url", + "utf-8", + ] + + [[package]] + name = "typenum" +-version = "1.12.0" ++version = "1.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" ++checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + + [[package]] + name = "ucd-trie" +@@ -1775,12 +1813,6 @@ dependencies = [ + "tinyvec", + ] + +-[[package]] +-name = "unicode-segmentation" +-version = "1.7.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae" +- + [[package]] + name = "unicode-width" + version = "0.1.8" +@@ -1805,12 +1837,6 @@ dependencies = [ + "percent-encoding", + ] + +-[[package]] +-name = "urlencoding" +-version = "1.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c9232eb53352b4442e40d7900465dfc534e8cb2dc8f18656fcb2ac16112b5593" +- + [[package]] + name = "utf-8" + version = "0.7.5" +@@ -1862,29 +1888,32 @@ dependencies = [ + + [[package]] + name = "warp" +-version = "0.2.5" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f41be6df54c97904af01aa23e613d4521eed7ab23537cede692d4058f6449407" ++checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" + dependencies = [ +- "bytes", +- "futures", ++ "bytes 1.2.1", ++ "futures-channel", ++ "futures-util", + "headers", + "http", + "hyper", + "log", + "mime", + "mime_guess", +- "pin-project 0.4.27", ++ "percent-encoding", ++ "pin-project", ++ "rustls-pemfile", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", ++ "tokio-stream", + "tokio-tungstenite", ++ "tokio-util", + "tower-service", + "tracing", +- "tracing-futures", +- "urlencoding", + ] + + [[package]] +@@ -1899,6 +1928,12 @@ version = "0.10.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++ + [[package]] + name = "winapi" + version = "0.2.8" +@@ -1942,6 +1977,49 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + ++[[package]] ++name = "windows-sys" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" ++dependencies = [ ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" ++ + [[package]] + name = "ws2_32-sys" + version = "0.2.1" +diff --git a/Cargo.toml b/Cargo.toml +index 16efef1..e750ee2 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -10,6 +10,6 @@ readme = "README.md" + [dependencies] + katex = "0.3.2" + clap = "2.33.3" +-mdbook = "0.4.4" ++mdbook = "0.4.21" + serde_json = "1.0.59" + toml = "0.5.7" diff --git a/pkgs/tools/text/mdbook-man/default.nix b/pkgs/tools/text/mdbook-man/default.nix index 7783be1ccac..541e27eb7e0 100644 --- a/pkgs/tools/text/mdbook-man/default.nix +++ b/pkgs/tools/text/mdbook-man/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-man"; - version = "unstable-2021-08-26"; + version = "unstable-2022-11-05"; src = fetchFromGitHub { owner = "vv9k"; repo = pname; - rev = "419c91db0fcfcce65a6006ed9ec8415a8b705186"; - sha256 = "sha256-NOPyDPQms/YJzjkXjVAFR60gLK4zqOuFSdRvFkZRRxQ="; + rev = "b9537dfbb241d7456835ed7e9d27ab8c8184e5f6"; + hash = "sha256-ssAk60jnwYzAjseL26/3FaDv1vBAylgdE+vLhWZ8It4="; }; - cargoSha256 = "sha256-NyeB2vI9Za5T1SKrjqwTi8LXX7A+M+2r/n1u2qtnK5g="; + cargoHash = "sha256-cR86eFhP9Swh+Ff8FNbAfWpWMkliOAyPwDQ6lRvU+nk="; meta = with lib; { description = "Generate manual pages from mdBooks"; diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index bf666d36cb6..1977fcd4efe 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; @@ -8,10 +8,19 @@ rustPlatform.buildRustPackage rec { owner = "badboy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zXgXgcMF7MOa9Vx3rhv9aavqRCfMcyRLtaWEvYlyaTs="; + hash = "sha256-zXgXgcMF7MOa9Vx3rhv9aavqRCfMcyRLtaWEvYlyaTs="; }; - cargoSha256 = "sha256-sV/1caeXq/he92cvAajDL7pZJNiXCzf/DDXKnPKU4XQ="; + cargoPatches = [ + # https://github.com/badboy/mdbook-mermaid/pull/23 + (fetchpatch { + name = "update-mdbook-for-rust-1.64.patch"; + url = "https://github.com/badboy/mdbook-mermaid/commit/5a3432d1b28ef9a065dd37aa77b82a3593358793.patch"; + hash = "sha256-NkCxGmRdwJ+jdkgxp5gWfGpgpLpEpKUd44LyPx0kyEE="; + }) + ]; + + cargoHash = "sha256-IkMBnBuobrJzR6+030/Wfbu2ZCjvFnjBV+6sSWdiNUw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/tools/text/mdbook-open-on-gh/default.nix index 09b0db3866b..f334645ba5a 100644 --- a/pkgs/tools/text/mdbook-open-on-gh/default.nix +++ b/pkgs/tools/text/mdbook-open-on-gh/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "mdbook-open-on-gh"; @@ -8,10 +8,19 @@ rustPlatform.buildRustPackage rec { owner = "badboy"; repo = pname; rev = "2.2.0"; - sha256 = "sha256-x7ESuXoF5dYnJZpgDyYliVixCG4w/VX/Vhm3VqxsiEI="; + hash = "sha256-x7ESuXoF5dYnJZpgDyYliVixCG4w/VX/Vhm3VqxsiEI="; }; - cargoSha256 = "sha256-FVcCzL0jJ827HHS/9G597QjNFY3HLNYHCPWcepEulD0="; + cargoPatches = [ + # https://github.com/badboy/mdbook-open-on-gh/pull/7 + (fetchpatch { + name = "update-mdbook-for-rust-1.64.patch"; + url = "https://github.com/badboy/mdbook-open-on-gh/commit/bd20601bfcec144c9302b1ba1a1aff4b95b334d9.patch"; + hash = "sha256-3Df9Q3sqCpZzqCN9fi+wdeWjLUW4XdywIS3QUjsDE9g="; + }) + ]; + + cargoHash = "sha256-N0RwengTWk4luPIecIxzbFReGi+PtE77FJalPq1CdbA="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/tools/text/mdbook-pdf/default.nix index 8c21f50b1d7..ca24909ed1d 100644 --- a/pkgs/tools/text/mdbook-pdf/default.nix +++ b/pkgs/tools/text/mdbook-pdf/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-pdf"; - version = "0.1.2"; + version = "0.1.3"; src = fetchCrate { inherit pname version; - sha256 = "1ibmn8x9kyfd058hsyah2ggyzpahzf2w2qjn6rs9qv8mr3bvc0pv"; + sha256 = "sha256-zFeEmIv3DIYKmhVYO9cJwRQbSP8yELaJjVjP7hYegco="; }; - cargoSha256 = "0k47a5yqnjjc599vgk39ijy6fm62rr8xarvz37g0c7fx9cljhihz"; + cargoHash = "sha256-pB7NEloeow4TE1Y1EMUZzeCJ/f4DnCS+sQlyN49gqzA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/text/mdbook-plantuml/default.nix b/pkgs/tools/text/mdbook-plantuml/default.nix index 0b26bee0953..e57bd1a4522 100644 --- a/pkgs/tools/text/mdbook-plantuml/default.nix +++ b/pkgs/tools/text/mdbook-plantuml/default.nix @@ -1,18 +1,36 @@ -{ lib, fetchFromGitHub, stdenv, rustPlatform, darwin, pkg-config, openssl -, libiconv, CoreServices }: +{ lib +, fetchFromGitHub +, fetchpatch +, stdenv +, rustPlatform +, darwin +, pkg-config +, openssl +, libiconv +, CoreServices +}: rustPlatform.buildRustPackage rec { pname = "mdbook-plantuml"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sytsereitsma"; repo = pname; rev = "v${version}"; - sha256 = "1m53sp3k387injn6mwk2c6rkzw16b12m4j7q0p69fdb3fiqbkign"; + hash = "sha256-26epwn6j/ZeMAphiFsrLjS0KIewvElr7V3p/EDr4Uqk="; }; - cargoSha256 = "0xi14k86ym3rfz6901lmj444y814m7vp90bwsyjmcph3hdv6mjp0"; + cargoPatches = [ + # https://github.com/sytsereitsma/mdbook-plantuml/pull/60 + (fetchpatch { + name = "update-mdbook-for-rust-1.64.patch"; + url = "https://github.com/sytsereitsma/mdbook-plantuml/commit/a1c7fdaff65fbbcc086006f6d180b27e180739e7.patch"; + hash = "sha256-KXFQxogR6SaoX8snsSYMA8gn1FrQVKMl5l8khxB09WE="; + }) + ]; + + cargoHash = "sha256-3HlnhRexfFcAuk1RoatWORMJvYRrnoEft5ys6j3t9S0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index cf6e0bdb3d4..4cfecfccdbc 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -218,7 +218,7 @@ in python3.pkgs.buildPythonApplication rec { # cannot find their neighbours (e.g. pdflatex doesn't find mktextfm). # We can remove PATH= when those impurities are fixed. # TODO: Is this still necessary when using texlive? - sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${lib.makeBinPath [ texlive coreutils gnused ]}')|" \ + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${lib.makeBinPath [ texlive coreutils gnused ]}', **(dict(filter(lambda v: v[0] == 'SOURCE_DATE_EPOCH', os.environ.items()))))|" \ -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ @@ -229,7 +229,7 @@ in python3.pkgs.buildPythonApplication rec { -e "s|^EPUBCHECK =.*|EPUBCHECK = '${epubcheck}/bin/epubcheck'|" \ -i asciidoc/a2x.py '' else '' - sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml')|" \ + sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl_ns}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', **(dict(filter(lambda v: v[0] == 'SOURCE_DATE_EPOCH', os.environ.items()))))|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ -i asciidoc/a2x.py diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 8da3df2773f..94ed0b87362 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch, buildPackages , texlive , zlib, libiconv, libpng, libX11 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext @@ -77,7 +77,13 @@ core = stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # configure: error: tangle was not found but is required when cross-compiling. + texlive.bin.core + ]; + buildInputs = [ /*teckit*/ zziplib mpfr gmp pixman gd freetype libpng libpaper zlib @@ -94,7 +100,10 @@ core = stdenv.mkDerivation rec { ''; configureScript = "../configure"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + configureFlags = common.configureFlags + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "BUILDCC=${buildPackages.stdenv.cc.targetPrefix}cc" ] ++ [ "--without-x" ] # disable xdvik and xpdfopen ++ map (what: "--disable-${what}") [ "chktex" @@ -113,7 +122,7 @@ core = stdenv.mkDerivation rec { # TODO: perhaps improve texmf.cnf search locations postInstall = /* links format -> engine will be regenerated in texlive.combine */ '' - PATH="$out/bin:$PATH" ${texlinks}/bin/texlinks --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin" + PATH="$out/bin:$PATH" ${buildPackages.texlive.bin.texlinks}/bin/texlinks --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin" '' + /* a few texmf-dist files are useful; take the rest from pkgs */ '' mv "$out/share/texmf-dist/web2c/texmf.cnf" . rm -r "$out/share/texmf-dist" @@ -202,7 +211,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex if [[ "$path" =~ "libs/pplib" ]]; then # TODO: revert for texlive 2022 # ../../../texk/web2c/luatexdir/luamd5/md5lib.c:197:10: fatal error: 'utilsha.h' file not found - make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} + make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}} fi ) done |