updated Cargo.nix; fixed typo in flake.nix

This commit is contained in:
Quinn Dougherty 2022-08-17 04:20:50 -07:00
parent 8c38c3955f
commit 21da50375a
2 changed files with 17 additions and 17 deletions

View File

@ -131,7 +131,7 @@
wasm.outputs = {
squiggle-wasm-lint = mc.rust-lint;
squiggle-wasm-pkg = mc.webpack-build-pkg;
squiggle-wasm-test-ff = mc.rust-firefox-test;
squiggle-wasm-test-ff = mc.firefox-test;
};
lang.outputs = {
squiggle-lang-lint = lang.lint;

View File

@ -4,7 +4,7 @@
args@{
release ? true,
rootFeatures ? [
"quri-squiggle-mc/default"
"quri_squiggle_mc/default"
],
rustPackages,
buildRustPackages,
@ -38,7 +38,7 @@ in
{
cargo2nixVersion = "0.11.0";
workspace = {
quri-squiggle-mc = rustPackages.unknown.quri-squiggle-mc."0.0.1";
quri_squiggle_mc = rustPackages.unknown.quri_squiggle_mc."0.0.1";
};
"registry+https://github.com/rust-lang/crates.io-index".aho-corasick."0.7.18" = overridableMkRustCrate (profileName: rec {
name = "aho-corasick";
@ -659,14 +659,14 @@ in
};
});
"unknown".quri-squiggle-mc."0.0.1" = overridableMkRustCrate (profileName: rec {
name = "quri-squiggle-mc";
"unknown".quri_squiggle_mc."0.0.1" = overridableMkRustCrate (profileName: rec {
name = "quri_squiggle_mc";
version = "0.0.1";
registry = "unknown";
src = fetchCrateLocal workspaceSrc;
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "quri-squiggle-mc/default") "default")
(lib.optional (rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc") "wee_alloc")
(lib.optional (rootFeatures' ? "quri_squiggle_mc/default") "default")
(lib.optional (rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc") "wee_alloc")
];
dependencies = {
cached = rustPackages."registry+https://github.com/rust-lang/crates.io-index".cached."0.38.0" { inherit profileName; };
@ -678,7 +678,7 @@ in
statistics = rustPackages."registry+https://github.com/rust-lang/crates.io-index".statistics."0.4.1" { inherit profileName; };
wasm_bindgen = rustPackages."registry+https://github.com/rust-lang/crates.io-index".wasm-bindgen."0.2.82" { inherit profileName; };
web_sys = rustPackages."registry+https://github.com/rust-lang/crates.io-index".web-sys."0.3.59" { inherit profileName; };
${ if rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc" then "wee_alloc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".wee_alloc."0.4.5" { inherit profileName; };
${ if rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc" then "wee_alloc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".wee_alloc."0.4.5" { inherit profileName; };
};
devDependencies = {
futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.1.31" { inherit profileName; };
@ -1140,14 +1140,14 @@ in
registry = "registry+https://github.com/rust-lang/crates.io-index";
src = fetchCratesIo { inherit name version; sha256 = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"; };
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc") "default")
(lib.optional (rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc") "size_classes")
(lib.optional (rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc") "default")
(lib.optional (rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc") "size_classes")
];
dependencies = {
${ if rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc" then "cfg_if" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".cfg-if."0.1.10" { inherit profileName; };
${ if (rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc") && hostPlatform.isUnix && !(hostPlatform.parsed.cpu.name == "wasm32") then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.132" { inherit profileName; };
${ if rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc" then "memory_units" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".memory_units."0.4.0" { inherit profileName; };
${ if (rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc") && hostPlatform.parsed.kernel.name == "windows" then "winapi" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".winapi."0.3.9" { inherit profileName; };
${ if rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc" then "cfg_if" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".cfg-if."0.1.10" { inherit profileName; };
${ if (rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc") && hostPlatform.isUnix && !(hostPlatform.parsed.cpu.name == "wasm32") then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.132" { inherit profileName; };
${ if rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc" then "memory_units" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".memory_units."0.4.0" { inherit profileName; };
${ if (rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc") && hostPlatform.parsed.kernel.name == "windows" then "winapi" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".winapi."0.3.9" { inherit profileName; };
};
});
@ -1157,12 +1157,12 @@ in
registry = "registry+https://github.com/rust-lang/crates.io-index";
src = fetchCratesIo { inherit name version; sha256 = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"; };
features = builtins.concatLists [
(lib.optional (rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc") "memoryapi")
(lib.optional (rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc") "memoryapi")
[ "minwindef" ]
[ "ntsecapi" ]
[ "profileapi" ]
(lib.optional (rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc") "synchapi")
(lib.optional (rootFeatures' ? "quri-squiggle-mc/default" || rootFeatures' ? "quri-squiggle-mc/wee_alloc") "winbase")
(lib.optional (rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc") "synchapi")
(lib.optional (rootFeatures' ? "quri_squiggle_mc/default" || rootFeatures' ? "quri_squiggle_mc/wee_alloc") "winbase")
[ "winnt" ]
];
dependencies = {