From f8c5ffa59f340ae03b339e6db75262cd859edc9d Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 20 Nov 2024 16:43:14 +0100
Subject: [PATCH] signal-desktop-beta: drop

The beta increases the complexity of the signal-desktop package for
maintainers and releases of signal-desktop happen very frequently.
---
 .../instant-messengers/signal-desktop/default.nix         | 5 -----
 .../signal-desktop/signal-desktop-beta.nix                | 8 --------
 .../instant-messengers/signal-desktop/update.sh           | 6 ------
 pkgs/top-level/aliases.nix                                | 1 +
 pkgs/top-level/all-packages.nix                           | 2 +-
 5 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 45f93f97f245..821506747bd8 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -7,9 +7,4 @@
       callPackage ./signal-desktop-darwin.nix { }
     else
       callPackage ./signal-desktop.nix { };
-  signal-desktop-beta = (callPackage ./signal-desktop-beta.nix { }).overrideAttrs (old: {
-    meta = old.meta // {
-      platforms = [ "x86_64-linux" ];
-    };
-  });
 }
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
deleted file mode 100644
index 2b91efdca61a..000000000000
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage }:
-callPackage ./generic.nix { } rec {
-  pname = "signal-desktop-beta";
-  dir = "Signal Beta";
-  version = "7.34.0-beta.2";
-  url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
-  hash = "sha256-fwSZ0j2iHJUhRc2MZY5Cj6guoAST3XfrXFnj8uUCl9k=";
-}
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh b/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh
index 1c5f2386da29..a2d0e2aae340 100755
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh
@@ -33,12 +33,6 @@ signal-desktop)
     --override-filename "$SCRIPT_DIR/signal-desktop-darwin.nix" \
     signal-desktop
   ;;
-signal-desktop-beta)
-  latestTagBeta=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases | jq -r ".[0].tag_name")
-  latestVersionBeta="$(expr "$latestTagBeta" : 'v\(.*\)')"
-  echo "Updating signal-desktop-beta for x86_64-linux"
-  nix-update --version "$latestVersionBeta" --system x86_64-linux --override-filename "$SCRIPT_DIR/signal-desktop-beta.nix" signal-desktop-beta
-  ;;
 *)
   echo "Unknown attr path $UPDATE_NIX_ATTR_PATH"
   ;;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5f6f3ad0eaa6..a0bd1bb7e82d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1101,6 +1101,7 @@ mapAliases {
   sexp = sexpp; # Added 2023-07-03
   inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17
   shipyard = jumppad; # Added 2023-06-06
+  signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain";
   shout = nodePackages.shout; # Added unknown; moved 2024-10-19
   sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
   SkypeExport = skypeexport; # Added 2024-06-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16b6aa095873..24263e47ccfa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5289,7 +5289,7 @@ with pkgs;
 
   sigil = libsForQt5.callPackage ../applications/editors/sigil { };
 
-  inherit (callPackage ../applications/networking/instant-messengers/signal-desktop {}) signal-desktop signal-desktop-beta;
+  inherit (callPackage ../applications/networking/instant-messengers/signal-desktop {}) signal-desktop;
 
   slither-analyzer = with python3Packages; toPythonApplication slither-analyzer;