From e9d0f34404f83e300aea35700a6e0e184a068f96 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 16 Apr 2025 14:43:39 +0200 Subject: [PATCH] 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. --- doc/release-notes/rl-2505.section.md | 2 ++ .../by-name/si/signal-desktop-bin/generic.nix | 2 +- .../signal-desktop-aarch64.nix | 2 +- .../signal-desktop-darwin.nix | 2 +- .../si/signal-desktop-bin/signal-desktop.nix | 2 +- pkgs/by-name/si/signal-desktop-bin/update.sh | 6 +++--- .../libsignal-node.nix | 0 .../package.nix | 2 +- .../replace-apple-emoji-with-noto-emoji.patch | 0 .../ringrtc.nix | 0 .../signal-sqlcipher.nix | 0 .../update.sh | 20 +++++++++---------- .../webrtc-sources.json | 0 .../webrtc.nix | 0 pkgs/top-level/aliases.nix | 2 +- 15 files changed, 21 insertions(+), 19 deletions(-) rename pkgs/by-name/si/{signal-desktop-source => signal-desktop}/libsignal-node.nix (100%) rename pkgs/by-name/si/{signal-desktop-source => signal-desktop}/package.nix (99%) rename pkgs/by-name/si/{signal-desktop-source => signal-desktop}/replace-apple-emoji-with-noto-emoji.patch (100%) rename pkgs/by-name/si/{signal-desktop-source => signal-desktop}/ringrtc.nix (100%) rename pkgs/by-name/si/{signal-desktop-source => signal-desktop}/signal-sqlcipher.nix (100%) rename pkgs/by-name/si/{signal-desktop-source => signal-desktop}/update.sh (78%) rename pkgs/by-name/si/{signal-desktop-source => signal-desktop}/webrtc-sources.json (100%) rename pkgs/by-name/si/{signal-desktop-source => signal-desktop}/webrtc.nix (100%) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 428adcd4d562..c7ec7814360b 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -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} diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix index 9478ac430f02..ea6e150ef94d 100644 --- a/pkgs/by-name/si/signal-desktop-bin/generic.nix +++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix @@ -280,7 +280,7 @@ stdenv.mkDerivation rec { emily Gliczy ]; - mainProgram = pname; + mainProgram = "signal-desktop"; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix index 9280347b8965..181b6d7b53b4 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix @@ -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"; diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix index b0ab336efd86..046a290cdf1e 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix @@ -5,7 +5,7 @@ _7zz, }: stdenv.mkDerivation (finalAttrs: { - pname = "signal-desktop"; + pname = "signal-desktop-bin"; version = "7.47.0"; src = fetchurl { diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix index 3f64c17b254a..a92b85e3db07 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { } rec { - pname = "signal-desktop"; + pname = "signal-desktop-bin"; version = "7.47.0"; libdir = "opt/Signal"; diff --git a/pkgs/by-name/si/signal-desktop-bin/update.sh b/pkgs/by-name/si/signal-desktop-bin/update.sh index dc2c6864cec6..cca3e29ae12c 100755 --- a/pkgs/by-name/si/signal-desktop-bin/update.sh +++ b/pkgs/by-name/si/signal-desktop-bin/update.sh @@ -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" diff --git a/pkgs/by-name/si/signal-desktop-source/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix similarity index 100% rename from pkgs/by-name/si/signal-desktop-source/libsignal-node.nix rename to pkgs/by-name/si/signal-desktop/libsignal-node.nix diff --git a/pkgs/by-name/si/signal-desktop-source/package.nix b/pkgs/by-name/si/signal-desktop/package.nix similarity index 99% rename from pkgs/by-name/si/signal-desktop-source/package.nix rename to pkgs/by-name/si/signal-desktop/package.nix index 0d8cdef5eaac..2c32b9d68415 100644 --- a/pkgs/by-name/si/signal-desktop-source/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -103,7 +103,7 @@ let }); in stdenv.mkDerivation (finalAttrs: { - pname = "signal-desktop-source"; + pname = "signal-desktop"; inherit src version; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch similarity index 100% rename from pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch rename to pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch diff --git a/pkgs/by-name/si/signal-desktop-source/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix similarity index 100% rename from pkgs/by-name/si/signal-desktop-source/ringrtc.nix rename to pkgs/by-name/si/signal-desktop/ringrtc.nix diff --git a/pkgs/by-name/si/signal-desktop-source/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix similarity index 100% rename from pkgs/by-name/si/signal-desktop-source/signal-sqlcipher.nix rename to pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix diff --git a/pkgs/by-name/si/signal-desktop-source/update.sh b/pkgs/by-name/si/signal-desktop/update.sh similarity index 78% rename from pkgs/by-name/si/signal-desktop-source/update.sh rename to pkgs/by-name/si/signal-desktop/update.sh index 4614a7222861..d4dca6e74ef8 100755 --- a/pkgs/by-name/si/signal-desktop-source/update.sh +++ b/pkgs/by-name/si/signal-desktop/update.sh @@ -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 diff --git a/pkgs/by-name/si/signal-desktop-source/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json similarity index 100% rename from pkgs/by-name/si/signal-desktop-source/webrtc-sources.json rename to pkgs/by-name/si/signal-desktop/webrtc-sources.json diff --git a/pkgs/by-name/si/signal-desktop-source/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix similarity index 100% rename from pkgs/by-name/si/signal-desktop-source/webrtc.nix rename to pkgs/by-name/si/signal-desktop/webrtc.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6671271001d2..6a5124046aeb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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