colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

fractal-nixified: 5 -> 6

Browse Source
This commit is contained in:
Colin 2024-02-01 10:57:01 +00:00
parent 00f995aec9
commit 02e597a862
3 changed files with 1424 additions and 870 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2231
pkgs/additional/fractal-nixified/Cargo.nix
View File

File diff suppressed because it is too large Load Diff

25
pkgs/additional/fractal-nixified/crate-hashes.json
View File

@ -1,18 +1,11 @@
{
"mas-http 0.5.0-rc.2 (git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608)": "11l2iww7zbhjyskkw6rfrkzgwdi2c7hprw6hw2c48vjw8kjqhzsw",
"mas-iana 0.5.0-rc.2 (git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608)": "11l2iww7zbhjyskkw6rfrkzgwdi2c7hprw6hw2c48vjw8kjqhzsw",
"mas-jose 0.5.0-rc.2 (git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608)": "11l2iww7zbhjyskkw6rfrkzgwdi2c7hprw6hw2c48vjw8kjqhzsw",
"mas-keystore 0.5.0-rc.2 (git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608)": "11l2iww7zbhjyskkw6rfrkzgwdi2c7hprw6hw2c48vjw8kjqhzsw",
"mas-oidc-client 0.5.0-rc.2 (git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608)": "11l2iww7zbhjyskkw6rfrkzgwdi2c7hprw6hw2c48vjw8kjqhzsw",
"mas-tower 0.5.0-rc.2 (git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608)": "11l2iww7zbhjyskkw6rfrkzgwdi2c7hprw6hw2c48vjw8kjqhzsw",
"matrix-sdk 0.6.2 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758)": "1s72nchfy860f9mk2a9l33wby1k3w93kvmviilrlys75pbpk9vjz",
"matrix-sdk-base 0.6.1 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758)": "1s72nchfy860f9mk2a9l33wby1k3w93kvmviilrlys75pbpk9vjz",
"matrix-sdk-common 0.6.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758)": "1s72nchfy860f9mk2a9l33wby1k3w93kvmviilrlys75pbpk9vjz",
"matrix-sdk-crypto 0.6.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758)": "1s72nchfy860f9mk2a9l33wby1k3w93kvmviilrlys75pbpk9vjz",
"matrix-sdk-indexeddb 0.2.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758)": "1s72nchfy860f9mk2a9l33wby1k3w93kvmviilrlys75pbpk9vjz",
"matrix-sdk-qrcode 0.4.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758)": "1s72nchfy860f9mk2a9l33wby1k3w93kvmviilrlys75pbpk9vjz",
"matrix-sdk-sqlite 0.1.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758)": "1s72nchfy860f9mk2a9l33wby1k3w93kvmviilrlys75pbpk9vjz",
"matrix-sdk-store-encryption 0.2.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758)": "1s72nchfy860f9mk2a9l33wby1k3w93kvmviilrlys75pbpk9vjz",
"matrix-sdk-ui 0.6.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=8895ce40d13faa79012144c97044990284215758#8895ce40d13faa79012144c97044990284215758)": "1s72nchfy860f9mk2a9l33wby1k3w93kvmviilrlys75pbpk9vjz",
"oauth2-types 0.5.0-rc.2 (git+https://github.com/matrix-org/matrix-authentication-service?rev=357481b52e6dc092178a16b8a7d86df036aac608#357481b52e6dc092178a16b8a7d86df036aac608)": "11l2iww7zbhjyskkw6rfrkzgwdi2c7hprw6hw2c48vjw8kjqhzsw"
"matrix-sdk 0.6.2 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6)": "1m27qn8gvlgrihmnin66xgwvz16lz6nl3wpb47sl6dkpnyb1i389",
"matrix-sdk-base 0.6.1 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6)": "1m27qn8gvlgrihmnin66xgwvz16lz6nl3wpb47sl6dkpnyb1i389",
"matrix-sdk-common 0.6.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6)": "1m27qn8gvlgrihmnin66xgwvz16lz6nl3wpb47sl6dkpnyb1i389",
"matrix-sdk-crypto 0.6.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6)": "1m27qn8gvlgrihmnin66xgwvz16lz6nl3wpb47sl6dkpnyb1i389",
"matrix-sdk-indexeddb 0.2.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6)": "1m27qn8gvlgrihmnin66xgwvz16lz6nl3wpb47sl6dkpnyb1i389",
"matrix-sdk-qrcode 0.4.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6)": "1m27qn8gvlgrihmnin66xgwvz16lz6nl3wpb47sl6dkpnyb1i389",
"matrix-sdk-sqlite 0.1.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6)": "1m27qn8gvlgrihmnin66xgwvz16lz6nl3wpb47sl6dkpnyb1i389",
"matrix-sdk-store-encryption 0.2.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6)": "1m27qn8gvlgrihmnin66xgwvz16lz6nl3wpb47sl6dkpnyb1i389",
"matrix-sdk-ui 0.6.0 (git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6)": "1m27qn8gvlgrihmnin66xgwvz16lz6nl3wpb47sl6dkpnyb1i389"
}

38
pkgs/additional/fractal-nixified/default.nix
View File

@ -1,22 +1,13 @@
# Cargo.nix and crate-hashes.json were created with:
# - `nix run '.#crate2nix' -- generate -f ~/ref/repos/gnome/fractal/Cargo.toml`
# or, for latest crate2nix:
# or, for devel crate2nix:
# - `nix shell -f https://github.com/kolloch/crate2nix/tarball/master`
# - `crate2nix generate -f ~/ref/repos/gnome/fractal/Cargo.toml`
#
# note that serde_derive fails for cross compilation. pin to 1.0.171.
# - see: <https://discourse.nixos.org/t/errors-using-serde-derive-with-buildrustcrate/31398>
# - sounds like serde-derive did eventually remove the "precompiled" blobs
# - 1.0.183: fails
# - 1.0.192: seems to work?
#
# to update:
# - `git fetch` in `~/ref/repos/gnome/fractal/`
# - re-run that crate2nix step
# - update `src` rev to match the local checkout!
#
# then:
# - `sed -i 's/target."curve25519_dalek_backend"/target."curve25519_dalek_backend" or ""/g' Cargo.nix`
{ pkgs
, lib
@ -66,10 +57,10 @@ let
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "fractal";
rev = "5";
hash = "sha256-XHb8HjQ5PDL2sen6qUivDllvYEhKnp1vQynD2Lksi30=";
# rev = "ba15c5b12a3cdb67b57d6a1ce7c4a2e6a15f8c88";
# hash = "sha256-BZC/otMPM4pf/VOhFkgRrq6yEquChL3I9QsQVpFMakQ=";
rev = "6";
hash = "sha256-J4Jb7G5Rfou3N7mytetIdLl0dGY5dSvTjnu8aj4kWXQ=";
# rev = "5";
# hash = "sha256-XHb8HjQ5PDL2sen6qUivDllvYEhKnp1vQynD2Lksi30=";
};
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
@ -318,10 +309,17 @@ let
# LIBCLANG_PATH = "${buildPackages.llvmPackages.libclang.lib}/lib";
};
ring = attrs: attrs // {
# CARGO_MANIFEST_LINKS = "ring_core_0_17_5";
# if after an update you see:
# ```
# > assertion `left == right` failed
# > left: "ring_core_0_17_5"
# > right: "ring_core_0_17_7"
# ```
# just update this patch to reflect the right-hand side
# CARGO_MANIFEST_LINKS = "ring_core_0_17_7";
postPatch = (attrs.postPatch or "") + ''
substituteInPlace build.rs --replace \
'links = std::env::var("CARGO_MANIFEST_LINKS").unwrap();' 'links = "ring_core_0_17_5".to_string();'
'links = std::env::var("CARGO_MANIFEST_LINKS").unwrap();' 'links = "ring_core_0_17_7".to_string();'
'';
};
sourceview5-sys = attrs: attrs // {
@ -338,6 +336,14 @@ 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.
matrix-sdk = crates.matrix-sdk // {
dependencies = crates.matrix-sdk.dependencies ++ [
{
name = "ruma-events";
packageId = "ruma-events";
}
];
};
matrix-sdk-base = crates.matrix-sdk-base // {
dependencies = crates.matrix-sdk-base.dependencies ++ [
{