From e78566591b6fc2ff67a1b9beec064b6a7e605e6f Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 5 Sep 2023 23:23:23 +0200 Subject: [PATCH 1/2] Revert netapp update, hold to version 0.5.2 that uses rmp-serde 0.15 --- Cargo.lock | 19 ++++--------------- Cargo.nix | 33 +++++++++++---------------------- src/rpc/Cargo.toml | 2 +- 3 files changed, 16 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 405092e7..e3c0daa6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1435,7 +1435,7 @@ dependencies = [ "netapp", "opentelemetry", "rand", - "rmp-serde 0.15.5", + "rmp-serde", "rustc_version", "serde", "serde_json", @@ -2266,9 +2266,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "netapp" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb28e89e7b21d3fdf2b46e2a580ccaab68f469f2e5c27db74f61994be90b558" +checksum = "4ffe47ac46d3b2ce2f736a70865492df082e042eb2bfdddfca3b8dd66bd9469d" dependencies = [ "arc-swap", "async-trait", @@ -2284,7 +2284,7 @@ dependencies = [ "opentelemetry-contrib", "pin-project", "rand", - "rmp-serde 1.1.2", + "rmp-serde", "serde", "tokio", "tokio-stream", @@ -3013,17 +3013,6 @@ dependencies = [ "serde", ] -[[package]] -name = "rmp-serde" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - [[package]] name = "roxmltree" version = "0.18.0" diff --git a/Cargo.nix b/Cargo.nix index 12ef31c6..f2da2492 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -24,6 +24,7 @@ args@{ target ? null, codegenOpts ? null, profileOpts ? null, + cargoUnstableFlags ? null, rustcLinkFlags ? null, rustcBuildFlags ? null, mkRustCrate, @@ -33,7 +34,7 @@ args@{ ignoreLockHash, }: let - nixifiedLockHash = "a7a160a4ba7f9e704428eb860ae5c63eae57b2178e4a641d23a43ea1cef9e4a4"; + nixifiedLockHash = "22bbf553d627a8e75e4f63b540267fbfb874cfdb7bf6e76efc2332e7eddfc80d"; workspaceSrc = if args.workspaceSrc == null then ./. else args.workspaceSrc; currentLockHash = builtins.hashFile "sha256" (workspaceSrc + /Cargo.lock); lockHashIgnored = if ignoreLockHash @@ -50,7 +51,7 @@ else let rootFeatures' = expandFeatures rootFeatures; overridableMkRustCrate = f: let - drvs = genDrvsByProfile profilesByName ({ profile, profileName }: mkRustCrate ({ inherit release profile hostPlatformCpu hostPlatformFeatures target profileOpts codegenOpts rustcLinkFlags rustcBuildFlags; } // (f profileName))); + drvs = genDrvsByProfile profilesByName ({ profile, profileName }: mkRustCrate ({ inherit release profile hostPlatformCpu hostPlatformFeatures target profileOpts codegenOpts cargoUnstableFlags rustcLinkFlags rustcBuildFlags; } // (f profileName))); in { compileMode ? null, profileName ? decideProfile compileMode release }: let drv = drvs.${profileName}; in if compileMode == null then drv else drv.override { inherit compileMode; }; in @@ -1745,7 +1746,7 @@ in git_version = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".git-version."0.3.5" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; sodiumoxide = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".kuska-sodiumoxide."0.2.5-0" { inherit profileName; }).out; - netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.3" { inherit profileName; }).out; + netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.2" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; ${ if rootFeatures' ? "garage/opentelemetry-otlp" || rootFeatures' ? "garage/telemetry-otlp" then "opentelemetry_otlp" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry-otlp."0.10.0" { inherit profileName; }).out; ${ if rootFeatures' ? "garage/default" || rootFeatures' ? "garage/metrics" || rootFeatures' ? "garage/opentelemetry-prometheus" then "opentelemetry_prometheus" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry-prometheus."0.10.0" { inherit profileName; }).out; @@ -1920,7 +1921,7 @@ in garage_table = (rustPackages."unknown".garage_table."0.8.3" { inherit profileName; }).out; garage_util = (rustPackages."unknown".garage_util."0.8.3" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; - netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.3" { inherit profileName; }).out; + netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.2" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; rand = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.5" { inherit profileName; }).out; serde = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.188" { inherit profileName; }).out; @@ -1960,7 +1961,7 @@ in ${ if rootFeatures' ? "garage/kubernetes-discovery" || rootFeatures' ? "garage_rpc/k8s-openapi" || rootFeatures' ? "garage_rpc/kubernetes-discovery" then "k8s_openapi" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".k8s-openapi."0.16.0" { inherit profileName; }).out; ${ if rootFeatures' ? "garage/kubernetes-discovery" || rootFeatures' ? "garage_rpc/kube" || rootFeatures' ? "garage_rpc/kubernetes-discovery" then "kube" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".kube."0.75.0" { inherit profileName; }).out; sodiumoxide = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".kuska-sodiumoxide."0.2.5-0" { inherit profileName; }).out; - netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.3" { inherit profileName; }).out; + netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.2" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; pnet_datalink = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".pnet_datalink."0.33.0" { inherit profileName; }).out; rand = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.5" { inherit profileName; }).out; @@ -2024,7 +2025,7 @@ in http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.9" { inherit profileName; }).out; hyper = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.27" { inherit profileName; }).out; lazy_static = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".lazy_static."1.4.0" { inherit profileName; }).out; - netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.3" { inherit profileName; }).out; + netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.2" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; rand = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.5" { inherit profileName; }).out; rmp_serde = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rmp-serde."0.15.5" { inherit profileName; }).out; @@ -3197,11 +3198,11 @@ in src = fetchCratesIo { inherit name version; sha256 = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"; }; }); - "registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.3" = overridableMkRustCrate (profileName: rec { + "registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.2" = overridableMkRustCrate (profileName: rec { name = "netapp"; - version = "0.5.3"; + version = "0.5.2"; registry = "registry+https://github.com/rust-lang/crates.io-index"; - src = fetchCratesIo { inherit name version; sha256 = "0eb28e89e7b21d3fdf2b46e2a580ccaab68f469f2e5c27db74f61994be90b558"; }; + src = fetchCratesIo { inherit name version; sha256 = "4ffe47ac46d3b2ce2f736a70865492df082e042eb2bfdddfca3b8dd66bd9469d"; }; features = builtins.concatLists [ [ "default" ] [ "opentelemetry" ] @@ -3223,7 +3224,7 @@ in opentelemetry_contrib = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry-contrib."0.9.0" { inherit profileName; }).out; pin_project = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".pin-project."1.1.3" { inherit profileName; }).out; rand = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.5" { inherit profileName; }).out; - rmp_serde = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rmp-serde."1.1.2" { inherit profileName; }).out; + rmp_serde = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rmp-serde."0.15.5" { inherit profileName; }).out; serde = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.188" { inherit profileName; }).out; tokio = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio."1.32.0" { inherit profileName; }).out; tokio_stream = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".tokio-stream."0.1.14" { inherit profileName; }).out; @@ -4285,18 +4286,6 @@ in }; }); - "registry+https://github.com/rust-lang/crates.io-index".rmp-serde."1.1.2" = overridableMkRustCrate (profileName: rec { - name = "rmp-serde"; - version = "1.1.2"; - registry = "registry+https://github.com/rust-lang/crates.io-index"; - src = fetchCratesIo { inherit name version; sha256 = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"; }; - dependencies = { - byteorder = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".byteorder."1.4.3" { inherit profileName; }).out; - rmp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rmp."0.8.12" { inherit profileName; }).out; - serde = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".serde."1.0.188" { inherit profileName; }).out; - }; - }); - "registry+https://github.com/rust-lang/crates.io-index".roxmltree."0.18.0" = overridableMkRustCrate (profileName: rec { name = "roxmltree"; version = "0.18.0"; diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml index 3fc9bbf9..e131566d 100644 --- a/src/rpc/Cargo.toml +++ b/src/rpc/Cargo.toml @@ -46,7 +46,7 @@ tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi tokio-stream = { version = "0.1", features = ["net"] } opentelemetry = "0.17" -netapp = { version = "0.5.2", features = ["telemetry"] } +netapp = { version = "=0.5.2", features = ["telemetry"] } [features] kubernetes-discovery = [ "kube", "k8s-openapi", "schemars" ] From 51eac97260d768d0f1f93680fad95787f7e42e72 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 5 Sep 2023 23:28:12 +0200 Subject: [PATCH 2/2] update version to 0.8.4 --- Cargo.lock | 18 ++--- Cargo.nix | 123 +++++++++++++++++----------------- Cargo.toml | 16 ++--- script/helm/garage/Chart.yaml | 2 +- src/api/Cargo.toml | 2 +- src/block/Cargo.toml | 2 +- src/db/Cargo.toml | 2 +- src/garage/Cargo.toml | 2 +- src/model/Cargo.toml | 2 +- src/rpc/Cargo.toml | 2 +- src/table/Cargo.toml | 2 +- src/util/Cargo.toml | 2 +- src/web/Cargo.toml | 2 +- 13 files changed, 88 insertions(+), 89 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3c0daa6..d14701cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1198,7 +1198,7 @@ dependencies = [ [[package]] name = "garage" -version = "0.8.3" +version = "0.8.4" dependencies = [ "assert-json-diff", "async-trait", @@ -1249,7 +1249,7 @@ dependencies = [ [[package]] name = "garage_api" -version = "0.8.3" +version = "0.8.4" dependencies = [ "async-trait", "base64 0.21.3", @@ -1294,7 +1294,7 @@ dependencies = [ [[package]] name = "garage_block" -version = "0.8.3" +version = "0.8.4" dependencies = [ "arc-swap", "async-compression", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "garage_db" -version = "0.8.3" +version = "0.8.4" dependencies = [ "clap 4.4.0", "err-derive", @@ -1334,7 +1334,7 @@ dependencies = [ [[package]] name = "garage_model" -version = "0.8.3" +version = "0.8.4" dependencies = [ "arc-swap", "async-trait", @@ -1361,7 +1361,7 @@ dependencies = [ [[package]] name = "garage_rpc" -version = "0.8.3" +version = "0.8.4" dependencies = [ "arc-swap", "async-trait", @@ -1393,7 +1393,7 @@ dependencies = [ [[package]] name = "garage_table" -version = "0.8.3" +version = "0.8.4" dependencies = [ "arc-swap", "async-trait", @@ -1415,7 +1415,7 @@ dependencies = [ [[package]] name = "garage_util" -version = "0.8.3" +version = "0.8.4" dependencies = [ "arc-swap", "async-trait", @@ -1448,7 +1448,7 @@ dependencies = [ [[package]] name = "garage_web" -version = "0.8.3" +version = "0.8.4" dependencies = [ "err-derive", "futures", diff --git a/Cargo.nix b/Cargo.nix index f2da2492..9e458f88 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -24,7 +24,6 @@ args@{ target ? null, codegenOpts ? null, profileOpts ? null, - cargoUnstableFlags ? null, rustcLinkFlags ? null, rustcBuildFlags ? null, mkRustCrate, @@ -34,7 +33,7 @@ args@{ ignoreLockHash, }: let - nixifiedLockHash = "22bbf553d627a8e75e4f63b540267fbfb874cfdb7bf6e76efc2332e7eddfc80d"; + nixifiedLockHash = "b958f9aca0ee3fb1f7b52b15508132d0a96480a7f43f83e0da6609c0fe1812ef"; workspaceSrc = if args.workspaceSrc == null then ./. else args.workspaceSrc; currentLockHash = builtins.hashFile "sha256" (workspaceSrc + /Cargo.lock); lockHashIgnored = if ignoreLockHash @@ -51,22 +50,22 @@ else let rootFeatures' = expandFeatures rootFeatures; overridableMkRustCrate = f: let - drvs = genDrvsByProfile profilesByName ({ profile, profileName }: mkRustCrate ({ inherit release profile hostPlatformCpu hostPlatformFeatures target profileOpts codegenOpts cargoUnstableFlags rustcLinkFlags rustcBuildFlags; } // (f profileName))); + drvs = genDrvsByProfile profilesByName ({ profile, profileName }: mkRustCrate ({ inherit release profile hostPlatformCpu hostPlatformFeatures target profileOpts codegenOpts rustcLinkFlags rustcBuildFlags; } // (f profileName))); in { compileMode ? null, profileName ? decideProfile compileMode release }: let drv = drvs.${profileName}; in if compileMode == null then drv else drv.override { inherit compileMode; }; in { cargo2nixVersion = "0.11.0"; workspace = { - garage_db = rustPackages.unknown.garage_db."0.8.3"; - garage_util = rustPackages.unknown.garage_util."0.8.3"; - garage_rpc = rustPackages.unknown.garage_rpc."0.8.3"; - garage_table = rustPackages.unknown.garage_table."0.8.3"; - garage_block = rustPackages.unknown.garage_block."0.8.3"; - garage_model = rustPackages.unknown.garage_model."0.8.3"; - garage_api = rustPackages.unknown.garage_api."0.8.3"; - garage_web = rustPackages.unknown.garage_web."0.8.3"; - garage = rustPackages.unknown.garage."0.8.3"; + garage_db = rustPackages.unknown.garage_db."0.8.4"; + garage_util = rustPackages.unknown.garage_util."0.8.4"; + garage_rpc = rustPackages.unknown.garage_rpc."0.8.4"; + garage_table = rustPackages.unknown.garage_table."0.8.4"; + garage_block = rustPackages.unknown.garage_block."0.8.4"; + garage_model = rustPackages.unknown.garage_model."0.8.4"; + garage_api = rustPackages.unknown.garage_api."0.8.4"; + garage_web = rustPackages.unknown.garage_web."0.8.4"; + garage = rustPackages.unknown.garage."0.8.4"; format_table = rustPackages.unknown.format_table."0.1.1"; k2v-client = rustPackages.unknown.k2v-client."0.0.4"; }; @@ -1706,9 +1705,9 @@ in }; }); - "unknown".garage."0.8.3" = overridableMkRustCrate (profileName: rec { + "unknown".garage."0.8.4" = overridableMkRustCrate (profileName: rec { name = "garage"; - version = "0.8.3"; + version = "0.8.4"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/garage"); features = builtins.concatLists [ @@ -1735,14 +1734,14 @@ in format_table = (rustPackages."unknown".format_table."0.1.1" { inherit profileName; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.28" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.28" { inherit profileName; }).out; - garage_api = (rustPackages."unknown".garage_api."0.8.3" { inherit profileName; }).out; - garage_block = (rustPackages."unknown".garage_block."0.8.3" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.3" { inherit profileName; }).out; - garage_model = (rustPackages."unknown".garage_model."0.8.3" { inherit profileName; }).out; - garage_rpc = (rustPackages."unknown".garage_rpc."0.8.3" { inherit profileName; }).out; - garage_table = (rustPackages."unknown".garage_table."0.8.3" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.3" { inherit profileName; }).out; - garage_web = (rustPackages."unknown".garage_web."0.8.3" { inherit profileName; }).out; + garage_api = (rustPackages."unknown".garage_api."0.8.4" { inherit profileName; }).out; + garage_block = (rustPackages."unknown".garage_block."0.8.4" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.4" { inherit profileName; }).out; + garage_model = (rustPackages."unknown".garage_model."0.8.4" { inherit profileName; }).out; + garage_rpc = (rustPackages."unknown".garage_rpc."0.8.4" { inherit profileName; }).out; + garage_table = (rustPackages."unknown".garage_table."0.8.4" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.4" { inherit profileName; }).out; + garage_web = (rustPackages."unknown".garage_web."0.8.4" { inherit profileName; }).out; git_version = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".git-version."0.3.5" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; sodiumoxide = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".kuska-sodiumoxide."0.2.5-0" { inherit profileName; }).out; @@ -1778,9 +1777,9 @@ in }; }); - "unknown".garage_api."0.8.3" = overridableMkRustCrate (profileName: rec { + "unknown".garage_api."0.8.4" = overridableMkRustCrate (profileName: rec { name = "garage_api"; - version = "0.8.3"; + version = "0.8.4"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/api"); features = builtins.concatLists [ @@ -1799,11 +1798,11 @@ in form_urlencoded = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".form_urlencoded."1.2.0" { inherit profileName; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.28" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.28" { inherit profileName; }).out; - garage_block = (rustPackages."unknown".garage_block."0.8.3" { inherit profileName; }).out; - garage_model = (rustPackages."unknown".garage_model."0.8.3" { inherit profileName; }).out; - garage_rpc = (rustPackages."unknown".garage_rpc."0.8.3" { inherit profileName; }).out; - garage_table = (rustPackages."unknown".garage_table."0.8.3" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.3" { inherit profileName; }).out; + garage_block = (rustPackages."unknown".garage_block."0.8.4" { inherit profileName; }).out; + garage_model = (rustPackages."unknown".garage_model."0.8.4" { inherit profileName; }).out; + garage_rpc = (rustPackages."unknown".garage_rpc."0.8.4" { inherit profileName; }).out; + garage_table = (rustPackages."unknown".garage_table."0.8.4" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.4" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; hmac = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hmac."0.12.1" { inherit profileName; }).out; http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.9" { inherit profileName; }).out; @@ -1832,9 +1831,9 @@ in }; }); - "unknown".garage_block."0.8.3" = overridableMkRustCrate (profileName: rec { + "unknown".garage_block."0.8.4" = overridableMkRustCrate (profileName: rec { name = "garage_block"; - version = "0.8.3"; + version = "0.8.4"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/block"); features = builtins.concatLists [ @@ -1847,10 +1846,10 @@ in bytes = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.4.0" { inherit profileName; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.28" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.28" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.3" { inherit profileName; }).out; - garage_rpc = (rustPackages."unknown".garage_rpc."0.8.3" { inherit profileName; }).out; - garage_table = (rustPackages."unknown".garage_table."0.8.3" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.3" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.4" { inherit profileName; }).out; + garage_rpc = (rustPackages."unknown".garage_rpc."0.8.4" { inherit profileName; }).out; + garage_table = (rustPackages."unknown".garage_table."0.8.4" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.4" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; rand = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.5" { inherit profileName; }).out; @@ -1863,9 +1862,9 @@ in }; }); - "unknown".garage_db."0.8.3" = overridableMkRustCrate (profileName: rec { + "unknown".garage_db."0.8.4" = overridableMkRustCrate (profileName: rec { name = "garage_db"; - version = "0.8.3"; + version = "0.8.4"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/db"); features = builtins.concatLists [ @@ -1895,9 +1894,9 @@ in }; }); - "unknown".garage_model."0.8.3" = overridableMkRustCrate (profileName: rec { + "unknown".garage_model."0.8.4" = overridableMkRustCrate (profileName: rec { name = "garage_model"; - version = "0.8.3"; + version = "0.8.4"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/model"); features = builtins.concatLists [ @@ -1915,11 +1914,11 @@ in err_derive = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.28" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.28" { inherit profileName; }).out; - garage_block = (rustPackages."unknown".garage_block."0.8.3" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.3" { inherit profileName; }).out; - garage_rpc = (rustPackages."unknown".garage_rpc."0.8.3" { inherit profileName; }).out; - garage_table = (rustPackages."unknown".garage_table."0.8.3" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.3" { inherit profileName; }).out; + garage_block = (rustPackages."unknown".garage_block."0.8.4" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.4" { inherit profileName; }).out; + garage_rpc = (rustPackages."unknown".garage_rpc."0.8.4" { inherit profileName; }).out; + garage_table = (rustPackages."unknown".garage_table."0.8.4" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.4" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.2" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; @@ -1932,9 +1931,9 @@ in }; }); - "unknown".garage_rpc."0.8.3" = overridableMkRustCrate (profileName: rec { + "unknown".garage_rpc."0.8.4" = overridableMkRustCrate (profileName: rec { name = "garage_rpc"; - version = "0.8.3"; + version = "0.8.4"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/rpc"); features = builtins.concatLists [ @@ -1954,8 +1953,8 @@ in ${ if rootFeatures' ? "garage/consul-discovery" || rootFeatures' ? "garage_rpc/consul-discovery" || rootFeatures' ? "garage_rpc/err-derive" then "err_derive" else null } = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.28" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.28" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.3" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.3" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.4" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.4" { inherit profileName; }).out; gethostname = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".gethostname."0.4.3" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; ${ if rootFeatures' ? "garage/kubernetes-discovery" || rootFeatures' ? "garage_rpc/k8s-openapi" || rootFeatures' ? "garage_rpc/kubernetes-discovery" then "k8s_openapi" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".k8s-openapi."0.16.0" { inherit profileName; }).out; @@ -1977,9 +1976,9 @@ in }; }); - "unknown".garage_table."0.8.3" = overridableMkRustCrate (profileName: rec { + "unknown".garage_table."0.8.4" = overridableMkRustCrate (profileName: rec { name = "garage_table"; - version = "0.8.3"; + version = "0.8.4"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/table"); dependencies = { @@ -1988,9 +1987,9 @@ in bytes = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.4.0" { inherit profileName; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.28" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.28" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.3" { inherit profileName; }).out; - garage_rpc = (rustPackages."unknown".garage_rpc."0.8.3" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.3" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.4" { inherit profileName; }).out; + garage_rpc = (rustPackages."unknown".garage_rpc."0.8.4" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.4" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; hexdump = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hexdump."0.1.1" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; @@ -2002,9 +2001,9 @@ in }; }); - "unknown".garage_util."0.8.3" = overridableMkRustCrate (profileName: rec { + "unknown".garage_util."0.8.4" = overridableMkRustCrate (profileName: rec { name = "garage_util"; - version = "0.8.3"; + version = "0.8.4"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/util"); features = builtins.concatLists [ @@ -2019,7 +2018,7 @@ in digest = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".digest."0.10.7" { inherit profileName; }).out; err_derive = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.28" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.3" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.4" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; hexdump = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hexdump."0.1.1" { inherit profileName; }).out; http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.9" { inherit profileName; }).out; @@ -2045,18 +2044,18 @@ in }; }); - "unknown".garage_web."0.8.3" = overridableMkRustCrate (profileName: rec { + "unknown".garage_web."0.8.4" = overridableMkRustCrate (profileName: rec { name = "garage_web"; - version = "0.8.3"; + version = "0.8.4"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/web"); dependencies = { err_derive = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.28" { inherit profileName; }).out; - garage_api = (rustPackages."unknown".garage_api."0.8.3" { inherit profileName; }).out; - garage_model = (rustPackages."unknown".garage_model."0.8.3" { inherit profileName; }).out; - garage_table = (rustPackages."unknown".garage_table."0.8.3" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.3" { inherit profileName; }).out; + garage_api = (rustPackages."unknown".garage_api."0.8.4" { inherit profileName; }).out; + garage_model = (rustPackages."unknown".garage_model."0.8.4" { inherit profileName; }).out; + garage_table = (rustPackages."unknown".garage_table."0.8.4" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.4" { inherit profileName; }).out; http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.9" { inherit profileName; }).out; hyper = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.27" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; diff --git a/Cargo.toml b/Cargo.toml index c745f487..b6194766 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,14 +18,14 @@ default-members = ["src/garage"] [workspace.dependencies] format_table = { version = "0.1.1", path = "src/format-table" } -garage_api = { version = "0.8.3", path = "src/api" } -garage_block = { version = "0.8.3", path = "src/block" } -garage_db = { version = "0.8.3", path = "src/db", default-features = false } -garage_model = { version = "0.8.3", path = "src/model", default-features = false } -garage_rpc = { version = "0.8.3", path = "src/rpc" } -garage_table = { version = "0.8.3", path = "src/table" } -garage_util = { version = "0.8.3", path = "src/util" } -garage_web = { version = "0.8.3", path = "src/web" } +garage_api = { version = "0.8.4", path = "src/api" } +garage_block = { version = "0.8.4", path = "src/block" } +garage_db = { version = "0.8.4", path = "src/db", default-features = false } +garage_model = { version = "0.8.4", path = "src/model", default-features = false } +garage_rpc = { version = "0.8.4", path = "src/rpc" } +garage_table = { version = "0.8.4", path = "src/table" } +garage_util = { version = "0.8.4", path = "src/util" } +garage_web = { version = "0.8.4", path = "src/web" } k2v-client = { version = "0.0.4", path = "src/k2v-client" } [profile.dev] diff --git a/script/helm/garage/Chart.yaml b/script/helm/garage/Chart.yaml index 6ead9042..31c5d4e2 100644 --- a/script/helm/garage/Chart.yaml +++ b/script/helm/garage/Chart.yaml @@ -21,4 +21,4 @@ version: 0.4.1 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.8.3" +appVersion: "v0.8.4" diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index a9279c37..6425591f 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api" -version = "0.8.3" +version = "0.8.4" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/block/Cargo.toml b/src/block/Cargo.toml index 1057b699..963086ac 100644 --- a/src/block/Cargo.toml +++ b/src/block/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_block" -version = "0.8.3" +version = "0.8.4" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/db/Cargo.toml b/src/db/Cargo.toml index 135777ad..2f6f06be 100644 --- a/src/db/Cargo.toml +++ b/src/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_db" -version = "0.8.3" +version = "0.8.4" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index 4d0eca46..35d87a3e 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage" -version = "0.8.3" +version = "0.8.4" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml index 0ac77859..1d3600a6 100644 --- a/src/model/Cargo.toml +++ b/src/model/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_model" -version = "0.8.3" +version = "0.8.4" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml index e131566d..66004bb9 100644 --- a/src/rpc/Cargo.toml +++ b/src/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_rpc" -version = "0.8.3" +version = "0.8.4" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/table/Cargo.toml b/src/table/Cargo.toml index 69908b6e..0d2a3103 100644 --- a/src/table/Cargo.toml +++ b/src/table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_table" -version = "0.8.3" +version = "0.8.4" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml index 834a2eb9..00dae4d1 100644 --- a/src/util/Cargo.toml +++ b/src/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_util" -version = "0.8.3" +version = "0.8.4" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index 354b5fb0..6d0eba3a 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_web" -version = "0.8.3" +version = "0.8.4" authors = ["Alex Auvolat ", "Quentin Dufour "] edition = "2018" license = "AGPL-3.0"