Unverified Commit cead8a93 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

signal-desktop: 7.73.0 -> 7.75.1 (#452197)

parents 70015f3a cdeec81a

pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch

+7 −7
Original line number Diff line number Diff line 
diff --git a/node/build_node_bridge.py b/node/build_node_bridge.py

index c983fc3..2ab06dc 100755

--- a/node/build_node_bridge.py

+++ b/node/build_node_bridge.py

@@ -138,9 +138,6 @@ def main(args: Optional[List[str]] = None) -> int:

     cargo_env['CARGO_PROFILE_RELEASE_LTO'] = 'thin'

     # Enable ARMv8 cryptography acceleration when available

index a2da3c8b..cb5d475f 100755

--- i/node/build_node_bridge.py

+++ w/node/build_node_bridge.py

@@ -154,9 +154,6 @@ def main(args: Optional[List[str]] = None) -> int:

     cargo_env['RUSTFLAGS'] += ' --cfg aes_armv8'

     # Access tokio's unstable metrics

     cargo_env['RUSTFLAGS'] += ' --cfg tokio_unstable'

-    # Strip absolute paths

-    for path in build_helpers.rust_paths_to_remap():

-        cargo_env['RUSTFLAGS'] += f' --remap-path-prefix {path}='

pkgs/by-name/si/signal-desktop/libsignal-node.nix

+4 −4
Original line number Diff line number Diff line
@@ -24,23 +24,23 @@ let 
in

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "libsignal-node";

  version = "0.81.1";

  version = "0.83.0";



  src = fetchFromGitHub {

    owner = "signalapp";

    repo = "libsignal";

    tag = "v${finalAttrs.version}";

    hash = "sha256-uhxfVFsoB+c1R5MUOgpJFm8ZD3vgU8BIn35QSfbEp5w=";

    hash = "sha256-lSk9C2RIRsAlSUr8folhdHkHkpAfPM+vwJ/rZ6mys3Q=";

  };



  cargoHash = "sha256-Q3GSeaW3YveLxLeJPpPXUVwlJ0QLRkAmRGSJetxKl4Y=";

  cargoHash = "sha256-0P89+p0WlQaa48wpgsaapIhEzlAnWVPl9qD+jnBw9mM=";



  npmRoot = "node";

  npmDeps = fetchNpmDeps {

    name = "${finalAttrs.pname}-npm-deps";

    inherit (finalAttrs) version src;

    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";

    hash = "sha256-6Mr3SJn4pO0p6PISXvEOhN9uPk1TIEU03ssclNUg2No=";

    hash = "sha256-4sd8JVQfCC4dAkksICbb3e4JjNcgplOW26TyRkAFWp0=";

  };



  nativeBuildInputs = [

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

+7 −9
Original line number Diff line number Diff line
@@ -52,13 +52,13 @@ let 
    '';

  });



  version = "7.73.0";

  version = "7.75.1";



  src = fetchFromGitHub {

    owner = "signalapp";

    repo = "Signal-Desktop";

    tag = "v${version}";

    hash = "sha256-5cwGV0WPOS7O/xnQZ38t/hiQppqFFtVQmGuniGsD6H8=";

    hash = "sha256-l5fMVXwuXHaGcBuemkwzUcEuktTseGL2k13oxoo81+0=";

  };



  sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -69,7 +69,7 @@ let 
    pnpmDeps = pnpm.fetchDeps {

      inherit (finalAttrs) pname src version;

      fetcherVersion = 1;

      hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0=";

      hash = "sha256-WUwclz7dJl+s5zRjWu/HTJ5eZroAFA6vR8mZzwib6Po=";

    };



    strictDeps = true;
@@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: { 
    fetcherVersion = 1;

    hash =

      if withAppleEmojis then

        "sha256-9YvNs925xBUYEpF429rHfMXIGPapVYd8j1jZa/yBuhA="

        "sha256-b13di3TdaS6CT8gAZfBqlu4WheIHL+X8LvAo148H8kI="

      else

        "sha256-lcr8EeL+wd6VihKcBgfXNRny8VskX8g7I7WTAkLuBss=";

        "sha256-/Yy9R+MRN5e5vGU0XgwJa7oFpHn8bi8B0y89aaT2LQI=";

  };



  env = {

    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

    SIGNAL_ENV = "production";

    SOURCE_DATE_EPOCH = 1759413120;

    SOURCE_DATE_EPOCH = 1760633959;

  };



  preBuild = ''
@@ -218,12 +218,10 @@ stdenv.mkDerivation (finalAttrs: { 
      install -Dm644 $icon $out/share/icons/hicolor/`basename ''${icon%.png}`/apps/signal-desktop.png

    done



    # TODO: Remove --ozone-platform=wayland after next electron update,

    # see https://github.com/electron/electron/pull/48309

    makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \

      --add-flags "$out/share/signal-desktop/app.asar" \

      --set-default ELECTRON_FORCE_IS_PACKAGED 1 \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \

      --add-flags ${lib.escapeShellArg commandLineArgs}



    runHook postInstall

pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch

+43 −37
Original line number Diff line number Diff line
@@ -49,11 +49,11 @@ diff --git a/package.json b/package.json 
index 5755fec..86125ba 100644

--- a/package.json

+++ b/package.json

@@ -137,7 +137,6 @@

@@ -154,7 +154,6 @@

     "dashdash": "2.0.0",

     "direction": "1.0.4",

     "emoji-datasource": "15.1.2",

-    "emoji-datasource-apple": "15.1.2",

     "emoji-datasource": "16.0.0",

-    "emoji-datasource-apple": "16.0.0",

     "emoji-regex": "10.4.0",

     "encoding": "0.1.13",

     "fabric": "4.6.0",
@@ -64,43 +64,43 @@ index 5755fec..86125ba 100644 
-}

+}

\ No newline at end of file

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

index f04b2b1..070fa0f 100644

--- a/pnpm-lock.yaml

+++ b/pnpm-lock.yaml

@@ -184,9 +184,6 @@ importers:

diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml

index b162101a8..82ee9d67e 100644

--- i/pnpm-lock.yaml

+++ w/pnpm-lock.yaml

@@ -197,9 +197,6 @@ importers:

       emoji-datasource:

         specifier: 15.1.2

         version: 15.1.2

         specifier: 16.0.0

         version: 16.0.0

-      emoji-datasource-apple:

-        specifier: 15.1.2

-        version: 15.1.2

-        specifier: 16.0.0

-        version: 16.0.0

       emoji-regex:

         specifier: 10.4.0

         version: 10.4.0

@@ -4817,9 +4814,6 @@ packages:

@@ -5814,9 +5811,6 @@ packages:

     resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}

     engines: {node: '>=12'}



-  emoji-datasource-apple@15.1.2:

-    resolution: {integrity: sha512-32UZTK36x4DlvgD1smkmBlKmmJH7qUr5Qut4U/on2uQLGqNXGbZiheq6/LEA8xRQEUrmNrGEy25wpEI6wvYmTg==}

-  emoji-datasource-apple@16.0.0:

-    resolution: {integrity: sha512-dVYjsK0FnCry9F+PBtnivhG2K0xdwlmqYaSgiUtztUdAGPYiHYhZcVKvNBqC791g2qyEcFNTBO6utg4eQ3uLTw==}

-

   emoji-datasource@15.1.2:

     resolution: {integrity: sha512-tXAqGsrDVhgCRpFePtaD9P4Z8Ro2SUQSL/4MIJBG0SxqQJaMslEbin8J53OaFwEBu6e7JxFaIF6s4mw9+8acAQ==}

   emoji-datasource@16.0.0:

     resolution: {integrity: sha512-/qHKqK5Nr3+8zhgO6kHmF43Fm5C8HNn0AaFRIpgw8HF3+uF0Vfc8jgLI1ZQS5ba1vBzksS8NBCjHejwLb2D/Sg==}



@@ -14990,8 +14984,6 @@ snapshots:

@@ -17037,8 +17031,6 @@ snapshots:



   emittery@0.13.1: {}



-  emoji-datasource-apple@15.1.2: {}

-  emoji-datasource-apple@16.0.0: {}

-

   emoji-datasource@15.1.2: {}

   emoji-datasource@16.0.0: {}



   emoji-regex@10.4.0: {}

diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss

index 78c7563..83d196c 100644

--- a/stylesheets/components/fun/FunEmoji.scss

+++ b/stylesheets/components/fun/FunEmoji.scss

index ea029fd5b..0e3563b4f 100644

--- i/stylesheets/components/fun/FunEmoji.scss

+++ w/stylesheets/components/fun/FunEmoji.scss

@@ -5,19 +5,9 @@

 $emoji-sprite-sheet-grid-item-count: 62;
@@ -125,14 +125,20 @@ index 78c7563..83d196c 100644 
 }



diff --git a/ts/components/fun/FunEmoji.tsx b/ts/components/fun/FunEmoji.tsx

index 08785e8..d25b868 100644

index ddb30bf6d..5fc39339b 100644

--- a/ts/components/fun/FunEmoji.tsx

+++ b/ts/components/fun/FunEmoji.tsx

@@ -10,7 +10,14 @@ export const FUN_STATIC_EMOJI_CLASS = 'FunStaticEmoji';

 export const FUN_INLINE_EMOJI_CLASS = 'FunInlineEmoji';

 

 function getEmojiJumboUrl(emoji: EmojiVariantData): string {

-  return `emoji://jumbo?emoji=${encodeURIComponent(emoji.value)}`;

@@ -20,13 +20,14 @@ function getEmojiJumboBackground(

   emoji: EmojiVariantData,

   size: number | undefined

 ): string | null {

-  if (size != null && size < MIN_JUMBOMOJI_SIZE) {

-    return null;

-  }

-  if (KNOWN_JUMBOMOJI.has(emoji.value)) {

-    return `url(emoji://jumbo?emoji=${encodeURIComponent(emoji.value)})`;

-  }

-  return null;

+  const emojiToNotoName = (emoji: string): string =>

+    `emoji_u${

+      [...emoji]
@@ -140,7 +146,7 @@ index 08785e8..d25b868 100644 
+        .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0"))

+        .join("_")

+    }.png`;

+  return `file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)}`;

+  return `url(file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)})`;

 }

 

 export type FunStaticEmojiSize =

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

+8 −3
Original line number Diff line number Diff line
@@ -19,16 +19,21 @@ let 
in

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "ringrtc";

  version = "2.58.1";

  version = "2.59.0";



  src = fetchFromGitHub {

    owner = "signalapp";

    repo = "ringrtc";

    tag = "v${finalAttrs.version}";

    hash = "sha256-HI+HVDv+nuJp2BPIAVY+PI6Pof1pnB8L6CIAgBT+tJA=";

    hash = "sha256-zgDXkkKJrcD357DxbPq/sL/c4AG8xyMPY5IpcBtvATY=";

  };



  cargoHash = "sha256-n+1pe202U2lljisSRBWeVvuBLyp7jhXG+ovDDi5WV8Q=";

  cargoHash = "sha256-uwMNJ+PQa/Q7XZ9QONo+vm2wMqGwOEB97Kl/RFQkdhU=";



  preConfigure = ''

    # Check for matching webrtc version

    grep 'webrtc.version=${webrtc.version}' config/version.properties

  '';



  cargoBuildFlags = [

    "-p"