From 3d12e576b39a22ac70cb5bf37509d091a0fb7949 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Thu, 9 Apr 2026 00:41:13 +0200 Subject: [PATCH] signal-desktop: 8.4.1 -> 8.6.0 changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v8.6.0 diff: https://github.com/signalapp/Signal-Desktop/compare/v8.4.1...v8.6.0 --- .../force-90-days-expiration.patch | 8 +++--- .../si/signal-desktop/libsignal-node.nix | 8 +++--- pkgs/by-name/si/signal-desktop/package.nix | 20 ++++++------- .../replace-apple-emoji-with-noto-emoji.patch | 28 +++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch b/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch index 982ed6eaac8e..0f87e258dada 100644 --- a/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch +++ b/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch @@ -1,18 +1,18 @@ diff --git a/ts/scripts/get-expire-time.node.ts b/ts/scripts/get-expire-time.node.ts -index 7938f74d3..9d427977d 100644 +index deebfcee6..50f6df652 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 = isNotUpdatable(packageJson.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 +index c2ac24c6d..65260f8bd 100644 --- a/ts/util/buildExpiration.std.ts +++ b/ts/util/buildExpiration.std.ts @@ -70,9 +70,7 @@ export function hasBuildExpired({ @@ -25,4 +25,4 @@ index 530443ec7..26cb03d7c 100644 + const safeExpirationMs = NINETY_ONE_DAYS; const buildExpirationDuration = buildExpirationTimestamp - now; - const tooFarIntoFuture = buildExpirationDuration > safeExpirationMs; + const tooFarIntoFuture = buildExpirationDuration > safeExpirationMs; \ No newline at end of file diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index d71c7d6a3546..1009f28ac4b3 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -14,23 +14,23 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.89.1"; + version = "0.91.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-eYeRlyKtTxPT1tpmuEsFrXNnp1F+l/PJcxpUDblCL60="; + hash = "sha256-icmmQWWVCWg8dpNkQtLi3YWSxBrUwaGP4ezTDqC/0kc="; }; - cargoHash = "sha256-7kLqrU/yD0aeeULpuh8EgZvmKo1c3Wuwe+9vEm8sFT8="; + cargoHash = "sha256-NaFl9r4e08I3+/asek7VMA0yikxPR0MtBX9TnHaebSU="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-SZJIj5uBB6EZEACC44IpGvDTQuQIDgqmLGkgRbtUwOc="; + hash = "sha256-TTU7cfoS0h2fqHanSOCsF+dtkhBfaWApfOC3O4DGClo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index c452a132f4f7..5bda913e7a00 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -58,13 +58,13 @@ let ''; }); - version = "8.4.1"; + version = "8.6.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-HjIU7L3iSr51w3KxzmaVzOI6qtAyyyWTlK1HygNyEzw="; + hash = "sha256-K6mufC7LFGWeCkIkrsYPO2n/0L1b6yBqiLcv7w7e57g="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -159,11 +159,11 @@ stdenv.mkDerivation (finalAttrs: { # language-pack postprocessing), and they expect a different macOS # app layout than nixpkgs' Electron provides. substituteInPlace package.json \ - --replace-fail '"artifactBuildCompleted": "ts/scripts/artifact-build-completed.node.js",' "" \ - --replace-fail '"afterSign": "ts/scripts/after-sign.node.js",' "" \ - --replace-fail '"afterPack": "ts/scripts/after-pack.node.js",' "" \ - --replace-fail '"sign": "./ts/scripts/sign-macos.node.js",' "" \ - --replace-fail '"afterAllArtifactBuild": "ts/scripts/after-all-artifact-build.node.js",' "" + --replace-fail '"artifactBuildCompleted": "ts/scripts/artifact-build-completed.node.ts",' "" \ + --replace-fail '"afterSign": "ts/scripts/after-sign.node.ts",' "" \ + --replace-fail '"afterPack": "ts/scripts/after-pack.node.ts",' "" \ + --replace-fail '"sign": "./ts/scripts/sign-macos.node.ts",' "" \ + --replace-fail '"afterAllArtifactBuild": "ts/scripts/after-all-artifact-build.node.ts",' "" ''; pnpmDeps = fetchPnpmDeps { @@ -177,15 +177,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 3; hash = if withAppleEmojis then - "sha256-QaYUL5/JcXqd564CFAR+4EMMG38h8a1dpls054iWDzU=" + "sha256-d6ul6MTJhnM4PyxMlMaVovnvSPfYh3DmMjHjmOideB4=" else - "sha256-NEUKdRT0aVznkXTZOJJ8TCUhidhTAiDdBxoukKvt4qs="; + "sha256-JymcPdFMi0wfceOJnPrwEBG4PnosIFnrxiIrTlcGf/g="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1774560637; + SOURCE_DATE_EPOCH = 1775687068; } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Disable code signing during local macOS builds. diff --git a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch index 71e6d448bfab..8cf90b611334 100644 --- a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch +++ b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch @@ -46,32 +46,32 @@ index 483d1c4e4..66609d9e9 100644 getBadgesPath(userDataPath), getDraftPath(userDataPath), diff --git a/package.json b/package.json -index 31399e645..05fc46b8b 100644 +index 8585e6bdc..4d900ebfe 100644 --- a/package.json +++ b/package.json -@@ -156,7 +156,6 @@ - "dashdash": "2.0.0", - "direction": "1.0.4", +@@ -122,7 +122,6 @@ + "@signalapp/sqlcipher": "3.2.1", + "@signalapp/windows-ucv": "1.0.1", "emoji-datasource": "16.0.0", - "emoji-datasource-apple": "16.0.0", - "emoji-regex": "10.4.0", - "encoding": "0.1.13", - "fabric": "4.6.0", + "google-libphonenumber": "3.2.39" + }, + "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml -index 223557f67..2250b619d 100644 +index 756130661..4872be4cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml -@@ -200,9 +200,6 @@ importers: +@@ -97,9 +97,6 @@ importers: emoji-datasource: specifier: 16.0.0 version: 16.0.0 - emoji-datasource-apple: - specifier: 16.0.0 - version: 16.0.0 - emoji-regex: - specifier: 10.4.0 - version: 10.4.0 -@@ -5835,9 +5832,6 @@ packages: + google-libphonenumber: + specifier: 3.2.39 + version: 3.2.39 +@@ -6068,9 +6065,6 @@ packages: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} engines: {node: '>=12'} @@ -81,7 +81,7 @@ index 223557f67..2250b619d 100644 emoji-datasource@16.0.0: resolution: {integrity: sha512-/qHKqK5Nr3+8zhgO6kHmF43Fm5C8HNn0AaFRIpgw8HF3+uF0Vfc8jgLI1ZQS5ba1vBzksS8NBCjHejwLb2D/Sg==} -@@ -17062,8 +17056,6 @@ snapshots: +@@ -16954,8 +16948,6 @@ snapshots: emittery@0.13.1: {}