fractal: 6-unstable-2024-01-31 -> 7
This commit is contained in:
parent
ae7034d942
commit
47ced34c84
File diff suppressed because it is too large
Load Diff
|
|
@ -1,20 +1,26 @@
|
|||
{
|
||||
"matrix-sdk 0.7.1 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=eec52d7977c6122879a2d25f6ea81d76ea754280#eec52d7977c6122879a2d25f6ea81d76ea754280)": "0a1q8icmdd4pqakayp7dzbwmj0cbhlsr4sgd34h907sp4db7y17k",
|
||||
"matrix-sdk-base 0.7.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=eec52d7977c6122879a2d25f6ea81d76ea754280#eec52d7977c6122879a2d25f6ea81d76ea754280)": "0a1q8icmdd4pqakayp7dzbwmj0cbhlsr4sgd34h907sp4db7y17k",
|
||||
"matrix-sdk-common 0.7.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=eec52d7977c6122879a2d25f6ea81d76ea754280#eec52d7977c6122879a2d25f6ea81d76ea754280)": "0a1q8icmdd4pqakayp7dzbwmj0cbhlsr4sgd34h907sp4db7y17k",
|
||||
"matrix-sdk-crypto 0.7.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=eec52d7977c6122879a2d25f6ea81d76ea754280#eec52d7977c6122879a2d25f6ea81d76ea754280)": "0a1q8icmdd4pqakayp7dzbwmj0cbhlsr4sgd34h907sp4db7y17k",
|
||||
"matrix-sdk-indexeddb 0.7.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=eec52d7977c6122879a2d25f6ea81d76ea754280#eec52d7977c6122879a2d25f6ea81d76ea754280)": "0a1q8icmdd4pqakayp7dzbwmj0cbhlsr4sgd34h907sp4db7y17k",
|
||||
"matrix-sdk-qrcode 0.7.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=eec52d7977c6122879a2d25f6ea81d76ea754280#eec52d7977c6122879a2d25f6ea81d76ea754280)": "0a1q8icmdd4pqakayp7dzbwmj0cbhlsr4sgd34h907sp4db7y17k",
|
||||
"matrix-sdk-sqlite 0.7.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=eec52d7977c6122879a2d25f6ea81d76ea754280#eec52d7977c6122879a2d25f6ea81d76ea754280)": "0a1q8icmdd4pqakayp7dzbwmj0cbhlsr4sgd34h907sp4db7y17k",
|
||||
"matrix-sdk-store-encryption 0.7.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=eec52d7977c6122879a2d25f6ea81d76ea754280#eec52d7977c6122879a2d25f6ea81d76ea754280)": "0a1q8icmdd4pqakayp7dzbwmj0cbhlsr4sgd34h907sp4db7y17k",
|
||||
"matrix-sdk-ui 0.7.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=eec52d7977c6122879a2d25f6ea81d76ea754280#eec52d7977c6122879a2d25f6ea81d76ea754280)": "0a1q8icmdd4pqakayp7dzbwmj0cbhlsr4sgd34h907sp4db7y17k",
|
||||
"ruma 0.9.4 (git+https://github.com/ruma/ruma.git?rev=684ffc789877355bd25269451b2356817c17cc3f#684ffc789877355bd25269451b2356817c17cc3f)": "0x6b300r98kr3vas84v1v1jf0h6144lgdlw6ixcq9vfbabmmcsw2",
|
||||
"ruma-client-api 0.17.4 (git+https://github.com/ruma/ruma.git?rev=684ffc789877355bd25269451b2356817c17cc3f#684ffc789877355bd25269451b2356817c17cc3f)": "0x6b300r98kr3vas84v1v1jf0h6144lgdlw6ixcq9vfbabmmcsw2",
|
||||
"ruma-common 0.12.1 (git+https://github.com/ruma/ruma.git?rev=684ffc789877355bd25269451b2356817c17cc3f#684ffc789877355bd25269451b2356817c17cc3f)": "0x6b300r98kr3vas84v1v1jf0h6144lgdlw6ixcq9vfbabmmcsw2",
|
||||
"ruma-events 0.27.11 (git+https://github.com/ruma/ruma.git?rev=684ffc789877355bd25269451b2356817c17cc3f#684ffc789877355bd25269451b2356817c17cc3f)": "0x6b300r98kr3vas84v1v1jf0h6144lgdlw6ixcq9vfbabmmcsw2",
|
||||
"ruma-federation-api 0.8.0 (git+https://github.com/ruma/ruma.git?rev=684ffc789877355bd25269451b2356817c17cc3f#684ffc789877355bd25269451b2356817c17cc3f)": "0x6b300r98kr3vas84v1v1jf0h6144lgdlw6ixcq9vfbabmmcsw2",
|
||||
"ruma-html 0.1.0 (git+https://github.com/ruma/ruma.git?rev=684ffc789877355bd25269451b2356817c17cc3f#684ffc789877355bd25269451b2356817c17cc3f)": "0x6b300r98kr3vas84v1v1jf0h6144lgdlw6ixcq9vfbabmmcsw2",
|
||||
"ruma-identifiers-validation 0.9.3 (git+https://github.com/ruma/ruma.git?rev=684ffc789877355bd25269451b2356817c17cc3f#684ffc789877355bd25269451b2356817c17cc3f)": "0x6b300r98kr3vas84v1v1jf0h6144lgdlw6ixcq9vfbabmmcsw2",
|
||||
"ruma-macros 0.12.0 (git+https://github.com/ruma/ruma.git?rev=684ffc789877355bd25269451b2356817c17cc3f#684ffc789877355bd25269451b2356817c17cc3f)": "0x6b300r98kr3vas84v1v1jf0h6144lgdlw6ixcq9vfbabmmcsw2",
|
||||
"ruma-push-gateway-api 0.8.0 (git+https://github.com/ruma/ruma.git?rev=684ffc789877355bd25269451b2356817c17cc3f#684ffc789877355bd25269451b2356817c17cc3f)": "0x6b300r98kr3vas84v1v1jf0h6144lgdlw6ixcq9vfbabmmcsw2"
|
||||
"git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#mas-http@0.8.0": "0zpykj45889vgvcay0qkcfby0pa5qczmbp6zybkrzz4kv8bk29i2",
|
||||
"git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#mas-iana@0.8.0": "0zpykj45889vgvcay0qkcfby0pa5qczmbp6zybkrzz4kv8bk29i2",
|
||||
"git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#mas-jose@0.8.0": "0zpykj45889vgvcay0qkcfby0pa5qczmbp6zybkrzz4kv8bk29i2",
|
||||
"git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#mas-oidc-client@0.8.0": "0zpykj45889vgvcay0qkcfby0pa5qczmbp6zybkrzz4kv8bk29i2",
|
||||
"git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#oauth2-types@0.8.0": "0zpykj45889vgvcay0qkcfby0pa5qczmbp6zybkrzz4kv8bk29i2",
|
||||
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#matrix-sdk-base@0.7.0": "0x2k85v4bzp8fk0596pr7kvkjjfq76bqmh816g1s4avl7ks2vv5a",
|
||||
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#matrix-sdk-common@0.7.0": "0x2k85v4bzp8fk0596pr7kvkjjfq76bqmh816g1s4avl7ks2vv5a",
|
||||
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#matrix-sdk-crypto@0.7.0": "0x2k85v4bzp8fk0596pr7kvkjjfq76bqmh816g1s4avl7ks2vv5a",
|
||||
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#matrix-sdk-indexeddb@0.7.0": "0x2k85v4bzp8fk0596pr7kvkjjfq76bqmh816g1s4avl7ks2vv5a",
|
||||
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#matrix-sdk-qrcode@0.7.0": "0x2k85v4bzp8fk0596pr7kvkjjfq76bqmh816g1s4avl7ks2vv5a",
|
||||
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#matrix-sdk-sqlite@0.7.0": "0x2k85v4bzp8fk0596pr7kvkjjfq76bqmh816g1s4avl7ks2vv5a",
|
||||
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#matrix-sdk-store-encryption@0.7.0": "0x2k85v4bzp8fk0596pr7kvkjjfq76bqmh816g1s4avl7ks2vv5a",
|
||||
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#matrix-sdk-ui@0.7.0": "0x2k85v4bzp8fk0596pr7kvkjjfq76bqmh816g1s4avl7ks2vv5a",
|
||||
"git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#matrix-sdk@0.7.1": "0x2k85v4bzp8fk0596pr7kvkjjfq76bqmh816g1s4avl7ks2vv5a",
|
||||
"git+https://github.com/matrix-org/vodozemac?rev=0c75746fc8a5eda4a0e490d345d1798b4c6cbd67#0.5.1": "10rqywmw1f14fsrjp5ibn1sykj18lhdglwajkzxdb64ivvmh4v8y",
|
||||
"git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#ruma-client-api@0.17.4": "12252g7yhqq5ha2kq2qc7g1zq5lbj0vhxm034pckalgx5lah97dn",
|
||||
"git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#ruma-common@0.12.1": "12252g7yhqq5ha2kq2qc7g1zq5lbj0vhxm034pckalgx5lah97dn",
|
||||
"git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#ruma-events@0.27.11": "12252g7yhqq5ha2kq2qc7g1zq5lbj0vhxm034pckalgx5lah97dn",
|
||||
"git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#ruma-federation-api@0.8.0": "12252g7yhqq5ha2kq2qc7g1zq5lbj0vhxm034pckalgx5lah97dn",
|
||||
"git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#ruma-html@0.1.0": "12252g7yhqq5ha2kq2qc7g1zq5lbj0vhxm034pckalgx5lah97dn",
|
||||
"git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#ruma-identifiers-validation@0.9.3": "12252g7yhqq5ha2kq2qc7g1zq5lbj0vhxm034pckalgx5lah97dn",
|
||||
"git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#ruma-macros@0.12.0": "12252g7yhqq5ha2kq2qc7g1zq5lbj0vhxm034pckalgx5lah97dn",
|
||||
"git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#ruma-push-gateway-api@0.8.0": "12252g7yhqq5ha2kq2qc7g1zq5lbj0vhxm034pckalgx5lah97dn",
|
||||
"git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#ruma@0.9.4": "12252g7yhqq5ha2kq2qc7g1zq5lbj0vhxm034pckalgx5lah97dn"
|
||||
}
|
||||
|
|
@ -57,10 +57,8 @@ let
|
|||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "fractal";
|
||||
# rev = "6";
|
||||
# hash = "sha256-J4Jb7G5Rfou3N7mytetIdLl0dGY5dSvTjnu8aj4kWXQ=";
|
||||
rev = "8489c25e4b2433642e63fe263fc0145a96e0b9aa"; # 6-unstable-2024-01-31; last commit before libadwaita 1.5
|
||||
hash = "sha256-SZjVQz3gHAJoxhjfq0N7UHs/0MVx8de4FVGxQ5ZJ7sg=";
|
||||
rev = "7";
|
||||
hash = "sha256-IfcThpsGATMD3Uj9tvw/aK7IVbiVT8sdZ088gRUqnlg=";
|
||||
};
|
||||
codegenUnits = 256; #< this does get plumbed, but doesn't seem to affect build speed
|
||||
outputs = [ "out" ]; # default is "out" and "lib", but that somehow causes cycles
|
||||
|
|
@ -177,6 +175,10 @@ let
|
|||
};
|
||||
|
||||
# TODO: upstream these into `pkgs/build-support/rust/default-crate-overrides.nix`
|
||||
# figuring this out is largely guesswork based on seeing build failures and then cloning the
|
||||
# crate and checking its build script. however, grepping the failed crate in nixpkgs can reveal
|
||||
# users, and then see which other buildInputs consumers typically provide near these libraries.
|
||||
# see also: <repo:nixos/nixpkgs:pkgs/build-support/rust/default-crate-overrides.nix>
|
||||
|
||||
clang-sys = attrs: attrs // {
|
||||
LIBCLANG_PATH = "${buildPackages.llvmPackages.libclang.lib}/lib";
|
||||
|
|
@ -308,6 +310,11 @@ let
|
|||
# '';
|
||||
# LIBCLANG_PATH = "${buildPackages.llvmPackages.libclang.lib}/lib";
|
||||
};
|
||||
rav1e = attrs: attrs // {
|
||||
# TODO: `rav1e` is actually packaged in nixpkgs as a library:
|
||||
# is there any way i can reuse that?
|
||||
CARGO_ENCODED_RUSTFLAGS = "";
|
||||
};
|
||||
ring = attrs: attrs // {
|
||||
# if after an update you see:
|
||||
# ```
|
||||
|
|
@ -326,6 +333,16 @@ let
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtksourceview5 ];
|
||||
};
|
||||
# # tried, but can't get zune-jpeg to cross compile
|
||||
# zune-jpeg = attrs: attrs // {
|
||||
# postPatch = ''
|
||||
# # substituteInPlace src/unsafe_utils_neon.rs --replace-fail \
|
||||
# # 'std::' 'core::'
|
||||
# substituteInPlace src/unsafe_utils_neon.rs --replace-fail \
|
||||
# '#![cfg(target_arch = "aarch64")]' \
|
||||
# '#![cfg(all(feature = "neon", target_arch = "aarch64"))]'
|
||||
# '';
|
||||
# };
|
||||
};
|
||||
|
||||
defaultCrateOverrides' = defaultCrateOverrides // (lib.mapAttrs (crate: fn:
|
||||
|
|
@ -336,6 +353,11 @@ let
|
|||
crate2NixOverrides = crates: crates // {
|
||||
# crate2nix sometimes "misses" dependencies, or gets them wrong in a way that crateOverrides can't patch.
|
||||
# this function lets me patch over Cargo.nix without actually modifying it by hand.
|
||||
ashpd = crates.ashpd // {
|
||||
# specifically, it needs zvariant; providing that through zbus is a convenient way to also
|
||||
# coerce the feature flags so as to reduce rebuilds
|
||||
dependencies = crates.ashpd.dependencies ++ crates.zbus.dependencies;
|
||||
};
|
||||
matrix-sdk = crates.matrix-sdk // {
|
||||
dependencies = crates.matrix-sdk.dependencies ++ [
|
||||
{
|
||||
|
|
@ -360,6 +382,23 @@ let
|
|||
}
|
||||
];
|
||||
};
|
||||
image = crates.image // {
|
||||
# zune-jpeg does not cross compile OOTB ("symbols in wrong format" when linking).
|
||||
# disable jpeg feature to bypass that (does this mean i won't be able to view jpegs?)
|
||||
features = crates.image.features // {
|
||||
"default-formats" = lib.remove "jpeg" crates.image.features."default-formats";
|
||||
};
|
||||
resolvedDefaultFeatures = lib.remove "jpeg" crates.image.resolvedDefaultFeatures;
|
||||
};
|
||||
# zune-core = crates.zune-core // {
|
||||
# resolvedDefaultFeatures = [ ];
|
||||
# };
|
||||
# zune-jpeg = crates.zune-jpeg // {
|
||||
# features = crates.zune-jpeg.features // {
|
||||
# "default" = [ "std" ];
|
||||
# };
|
||||
# resolvedDefaultFeatures = [ "default" "std" ];
|
||||
# };
|
||||
};
|
||||
|
||||
cargoNix = import ./Cargo.nix {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user