flare-signal-nixified: 0.10.1-beta.4 -> 0.10.1-beta.6

This commit is contained in:
Colin 2023-12-13 07:01:16 +00:00
parent b34b8a249c
commit 354a4e523b
3 changed files with 24 additions and 23 deletions

View File

@ -2989,7 +2989,7 @@ rec {
};
"flare" = rec {
crateName = "flare";
version = "0.10.1-beta.4";
version = "0.10.1-beta.6";
edition = "2021";
crateBin = [
{
@ -3148,8 +3148,9 @@ rec {
}
];
features = {
"screenshot-setup" = [ "screenshot" ];
};
resolvedDefaultFeatures = [ "default" "libspelling" "screenshot" ];
resolvedDefaultFeatures = [ "default" "libspelling" "screenshot" "screenshot-setup" ];
};
"flate2" = rec {
crateName = "flate2";
@ -6400,9 +6401,9 @@ rec {
edition = "2018";
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/whisperfish/libsignal-service-rs";
rev = "6fc62c8c67817886560dd2eb99ab5e90f451bd67";
sha256 = "12ycij5a92y152hnw8l7isxw64hlfbpwk4sj7ih0247m0k96bx77";
url = "https://github.com/direc85/libsignal-service-rs";
rev = "4d6ebf20a43c3214ef349a1f62d87970bf26d63c";
sha256 = "18khsrgwkhhiyz96kkqr7awp8pcwj7sz4fj7i2r158d01zjli910";
};
authors = [
"Ruben De Smet <ruben.de.smet@rubdos.be>"
@ -6534,8 +6535,8 @@ rec {
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/whisperfish/libsignal-service-rs";
rev = "6fc62c8c67817886560dd2eb99ab5e90f451bd67";
sha256 = "12ycij5a92y152hnw8l7isxw64hlfbpwk4sj7ih0247m0k96bx77";
rev = "2e3bd5813aa54abe354a46e78ac0ee164027b985";
sha256 = "1h8jj4mbi3kd014i8dcni5gazg3rchgpv2psxbcfvyg335c11z9n";
};
authors = [
"Gabriel Féron <g@leirbag.net>"
@ -8860,8 +8861,8 @@ rec {
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/Schmiddiii/presage";
rev = "af72b474099361c68f09aff38182eb26d7c8ca86";
sha256 = "1000034fv2cg8dvhzsmxx61lvc7llqi73832vrf7wfc79yj47q8z";
rev = "86ff0c3e857af8f2f1d3bbcc7d7152d774490951";
sha256 = "0vdxhcz0b4xg79mmj5jz6gmqadi94acf2abfcsgwkikhs2wm362n";
};
authors = [
"Gabriel Féron <g@leirbag.net>"
@ -8927,8 +8928,8 @@ rec {
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/Schmiddiii/presage";
rev = "af72b474099361c68f09aff38182eb26d7c8ca86";
sha256 = "1000034fv2cg8dvhzsmxx61lvc7llqi73832vrf7wfc79yj47q8z";
rev = "86ff0c3e857af8f2f1d3bbcc7d7152d774490951";
sha256 = "0vdxhcz0b4xg79mmj5jz6gmqadi94acf2abfcsgwkikhs2wm362n";
};
dependencies = [
{
@ -8984,8 +8985,8 @@ rec {
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/Schmiddiii/presage";
rev = "af72b474099361c68f09aff38182eb26d7c8ca86";
sha256 = "1000034fv2cg8dvhzsmxx61lvc7llqi73832vrf7wfc79yj47q8z";
rev = "86ff0c3e857af8f2f1d3bbcc7d7152d774490951";
sha256 = "0vdxhcz0b4xg79mmj5jz6gmqadi94acf2abfcsgwkikhs2wm362n";
};
authors = [
"Gabriel Féron <g@leirbag.net>"

View File

@ -2,12 +2,12 @@
"curve25519-dalek 4.0.0 (git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.0.0#463e5c7cba32561ffee8a281c4455ff3c25660d4)": "0baapyz09niwn0l64sy5cq1nc9jqsyn78wp7zw893g4mfxhyyi99",
"curve25519-dalek-derive 0.1.0 (git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.0.0#463e5c7cba32561ffee8a281c4455ff3c25660d4)": "0baapyz09niwn0l64sy5cq1nc9jqsyn78wp7zw893g4mfxhyyi99",
"libsignal-protocol 0.1.0 (git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364)": "00w7wbw7rw1lvjzpsw3v0fv7ixshpg7dj6dw2qwmdbk8p8xwjahl",
"libsignal-service 0.1.0 (git+https://github.com/whisperfish/libsignal-service-rs?rev=6fc62c8#6fc62c8c67817886560dd2eb99ab5e90f451bd67)": "12ycij5a92y152hnw8l7isxw64hlfbpwk4sj7ih0247m0k96bx77",
"libsignal-service-hyper 0.1.0 (git+https://github.com/whisperfish/libsignal-service-rs?rev=6fc62c8#6fc62c8c67817886560dd2eb99ab5e90f451bd67)": "12ycij5a92y152hnw8l7isxw64hlfbpwk4sj7ih0247m0k96bx77",
"libsignal-service 0.1.0 (git+https://github.com/direc85/libsignal-service-rs?rev=4d6ebf2#4d6ebf20a43c3214ef349a1f62d87970bf26d63c)": "18khsrgwkhhiyz96kkqr7awp8pcwj7sz4fj7i2r158d01zjli910",
"libsignal-service-hyper 0.1.0 (git+https://github.com/whisperfish/libsignal-service-rs?rev=2e3bd5813aa54abe354a46e78ac0ee164027b985#2e3bd5813aa54abe354a46e78ac0ee164027b985)": "1h8jj4mbi3kd014i8dcni5gazg3rchgpv2psxbcfvyg335c11z9n",
"poksho 0.7.0 (git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364)": "00w7wbw7rw1lvjzpsw3v0fv7ixshpg7dj6dw2qwmdbk8p8xwjahl",
"presage 0.6.0-dev (git+https://github.com/Schmiddiii/presage?rev=af72b474099361c68f09aff38182eb26d7c8ca86#af72b474099361c68f09aff38182eb26d7c8ca86)": "1000034fv2cg8dvhzsmxx61lvc7llqi73832vrf7wfc79yj47q8z",
"presage-store-cipher 0.1.0 (git+https://github.com/Schmiddiii/presage?rev=af72b474099361c68f09aff38182eb26d7c8ca86#af72b474099361c68f09aff38182eb26d7c8ca86)": "1000034fv2cg8dvhzsmxx61lvc7llqi73832vrf7wfc79yj47q8z",
"presage-store-sled 0.6.0-dev (git+https://github.com/Schmiddiii/presage?rev=af72b474099361c68f09aff38182eb26d7c8ca86#af72b474099361c68f09aff38182eb26d7c8ca86)": "1000034fv2cg8dvhzsmxx61lvc7llqi73832vrf7wfc79yj47q8z",
"presage 0.6.0-dev (git+https://github.com/Schmiddiii/presage?rev=86ff0c3e857af8f2f1d3bbcc7d7152d774490951#86ff0c3e857af8f2f1d3bbcc7d7152d774490951)": "0vdxhcz0b4xg79mmj5jz6gmqadi94acf2abfcsgwkikhs2wm362n",
"presage-store-cipher 0.1.0 (git+https://github.com/Schmiddiii/presage?rev=86ff0c3e857af8f2f1d3bbcc7d7152d774490951#86ff0c3e857af8f2f1d3bbcc7d7152d774490951)": "0vdxhcz0b4xg79mmj5jz6gmqadi94acf2abfcsgwkikhs2wm362n",
"presage-store-sled 0.6.0-dev (git+https://github.com/Schmiddiii/presage?rev=86ff0c3e857af8f2f1d3bbcc7d7152d774490951#86ff0c3e857af8f2f1d3bbcc7d7152d774490951)": "0vdxhcz0b4xg79mmj5jz6gmqadi94acf2abfcsgwkikhs2wm362n",
"signal-crypto 0.1.0 (git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364)": "00w7wbw7rw1lvjzpsw3v0fv7ixshpg7dj6dw2qwmdbk8p8xwjahl",
"zkcredential 0.1.0 (git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364)": "00w7wbw7rw1lvjzpsw3v0fv7ixshpg7dj6dw2qwmdbk8p8xwjahl",
"zkgroup 0.9.0 (git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364)": "00w7wbw7rw1lvjzpsw3v0fv7ixshpg7dj6dw2qwmdbk8p8xwjahl"

View File

@ -39,12 +39,12 @@ let
domain = "gitlab.com";
owner = "schmiddi-on-mobile";
repo = "flare";
rev = "0.10.1-beta.4";
hash = "sha256-SkHARJ4V8t4dXITH+V36RIfPrWL5Bdju1gahCS2aiWo=";
rev = "0.10.1-beta.6";
hash = "sha256-NhQu9gpnweI+kIWh3Mbb9bCQnfgthxocAqDRwG0m2Hg=";
# flare/Cargo.nix version compatibility:
# - flare 0.10.1-beta.5: errors with curve25519_dalek_backend stuff
# - flare tip (49060eee): same errors as 0.10.1-beta.2
# - flare 0.10.1-beta.4: compiles
# - flare 0.10.1-beta.2: requires gtk 4.11, not yet in nixpkgs
# - <https://github.com/NixOS/nixpkgs/pull/247766>
# - specifically, that's because of gdk4-sys 0.7.2.
@ -68,8 +68,8 @@ let
# - flare 0.9.1: uses a version of serde_derive (1.0.175) which doesn't cross compile in nixpkgs
# - flare 16acc70ceb6e80eb2d87a92e72e2727e8b98b4db (last rev before serde_derive 1.0.175): same error as 0.9.0
# - flare 0.9.0: deps build but crate itself fails because `mod config` is unknown (i.e. we didn't invoke meson and let it generate config.rs)
# rev = "49060eee61e26b622150179cece4918c1707db6a";
# hash = "sha256-/xP4AC0ZkVsNIFiTxyTsF0sJWIj53OIiXlSLU0LhBRM=";
# rev = "0.10.1-beta.4";
# hash = "sha256-SkHARJ4V8t4dXITH+V36RIfPrWL5Bdju1gahCS2aiWo=";
# rev = "0.10.1-beta.2";
# hash = "sha256-xkTM8Jeyb89ZUo2lFKNm8HlTe8BTlO/flZmENRfDEm4=";
# rev = "0.10.1-beta.1";