treewide: move openssl_3 consumers to openssl_3_5

(cherry picked from commit 7088afe070)
This commit is contained in:
Adam C. Stephens
2026-09-17 11:32:20 -04:00
parent 5ed4840cab
commit 1b5659064d
7 changed files with 15 additions and 20 deletions

View File

@@ -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

View File

@@ -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=";

View File

@@ -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

View File

@@ -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"

View File

@@ -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

View File

@@ -36,7 +36,7 @@ buildFHSEnv {
libgcc.lib
krb5.lib
lttng-ust.out
openssl_3.out
openssl_3_5.out
icu76
plasticscm-theme

View File

@@ -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=";