Skip to content

Commit

Permalink
Merge pull request #122777 from primeos/signal-desktop-backport
Browse files Browse the repository at this point in the history
[20.09] signal-desktop: 5.0.0 -> 5.1.0
  • Loading branch information
primeos committed May 15, 2021
2 parents 17d3dab + 0067458 commit 5e8262f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
12 changes: 10 additions & 2 deletions nixos/tests/signal-desktop.nix
Expand Up @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{
name = "signal-desktop";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ flokli ];
maintainers = [ flokli primeos ];
};

machine = { ... }:
Expand All @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ...} :

services.xserver.enable = true;
test-support.displayManager.auto.user = "alice";
environment.systemPackages = [ pkgs.signal-desktop ];
environment.systemPackages = with pkgs; [ signal-desktop file ];
virtualisation.memorySize = 1024;
};

Expand All @@ -39,5 +39,13 @@ import ./make-test-python.nix ({ pkgs, ...} :
machine.wait_for_text("Signal")
machine.wait_for_text("File Edit View Window Help")
machine.screenshot("signal_desktop")
# Test if the database is encrypted to prevent these issues:
# - https://github.com/NixOS/nixpkgs/issues/108772
# - https://github.com/NixOS/nixpkgs/pull/117555
print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'"))
machine.fail(
"su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database"
)
'';
})
Expand Up @@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.0.0"; # Please backport all updates to the stable channel.
version = "5.1.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
Expand All @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "17hxg61m9kk1kph6ifqy6507kzx5hi6yafr2mj8n0a6c39vc8f9g";
sha256 = "1cirnnxy63jfkl98472k25bn1yp5apa7b5s74r42sxhlwzwkplw1";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -78,6 +78,7 @@ in stdenv.mkDerivation rec {
pango
systemd
xorg.libxcb
xorg.libxshmfence
];

runtimeDependencies = [
Expand Down

0 comments on commit 5e8262f

Please sign in to comment.