Unverified Commit a1b91992 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #296367 from flokli/mycelium-0.4.3 

mycelium: 0.4.2 -> 0.4.3
parents cfabb44c 6d5fedf9

pkgs/by-name/my/mycelium/Cargo.lock

+149 −83
Original line number Diff line number Diff line
@@ -146,18 +146,19 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" 


[[package]]

name = "axum"

version = "0.6.20"

version = "0.7.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"

checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e"

dependencies = [

 "async-trait",

 "axum-core",

 "bitflags 1.3.2",

 "bytes",

 "futures-util",

 "http",

 "http-body",

 "hyper",

 "http 1.1.0",

 "http-body 1.0.0",

 "http-body-util",

 "hyper 1.2.0",

 "hyper-util",

 "itoa",

 "matchit",

 "memchr",
@@ -178,17 +179,20 @@ dependencies = [ 


[[package]]

name = "axum-core"

version = "0.3.4"

version = "0.4.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"

checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"

dependencies = [

 "async-trait",

 "bytes",

 "futures-util",

 "http",

 "http-body",

 "http 1.1.0",

 "http-body 1.0.0",

 "http-body-util",

 "mime",

 "pin-project-lite",

 "rustversion",

 "sync_wrapper",

 "tower-layer",

 "tower-service",

]
@@ -310,6 +314,12 @@ version = "1.0.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"



[[package]]

name = "cfg_aliases"

version = "0.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"



[[package]]

name = "cipher"

version = "0.4.4"
@@ -504,9 +514,9 @@ dependencies = [ 


[[package]]

name = "etherparse"

version = "0.13.0"

version = "0.14.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "827292ea592108849932ad8e30218f8b1f21c0dfd0696698a18b5d0aed62d990"

checksum = "24890603eb4b43aa788f02261ce21714449033e3e2ab93692f0ab18480c3c9b1"

dependencies = [

 "arrayvec",

]
@@ -691,7 +701,26 @@ dependencies = [ 
 "futures-core",

 "futures-sink",

 "futures-util",

 "http",

 "http 0.2.11",

 "indexmap",

 "slab",

 "tokio",

 "tokio-util",

 "tracing",

]



[[package]]

name = "h2"

version = "0.4.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943"

dependencies = [

 "bytes",

 "fnv",

 "futures-core",

 "futures-sink",

 "futures-util",

 "http 1.1.0",

 "indexmap",

 "slab",

 "tokio",
@@ -728,6 +757,17 @@ dependencies = [ 
 "itoa",

]



[[package]]

name = "http"

version = "1.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"

dependencies = [

 "bytes",

 "fnv",

 "itoa",

]



[[package]]

name = "http-body"

version = "0.4.6"
@@ -735,7 +775,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"

dependencies = [

 "bytes",

 "http",

 "http 0.2.11",

 "pin-project-lite",

]



[[package]]

name = "http-body"

version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"

dependencies = [

 "bytes",

 "http 1.1.0",

]



[[package]]

name = "http-body-util"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"

dependencies = [

 "bytes",

 "futures-util",

 "http 1.1.0",

 "http-body 1.0.0",

 "pin-project-lite",

]
@@ -767,9 +830,9 @@ dependencies = [ 
 "futures-channel",

 "futures-core",

 "futures-util",

 "h2",

 "http",

 "http-body",

 "h2 0.3.24",

 "http 0.2.11",

 "http-body 0.4.6",

 "httparse",

 "httpdate",

 "itoa",
@@ -782,17 +845,39 @@ dependencies = [ 
]



[[package]]

name = "hyper-rustls"

version = "0.24.2"

name = "hyper"

version = "1.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"

checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"

dependencies = [

 "bytes",

 "futures-channel",

 "futures-util",

 "http",

 "hyper",

 "rustls",

 "h2 0.4.2",

 "http 1.1.0",

 "http-body 1.0.0",

 "httparse",

 "httpdate",

 "itoa",

 "pin-project-lite",

 "smallvec",

 "tokio",

]



[[package]]

name = "hyper-util"

version = "0.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"

dependencies = [

 "bytes",

 "futures-util",

 "http 1.1.0",

 "http-body 1.0.0",

 "hyper 1.2.0",

 "pin-project-lite",

 "socket2",

 "tokio",

 "tokio-rustls",

]



[[package]]
@@ -886,9 +971,9 @@ dependencies = [ 


[[package]]

name = "libc"

version = "0.2.152"

version = "0.2.153"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"

checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"



[[package]]

name = "libloading"
@@ -908,9 +993,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" 


[[package]]

name = "log"

version = "0.4.20"

version = "0.4.21"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"

checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"



[[package]]

name = "loom"
@@ -972,9 +1057,9 @@ dependencies = [ 


[[package]]

name = "mio"

version = "0.8.10"

version = "0.8.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"

checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"

dependencies = [

 "libc",

 "wasi",
@@ -983,7 +1068,7 @@ dependencies = [ 


[[package]]

name = "mycelium"

version = "0.4.2"

version = "0.4.3"

dependencies = [

 "aes-gcm",

 "axum",
@@ -1002,7 +1087,7 @@ dependencies = [ 
 "libc",

 "log",

 "network-interface",

 "nix 0.27.1",

 "nix 0.28.0",

 "pretty_env_logger",

 "quinn",

 "rand",
@@ -1119,6 +1204,18 @@ dependencies = [ 
 "bitflags 2.4.2",

 "cfg-if",

 "libc",

]



[[package]]

name = "nix"

version = "0.28.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"

dependencies = [

 "bitflags 2.4.2",

 "cfg-if",

 "cfg_aliases",

 "libc",

 "memoffset",

]
@@ -1360,9 +1457,9 @@ dependencies = [ 


[[package]]

name = "rcgen"

version = "0.12.0"

version = "0.12.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5d918c80c5a4c7560db726763020bd16db179e4d5b828078842274a443addb5d"

checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1"

dependencies = [

 "pem",

 "ring 0.17.7",
@@ -1425,11 +1522,10 @@ dependencies = [ 
 "encoding_rs",

 "futures-core",

 "futures-util",

 "h2",

 "http",

 "http-body",

 "hyper",

 "hyper-rustls",

 "h2 0.3.24",

 "http 0.2.11",

 "http-body 0.4.6",

 "hyper 0.14.28",

 "ipnet",

 "js-sys",

 "log",
@@ -1437,20 +1533,16 @@ dependencies = [ 
 "once_cell",

 "percent-encoding",

 "pin-project-lite",

 "rustls",

 "rustls-pemfile",

 "serde",

 "serde_json",

 "serde_urlencoded",

 "system-configuration",

 "tokio",

 "tokio-rustls",

 "tower-service",

 "url",

 "wasm-bindgen",

 "wasm-bindgen-futures",

 "web-sys",

 "webpki-roots",

 "winreg",

]
@@ -1541,21 +1633,11 @@ version = "0.21.10" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"

dependencies = [

 "log",

 "ring 0.17.7",

 "rustls-webpki",

 "sct",

]



[[package]]

name = "rustls-pemfile"

version = "1.0.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"

dependencies = [

 "base64",

]



[[package]]

name = "rustls-webpki"

version = "0.101.7"
@@ -1602,18 +1684,18 @@ checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" 


[[package]]

name = "serde"

version = "1.0.195"

version = "1.0.197"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"

checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"

dependencies = [

 "serde_derive",

]



[[package]]

name = "serde_derive"

version = "1.0.195"

version = "1.0.197"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"

checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"

dependencies = [

 "proc-macro2",

 "quote",
@@ -1622,9 +1704,9 @@ dependencies = [ 


[[package]]

name = "serde_json"

version = "1.0.111"

version = "1.0.114"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"

checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"

dependencies = [

 "itoa",

 "ryu",
@@ -1879,16 +1961,6 @@ dependencies = [ 
 "syn 2.0.48",

]



[[package]]

name = "tokio-rustls"

version = "0.24.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"

dependencies = [

 "rustls",

 "tokio",

]



[[package]]

name = "tokio-stream"

version = "0.1.14"
@@ -1929,9 +2001,9 @@ dependencies = [ 


[[package]]

name = "toml"

version = "0.7.8"

version = "0.8.10"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"

checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"

dependencies = [

 "serde",

 "serde_spanned",
@@ -1950,9 +2022,9 @@ dependencies = [ 


[[package]]

name = "toml_edit"

version = "0.19.15"

version = "0.22.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"

checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"

dependencies = [

 "indexmap",

 "serde",
@@ -2241,12 +2313,6 @@ dependencies = [ 
 "wasm-bindgen",

]



[[package]]

name = "webpki-roots"

version = "0.25.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"



[[package]]

name = "winapi"

version = "0.3.9"
@@ -2459,9 +2525,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" 


[[package]]

name = "winnow"

version = "0.5.34"

version = "0.6.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16"

checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"

dependencies = [

 "memchr",

]
@@ -2504,9 +2570,9 @@ dependencies = [ 


[[package]]

name = "x25519-dalek"

version = "2.0.0"

version = "2.0.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"

checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"

dependencies = [

 "curve25519-dalek",

 "rand_core",

pkgs/by-name/my/mycelium/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


rustPlatform.buildRustPackage rec {

  pname = "mycelium";

  version = "0.4.2";

  version = "0.4.3";



  src = fetchFromGitHub {

    owner = "threefoldtech";

    repo = "mycelium";

    rev = "v${version}";

    hash = "sha256-VWrWg9UpBSug0cvY/zuzGFI6Y0CRFcrh1Cy4mbYtg9Q=";

    hash = "sha256-bA3ci+vqXBCPBaxMvfUdFcqdaZbAw/+r5UbH/as/fnc=";

  };



  cargoLock = {
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { 
    homepage = "https://github.com/threefoldtech/mycelium";

    changelog = "https://github.com/threefoldtech/mycelium/blob/${src.rev}/CHANGELOG.md";

    license = licenses.asl20;

    maintainers = with maintainers; [ matthewcroughan ];

    maintainers = with maintainers; [ flokli matthewcroughan ];

    mainProgram = "mycelium";

  };

}