commit bd61e4bada3b8e7dfb6a3880ff7912d68eac3517
parent bddd3fa6ba2fdd51a91f387ee35f0452e8ed2ad5
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 11 Jun 2023 19:20:06 +0400
Up
Diffstat:
8 files changed, 422 insertions(+), 156 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1685866647,
- "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=",
+ "lastModified": 1686398752,
+ "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8",
+ "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
@@ -7,7 +7,7 @@
};
outputs = { self, nixpkgs, flake-utils }: {
- overlay = final: prev: import ./pkgs { pkgs = prev; };
+ overlays.default = final: prev: import ./pkgs { pkgs = prev; };
nixosModules = import ./modules;
} // flake-utils.lib.eachDefaultSystem (system: {
packages = flake-utils.lib.filterPackages system (import ./default.nix {
@@ -15,8 +15,8 @@
});
legacyPackages = import nixpkgs {
inherit system;
- overlays = [ self.overlay ];
- crossOverlays = [ self.overlay ];
+ overlays = [ self.overlays.default ];
+ crossOverlays = [ self.overlays.default ];
};
});
}
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -32,7 +32,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2023-06-03";
+ version = "2023-06-10";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -1,19 +1,19 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-snH7qXjXpwxPFyJJLV0ahlvUKPfurlg+ZO4peA2aw88="
+ "hash": "sha256-rVlo6RT9FAJteNI2Pb15merFyipkgmgaBpxVKgqoVfE="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-UIwgnSZhHgZrm5NJZlJmPef1Cv9T9G4YFX756vqOfBU="
+ "hash": "sha256-yV1gQcCp/zjjsb8gh6jOJfd6sYDejumGVNPglWGAmoA="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-C4Xf/OsTSwYd2z1QiE+w1zY732JV3hLYvaLfVwRdkIA="
+ "hash": "sha256-9Sq1WFx0dc8AZ3+X56zA4iaTOMKN2eL5owyxch1tx2w="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-lqotd32EsJaqhBjFqB5S4Pp9ybsWfY9SsSfn7O3jD2Q="
+ "hash": "sha256-sqribIEOjSSjz+nQtPfobdQJygAnDdeWd6Xdxtk7tGI="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
@@ -21,35 +21,35 @@
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-N4sbyEGanNj7l+lg5Qczq/B87uTQdRGnHvI98qLR9WQ="
+ "hash": "sha256-qtxnCcGuiuc6j7PsRxNznV1ooDWalPLaLeYEqbKekZU="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-9wWNTY3zwualGhDUEtJfzyAQzHbjlRi8DeCqNqYa6IM="
+ "hash": "sha256-mxB2L4mMS6I2vfuBKwXXfyq6ZML8vOnXLi4COpcryZ8="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-z56LKcN78tczbUhK+NYMZEKCvMQFrjyqTFCg0KlcypQ="
+ "hash": "sha256-m8ni12v0rBmGItywONSAWkZb10yRSlofNyiHaXdvUjc="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-r+E53FJoy7NiB6HTmhS2wMMiUBHpgCJmY/gFyP7DDms="
+ "hash": "sha256-QGe9vV6tZOWpNRqVAsyAbjFndnIE/mvQvdlu2sZ1t3Y="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-tbzfi1ffJXJRFIMakW65Sff7vs0hh4KeKoCx+jC17p4="
+ "hash": "sha256-cY7TKiGvPzhh9y1aFwZ6hXaxeNeeqn0jryd/Mr2lVo0="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-rdK9nKhhNzC+SEj2Im1ZQ+1uAgCQMrkMS+DS4NP2QJo="
+ "hash": "sha256-+ymJ3Jh9GQAtQdFGxJSpRuomzDu6WZr10eZ9BFVaUGk="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-XEmFBcqMdkl/eUEC9M2VerAH0nw0erGkWTGzgEpvbvk="
+ "hash": "sha256-/KTzX/JExqjEJcpXI8S7fgQBHlyF7+Jzwh3g+uq8/ww="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-VNPo2sYRMSSCkb2P+9y4sr1GBr1vzDyWoidTRZkl9H0="
+ "hash": "sha256-8dxScg54RJFzCQJPOEIRtywl+N9I6g9RCPr4gs+KUSA="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
@@ -57,27 +57,27 @@
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-NLeX+hxo5YV4AMktlGU05IgP4gPC4U5twewu8dXZnrk="
+ "hash": "sha256-OR4LfvcI8WDEyOwU+cDA+RU4s1ioSqoWjw80aRqlsOY="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-0n7aR5qdYKnmVrMSCKnkKMCyyb9wIId0RO4sKmGe3R4="
+ "hash": "sha256-8lFkd7IJ28dc/5O7aSX9+W0n8d8yTXoZzX2dDHu1TUg="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-gabS/WfH0TFXIChwJFY2e4/cbx9jgQ99+NP4H7k5SIs="
+ "hash": "sha256-yctMZ0nNuZ1jy2AuhE6GXLvJz6hhxBYtomnglcrVReE="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-qGKze8PJ3lPukDHEdbtDprZg6sto/N83uBPOOt7jFMI="
+ "hash": "sha256-0rYicK1hA7VK/ABpL3XIoVLKmVwn6VJ7MKZLLpGRvK0="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-yxR5fD8F2pj+Hjps0CY/M0BdUU105m0rZlK7PyGbjwc="
+ "hash": "sha256-aiXC3gtLZKjFeiCWPQ/J6GXdW7lbPHri75fZxs/FxeA="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-1O6B/+zSe6wVXwToGZHgYpk5UyPeGHNKBSYRFm+oq6k="
+ "hash": "sha256-uz/62w4pXCza/vG1vi5jPR97nrL4TpYqMsfI7dqVYVc="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -89,19 +89,19 @@
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
- "hash": "sha256-gyGczyxeyix9Doa2n7LzYnN7QjuGuG3zTI9ahvKkIsE="
+ "hash": "sha256-yCE3lT+ZmGGFxBYhvdtXOb8DamBvzs7DhOkq9sFCRsY="
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-VYafRjhvlKvV9F2dUzq2BZJAAZjL3rzek50cGcruc4k="
+ "hash": "sha256-aYnJx+zp/5qEwBGzJ98idnl9OdhMgN90GAKaX8Ji8dA="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-LKmTl1YApnuR5qaV+XXzcbv0y4QoWJO+X0riVppQBPc="
+ "hash": "sha256-w4Lyq35LkBz2PZ2IHvr1+T/Z/V+9+zXqfU4P79iQ9To="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-TQIUETSZBY3px8QImVG7d9so7aRxe9gGB7Y7VFqrnFY="
+ "hash": "sha256-ipaQXa0kGpCDjbWrecQDuravJiMS3RBgFzJSSaODg0w="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -109,30 +109,30 @@
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
- "hash": "sha256-jkryaZ2YEJetfVaLm8WFg7g5aYxzcM8jAwr8iPxmFXg="
+ "hash": "sha256-uAxl2ZeMm4AUoFz7IaVPMRRvmLYvmDckIY/3coKFKbQ="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
- "hash": "sha256-1VYt59QiwnaLOY2HW1SNdsvAuU4Q/SqN1ZSWg2MOxi0="
+ "hash": "sha256-N4oP8fPfzZ53KjlVKnbFRbb4S8osaOQuS0nbTrmHNJw="
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-9RVoZ+Q2sNnv6CAYi6umFiXHxaXJejUywqxPvOH4lZk="
+ "hash": "sha256-SMkVEXtE1FvNVDH8u0EC0JfYirsdORpScTli8n+oZP0="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-0ypyxJ8Ex77SnrF4zw9bPOld9lMlQBWplk99ZQbiuDc="
+ "hash": "sha256-r7LmKh+qAdFAc9bXwqNo7fLter1YseQTdBCQKYTeINg="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
- "hash": "sha256-gtEwkFNVz5LVSUgPcHEkIZss4sQazr445r+5AZeB/Xo="
+ "hash": "sha256-5H5FZjmHMdfah4kysHZ4c2tXgnX2HDO0sbT0PRC3BC4="
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-82u0MEUrXd9yzR2FDJVOR3BEkwok89ATMBXO9wgAdfY="
+ "hash": "sha256-PAs2y7FLRvrNhs3U2r9f3na8ekWkf0RfPARMDOdviIw="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-LMx8vIGOOTvj1z9ibxnwja4zvatZAhDHFUf5Iv84G9Y="
+ "hash": "sha256-xn9rD7yLfISHdni5zksrTMQ7PaJ4ic2H6s+OQCx0onQ="
}
}
diff --git a/pkgs/misc/xtr/cargo-lock.patch b/pkgs/misc/xtr/cargo-lock.patch
@@ -1,57 +1,103 @@
diff --git c/Cargo.lock i/Cargo.lock
new file mode 100644
-index 0000000..cd630be
+index 0000000..d6f889f
--- /dev/null
+++ i/Cargo.lock
-@@ -0,0 +1,440 @@
+@@ -0,0 +1,706 @@
+# 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 = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
++checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
-+name = "ansi_term"
-+version = "0.11.0"
++name = "android-tzdata"
++version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
++
++[[package]]
++name = "android_system_properties"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
-+ "winapi",
++ "libc",
+]
+
+[[package]]
-+name = "anyhow"
-+version = "1.0.38"
++name = "anstream"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
++dependencies = [
++ "anstyle",
++ "anstyle-parse",
++ "anstyle-query",
++ "anstyle-wincon",
++ "colorchoice",
++ "is-terminal",
++ "utf8parse",
++]
++
++[[package]]
++name = "anstyle"
++version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
++checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
+[[package]]
-+name = "atty"
-+version = "0.2.14"
++name = "anstyle-parse"
++version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
++checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+dependencies = [
-+ "hermit-abi",
-+ "libc",
-+ "winapi",
++ "utf8parse",
+]
+
+[[package]]
-+name = "autocfg"
++name = "anstyle-query"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
++dependencies = [
++ "windows-sys",
++]
++
++[[package]]
++name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
++checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
++dependencies = [
++ "anstyle",
++ "windows-sys",
++]
++
++[[package]]
++name = "anyhow"
++version = "1.0.71"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
++
++[[package]]
++name = "autocfg"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[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"
@@ -60,46 +106,83 @@ index 0000000..cd630be
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
+[[package]]
++name = "bumpalo"
++version = "3.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
++
++[[package]]
+name = "byteorder"
-+version = "1.4.2"
++version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "cc"
-+version = "1.0.66"
++version = "1.0.79"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
-+version = "0.4.19"
++version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
++checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+dependencies = [
-+ "libc",
-+ "num-integer",
++ "android-tzdata",
++ "iana-time-zone",
+ "num-traits",
-+ "time",
+ "winapi",
+]
+
+[[package]]
+name = "clap"
-+version = "2.33.3"
++version = "4.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca8f255e4b8027970e78db75e78831229c9815fdbfa67eb1a1b777a62e24b4a0"
++dependencies = [
++ "clap_builder",
++]
++
++[[package]]
++name = "clap_builder"
++version = "4.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
++checksum = "acd4f3c17c83b0ba34ffbc4f8bbd74f079413f747f84a6f89292f138057e36ab"
+dependencies = [
-+ "ansi_term",
-+ "atty",
++ "anstream",
++ "anstyle",
+ "bitflags",
++ "clap_lex",
++ "once_cell",
+ "strsim",
-+ "textwrap",
-+ "unicode-width",
-+ "vec_map",
+]
+
+[[package]]
++name = "clap_lex"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
++
++[[package]]
++name = "colorchoice"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
++
++[[package]]
++name = "core-foundation-sys"
++version = "0.8.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
++
++[[package]]
+name = "encoding"
+version = "0.2.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -164,6 +247,27 @@ index 0000000..cd630be
+checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
+
+[[package]]
++name = "errno"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
++dependencies = [
++ "errno-dragonfly",
++ "libc",
++ "windows-sys",
++]
++
++[[package]]
++name = "errno-dragonfly"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
++dependencies = [
++ "cc",
++ "libc",
++]
++
++[[package]]
+name = "gettext"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -175,9 +279,9 @@ index 0000000..cd630be
+
+[[package]]
+name = "gettext-rs"
-+version = "0.5.0"
++version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1b95fa19cca70adf9888150e979839ae9bd58f85a1a42e4753699112875189e1"
++checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364"
+dependencies = [
+ "gettext-sys",
+ "locale_config",
@@ -185,20 +289,73 @@ index 0000000..cd630be
+
+[[package]]
+name = "gettext-sys"
-+version = "0.19.9"
++version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e034c4ba5bb796730a6cc5eb0d654c16885006a7c3d6c6603581ed809434f153"
++checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d"
+dependencies = [
+ "cc",
++ "temp-dir",
+]
+
+[[package]]
+name = "hermit-abi"
-+version = "0.1.18"
++version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
++checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
++
++[[package]]
++name = "iana-time-zone"
++version = "0.1.57"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+dependencies = [
++ "android_system_properties",
++ "core-foundation-sys",
++ "iana-time-zone-haiku",
++ "js-sys",
++ "wasm-bindgen",
++ "windows",
++]
++
++[[package]]
++name = "iana-time-zone-haiku"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
++dependencies = [
++ "cc",
++]
++
++[[package]]
++name = "io-lifetimes"
++version = "1.0.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
++dependencies = [
++ "hermit-abi",
+ "libc",
++ "windows-sys",
++]
++
++[[package]]
++name = "is-terminal"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
++dependencies = [
++ "hermit-abi",
++ "io-lifetimes",
++ "rustix",
++ "windows-sys",
++]
++
++[[package]]
++name = "js-sys"
++version = "0.3.63"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
++dependencies = [
++ "wasm-bindgen",
+]
+
+[[package]]
@@ -209,9 +366,15 @@ index 0000000..cd630be
+
+[[package]]
+name = "libc"
-+version = "0.2.86"
++version = "0.2.146"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
++
++[[package]]
++name = "linux-raw-sys"
++version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
++checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "locale_config"
@@ -227,6 +390,12 @@ index 0000000..cd630be
+]
+
+[[package]]
++name = "log"
++version = "0.4.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
++
++[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -237,25 +406,15 @@ index 0000000..cd630be
+
+[[package]]
+name = "memchr"
-+version = "2.3.4"
++version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
-+
-+[[package]]
-+name = "num-integer"
-+version = "0.1.44"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-+dependencies = [
-+ "autocfg",
-+ "num-traits",
-+]
++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "num-traits"
-+version = "0.2.14"
++version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
@@ -291,124 +450,156 @@ index 0000000..cd630be
+
+[[package]]
+name = "once_cell"
-+version = "1.5.2"
++version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
++checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "proc-macro2"
-+version = "1.0.24"
++version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
++checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
+dependencies = [
-+ "unicode-xid",
++ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
-+version = "1.0.9"
++version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
++checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
-+version = "1.4.3"
++version = "1.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
++checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
-+ "thread_local",
+]
+
+[[package]]
+name = "regex-syntax"
-+version = "0.6.22"
++version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
++checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
++
++[[package]]
++name = "rustix"
++version = "0.37.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
++dependencies = [
++ "bitflags",
++ "errno",
++ "io-lifetimes",
++ "libc",
++ "linux-raw-sys",
++ "windows-sys",
++]
+
+[[package]]
+name = "strsim"
-+version = "0.8.0"
++version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
-+version = "1.0.60"
++version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
++checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
-+ "unicode-xid",
++ "unicode-ident",
+]
+
+[[package]]
-+name = "textwrap"
-+version = "0.11.0"
++name = "temp-dir"
++version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
++
++[[package]]
++name = "tr"
++version = "0.1.7"
+dependencies = [
-+ "unicode-width",
++ "gettext",
++ "gettext-rs",
++ "lazy_static",
+]
+
+[[package]]
-+name = "thread_local"
-+version = "1.1.3"
++name = "unicode-ident"
++version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
-+dependencies = [
-+ "once_cell",
-+]
++checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+
+[[package]]
-+name = "time"
-+version = "0.1.44"
++name = "utf8parse"
++version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-+dependencies = [
-+ "libc",
-+ "wasi",
-+ "winapi",
-+]
++checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
-+name = "tr"
-+version = "0.1.6"
++name = "wasm-bindgen"
++version = "0.2.86"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
+dependencies = [
-+ "gettext",
-+ "gettext-rs",
-+ "lazy_static",
++ "cfg-if",
++ "wasm-bindgen-macro",
+]
+
+[[package]]
-+name = "unicode-width"
-+version = "0.1.8"
++name = "wasm-bindgen-backend"
++version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
++checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
++dependencies = [
++ "bumpalo",
++ "log",
++ "once_cell",
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-shared",
++]
+
+[[package]]
-+name = "unicode-xid"
-+version = "0.2.1"
++name = "wasm-bindgen-macro"
++version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
++checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
++dependencies = [
++ "quote",
++ "wasm-bindgen-macro-support",
++]
+
+[[package]]
-+name = "vec_map"
-+version = "0.8.2"
++name = "wasm-bindgen-macro-support"
++version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
++checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-backend",
++ "wasm-bindgen-shared",
++]
+
+[[package]]
-+name = "wasi"
-+version = "0.10.0+wasi-snapshot-preview1"
++name = "wasm-bindgen-shared"
++version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
++checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+
+[[package]]
+name = "winapi"
@@ -433,8 +624,83 @@ index 0000000..cd630be
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
++name = "windows"
++version = "0.48.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
++dependencies = [
++ "windows-targets",
++]
++
++[[package]]
++name = "windows-sys"
++version = "0.48.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
++dependencies = [
++ "windows-targets",
++]
++
++[[package]]
++name = "windows-targets"
++version = "0.48.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
++dependencies = [
++ "windows_aarch64_gnullvm",
++ "windows_aarch64_msvc",
++ "windows_i686_gnu",
++ "windows_i686_msvc",
++ "windows_x86_64_gnu",
++ "windows_x86_64_gnullvm",
++ "windows_x86_64_msvc",
++]
++
++[[package]]
++name = "windows_aarch64_gnullvm"
++version = "0.48.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
++
++[[package]]
++name = "windows_aarch64_msvc"
++version = "0.48.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
++
++[[package]]
++name = "windows_i686_gnu"
++version = "0.48.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
++
++[[package]]
++name = "windows_i686_msvc"
++version = "0.48.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
++
++[[package]]
++name = "windows_x86_64_gnu"
++version = "0.48.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
++
++[[package]]
++name = "windows_x86_64_gnullvm"
++version = "0.48.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
++
++[[package]]
++name = "windows_x86_64_msvc"
++version = "0.48.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
++
++[[package]]
+name = "xtr"
-+version = "0.1.6"
++version = "0.1.8"
+dependencies = [
+ "anyhow",
+ "chrono",
diff --git a/pkgs/misc/xtr/default.nix b/pkgs/misc/xtr/default.nix
@@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "xtr";
- version = "0.1.6";
+ version = "0.1.8";
src = fetchFromGitHub {
owner = "woboq";
repo = "tr";
rev = "v${version}";
- hash = "sha256-IgiCcZHtcNOGw0l/sYb4nz15hhzmZ+4G6zzO3I4hpxA=";
+ hash = "sha256-8Ncoo5Nzm4dj2A0L02o8OoT3ZXRciDnwCbHfLIggPw4=";
};
cargoPatches = [ ./cargo-lock.patch ];
- cargoHash = "sha256-6a+n1ApCyfcPQy4wqWNDhXCRGCbJ8BgxHxz/b9uY6Qk=";
+ cargoHash = "sha256-g/8OZmMa2gzRr2ft6/0Tur23sjB+SEQq3/qiiAD5y6M=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
diff --git a/pkgs/mqtt/mongoose/default.nix b/pkgs/mqtt/mongoose/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mongoose";
- version = "7.9";
+ version = "7.10";
src = fetchFromGitHub {
owner = "cesanta";
repo = "mongoose";
rev = finalAttrs.version;
- hash = "sha256-rmJoTjHsTTizq5RBxlMrCdeaFDs0U33fhfvPpbK5y0w=";
+ hash = "sha256-e2Kj1FCns+v1JIYp5CV8OfxYOaEM8kG86V/PAN2Gui0=";
};
buildInputs = [ mbedtls ];
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "imscript";
- version = "2023-05-13";
+ version = "2023-06-01";
src = fetchFromSourcehut {
owner = "~coco";
repo = "imscript";
- rev = "643ec06c17bd04ef338323c2d1f08588c9e3cf70";
- hash = "sha256-TXQd+FjhvBjjA3rgGxkTgtEk2g7841iqYRycZmpC4lY=";
+ rev = "3df6c7ccda23663ada152e6052d2b5aa2f17f7b6";
+ hash = "sha256-TsTXbkJc6doUkayUqo3ptLm5KdfFyXQ/1LjccOLQXrU=";
};
nativeBuildInputs = [ installShellFiles ];
