diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-14 12:01:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-14 12:01:18 +0000 |
commit | 87a5d42cfa3a3f1673e7ef64d64fbd1ad44b9c66 (patch) | |
tree | 5c8200cccf70924f1f57b4f3171589387ad96952 /pkgs/applications/networking | |
parent | 56d8697a63bbab709c4ca27cf800fc0cb49a0cb7 (diff) | |
parent | 9f26152cc3d7e90c7f2a5908de4d1aab069ed6ce (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking')
6 files changed, 29 insertions, 41 deletions
diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 2701db12e61d5..fc2f9cc206606 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-router"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-Iwo+I1EfclkF4FL8QM3xGkIFxakmelI+hSUepLwfFSw="; + hash = "sha256-5aOAQ5kRnNsCn5EH9RKoeEfcFB3g59eqYIdSNjQxdjM="; }; - vendorHash = "sha256-VjPesQ27GcwnFQrNI+VYzJ4/aahcjASbfMi//Zs/KLM="; + vendorHash = "sha256-5aGcDO+dV9XinH0vw6uNB0mnWuFQcyLhRB7zYr+sRfg="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ee0d92436ee32..94b7fe50c5a94 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -167,9 +167,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.7.4"; - hash = "sha256-LF8lFDZtDowHqa0z/TCVKznxn15Msha/af8p/w0bI1k="; - vendorHash = "sha256-DI4YTjdFFvfby8ExEY3KoK4J9YKK5LPpMbelzFMDVVs="; + version = "1.7.5"; + hash = "sha256-k/ugXlHK7lEKfOpSBXQNUdcq26rVVdjo53U+7ChJLIc="; + vendorHash = "sha256-5sCf65gFpI3y+qwDYvD08OZHNsDMg2IuDL65NMsLQ4Y="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 19ea95b452ffe..8cb54de82410a 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.59"; + "version" = "1.11.60"; "hashes" = { - "desktopSrcHash" = "sha256-dasRfLsa8Jc6Vyay02f6IytjvYs3xbSFB2fU5bxi79E="; - "desktopYarnHash" = "00jvid2li68ji1xkbbpdiy39fzvhmw7ypnr3x82wbqqafkc5vil6"; - "webSrcHash" = "sha256-UpRRTPrNiFsqXKD072jXVIqS8ZiuKt/BUzx1oja90VA="; - "webYarnHash" = "1s9lp2dd3slpp70rrbmsbmzphm6fwglnrqwk9fgylzqa1ds8nfjd"; + "desktopSrcHash" = "sha256-r4Kcf8iBACHSiUceHq5T2BswGqgVkMBm/5ANq0smA20="; + "desktopYarnHash" = "16psxfai8dyckm4xwrg5czv6l4163x2nlqqcdgly6axabllgacj1"; + "webSrcHash" = "sha256-k+jtTUuLaux2HSDsLT2ktcShQTNNnDe0e3Icoa31WdE="; + "webYarnHash" = "0rgdfdkri7mxs7rvp3rwbnijbcs5chc02smw1kbb00j6qzf6k3dj"; }; } diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index f6004c2a3faee..891dfe5d8e9e4 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -1,7 +1,7 @@ { lib, callPackage }: # For detailed information about the Citrix source-tarball, please refer to the OEM -# reference guide: https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/ +# 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; @@ -13,7 +13,7 @@ let Citrix Workspace at version ${x} is not supported anymore! Actively supported releases are listed here: - https://www.citrix.com/support/product-lifecycle/milestones/receiver.html + https://www.citrix.com/support/product-lifecycle/workspace-app.html '')) unsupportedVersions ); diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 5fb25d1cc93c5..f751f3237e412 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { ${mkWrappers copyCert extraCerts} - # See https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/reference-information/#library-files + # See https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide/reference-information/#library-files # Those files are fallbacks to support older libwekit.so and libjpeg.so rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so || true rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so || true @@ -237,7 +237,7 @@ stdenv.mkDerivation rec { license = licenses.unfree; description = "Citrix Workspace"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ] ++ optional (versionOlder version "24") "i686-linux"; maintainers = with maintainers; [ michaeladler ]; inherit homepage; }; diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 3d93911685140..00c1ff878b960 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -12,30 +12,8 @@ let # for Linux. # # 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.02.0" = { - major = "23"; - minor = "2"; - patch = "0"; - x64hash = "d0030a4782ba4b2628139635a12a7de044a4eb36906ef1eadb05b6ea77c1a7bc"; - x86hash = "39228fc8dd69adca4e56991c1ebc0832fec183c3ab5abd2d65c66b39b634391b"; - x64suffix = "10"; - x86suffix = "10"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest6.html"; - }; - - "23.07.0" = { - major = "23"; - minor = "7"; - patch = "0"; - x64hash = "d4001226e79b5353fc74da4c8ed4f6295c1859fe18142cb5de345a3c7ae48168"; - x86hash = "4a7da238286ae28d7baf0fefa1e7e09d077c8bc56c2bf7bec00da42c331bee59"; - x64suffix = "17"; - x86suffix = "17"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest21.html"; - }; - "23.09.0" = { major = "23"; minor = "9"; @@ -55,17 +33,27 @@ let x86hash = "65b8c144e51b5bd78b98ae69e0fa76d6c020a857d74fd5254be49492527072b6"; x64suffix = "82"; x86suffix = "82"; - 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-latest10.html"; }; + "24.02.0" = { + major = "24"; + minor = "2"; + patch = "0"; + x64hash = "eaeb5d3bd079d4e5c9707da67f5f7a25cb765e19c36d01861290655dbf2aaee4"; + x86hash = ""; + x64suffix = "65"; + 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 # 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/milestones/receiver.html - unsupportedVersions = [ ]; + # https://www.citrix.com/support/product-lifecycle/workspace-app.html + unsupportedVersions = [ "23.02.0" "23.07.0" ]; in { inherit supportedVersions unsupportedVersions; } |