From 1b5659064d65d526f3b3ebc3ef7351fcdaf7a4d5 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 17 Sep 2026 11:32:20 -0400
Subject: [PATCH] treewide: move openssl_3 consumers to openssl_3_5

(cherry picked from commit 7088afe0703103e05a30b58f69e65540f425cf38)
---
 pkgs/by-name/bi/binwalk/package.nix             |  4 ++--
 pkgs/by-name/fo/fortanix-sgx-tools/package.nix  |  4 ++--
 pkgs/by-name/in/intune-portal/package.nix       | 17 ++++++-----------
 pkgs/by-name/in/intune-portal/update.sh         |  2 +-
 .../pl/plasticscm-client-core/package.nix       |  2 +-
 .../pl/plasticscm-client-gui/package.nix        |  2 +-
 pkgs/by-name/sg/sgxs-tools/package.nix          |  4 ++--
 7 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix
index 03dce12fdf09..3ea745e485d4 100644
--- a/pkgs/by-name/bi/binwalk/package.nix
+++ b/pkgs/by-name/bi/binwalk/package.nix
@@ -14,7 +14,7 @@
   lzo,
   lzop,
   lz4,
-  openssl_3,
+  openssl_3_5,
   pkg-config,
   python3,
   rustPlatform,
@@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     dtc
     fontconfig
     lzo
-    openssl_3
+    openssl_3_5
     python3.pkgs.python-lzo
     ucl
     unzip
diff --git a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
index 1283f597381f..1a8534f365e6 100644
--- a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
+++ b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
@@ -3,7 +3,7 @@
   fetchCrate,
   rustPlatform,
   pkg-config,
-  openssl_3,
+  openssl_3_5,
   protobuf,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     pkg-config
     protobuf
   ];
-  buildInputs = [ openssl_3 ];
+  buildInputs = [ openssl_3_5 ];
   src = fetchCrate {
     inherit (finalAttrs) pname version;
     hash = "sha256-IVkmZs3imzj8uN8kqEzN/Oio3H+Nqzu8ORjARNx1TpQ=";
diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix
index 96c24cc06aef..49cc6b0d9784 100644
--- a/pkgs/by-name/in/intune-portal/package.nix
+++ b/pkgs/by-name/in/intune-portal/package.nix
@@ -6,7 +6,7 @@
   libuuid,
   libx11,
   curlMinimal,
-  openssl_3,
+  openssl_3_5,
   libsecret,
   webkitgtk_4_1,
   libsoup_3,
@@ -22,18 +22,13 @@
   dbus,
   nixosTests,
 }:
-let
-  curlMinimal_openssl_3 = curlMinimal.override {
-    openssl = openssl_3;
-  };
-in
 stdenv.mkDerivation rec {
   pname = "intune-portal";
-  version = "1.2603.31-noble";
+  version = "1.2607.4-resolute";
 
   src = fetchurl {
-    url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
-    hash = "sha256-0braaXnRa04CUQdJx0ZFwe5qfjsJNzTtGqaKQV5Z6Yw=";
+    url = "https://packages.microsoft.com/ubuntu/26.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
+    hash = "sha256-WXgzLH7umvB75obzTGYW+EZ3eE1zxdIJNFNKcaNY04s=";
   };
 
   nativeBuildInputs = [ dpkg ];
@@ -45,8 +40,8 @@ stdenv.mkDerivation rec {
           stdenv.cc.cc
           libuuid
           libx11
-          curlMinimal_openssl_3
-          openssl_3
+          curlMinimal
+          openssl_3_5
           libsecret
           webkitgtk_4_1
           libsoup_3
diff --git a/pkgs/by-name/in/intune-portal/update.sh b/pkgs/by-name/in/intune-portal/update.sh
index fcb4312f2994..664974708870 100755
--- a/pkgs/by-name/in/intune-portal/update.sh
+++ b/pkgs/by-name/in/intune-portal/update.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p curl gzip dpkg common-updater-scripts
 
-index_file=$(curl -sL https://packages.microsoft.com/ubuntu/24.04/prod/dists/noble/main/binary-amd64/Packages.gz | gzip -dc)
+index_file=$(curl -sL https://packages.microsoft.com/ubuntu/26.04/prod/dists/resolute/main/binary-amd64/Packages.gz | gzip -dc)
 
 latest_version="0"
 
diff --git a/pkgs/by-name/pl/plasticscm-client-core/package.nix b/pkgs/by-name/pl/plasticscm-client-core/package.nix
index a6bb4b0e78df..7bb749def2eb 100644
--- a/pkgs/by-name/pl/plasticscm-client-core/package.nix
+++ b/pkgs/by-name/pl/plasticscm-client-core/package.nix
@@ -29,7 +29,7 @@ buildFHSEnv {
       libz
       krb5.lib
       lttng-ust.out
-      openssl_3.out
+      openssl_3_5.out
       icu76
 
       # Transitive dependencies from the Debian package
diff --git a/pkgs/by-name/pl/plasticscm-client-gui/package.nix b/pkgs/by-name/pl/plasticscm-client-gui/package.nix
index 8e3a57b9e488..1bd0975191ef 100644
--- a/pkgs/by-name/pl/plasticscm-client-gui/package.nix
+++ b/pkgs/by-name/pl/plasticscm-client-gui/package.nix
@@ -36,7 +36,7 @@ buildFHSEnv {
       libgcc.lib
       krb5.lib
       lttng-ust.out
-      openssl_3.out
+      openssl_3_5.out
       icu76
       plasticscm-theme
 
diff --git a/pkgs/by-name/sg/sgxs-tools/package.nix b/pkgs/by-name/sg/sgxs-tools/package.nix
index e80dbf630a52..22f2c960908d 100644
--- a/pkgs/by-name/sg/sgxs-tools/package.nix
+++ b/pkgs/by-name/sg/sgxs-tools/package.nix
@@ -3,7 +3,7 @@
   fetchCrate,
   rustPlatform,
   pkg-config,
-  openssl_3,
+  openssl_3_5,
   protobuf,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     pkg-config
     protobuf
   ];
-  buildInputs = [ openssl_3 ];
+  buildInputs = [ openssl_3_5 ];
   src = fetchCrate {
     inherit (finalAttrs) pname version;
     hash = "sha256-vLbSjDULrYL8emQTha4fhEbr00OlhXNa00QhCKCnWDc=";