diff options
| author | Tom Fitzhenry <tom@tom-fitzhenry.me.uk> | 2022-10-14 09:49:37 +1100 |
|---|---|---|
| committer | Tom Fitzhenry <tom@tom-fitzhenry.me.uk> | 2022-10-15 05:39:36 +1100 |
| commit | a4d63cf111f445107e80fa4068f3b6f1eddddf93 (patch) | |
| tree | 45cff32960e1825909d2f1facec09f20689cdd93 /pkgs/applications/networking/instant-messengers/chatty | |
| parent | 7a94322ed7898db6d9b308b76a6bb4a0c6f99c38 (diff) | |
chatty: unbreak by relying on same commit Alpine does
Motivation: Fix chatty. Background: chatty 0.6.7 depends on libsoup2 and evolution-data-service. During the GNOME 42 -> 43 migration, evolution-data-service changed from using libsoup2 to libsoup3. chatty's use of libsoup2 and libsoup3 was conflicting, and thus chatty broke. To fix this, let's use a recent unreleased commit, as Alpine did: https://git.alpinelinux.org/aports/commit/community/chatty/APKBUILD?id=1184b834c74362df3f9963585311256ed2c6908a Longer term, we can use chatty 0.7 when it is released: https://source.puri.sm/Librem5/chatty/-/merge_requests/1134
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/chatty')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/chatty/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 9728ea65c3612..541bcc72f5ac1 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,15 +29,16 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.6.7"; + version = "unstable-2022-09-20"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "chatty"; - rev = "v${version}"; + # https://source.puri.sm/Librem5/chatty/-/tree/247c53fd990f7472ddd1a92c2f9e1299ae3ef4e4 + rev = "247c53fd990f7472ddd1a92c2f9e1299ae3ef4e4"; fetchSubmodules = true; - hash = "sha256-W4w/00mRgjfyQmLQ81/EAN+80qk7kDkBmMPJnOU+AIc="; + hash = "sha256-9hgQC0vLmmJJxrBWTdTIrJbSSwLS23uVoJri2ieCj4E="; }; postPatch = '' @@ -87,7 +88,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda tomfitzhenry ]; platforms = platforms.linux; - # Requires upgrade to libsoup3 - broken = true; }; } |