From e4032e1e817da9a06f16218fff1273d177abb4ac Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 20 Jun 2025 16:11:40 -0500 Subject: [PATCH 1/4] citrix-workspace: fix libxml2 build incompatibility Breaking ABI change for libxml2 recently, need to override to use supported libxml version. Signed-off-by: Austin Horstman --- .../networking/remote/citrix-workspace/generic.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index e794bbb218549..35f7f893a8d36 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -55,6 +55,7 @@ libsecret, libcanberra-gtk3, sane-backends, + fetchurl, homepage, version, @@ -87,6 +88,14 @@ let ''; }; + libxml2' = libxml2.overrideAttrs rec { + version = "2.13.8"; + src = fetchurl { + url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; + hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; + }; + }; + in stdenv.mkDerivation rec { @@ -157,7 +166,7 @@ stdenv.mkDerivation rec { libsecret libsoup_2_4 libvorbis - libxml2 + libxml2' llvmPackages.libunwind libgbm nspr From 1c25ad4c5d9750a0e51ecf8b37c122255b59d2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 24 Jun 2025 14:21:59 -0400 Subject: [PATCH 2/4] citrix_workspace: remove versions <= 23.09 --- .../networking/remote/citrix-workspace/sources.nix | 11 +---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index d9de08380bb33..ff7117e9e7ff5 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -28,16 +28,6 @@ let # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/ # x86 is unsupported past 23.11, see https://docs.citrix.com/en-us/citrix-workspace-app-for-linux/deprecation supportedVersions = lib.mapAttrs mkVersionInfo { - "23.09.0" = { - major = "23"; - minor = "9"; - patch = "0"; - x64hash = "7b06339654aa27258d6dfa922828b43256e780b282d07109f452246c7aa27514"; - x86hash = "95436fb289602cf31c65b7df89da145fc170233cb2e758a2f11116f15b57d382"; - x64suffix = "24"; - x86suffix = "24"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest9.html"; - }; "23.11.0" = { major = "23"; @@ -114,6 +104,7 @@ let unsupportedVersions = [ "23.02.0" "23.07.0" + "23.09.0" ]; in { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03fb17ebc4568..a5fa720ed543f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2548,7 +2548,6 @@ with pkgs; circus = with python310Packages; toPythonApplication circus; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) - citrix_workspace_23_09_0 citrix_workspace_23_11_0 citrix_workspace_24_02_0 citrix_workspace_24_05_0 From 1386a8ff9490f1ef3646f83d6e1d3015044a5c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 24 Jun 2025 14:22:30 -0400 Subject: [PATCH 3/4] citrix_workspace: update homepages --- .../networking/remote/citrix-workspace/sources.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index ff7117e9e7ff5..6bcf1307deda1 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -59,7 +59,7 @@ let x86hash = ""; x64suffix = "76"; x86suffix = ""; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest1.html"; }; "24.08.0" = { @@ -70,7 +70,7 @@ let x86hash = ""; x64suffix = "98"; x86suffix = ""; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2408.html"; }; "24.11.0" = { @@ -81,8 +81,9 @@ let x86hash = ""; x64suffix = "85"; x86suffix = ""; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest13.html"; }; + "25.03.0" = { major = "25"; minor = "03"; @@ -91,7 +92,7 @@ let x86hash = ""; x64suffix = "66"; x86suffix = ""; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2503.html"; }; }; From 6f311e1e06120538142ee4e6a7385301b71bdf75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 24 Jun 2025 14:24:55 -0400 Subject: [PATCH 4/4] citrix_workspace: 25.03.0.66 -> 25.05.0.44 --- .../networking/remote/citrix-workspace/sources.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 6bcf1307deda1..597d244872716 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -95,6 +95,16 @@ let homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2503.html"; }; + "25.05.0" = { + major = "25"; + minor = "05"; + patch = "0"; + x64hash = "0fwqsxggswms40b5k8saxpm1ghkxppl27x19w8jcslq1f0i1fwqx"; + x86hash = ""; + x64suffix = "44"; + x86suffix = ""; + 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5fa720ed543f..cdd826124d457 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2554,8 +2554,9 @@ with pkgs; citrix_workspace_24_08_0 citrix_workspace_24_11_0 citrix_workspace_25_03_0 + citrix_workspace_25_05_0 ; - citrix_workspace = citrix_workspace_25_03_0; + citrix_workspace = citrix_workspace_25_05_0; cmst = libsForQt5.callPackage ../tools/networking/cmst { };