aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.nix27
-rw-r--r--flake.lock12
-rw-r--r--flake.nix5
3 files changed, 24 insertions, 20 deletions
diff --git a/Cargo.nix b/Cargo.nix
index 419b1f67..fcc7eaea 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -25,6 +25,7 @@ args@{
target ? null,
codegenOpts ? null,
profileOpts ? null,
+ cargoUnstableFlags ? null,
rustcLinkFlags ? null,
rustcBuildFlags ? null,
mkRustCrate,
@@ -51,7 +52,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
@@ -1756,7 +1757,7 @@ in
name = "format_table";
version = "0.1.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/format-table");
+ src = fetchCrateLocal workspaceSrc;
});
"registry+https://github.com/rust-lang/crates.io-index".futures."0.3.30" = overridableMkRustCrate (profileName: rec {
@@ -1914,7 +1915,7 @@ in
name = "garage";
version = "1.0.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/garage");
+ src = fetchCrateLocal workspaceSrc;
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "garage/bundled-libs" || rootFeatures' ? "garage/default") "bundled-libs")
(lib.optional (rootFeatures' ? "garage/consul-discovery") "consul-discovery")
@@ -1992,7 +1993,7 @@ in
name = "garage_api";
version = "1.0.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/api");
+ src = fetchCrateLocal workspaceSrc;
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/k2v" || rootFeatures' ? "garage_api/k2v") "k2v")
(lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/metrics" || rootFeatures' ? "garage_api/metrics") "metrics")
@@ -2056,7 +2057,7 @@ in
name = "garage_block";
version = "1.0.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/block");
+ src = fetchCrateLocal workspaceSrc;
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "garage/system-libs" || rootFeatures' ? "garage_block/system-libs") "system-libs")
];
@@ -2089,7 +2090,7 @@ in
name = "garage_db";
version = "1.0.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/db");
+ src = fetchCrateLocal workspaceSrc;
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "garage/bundled-libs" || rootFeatures' ? "garage/default" || rootFeatures' ? "garage_db/bundled-libs") "bundled-libs")
(lib.optional (rootFeatures' ? "garage_db/default") "default")
@@ -2118,7 +2119,7 @@ in
name = "garage_model";
version = "1.0.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/model");
+ src = fetchCrateLocal workspaceSrc;
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "garage_model/default") "default")
(lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/k2v" || rootFeatures' ? "garage_api/k2v" || rootFeatures' ? "garage_model/k2v") "k2v")
@@ -2157,7 +2158,7 @@ in
name = "garage_net";
version = "1.0.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/net");
+ src = fetchCrateLocal workspaceSrc;
features = builtins.concatLists [
[ "default" ]
(lib.optional (rootFeatures' ? "garage_net/opentelemetry" || rootFeatures' ? "garage_net/telemetry") "opentelemetry")
@@ -2194,7 +2195,7 @@ in
name = "garage_rpc";
version = "1.0.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/rpc");
+ src = fetchCrateLocal workspaceSrc;
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "garage/consul-discovery" || rootFeatures' ? "garage_rpc/consul-discovery") "consul-discovery")
(lib.optional (rootFeatures' ? "garage/consul-discovery" || rootFeatures' ? "garage_rpc/consul-discovery" || rootFeatures' ? "garage_rpc/err-derive") "err-derive")
@@ -2243,7 +2244,7 @@ in
name = "garage_table";
version = "1.0.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/table");
+ src = fetchCrateLocal workspaceSrc;
dependencies = {
arc_swap = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".arc-swap."1.6.0" { inherit profileName; }).out;
async_trait = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".async-trait."0.1.77" { profileName = "__noProfile"; }).out;
@@ -2268,7 +2269,7 @@ in
name = "garage_util";
version = "1.0.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/util");
+ src = fetchCrateLocal workspaceSrc;
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/k2v" || rootFeatures' ? "garage_api/k2v" || rootFeatures' ? "garage_model/k2v" || rootFeatures' ? "garage_util/k2v") "k2v")
];
@@ -2312,7 +2313,7 @@ in
name = "garage_web";
version = "1.0.1";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/web");
+ src = fetchCrateLocal workspaceSrc;
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.30" { inherit profileName; }).out;
@@ -3148,7 +3149,7 @@ in
name = "k2v-client";
version = "0.0.4";
registry = "unknown";
- src = fetchCrateLocal (workspaceSrc + "/src/k2v-client");
+ src = fetchCrateLocal workspaceSrc;
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "k2v-client/clap" || rootFeatures' ? "k2v-client/cli") "clap")
(lib.optional (rootFeatures' ? "k2v-client/cli") "cli")
diff --git a/flake.lock b/flake.lock
index 15cc70a5..2c7be871 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,17 +12,17 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1666087781,
- "narHash": "sha256-trKVdjMZ8mNkGfLcY5LsJJGtdV3xJDZnMVrkFjErlcs=",
- "owner": "Alexis211",
+ "lastModified": 1705129117,
+ "narHash": "sha256-LgdDHibvimzYhxBK3kxCk2gAL7k4Hyigl5KI0X9cijA=",
+ "owner": "cargo2nix",
"repo": "cargo2nix",
- "rev": "a7a61179b66054904ef6a195d8da736eaaa06c36",
+ "rev": "ae19a9e1f8f0880c088ea155ab66cee1fa001f59",
"type": "github"
},
"original": {
- "owner": "Alexis211",
+ "owner": "cargo2nix",
"repo": "cargo2nix",
- "rev": "a7a61179b66054904ef6a195d8da736eaaa06c36",
+ "rev": "ae19a9e1f8f0880c088ea155ab66cee1fa001f59",
"type": "github"
}
},
diff --git a/flake.nix b/flake.nix
index 91340245..b1cb7dbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,13 +10,16 @@
inputs.cargo2nix = {
# As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection
- url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36";
+ #url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36";
# As of 2023-04-25:
# - my two patches were merged into unstable (one for clippy and one to "fix" feature detection)
# - rustc v1.66
# url = "github:cargo2nix/cargo2nix/8fb57a670f7993bfc24099c33eb9c5abb51f29a2";
+ # Mainline cargo2nix as of of 2025-01-12 (branch release-0.11.0)
+ url = "github:cargo2nix/cargo2nix/ae19a9e1f8f0880c088ea155ab66cee1fa001f59";
+
# Rust overlay as of 2025-01-12
inputs.rust-overlay.url =
"github:oxalica/rust-overlay/162ab0edc2936508470199b2e8e6c444a2535019";
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 10:51:27 +0000