chore(3p/sources): bump channels & overlays (2024-09-10)
Includes the following fixes: * users/wpcarro: disable pulseaudio option (can't have pipewire _and_ PA) * users/aspen: disable pipewire (there's PA config here, so whatever) * bump wasm-bindgen in Rust frontend projects * users/tazjin: disable builds for frog (it's in storage) Change-Id: Ia508b14b84619d06c1d98f7245e84d66bc791592 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12466 Autosubmit: tazjin <tazjin@tvl.su> Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: aspen <root@gws.fyi>
This commit is contained in:
Vincent Ambo
tazjin
parent
7fa52f5933
commit
374cde20f2
17 changed files with 198 additions and 377 deletions
21
users/kranzes/wasm-hello-world/Cargo.lock
generated
21
users/kranzes/wasm-hello-world/Cargo.lock
generated
|
|
@ -63,19 +63,20 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.92"
|
||||
version = "0.2.93"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
|
||||
checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
"wasm-bindgen-macro",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.92"
|
||||
version = "0.2.93"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
|
||||
checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"log",
|
||||
|
|
@ -88,9 +89,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.92"
|
||||
version = "0.2.93"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
|
||||
checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
|
|
@ -98,9 +99,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.92"
|
||||
version = "0.2.93"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
|
||||
checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -111,9 +112,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.92"
|
||||
version = "0.2.93"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
|
||||
checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
|
||||
|
||||
[[package]]
|
||||
name = "wasm_hello_world"
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ rec {
|
|||
version = "1.0.0";
|
||||
edition = "2018";
|
||||
sha256 = "1za0vb97n4brpzpv8lsbnzmq5r8f2b0cpqqr0sy8h5bn751xxwds";
|
||||
libName = "cfg_if";
|
||||
authors = [
|
||||
"Alex Crichton <alex@alexcrichton.com>"
|
||||
];
|
||||
|
|
@ -232,6 +233,7 @@ rec {
|
|||
version = "1.0.12";
|
||||
edition = "2018";
|
||||
sha256 = "0jzf1znfpb2gx8nr8mvmyqs1crnv79l57nxnbiszc7xf7ynbjm1k";
|
||||
libName = "unicode_ident";
|
||||
authors = [
|
||||
"David Tolnay <dtolnay@gmail.com>"
|
||||
];
|
||||
|
|
@ -239,9 +241,10 @@ rec {
|
|||
};
|
||||
"wasm-bindgen" = rec {
|
||||
crateName = "wasm-bindgen";
|
||||
version = "0.2.92";
|
||||
edition = "2018";
|
||||
sha256 = "1a4mcw13nsk3fr8fxjzf9kk1wj88xkfsmnm0pjraw01ryqfm7qjb";
|
||||
version = "0.2.93";
|
||||
edition = "2021";
|
||||
sha256 = "1dfr7pka5kwvky2fx82m9d060p842hc5fyyw8igryikcdb0xybm8";
|
||||
libName = "wasm_bindgen";
|
||||
authors = [
|
||||
"The wasm-bindgen Developers"
|
||||
];
|
||||
|
|
@ -250,6 +253,10 @@ rec {
|
|||
name = "cfg-if";
|
||||
packageId = "cfg-if";
|
||||
}
|
||||
{
|
||||
name = "once_cell";
|
||||
packageId = "once_cell";
|
||||
}
|
||||
{
|
||||
name = "wasm-bindgen-macro";
|
||||
packageId = "wasm-bindgen-macro";
|
||||
|
|
@ -258,7 +265,6 @@ rec {
|
|||
features = {
|
||||
"default" = [ "spans" "std" ];
|
||||
"enable-interning" = [ "std" ];
|
||||
"gg-alloc" = [ "wasm-bindgen-test/gg-alloc" ];
|
||||
"serde" = [ "dep:serde" ];
|
||||
"serde-serialize" = [ "serde" "serde_json" "std" ];
|
||||
"serde_json" = [ "dep:serde_json" ];
|
||||
|
|
@ -270,9 +276,10 @@ rec {
|
|||
};
|
||||
"wasm-bindgen-backend" = rec {
|
||||
crateName = "wasm-bindgen-backend";
|
||||
version = "0.2.92";
|
||||
edition = "2018";
|
||||
sha256 = "1nj7wxbi49f0rw9d44rjzms26xlw6r76b2mrggx8jfbdjrxphkb1";
|
||||
version = "0.2.93";
|
||||
edition = "2021";
|
||||
sha256 = "0yypblaf94rdgqs5xw97499xfwgs1096yx026d6h88v563d9dqwx";
|
||||
libName = "wasm_bindgen_backend";
|
||||
authors = [
|
||||
"The wasm-bindgen Developers"
|
||||
];
|
||||
|
|
@ -314,10 +321,11 @@ rec {
|
|||
};
|
||||
"wasm-bindgen-macro" = rec {
|
||||
crateName = "wasm-bindgen-macro";
|
||||
version = "0.2.92";
|
||||
edition = "2018";
|
||||
sha256 = "09npa1srjjabd6nfph5yc03jb26sycjlxhy0c2a1pdrpx4yq5y51";
|
||||
version = "0.2.93";
|
||||
edition = "2021";
|
||||
sha256 = "1kycd1xfx4d9xzqknvzbiqhwb5fzvjqrrn88x692q1vblj8lqp2q";
|
||||
procMacro = true;
|
||||
libName = "wasm_bindgen_macro";
|
||||
authors = [
|
||||
"The wasm-bindgen Developers"
|
||||
];
|
||||
|
|
@ -339,9 +347,10 @@ rec {
|
|||
};
|
||||
"wasm-bindgen-macro-support" = rec {
|
||||
crateName = "wasm-bindgen-macro-support";
|
||||
version = "0.2.92";
|
||||
edition = "2018";
|
||||
sha256 = "1dqv2xs8zcyw4kjgzj84bknp2h76phmsb3n7j6hn396h4ssifkz9";
|
||||
version = "0.2.93";
|
||||
edition = "2021";
|
||||
sha256 = "0dp8w6jmw44srym6l752nkr3hkplyw38a2fxz5f3j1ch9p3l1hxg";
|
||||
libName = "wasm_bindgen_macro_support";
|
||||
authors = [
|
||||
"The wasm-bindgen Developers"
|
||||
];
|
||||
|
|
@ -376,10 +385,11 @@ rec {
|
|||
};
|
||||
"wasm-bindgen-shared" = rec {
|
||||
crateName = "wasm-bindgen-shared";
|
||||
version = "0.2.92";
|
||||
edition = "2018";
|
||||
version = "0.2.93";
|
||||
edition = "2021";
|
||||
links = "wasm_bindgen";
|
||||
sha256 = "15kyavsrna2cvy30kg03va257fraf9x00ny554vxngvpyaa0q6dg";
|
||||
sha256 = "1104bny0hv40jfap3hp8jhs0q4ya244qcrvql39i38xlghq0lan6";
|
||||
libName = "wasm_bindgen_shared";
|
||||
authors = [
|
||||
"The wasm-bindgen Developers"
|
||||
];
|
||||
|
|
@ -508,52 +518,41 @@ rec {
|
|||
testPostRun
|
||||
]);
|
||||
in
|
||||
pkgs.runCommand "run-tests-${testCrate.name}"
|
||||
{
|
||||
inherit testCrateFlags;
|
||||
buildInputs = testInputs;
|
||||
} ''
|
||||
set -e
|
||||
pkgs.stdenvNoCC.mkDerivation {
|
||||
name = "run-tests-${testCrate.name}";
|
||||
|
||||
export RUST_BACKTRACE=1
|
||||
inherit (crate) src;
|
||||
|
||||
# recreate a file hierarchy as when running tests with cargo
|
||||
inherit testCrateFlags;
|
||||
|
||||
# the source for test data
|
||||
# It's necessary to locate the source in $NIX_BUILD_TOP/source/
|
||||
# instead of $NIX_BUILD_TOP/
|
||||
# because we compiled those test binaries in the former and not the latter.
|
||||
# So all paths will expect source tree to be there and not in the build top directly.
|
||||
# For example: $NIX_BUILD_TOP := /build in general, if you ask yourself.
|
||||
# NOTE: There could be edge cases if `crate.sourceRoot` does exist but
|
||||
# it's very hard to reason about them.
|
||||
# Open a bug if you run into this!
|
||||
mkdir -p source/
|
||||
cd source/
|
||||
buildInputs = testInputs;
|
||||
|
||||
${pkgs.buildPackages.xorg.lndir}/bin/lndir ${crate.src}
|
||||
buildPhase = ''
|
||||
set -e
|
||||
export RUST_BACKTRACE=1
|
||||
|
||||
# build outputs
|
||||
testRoot=target/debug
|
||||
mkdir -p $testRoot
|
||||
# build outputs
|
||||
testRoot=target/debug
|
||||
mkdir -p $testRoot
|
||||
|
||||
# executables of the crate
|
||||
# we copy to prevent std::env::current_exe() to resolve to a store location
|
||||
for i in ${crate}/bin/*; do
|
||||
cp "$i" "$testRoot"
|
||||
done
|
||||
chmod +w -R .
|
||||
# executables of the crate
|
||||
# we copy to prevent std::env::current_exe() to resolve to a store location
|
||||
for i in ${crate}/bin/*; do
|
||||
cp "$i" "$testRoot"
|
||||
done
|
||||
chmod +w -R .
|
||||
|
||||
# test harness executables are suffixed with a hash, like cargo does
|
||||
# this allows to prevent name collision with the main
|
||||
# executables of the crate
|
||||
hash=$(basename $out)
|
||||
for file in ${drv}/tests/*; do
|
||||
f=$testRoot/$(basename $file)-$hash
|
||||
cp $file $f
|
||||
${testCommand}
|
||||
done
|
||||
'';
|
||||
# test harness executables are suffixed with a hash, like cargo does
|
||||
# this allows to prevent name collision with the main
|
||||
# executables of the crate
|
||||
hash=$(basename $out)
|
||||
for file in ${drv}/tests/*; do
|
||||
f=$testRoot/$(basename $file)-$hash
|
||||
cp $file $f
|
||||
${testCommand}
|
||||
done
|
||||
'';
|
||||
};
|
||||
in
|
||||
pkgs.runCommand "${crate.name}-linked"
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue