Unverified Commit 90f12398 authored by Nick Hu's avatar Nick Hu Committed by GitHub
Browse files

signal-desktop: 7.76.0 -> 7.77.1 (#457111)

parents e7221c14 09bc9da9

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

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

  });



  version = "7.76.0";

  version = "7.77.1";



  src = fetchFromGitHub {

    owner = "signalapp";

    repo = "Signal-Desktop";

    tag = "v${version}";

    hash = "sha256-zwywpQ/1LYSofXPMLtYt7c0PLlzgNedRGqslPJur61g=";

    hash = "sha256-IFMNUuGL3sQVlEJI4N2rXrYStcDEZW/YxmZyPM0hhVU=";

  };



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

      inherit (finalAttrs) pname src version;

      fetcherVersion = 1;

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

      hash = "sha256-m/JxsKnVhcya7dUz1MBMQKwEdqoV3xQiGOoT4egh3K4=";

    };



    strictDeps = true;
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { 
    # resource if the nixpkgs version is different. To fix this we hardcode

    # the electron version to the declared one here instead of interpolating

    # it at runtime.

    substituteInPlace app/updateDefaultSession.ts \

    substituteInPlace app/updateDefaultSession.main.ts \

      --replace-fail "\''${process.versions.electron}" "`jq -r '.devDependencies.electron' < package.json`"

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

    hash =

      if withAppleEmojis then

        "sha256-b13di3TdaS6CT8gAZfBqlu4WheIHL+X8LvAo148H8kI="

        "sha256-RquJqKUDdz8QRJXz7eWiAcdUF+WhYEqnyOkhrIw7tgQ="

      else

        "sha256-/Yy9R+MRN5e5vGU0XgwJa7oFpHn8bi8B0y89aaT2LQI=";

        "sha256-v1KbjFLo5pD1uoNtDrX2kUbhCgGeEqbuHLZRIJqshHw=";

  };



  env = {

    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

    SIGNAL_ENV = "production";

    SOURCE_DATE_EPOCH = 1761172657;

    SOURCE_DATE_EPOCH = 1761859038;

  };



  preBuild = ''

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

+30 −37
Original line number Diff line number Diff line 
diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md

index 2c963f1..96edd02 100644

index 273a9e097..ffb5b6eb6 100644

--- a/ACKNOWLEDGMENTS.md

+++ b/ACKNOWLEDGMENTS.md

@@ -1636,30 +1636,6 @@ Signal Desktop makes use of the following open source projects.

@@ -3667,30 +3667,6 @@ Signal Desktop makes use of the following open source projects.

     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

     SOFTWARE.
@@ -33,11 +33,11 @@ index 2c963f1..96edd02 100644 
 ## emoji-regex

 

     Copyright Mathias Bynens <https://mathiasbynens.be/>

diff --git a/app/protocol_filter.ts b/app/protocol_filter.ts

index 68dceea..4b35bb1 100644

--- a/app/protocol_filter.ts

+++ b/app/protocol_filter.ts

@@ -59,6 +59,7 @@ function _createFileHandler({

diff --git a/app/protocol_filter.node.ts b/app/protocol_filter.node.ts

index 483d1c4e4..66609d9e9 100644

--- a/app/protocol_filter.node.ts

+++ b/app/protocol_filter.node.ts

@@ -62,6 +62,7 @@ function _createFileHandler({

   const allowedRoots = [

     userDataPath,

     installPath,
@@ -46,10 +46,10 @@ index 68dceea..4b35bb1 100644 
     getBadgesPath(userDataPath),

     getDraftPath(userDataPath),

diff --git a/package.json b/package.json

index 5755fec..86125ba 100644

index 31399e645..05fc46b8b 100644

--- a/package.json

+++ b/package.json

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

@@ -156,7 +156,6 @@

     "dashdash": "2.0.0",

     "direction": "1.0.4",

     "emoji-datasource": "16.0.0",
@@ -57,18 +57,11 @@ index 5755fec..86125ba 100644 
     "emoji-regex": "10.4.0",

     "encoding": "0.1.13",

     "fabric": "4.6.0",

@@ -649,4 +648,4 @@

       "sticker-creator/dist/**"

     ]

   }

-}

+}

\ No newline at end of file

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:

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

index 223557f67..2250b619d 100644

--- a/pnpm-lock.yaml

+++ b/pnpm-lock.yaml

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

       emoji-datasource:

         specifier: 16.0.0

         version: 16.0.0
@@ -78,7 +71,7 @@ index b162101a8..82ee9d67e 100644 
       emoji-regex:

         specifier: 10.4.0

         version: 10.4.0

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

@@ -5835,9 +5832,6 @@ packages:

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

     engines: {node: '>=12'}
@@ -88,7 +81,7 @@ index b162101a8..82ee9d67e 100644 
   emoji-datasource@16.0.0:

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

 

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

@@ -17062,8 +17056,6 @@ snapshots:

 

   emittery@0.13.1: {}
@@ -98,9 +91,9 @@ index b162101a8..82ee9d67e 100644 
 

   emoji-regex@10.4.0: {}

diff --git 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

index 1cc4bb43c..a6444101a 100644

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

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

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

 $emoji-sprite-sheet-grid-item-count: 62;
@@ -124,10 +117,10 @@ index ea029fd5b..0e3563b4f 100644 
   background-repeat: no-repeat;

 }

 

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

index ddb30bf6d..5fc39339b 100644

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

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

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

index ea031e9a8..3d760a43e 100644

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

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

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

   emoji: EmojiVariantData,

   size: number | undefined

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

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

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "ringrtc";

  version = "2.59.0";

  version = "2.59.2";



  src = fetchFromGitHub {

    owner = "signalapp";

    repo = "ringrtc";

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

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

    hash = "sha256-PpfGjeBSYus4yo6eC1PjRaGRhOOKAg2EgDw3AMEwR1I=";

  };



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

  cargoHash = "sha256-ex0/RA5wwSId6Pgi9y62KG42vBs3DxWcGso6Qk9iRlU=";



  preConfigure = ''

    # Check for matching webrtc version