signal-desktop-from-src: enable updateScript
and update 7.34.0 -> 7.35.0
This commit is contained in:
@@ -20,7 +20,6 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
# optionally, build this *mostly* from source (deps remain vendored), to allow e.g. for patching.
|
# optionally, build this *mostly* from source (deps remain vendored), to allow e.g. for patching.
|
||||||
# but the from-src package lacks an updateScript, so mantainance is high.
|
|
||||||
packageUnwrapped = pkgs.signal-desktop-from-src;
|
packageUnwrapped = pkgs.signal-desktop-from-src;
|
||||||
|
|
||||||
# or use the binary version:
|
# or use the binary version:
|
||||||
|
@@ -63,7 +63,6 @@
|
|||||||
# - compiling x64 -> arm64 is supported, but arm64 -> arm64 is *not*
|
# - compiling x64 -> arm64 is supported, but arm64 -> arm64 is *not*
|
||||||
# - the referenced file is a 13 MB ELF: /nix/store/7hb6840x2f10zpm3d5ccj3kr3vaf93n5-signal-desktop-6.36.0/lib/Signal/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node
|
# - the referenced file is a 13 MB ELF: /nix/store/7hb6840x2f10zpm3d5ccj3kr3vaf93n5-signal-desktop-6.36.0/lib/Signal/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node
|
||||||
# - not in crates.io
|
# - not in crates.io
|
||||||
# - TODO: simplest test would be to just copy this out of nixpkgs' signal-desktop
|
|
||||||
#
|
#
|
||||||
#### webrtc:
|
#### webrtc:
|
||||||
# - nothing much in nixpkgs cites "signalapp", so i probably have to do this manually
|
# - nothing much in nixpkgs cites "signalapp", so i probably have to do this manually
|
||||||
@@ -74,9 +73,10 @@
|
|||||||
#
|
#
|
||||||
# HOW TO UPDATE
|
# HOW TO UPDATE
|
||||||
# - `./scripts/update sane.signal-desktop-from-src`
|
# - `./scripts/update sane.signal-desktop-from-src`
|
||||||
|
# if using nixpkgs' prebuilds, that's all! else:
|
||||||
# - check signal-desktop's package.json for new ringrtc <repo:signalapp/Signal-Desktop:package.json>
|
# - check signal-desktop's package.json for new ringrtc <repo:signalapp/Signal-Desktop:package.json>
|
||||||
# - if sqlcipher fails then update sqlcipherTarball url/hash (rare)
|
# - if sqlcipher fails then update sqlcipherTarball url/hash (rare)
|
||||||
# errors which can be safely ignored:
|
# build errors which can be safely ignored:
|
||||||
# - "Error: Could not detect abi for version 30.1.1 and runtime electron. Updating "node-abi" might help solve this issue if it is a new release of electron"
|
# - "Error: Could not detect abi for version 30.1.1 and runtime electron. Updating "node-abi" might help solve this issue if it is a new release of electron"
|
||||||
# - <https://github.com/signalapp/Signal-Desktop/pull/6889>
|
# - <https://github.com/signalapp/Signal-Desktop/pull/6889>
|
||||||
|
|
||||||
@@ -108,6 +108,7 @@
|
|||||||
libxslt,
|
libxslt,
|
||||||
makeShellWrapper,
|
makeShellWrapper,
|
||||||
mesa,
|
mesa,
|
||||||
|
nix-update-script,
|
||||||
nspr,
|
nspr,
|
||||||
nss,
|
nss,
|
||||||
pango,
|
pango,
|
||||||
@@ -176,17 +177,17 @@ let
|
|||||||
in
|
in
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
pname = "signal-desktop-from-src";
|
pname = "signal-desktop-from-src";
|
||||||
version = "7.34.0";
|
version = "7.35.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "signalapp";
|
owner = "signalapp";
|
||||||
repo = "Signal-Desktop";
|
repo = "Signal-Desktop";
|
||||||
leaveDotGit = true; # signal calculates the release date via `git`
|
leaveDotGit = true; # signal calculates the release date via `git`
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-DpjTnjpUFEahIWTuZT4w3gtVJacc5ruMqDIAA8NbLog=";
|
hash = "sha256-5KMlSCCIea3beDnqsUT6ohbQYkIFHFUDfx7hkVOihR4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-YyCjZO0gjxU8+AO0K77N3Hh/S/h1z3Jyc1QmZZ2zY3U=";
|
npmDepsHash = "sha256-OZQlRnnlq4zlmDjqZsPLj3PpzqTrCAGLXGFisMPetBU=";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# ./debug.patch
|
# ./debug.patch
|
||||||
@@ -292,8 +293,6 @@ buildNpmPackage rec {
|
|||||||
# patchShebangs --build --update node_modules/{bufferutil/node_modules/node-gyp-build/,node-gyp-build,utf-8-validate/node_modules/node-gyp-build}
|
# patchShebangs --build --update node_modules/{bufferutil/node_modules/node-gyp-build/,node-gyp-build,utf-8-validate/node_modules/node-gyp-build}
|
||||||
# patch these out to remove a runtime reference back to the build bash
|
# patch these out to remove a runtime reference back to the build bash
|
||||||
# (better, perhaps, would be for these build scripts to not be included in the asar...)
|
# (better, perhaps, would be for these build scripts to not be included in the asar...)
|
||||||
sed -i 's:#!.*/bin/bash:#!/bin/sh:g' node_modules/@swc/helpers/scripts/gen.sh
|
|
||||||
sed -i 's:#!.*/bin/bash:#!/bin/sh:g' node_modules/@swc/helpers/scripts/generator.sh
|
|
||||||
substituteInPlace node_modules/dashdash/etc/dashdash.bash_completion.in --replace-fail '#!/bin/bash' '#!/bin/sh'
|
substituteInPlace node_modules/dashdash/etc/dashdash.bash_completion.in --replace-fail '#!/bin/bash' '#!/bin/sh'
|
||||||
|
|
||||||
# provide necessities which were skipped as part of --ignore-scripts
|
# provide necessities which were skipped as part of --ignore-scripts
|
||||||
@@ -404,11 +403,14 @@ buildNpmPackage rec {
|
|||||||
inherit ringrtcPrebuild betterSqlitePrebuild;
|
inherit ringrtcPrebuild betterSqlitePrebuild;
|
||||||
# inherit ringrtcPrebuild sqlcipherTarball;
|
# inherit ringrtcPrebuild sqlcipherTarball;
|
||||||
# inherit bettersqlitePatch signal-fts5-extension;
|
# inherit bettersqlitePatch signal-fts5-extension;
|
||||||
updateScript = gitUpdater {
|
# updateScript = gitUpdater {
|
||||||
rev-prefix = "v";
|
# rev-prefix = "v";
|
||||||
ignoredVersions = "beta";
|
# ignoredVersions = "beta";
|
||||||
|
# };
|
||||||
|
updateScript = nix-update-script {
|
||||||
|
# ignore beta versions
|
||||||
|
extraArgs = [ "--version-regex" "v([0-9.]+)" ];
|
||||||
};
|
};
|
||||||
updateWithSuper = false; #< TODO: enable auto-update, but i need a real updateScript for that instead of one which only updates top-level deps
|
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Reference in New Issue
Block a user