From 919bcf965c06626dfb66415bc0e3292806bb9bf7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 25 Nov 2025 13:40:32 +0100 Subject: [PATCH] citrix_workspace: remove unused code for unsupported versions These unused version attributes were not imported into all-packages.nix anymore anyway, so remove them entirely. --- .../remote/citrix-workspace/default.nix | 22 ++++--------------- .../remote/citrix-workspace/sources.nix | 15 +------------ 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index c6bd8596920b..22b7ea21154e 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -4,24 +4,10 @@ # reference guide: https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide let - inherit (callPackage ./sources.nix { }) supportedVersions unsupportedVersions; + supportedVersions = callPackage ./sources.nix { }; toAttrName = x: "citrix_workspace_${builtins.replaceStrings [ "." ] [ "_" ] x}"; - - unsupported = lib.listToAttrs ( - map ( - x: - lib.nameValuePair (toAttrName x) (throw '' - Citrix Workspace at version ${x} is not supported anymore! - - Actively supported releases are listed here: - https://www.citrix.com/support/product-lifecycle/workspace-app.html - '') - ) unsupportedVersions - ); - - supported = lib.mapAttrs' ( - attr: versionInfo: lib.nameValuePair (toAttrName attr) (callPackage ./generic.nix versionInfo) - ) supportedVersions; in -supported // unsupported +lib.mapAttrs' ( + attr: versionInfo: lib.nameValuePair (toAttrName attr) (callPackage ./generic.nix versionInfo) +) supportedVersions diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 597d24487271..e7bceff1e805 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -106,18 +106,5 @@ let homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; - - # Retain attribute-names for abandoned versions of Citrix workspace to - # provide a meaningful error-message if it's attempted to use such an old one. - # - # The lifespans of Citrix products can be found here: - # https://www.citrix.com/support/product-lifecycle/workspace-app.html - unsupportedVersions = [ - "23.02.0" - "23.07.0" - "23.09.0" - ]; in -{ - inherit supportedVersions unsupportedVersions; -} +supportedVersions