diff --git a/pkgs/additional/fractal-latest/default.nix b/pkgs/additional/fractal-latest/default.nix index e14e51317..0f9ea3ce7 100644 --- a/pkgs/additional/fractal-latest/default.nix +++ b/pkgs/additional/fractal-latest/default.nix @@ -1,18 +1,22 @@ { fractal-next, fetchFromGitLab, rustPlatform }: (fractal-next.overrideAttrs (prev: rec { - version = "20221220"; + version = "unstable-2023-07-28"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "fractal"; - rev = "d394badd0bf36c43026e01dbeb1cd7f881cf3440"; - hash = "sha256-JgLrDrMLEh7302tZ3NOJ12dCMiSxGgecaUjcuDPcGSg="; + rev = "dc66180a44e4e996db0e840dab0be08d826a5319"; + hash = "sha256-SYkeHkNlxHbsd+kubGZO5PEA9mg9Id0pHDi/2MMGy90="; }; - patches = []; - postPatch = ""; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - hash = "sha256-hHsMcU6s42yKn2+LkWraLDhnmWNY72dL2cJoy6uoOKI="; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "matrix-sdk-0.6.2" = "sha256-ofaXdhkbDa7/tp/RdBQ1/JBaSims8znJ66NeRUhof20="; + "ruma-0.8.2" = "sha256-ZlevGTGL/DQVAYeR078I0cT/V1kaubhORgt1cZUhBqM="; + # "vodozemac-0.3.0" = "sha256-tAimsVD8SZmlVybb7HvRffwlNsfb7gLWGCplmwbLIVE="; + "x25519-dalek-1.2.0" = "sha256-AHjhccCqacu0WMTFyxIret7ghJ2V+8wEAwR5L6Hy1KY="; + }; }; })) diff --git a/pkgs/default.nix b/pkgs/default.nix index 2eb9c7e70..462a0c12c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -56,7 +56,7 @@ let # packages i haven't used for a while, may or may not still work # fluffychat-moby = callPackage ./additional/fluffychat-moby { }; - # fractal-latest = callPackage ./additional/fractal-latest { }; + fractal-latest = callPackage ./additional/fractal-latest { }; # kaiteki = callPackage ./additional/kaiteki { }; # tokodon = libsForQt5.callPackage ./additional/tokodon { };