signal-desktop-source: rename to signal-desktop
This effectively migrates users of the `signal-desktop` attribute to the from-source build. We confirmed the from source build is also able to parse state produced by the binary version (not just with pretty empty state, but also bigger states with more historical data). Rename the binary variant to `signal-desktop-bin`, consistent with how this is handled in other places in nixpkgs. Also update the pname to reflect that.
This commit is contained in:
parent
32c543a3c6
commit
e9d0f34404
@ -353,6 +353,8 @@
|
||||
|
||||
- In `dovecot` package removed hard coding path to module directory.
|
||||
|
||||
- `signal-desktop` has been migrated to a from source build. No state migration is necessary. In case there's no working source build available (like on Darwin), the the binary build is still available at `signal-desktop-bin`.
|
||||
|
||||
- `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0)
|
||||
|
||||
### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded}
|
||||
|
@ -280,7 +280,7 @@ stdenv.mkDerivation rec {
|
||||
emily
|
||||
Gliczy
|
||||
];
|
||||
mainProgram = pname;
|
||||
mainProgram = "signal-desktop";
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ callPackage }:
|
||||
callPackage ./generic.nix { } {
|
||||
pname = "signal-desktop";
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.47.0-1";
|
||||
|
||||
libdir = "usr/lib64/signal-desktop";
|
||||
|
@ -5,7 +5,7 @@
|
||||
_7zz,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "signal-desktop";
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.47.0";
|
||||
|
||||
src = fetchurl {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ callPackage }:
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop";
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.47.0";
|
||||
|
||||
libdir = "opt/Signal";
|
||||
|
@ -17,17 +17,17 @@ latestBuildAarch64=$(jq '.id' <<< $latestBuildInfoAarch64)
|
||||
latestVersionAarch64=$(jq -r '.source_package.version' <<< $latestBuildInfoAarch64)
|
||||
|
||||
echo "Updating signal-desktop for x86_64-linux"
|
||||
update-source-version signal-desktop "$latestVersion" \
|
||||
update-source-version signal-desktop-bin "$latestVersion" \
|
||||
--system=x86_64-linux \
|
||||
--file="$SCRIPT_DIR/signal-desktop.nix"
|
||||
|
||||
echo "Updating signal-desktop for aarch64-linux"
|
||||
update-source-version signal-desktop "$latestVersionAarch64" "" \
|
||||
update-source-version signal-desktop-bin "$latestVersionAarch64" "" \
|
||||
"https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/$(printf "%08d" $latestBuildAarch64)-signal-desktop/signal-desktop-$latestVersionAarch64.fc42.aarch64.rpm" \
|
||||
--system=aarch64-linux \
|
||||
--file="$SCRIPT_DIR/signal-desktop-aarch64.nix"
|
||||
|
||||
echo "Updating signal-desktop for darwin"
|
||||
update-source-version signal-desktop "$latestVersion" \
|
||||
update-source-version signal-desktop-bin "$latestVersion" \
|
||||
--system=aarch64-darwin \
|
||||
--file="$SCRIPT_DIR/signal-desktop-darwin.nix"
|
||||
|
@ -103,7 +103,7 @@ let
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "signal-desktop-source";
|
||||
pname = "signal-desktop";
|
||||
inherit src version;
|
||||
|
||||
nativeBuildInputs = [
|
@ -32,32 +32,32 @@ sed -E -i "s/(electron_)../\1$electronVersion/" $SCRIPT_DIR/package.nix
|
||||
sed -E -i "s/(SOURCE_DATE_EPOCH = )[0-9]+/\1$releaseEpoch/" $SCRIPT_DIR/package.nix
|
||||
|
||||
sed -E -i "s/(withAppleEmojis \? )false/\1true/" $SCRIPT_DIR/package.nix
|
||||
nix-update signal-desktop-source --subpackage sticker-creator --version="$latestVersion"
|
||||
nix-update signal-desktop --subpackage sticker-creator --version="$latestVersion"
|
||||
sed -E -i "s/(withAppleEmojis \? )true/\1false/" $SCRIPT_DIR/package.nix
|
||||
update-source-version signal-desktop-source \
|
||||
update-source-version signal-desktop \
|
||||
--ignore-same-version \
|
||||
--source-key=pnpmDeps
|
||||
|
||||
update-source-version signal-desktop-source.libsignal-node \
|
||||
update-source-version signal-desktop.libsignal-node \
|
||||
"$libsignalClientVersion"
|
||||
update-source-version signal-desktop-source.libsignal-node \
|
||||
update-source-version signal-desktop.libsignal-node \
|
||||
--ignore-same-version \
|
||||
--source-key=cargoDeps.vendorStaging
|
||||
update-source-version signal-desktop-source.libsignal-node \
|
||||
update-source-version signal-desktop.libsignal-node \
|
||||
--ignore-same-version \
|
||||
--source-key=npmDeps
|
||||
|
||||
update-source-version signal-desktop-source.signal-sqlcipher \
|
||||
update-source-version signal-desktop.signal-sqlcipher \
|
||||
"$signalSqlcipherVersion"
|
||||
update-source-version signal-desktop-source.signal-sqlcipher \
|
||||
update-source-version signal-desktop.signal-sqlcipher \
|
||||
--ignore-same-version \
|
||||
--source-key=cargoDeps.vendorStaging
|
||||
update-source-version signal-desktop-source.signal-sqlcipher \
|
||||
update-source-version signal-desktop.signal-sqlcipher \
|
||||
--ignore-same-version \
|
||||
--source-key=pnpmDeps
|
||||
|
||||
update-source-version signal-desktop-source.ringrtc "$ringrtcVersion"
|
||||
update-source-version signal-desktop-source.ringrtc \
|
||||
update-source-version signal-desktop.ringrtc "$ringrtcVersion"
|
||||
update-source-version signal-desktop.ringrtc \
|
||||
--ignore-same-version \
|
||||
--source-key=cargoDeps.vendorStaging
|
||||
|
@ -1582,7 +1582,7 @@ mapAliases {
|
||||
shipyard = jumppad; # Added 2023-06-06
|
||||
siduck76-st = st-snazzy; # Added 2024-12-24
|
||||
signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain";
|
||||
signal-desktop = lib.warnOnInstantiate "'signal-desktop' has been renamed to 'signal-desktop-bin'; in the future, 'signal-desktop' will point to 'signal-desktop-source'" signal-desktop-bin; # Added 2025-04-01
|
||||
signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16
|
||||
sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
|
||||
shout = nodePackages.shout; # Added unknown; moved 2024-10-19
|
||||
sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
|
||||
|
Loading…
x
Reference in New Issue
Block a user