Unverified Commit 5bf1a6f4 authored by Marcin Serwin's avatar Marcin Serwin
Browse files

signal-desktop: force 90 days expiration 

This should prevent issues like
<https://github.com/NixOS/nixpkgs/issues/481074

> in the future.

Signed-off-by: default avatarMarcin Serwin <marcin@serwin.dev>
parent 73bfcdb6

pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
diff --git a/ts/scripts/get-expire-time.node.ts b/ts/scripts/get-expire-time.node.ts

index 7938f74d3..9d427977d 100644

--- a/ts/scripts/get-expire-time.node.ts

+++ b/ts/scripts/get-expire-time.node.ts

@@ -18,7 +18,7 @@ const buildCreation = unixTimestamp * 1000;

 

 // NB: Build expirations are also determined via users' auto-update settings; see

 // getExpirationTimestamp

-const validDuration = isNotUpdatable(version) ? DAY * 30 : DAY * 90;

+const validDuration = DAY * 90;

 const buildExpiration = buildCreation + validDuration;

 

 const localProductionPath = join(

diff --git a/ts/util/buildExpiration.std.ts b/ts/util/buildExpiration.std.ts

index 530443ec7..26cb03d7c 100644

--- a/ts/util/buildExpiration.std.ts

+++ b/ts/util/buildExpiration.std.ts

@@ -70,9 +70,7 @@ export function hasBuildExpired({

     return true;

   }

 

-  const safeExpirationMs = autoDownloadUpdate

-    ? NINETY_ONE_DAYS

-    : THIRTY_ONE_DAYS;

+  const safeExpirationMs = NINETY_ONE_DAYS;

 

   const buildExpirationDuration = buildExpirationTimestamp - now;

   const tooFarIntoFuture = buildExpirationDuration > safeExpirationMs;

pkgs/by-name/si/signal-desktop/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -111,7 +111,10 @@ stdenv.mkDerivation (finalAttrs: { 
  ];

  buildInputs = (lib.optional (!withAppleEmojis) noto-fonts-color-emoji-png);



  patches = lib.optional (!withAppleEmojis) (

  patches = [

    ./force-90-days-expiration.patch

  ]

  ++ lib.optional (!withAppleEmojis) (

    replaceVars ./replace-apple-emoji-with-noto-emoji.patch {

      noto-emoji-pngs = "${noto-fonts-color-emoji-png}/share/noto-fonts-color-emoji-png";

    }