diff --git a/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch new file mode 100644 index 000000000000..103ee8af45b6 --- /dev/null +++ b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch @@ -0,0 +1,14 @@ +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 + cargo_env['RUSTFLAGS'] += ' --cfg aes_armv8' +- # Strip absolute paths +- for path in build_helpers.rust_paths_to_remap(): +- cargo_env['RUSTFLAGS'] += f' --remap-path-prefix {path}=' + + # If set (below), will post-process the build library using this instead of just `cp`-ing it. + objcopy = None diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index 00bfe375f805..3d2aee9a4498 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -24,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.70.0"; + version = "0.72.1"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-6CBhLvD0UflLzJHAMB21wSH8MWTUNx0uPdqOUo/Eq44="; + hash = "sha256-A8EAHHcBFSD4ZlvFig64g4+eoZQCuqE/qv509hA3I4s="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4bSPPf16nUQTl6INa3mLhPIe8iiFfpPw1E5fpNvnKqs="; + cargoHash = "sha256-+vJrywIi/RcGGGns42XlN6S63RBil3fB4XByTLsaFVc="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-djk+YGZ/eUq6MXjUEE47bgKnQlUSuaoUPx8hUMtjvyQ="; + hash = "sha256-ZD0ZN2b7KReGbnvarqvGpOlQ5TsJfnaHmmOWQ42Y48E="; }; nativeBuildInputs = [ @@ -56,9 +56,12 @@ rustPlatform.buildRustPackage (finalAttrs: { env.BORING_BSSL_PATH = "${boringssl-wrapper}"; env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; - patchPhase = '' - runHook prePatch - + patches = [ + # This is used to strip absolute paths of dependencies to avoid leaking info about build machine. Nix builders + # already solve this problem by chrooting os this is not needed. + ./dont-strip-absolute-paths.patch + ]; + postPatch = '' substituteInPlace node/binding.gyp \ --replace-fail "'--out-dir', '<(PRODUCT_DIR)/'," \ "'--out-dir', '$out/lib/<(NODE_OS_NAME)-<(target_arch)/'," \ @@ -68,8 +71,6 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace node/build_node_bridge.py \ --replace-fail "dst_base = 'libsignal_client_%s_%s' % (node_os_name, node_arch)" \ "dst_base = '@signalapp+libsignal-client'" - - runHook postPatch ''; buildPhase = '' diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 8cbe760f89e5..10c160447c3e 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -3,7 +3,7 @@ lib, nodejs_22, pnpm_10, - electron_35, + electron_36, python3, makeWrapper, callPackage, @@ -19,7 +19,7 @@ let nodejs = nodejs_22; pnpm = pnpm_10.override { inherit nodejs; }; - electron = electron_35; + electron = electron_36; libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; }; signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; }; @@ -48,13 +48,13 @@ let ''; }); - version = "7.54.0"; + version = "7.56.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-dv1Yi7gSd7kY3MSrsPjcaf2hAEq6Y+XoWtlBfvd86ac="; + hash = "sha256-BrgBlDEgb08oX7Mh/P4nuoM+dkSDpB45zOtDNMYeZr0="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -64,7 +64,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname src version; - hash = "sha256-TuPyRVNFIlR0A4YHMpQsQ6m+lm2fsp79FzQ1P5qqjIc="; + hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0="; }; strictDeps = true; @@ -116,15 +116,15 @@ stdenv.mkDerivation (finalAttrs: { ; hash = if withAppleEmojis then - "sha256-Kdg0+kLEDFobWEEhJgKuaou/pYwn1dTugye7OcMYfEQ=" + "sha256-RP3d1t4bbvehdCDSL3bHrlJEnn65TDViI5jVjSiuJw8=" else - "sha256-cit/Hn7L6qmfIJCDF2wlx/4aKygRYy+zvBQGX6Mg+og="; + "sha256-KJvc+kVcwRKsUVW3lK7fPXUSqDQlJFPbYAzQjhFtfoU="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1747170390; + SOURCE_DATE_EPOCH = 1748456277; }; preBuild = '' diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index 782c518ea443..ee08a2da289c 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.51.0"; + version = "2.52.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-PLrGLW6pDoCNpbWASxAqockAJRoeBrkBdxNOHYrQu4s="; + hash = "sha256-Ao1mFJYPnV3lfg4SERwq4dGnBhOVI9pwsqPAsUtV/iY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-u38VOV2xdNG1WFox+SWT9ejJD1TjK0yAI6lCB9r75iY="; + cargoHash = "sha256-mO9t4ZDDM5Y9cMkmdrYrdGYukN1xfGogPSNq+S1t4Us="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix index 225876e18e7c..6f53f67100ca 100644 --- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "node-sqlcipher"; - version = "2.0.1"; + version = "2.0.3"; src = fetchFromGitHub { owner = "signalapp"; repo = "node-sqlcipher"; tag = "v${finalAttrs.version}"; - hash = "sha256-15t2HuEYdCxShK703/z3bb1VCgSNpziaK5+wM3TqSHg="; + hash = "sha256-H5/+XcXnINRL5BWItWx6YaPP46+k1xTbyfDqHPCRDXk="; }; pnpmDeps = pnpm.fetchDeps { diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index 4e94f9df5248..7207ea4e2d9d 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -1,10 +1,10 @@ { "src": { "args": { - "hash": "sha256-yomovlwRmrzsN+dvmUgOM6pzBTH41QuHQXnEJBhQglY=", + "hash": "sha256-AFMJmIo7O4fYrVWABciQphTxHQSj4CdfhluIIPpPWAw=", "owner": "signalapp", "repo": "webrtc", - "tag": "6998b" + "tag": "6998c" }, "fetcher": "fetchFromGitHub" },