overlay/plume: init at 0.6.1-dev
This commit is contained in:
parent
dd2ef8575a
commit
a2b490c882
60
flake.lock
60
flake.lock
|
|
@ -1,5 +1,26 @@
|
|||
{
|
||||
"nodes": {
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1639463089,
|
||||
"narHash": "sha256-qCuhw3r9oWumvE9F0fVTrlY+cV7M2pDTjY4G9INVGSM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "70e2edbbd0f94afb6831cb4acf2d3e99e216ff24",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"heliwatch": {
|
||||
"inputs": {
|
||||
"mozillapkgs": "mozillapkgs",
|
||||
|
|
@ -60,6 +81,26 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"naersk_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1638219772,
|
||||
"narHash": "sha256-R396OImY09dKCRgbY0s54/cQxoFNushVtHyCVw+y7FU=",
|
||||
"owner": "mhuesch",
|
||||
"repo": "naersk",
|
||||
"rev": "80649a7ebe7c0675699893b278ebed851d711a69",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "mhuesch",
|
||||
"repo": "naersk",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1638440530,
|
||||
|
|
@ -205,7 +246,9 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"heliwatch": "heliwatch",
|
||||
"naersk": "naersk_2",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-mobilizon": "nixpkgs-mobilizon",
|
||||
|
|
@ -220,6 +263,23 @@
|
|||
"zentralwerk": "zentralwerk"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1639175515,
|
||||
"narHash": "sha256-Yj38u9BpKfyGrcSEaoSEnOns885xn/Ask6lR5rsxS8k=",
|
||||
"owner": "rust-analyzer",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "d03397fe1173eaeb2e04c9e55ac223289e7e08ee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-analyzer",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"scrapers": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
|
|||
10
flake.nix
10
flake.nix
|
|
@ -22,9 +22,13 @@
|
|||
heliwatch.url = "git+https://gitea.c3d2.de/astro/heliwatch.git";
|
||||
heliwatch.inputs.nixpkgs.follows = "nixpkgs";
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
naersk.url = "github:mhuesch/naersk";
|
||||
naersk.inputs.nixpkgs.follows = "nixpkgs";
|
||||
fenix.url = "github:nix-community/fenix";
|
||||
fenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = inputs@{ self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, ... }:
|
||||
outputs = inputs@{ self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, naersk, fenix, ... }:
|
||||
let
|
||||
forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
|
||||
|
||||
|
|
@ -66,7 +70,9 @@
|
|||
then hostConf.ip6
|
||||
else throw "Host ${name} has no ip4 or ip6 address";
|
||||
in {
|
||||
overlay = import ./overlay;
|
||||
overlay = import ./overlay {
|
||||
inherit naersk fenix;
|
||||
};
|
||||
|
||||
legacyPackages = forAllSystems (system: nixpkgs.legacyPackages."${system}".extend self.overlay);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
{ naersk, fenix }:
|
||||
|
||||
final: prev:
|
||||
|
||||
{
|
||||
|
|
@ -14,4 +16,8 @@ final: prev:
|
|||
mlat-client = prev.python3Packages.callPackage ./mlat-client.nix { };
|
||||
|
||||
readsb = prev.callPackage ./readsb.nix { };
|
||||
|
||||
plume = prev.callPackage ./plume {
|
||||
inherit naersk fenix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,976 @@
|
|||
From 209a28fd8c6808ae2789cd60179678f6c025c8de Mon Sep 17 00:00:00 2001
|
||||
From: Astro <astro@spaceboyz.net>
|
||||
Date: Wed, 15 Dec 2021 23:28:59 +0100
|
||||
Subject: [PATCH] cargo update
|
||||
|
||||
---
|
||||
Cargo.lock | 274 +++++++++++++++++++++++++++--------------------------
|
||||
Cargo.toml | 3 +
|
||||
2 files changed, 143 insertions(+), 134 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 0bd4131..2680376 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -11,7 +11,7 @@ dependencies = [
|
||||
"activitystreams-derive",
|
||||
"activitystreams-traits",
|
||||
"activitystreams-types",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
]
|
||||
@@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "670ef03168e704b0cae242e7a5d8b40506772b339687e01a3496fc4afe2e8542"
|
||||
dependencies = [
|
||||
"failure",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
@@ -48,7 +48,7 @@ dependencies = [
|
||||
"activitystreams-traits",
|
||||
"chrono",
|
||||
"mime 0.3.16",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
]
|
||||
@@ -165,15 +165,6 @@ dependencies = [
|
||||
"url 1.7.2",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "ansi_term"
|
||||
-version = "0.11.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
|
||||
-dependencies = [
|
||||
- "winapi 0.3.9",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "ansi_term"
|
||||
version = "0.12.1"
|
||||
@@ -215,11 +206,11 @@ checksum = "719b48039ffac1564f67d70162109ba9341125cee0096a540e478355b3c724a7"
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
-version = "0.1.51"
|
||||
+version = "0.1.52"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
|
||||
+checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
@@ -357,7 +348,7 @@ version = "1.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
|
||||
dependencies = [
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -521,7 +512,7 @@ dependencies = [
|
||||
"libc",
|
||||
"num-integer",
|
||||
"num-traits 0.2.14",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"time 0.1.43",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
@@ -546,11 +537,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
-version = "2.33.3"
|
||||
+version = "2.34.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
|
||||
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
|
||||
dependencies = [
|
||||
- "ansi_term 0.11.0",
|
||||
+ "ansi_term",
|
||||
"atty",
|
||||
"bitflags 1.3.2",
|
||||
"strsim",
|
||||
@@ -586,7 +577,7 @@ dependencies = [
|
||||
"lazy_static",
|
||||
"nom 5.1.2",
|
||||
"rust-ini",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde-hjson",
|
||||
"serde_json",
|
||||
"toml 0.5.8",
|
||||
@@ -627,9 +618,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "conv"
|
||||
-version = "0.3.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
|
||||
+version = "0.3.4"
|
||||
dependencies = [
|
||||
"custom_derive",
|
||||
]
|
||||
@@ -671,7 +660,7 @@ dependencies = [
|
||||
"idna 0.1.5",
|
||||
"log 0.4.14",
|
||||
"publicsuffix",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_json",
|
||||
"time 0.1.43",
|
||||
"try_from",
|
||||
@@ -711,9 +700,9 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
|
||||
|
||||
[[package]]
|
||||
name = "crc32fast"
|
||||
-version = "1.2.2"
|
||||
+version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "3825b1e8580894917dc4468cb634a1b4e9745fddc854edad72d9c04644c0319f"
|
||||
+checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
]
|
||||
@@ -812,7 +801,7 @@ dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"crossbeam-utils 0.8.5",
|
||||
"lazy_static",
|
||||
- "memoffset 0.6.4",
|
||||
+ "memoffset 0.6.5",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
@@ -1027,7 +1016,7 @@ version = "1.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
@@ -1173,9 +1162,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
|
||||
|
||||
[[package]]
|
||||
name = "encoding_rs"
|
||||
-version = "0.8.29"
|
||||
+version = "0.8.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746"
|
||||
+checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
]
|
||||
@@ -1207,7 +1196,7 @@ version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
"synstructure",
|
||||
@@ -1352,9 +1341,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
|
||||
|
||||
[[package]]
|
||||
name = "futures"
|
||||
-version = "0.3.18"
|
||||
+version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e"
|
||||
+checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
|
||||
dependencies = [
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
@@ -1367,9 +1356,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "futures-channel"
|
||||
-version = "0.3.18"
|
||||
+version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27"
|
||||
+checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
@@ -1377,9 +1366,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
-version = "0.3.18"
|
||||
+version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445"
|
||||
+checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
|
||||
|
||||
[[package]]
|
||||
name = "futures-cpupool"
|
||||
@@ -1393,9 +1382,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "futures-executor"
|
||||
-version = "0.3.18"
|
||||
+version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97"
|
||||
+checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-task",
|
||||
@@ -1405,39 +1394,42 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "futures-io"
|
||||
-version = "0.3.18"
|
||||
+version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11"
|
||||
+checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
|
||||
|
||||
[[package]]
|
||||
name = "futures-macro"
|
||||
-version = "0.3.18"
|
||||
+version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd"
|
||||
+checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "autocfg 1.0.1",
|
||||
+ "proc-macro-hack 0.5.19",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-sink"
|
||||
-version = "0.3.18"
|
||||
+version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af"
|
||||
+checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
|
||||
|
||||
[[package]]
|
||||
name = "futures-task"
|
||||
-version = "0.3.18"
|
||||
+version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12"
|
||||
+checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
|
||||
|
||||
[[package]]
|
||||
name = "futures-util"
|
||||
-version = "0.3.18"
|
||||
+version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e"
|
||||
+checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
|
||||
dependencies = [
|
||||
+ "autocfg 1.0.1",
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
"futures-io",
|
||||
@@ -1447,6 +1439,8 @@ dependencies = [
|
||||
"memchr",
|
||||
"pin-project-lite 0.2.7",
|
||||
"pin-utils",
|
||||
+ "proc-macro-hack 0.5.19",
|
||||
+ "proc-macro-nested",
|
||||
"slab",
|
||||
]
|
||||
|
||||
@@ -1718,7 +1712,7 @@ checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
|
||||
dependencies = [
|
||||
"bytes 0.4.12",
|
||||
"fnv",
|
||||
- "itoa",
|
||||
+ "itoa 0.4.8",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1729,7 +1723,7 @@ checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b"
|
||||
dependencies = [
|
||||
"bytes 1.1.0",
|
||||
"fnv",
|
||||
- "itoa",
|
||||
+ "itoa 0.4.8",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1799,7 +1793,7 @@ dependencies = [
|
||||
"http-body 0.1.0",
|
||||
"httparse",
|
||||
"iovec",
|
||||
- "itoa",
|
||||
+ "itoa 0.4.8",
|
||||
"log 0.4.14",
|
||||
"net2",
|
||||
"rustc_version",
|
||||
@@ -1830,7 +1824,7 @@ dependencies = [
|
||||
"http-body 0.3.1",
|
||||
"httparse",
|
||||
"httpdate",
|
||||
- "itoa",
|
||||
+ "itoa 0.4.8",
|
||||
"pin-project",
|
||||
"socket2",
|
||||
"tokio 0.2.25",
|
||||
@@ -1958,9 +1952,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
-version = "0.10.1"
|
||||
+version = "0.10.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
|
||||
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
|
||||
dependencies = [
|
||||
"either 1.6.1",
|
||||
]
|
||||
@@ -1971,6 +1965,12 @@ version = "0.4.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
|
||||
|
||||
+[[package]]
|
||||
+name = "itoa"
|
||||
+version = "1.0.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
|
||||
+
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.55"
|
||||
@@ -2027,7 +2027,7 @@ checksum = "915f14e5fbd72f2f0816dcdbb98b56e7fe6d04dae6ed2c0395133b627aafda9e"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bytes 0.5.6",
|
||||
- "futures 0.3.18",
|
||||
+ "futures 0.3.17",
|
||||
"futures-util",
|
||||
"lazy_static",
|
||||
"lber",
|
||||
@@ -2056,7 +2056,7 @@ dependencies = [
|
||||
"log 0.4.14",
|
||||
"native-tls",
|
||||
"nom 4.2.3",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
]
|
||||
@@ -2096,9 +2096,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
-version = "0.2.108"
|
||||
+version = "0.2.112"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119"
|
||||
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
|
||||
|
||||
[[package]]
|
||||
name = "libsqlite3-sys"
|
||||
@@ -2123,7 +2123,7 @@ dependencies = [
|
||||
"lindera-dictionary",
|
||||
"lindera-ipadic",
|
||||
"lindera-ipadic-builder",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
@@ -2136,7 +2136,7 @@ dependencies = [
|
||||
"bincode",
|
||||
"byteorder 1.4.3",
|
||||
"encoding",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"yada",
|
||||
]
|
||||
|
||||
@@ -2284,7 +2284,7 @@ dependencies = [
|
||||
"log 0.4.14",
|
||||
"phf",
|
||||
"phf_codegen",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"string_cache",
|
||||
@@ -2346,9 +2346,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
-version = "0.6.4"
|
||||
+version = "0.6.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
|
||||
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
]
|
||||
@@ -2369,7 +2369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
|
||||
dependencies = [
|
||||
"migrations_internals",
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
@@ -2581,7 +2581,7 @@ dependencies = [
|
||||
"cc",
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
- "memoffset 0.6.4",
|
||||
+ "memoffset 0.6.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2699,9 +2699,9 @@ checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
-version = "1.8.0"
|
||||
+version = "1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
|
||||
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
|
||||
|
||||
[[package]]
|
||||
name = "onig"
|
||||
@@ -2753,9 +2753,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
|
||||
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
-version = "0.9.71"
|
||||
+version = "0.9.72"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73"
|
||||
+checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
|
||||
dependencies = [
|
||||
"autocfg 1.0.1",
|
||||
"cc",
|
||||
@@ -2921,7 +2921,7 @@ version = "1.0.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
@@ -2946,9 +2946,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
-version = "0.3.22"
|
||||
+version = "0.3.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
|
||||
+checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
|
||||
|
||||
[[package]]
|
||||
name = "plist"
|
||||
@@ -2959,7 +2959,7 @@ dependencies = [
|
||||
"base64 0.13.0",
|
||||
"indexmap",
|
||||
"line-wrap",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"time 0.3.5",
|
||||
"xml-rs",
|
||||
]
|
||||
@@ -2996,7 +2996,7 @@ dependencies = [
|
||||
"rsass",
|
||||
"ructe",
|
||||
"scheduled-thread-pool",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_json",
|
||||
"shrinkwraprs 0.2.3",
|
||||
"tracing",
|
||||
@@ -3010,7 +3010,7 @@ dependencies = [
|
||||
name = "plume-api"
|
||||
version = "0.6.1-dev"
|
||||
dependencies = [
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
@@ -3044,7 +3044,7 @@ dependencies = [
|
||||
"regex-syntax 0.6.25",
|
||||
"reqwest 0.9.24",
|
||||
"rocket",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"shrinkwraprs 0.3.0",
|
||||
@@ -3063,7 +3063,7 @@ dependencies = [
|
||||
"gettext-utils",
|
||||
"js-sys",
|
||||
"lazy_static",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"wasm-bindgen",
|
||||
@@ -3108,7 +3108,7 @@ dependencies = [
|
||||
"rocket",
|
||||
"rocket_i18n",
|
||||
"scheduled-thread-pool",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"shrinkwraprs 0.2.3",
|
||||
@@ -3173,6 +3173,12 @@ version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7be55bf0ae1635f4d7c7ddd6efc05c631e98a82104a73d35550bbc52db960027"
|
||||
|
||||
+[[package]]
|
||||
+name = "proc-macro-nested"
|
||||
+version = "0.1.7"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
|
||||
+
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "0.2.3"
|
||||
@@ -3202,9 +3208,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
-version = "1.0.32"
|
||||
+version = "1.0.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
|
||||
+checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1"
|
||||
dependencies = [
|
||||
"unicode-xid 0.2.2",
|
||||
]
|
||||
@@ -3286,7 +3292,7 @@ version = "1.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3629,7 +3635,7 @@ dependencies = [
|
||||
"mime 0.3.16",
|
||||
"mime_guess 2.0.3",
|
||||
"native-tls",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_json",
|
||||
"serde_urlencoded 0.5.5",
|
||||
"socks",
|
||||
@@ -3668,7 +3674,7 @@ dependencies = [
|
||||
"native-tls",
|
||||
"percent-encoding 2.1.0",
|
||||
"pin-project-lite 0.2.7",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_urlencoded 0.7.0",
|
||||
"tokio 0.2.25",
|
||||
"tokio-tls",
|
||||
@@ -3688,7 +3694,7 @@ dependencies = [
|
||||
"chrono",
|
||||
"config",
|
||||
"dashmap",
|
||||
- "futures 0.3.18",
|
||||
+ "futures 0.3.17",
|
||||
"num_cpus",
|
||||
"pin-utils",
|
||||
"rand 0.7.3",
|
||||
@@ -3768,7 +3774,7 @@ dependencies = [
|
||||
"log 0.4.14",
|
||||
"notify",
|
||||
"rocket",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
@@ -3780,7 +3786,7 @@ dependencies = [
|
||||
"data-encoding",
|
||||
"ring",
|
||||
"rocket",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"time 0.1.43",
|
||||
]
|
||||
|
||||
@@ -3851,7 +3857,7 @@ checksum = "c6fd2f3b927021cc8586d365c36d16d82d91fdae0a3839819c12c8e86e0f929e"
|
||||
dependencies = [
|
||||
"base64 0.13.0",
|
||||
"bytecount",
|
||||
- "itertools 0.10.1",
|
||||
+ "itertools 0.10.3",
|
||||
"md5",
|
||||
"nom 6.2.1",
|
||||
]
|
||||
@@ -3868,7 +3874,7 @@ version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54"
|
||||
dependencies = [
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
@@ -3889,9 +3895,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
-version = "1.0.5"
|
||||
+version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
|
||||
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
|
||||
|
||||
[[package]]
|
||||
name = "safemem"
|
||||
@@ -3979,9 +3985,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
-version = "1.0.130"
|
||||
+version = "1.0.131"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
|
||||
+checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
@@ -4001,24 +4007,24 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
-version = "1.0.130"
|
||||
+version = "1.0.131"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
|
||||
+checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
-version = "1.0.72"
|
||||
+version = "1.0.73"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527"
|
||||
+checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5"
|
||||
dependencies = [
|
||||
- "itoa",
|
||||
+ "itoa 1.0.1",
|
||||
"ryu",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4037,8 +4043,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
|
||||
dependencies = [
|
||||
"dtoa",
|
||||
- "itoa",
|
||||
- "serde 1.0.130",
|
||||
+ "itoa 0.4.8",
|
||||
+ "serde 1.0.131",
|
||||
"url 1.7.2",
|
||||
]
|
||||
|
||||
@@ -4049,9 +4055,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
|
||||
dependencies = [
|
||||
"form_urlencoded",
|
||||
- "itoa",
|
||||
+ "itoa 0.4.8",
|
||||
"ryu",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4084,7 +4090,7 @@ checksum = "83695fde96cbe9e08f0e4eb96b1b56fdbd44f2098ee27462dda964c7745fddc7"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"itertools 0.8.2",
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
@@ -4097,7 +4103,7 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"itertools 0.8.2",
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
@@ -4232,7 +4238,7 @@ dependencies = [
|
||||
"new_debug_unreachable",
|
||||
"phf_shared",
|
||||
"precomputed-hash",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"string_cache_codegen",
|
||||
"string_cache_shared",
|
||||
]
|
||||
@@ -4245,7 +4251,7 @@ checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
|
||||
dependencies = [
|
||||
"phf_generator",
|
||||
"phf_shared",
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"string_cache_shared",
|
||||
]
|
||||
@@ -4329,7 +4335,7 @@ version = "1.0.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"unicode-xid 0.2.2",
|
||||
]
|
||||
@@ -4349,7 +4355,7 @@ version = "0.12.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
"unicode-xid 0.2.2",
|
||||
@@ -4370,7 +4376,7 @@ dependencies = [
|
||||
"onig",
|
||||
"plist",
|
||||
"regex-syntax 0.6.25",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"walkdir",
|
||||
@@ -4396,7 +4402,7 @@ dependencies = [
|
||||
"failure",
|
||||
"fnv",
|
||||
"fs2",
|
||||
- "futures 0.3.18",
|
||||
+ "futures 0.3.17",
|
||||
"htmlescape",
|
||||
"levenshtein_automata",
|
||||
"log 0.4.14",
|
||||
@@ -4410,7 +4416,7 @@ dependencies = [
|
||||
"rayon",
|
||||
"regex",
|
||||
"rust-stemmers",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_json",
|
||||
"smallvec 1.7.0",
|
||||
"snap",
|
||||
@@ -4439,7 +4445,7 @@ dependencies = [
|
||||
"fail",
|
||||
"fnv",
|
||||
"fs2",
|
||||
- "futures 0.3.18",
|
||||
+ "futures 0.3.17",
|
||||
"htmlescape",
|
||||
"levenshtein_automata",
|
||||
"log 0.4.14",
|
||||
@@ -4451,7 +4457,7 @@ dependencies = [
|
||||
"rayon",
|
||||
"regex",
|
||||
"rust-stemmers",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_json",
|
||||
"smallvec 1.7.0",
|
||||
"snap",
|
||||
@@ -4501,9 +4507,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
|
||||
|
||||
[[package]]
|
||||
name = "tar"
|
||||
-version = "0.4.37"
|
||||
+version = "0.4.38"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c"
|
||||
+checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
|
||||
dependencies = [
|
||||
"filetime",
|
||||
"libc",
|
||||
@@ -4569,7 +4575,7 @@ version = "1.0.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
@@ -4599,7 +4605,7 @@ version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
|
||||
dependencies = [
|
||||
- "itoa",
|
||||
+ "itoa 0.4.8",
|
||||
"libc",
|
||||
]
|
||||
|
||||
@@ -4745,7 +4751,7 @@ version = "0.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
@@ -4895,7 +4901,7 @@ version = "0.4.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
|
||||
dependencies = [
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4904,7 +4910,7 @@ version = "0.5.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
|
||||
dependencies = [
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4932,7 +4938,7 @@ version = "0.1.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
]
|
||||
@@ -4973,7 +4979,7 @@ version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
|
||||
dependencies = [
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"tracing-core",
|
||||
]
|
||||
|
||||
@@ -4983,12 +4989,12 @@ version = "0.2.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
|
||||
dependencies = [
|
||||
- "ansi_term 0.12.1",
|
||||
+ "ansi_term",
|
||||
"chrono",
|
||||
"lazy_static",
|
||||
"matchers",
|
||||
"regex",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_json",
|
||||
"sharded-slab",
|
||||
"smallvec 1.7.0",
|
||||
@@ -5171,7 +5177,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
|
||||
dependencies = [
|
||||
"getrandom 0.2.3",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -5183,7 +5189,7 @@ dependencies = [
|
||||
"idna 0.1.5",
|
||||
"lazy_static",
|
||||
"regex",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"url 1.7.2",
|
||||
@@ -5285,7 +5291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_json",
|
||||
"wasm-bindgen-macro",
|
||||
]
|
||||
@@ -5299,7 +5305,7 @@ dependencies = [
|
||||
"bumpalo",
|
||||
"lazy_static",
|
||||
"log 0.4.14",
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
"wasm-bindgen-shared",
|
||||
@@ -5333,7 +5339,7 @@ version = "0.2.78"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.32",
|
||||
+ "proc-macro2 1.0.34",
|
||||
"quote 1.0.10",
|
||||
"syn 1.0.82",
|
||||
"wasm-bindgen-backend",
|
||||
@@ -5363,7 +5369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec24b1b0700d4b466d280228ed0f62274eedeaa80206820f071fdc8ed787b664"
|
||||
dependencies = [
|
||||
"reqwest 0.9.24",
|
||||
- "serde 1.0.130",
|
||||
+ "serde 1.0.131",
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 41d6d16..e3cab1d 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -81,3 +81,6 @@ search-lindera = ["plume-models/search-lindera"]
|
||||
|
||||
[workspace]
|
||||
members = ["plume-api", "plume-cli", "plume-models", "plume-common", "plume-front", "plume-macro"]
|
||||
+
|
||||
+[patch.crates-io]
|
||||
+conv = { path = "rust-conv" }
|
||||
--
|
||||
2.34.0
|
||||
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
{ naersk, fenix
|
||||
, system, stdenv, fetchFromGitHub, buildEnv
|
||||
, pkg-config, gettext
|
||||
, openssl, postgresql
|
||||
}:
|
||||
|
||||
let
|
||||
rust = fenix.packages.${system}.complete.withComponents [
|
||||
"cargo"
|
||||
"rustc"
|
||||
];
|
||||
naersk-lib = naersk.lib."${system}".override {
|
||||
cargo = rust;
|
||||
rustc = rust;
|
||||
};
|
||||
|
||||
conv = fetchFromGitHub {
|
||||
owner = "DanielKeep";
|
||||
repo = "rust-conv";
|
||||
rev = "90a1e85edcc6d63616436a6049b08ba87c76d703";
|
||||
sha256 = "029xq9cabz3scbmd84b8qkrg0q7x6fm27ijq869lkpq8bwjxvcb6";
|
||||
};
|
||||
|
||||
src = stdenv.mkDerivation {
|
||||
name = "plume-src";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Plume-org";
|
||||
repo = "Plume";
|
||||
rev = "33f3bbb774ccbc05636167111db8a601a4bf5fdd";
|
||||
sha256 = "1zpd7r45axps6wky1nf9ja9kyx8z5gywi5p5fgs1h1lxg9r0sfmw";
|
||||
};
|
||||
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
|
||||
patches = [
|
||||
./0001-cargo-update.patch
|
||||
];
|
||||
postPatch = ''
|
||||
ln -s ${conv} rust-conv
|
||||
'';
|
||||
installPhase = "cp -ar . $out";
|
||||
};
|
||||
|
||||
plume = naersk-lib.buildPackage {
|
||||
pname = "plume";
|
||||
inherit src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config gettext
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
postgresql
|
||||
];
|
||||
};
|
||||
|
||||
plm = naersk-lib.buildPackage {
|
||||
pname = "plm";
|
||||
root = src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
# gettext
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
postgresql
|
||||
];
|
||||
cargoBuildOptions = x: x ++ [ "--package=plume-cli" ];
|
||||
};
|
||||
in if true then plm else buildEnv {
|
||||
name = "plume-env";
|
||||
paths = [ plume plm ];
|
||||
passthru = { inherit plume plm; };
|
||||
}
|
||||
Loading…
Reference in New Issue