Skip to content

Commit 04a0c27

Browse files
tools: update nixpkgs-unstable to 6b5e5b7a6631f065bf6908986990b37d845
PR-URL: #65224 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent d099639 commit 04a0c27

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

‎tools/nix/openssl-matrix.nix‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
pkgs ? import ./pkgs.nix {
3-
config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
3+
config.permittedInsecurePackages = [ ];
44
},
55
}:
66

@@ -11,7 +11,6 @@
1111
# Other OpenSSL variants we want to test for:
1212
inherit (pkgs)
1313
boringssl
14-
openssl_1_1
1514
openssl_3
1615
openssl_3_6
1716
openssl_4_0

‎tools/nix/pkgs-26.05.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
arg:
22
let
33
repo = "https://github.com/NixOS/nixpkgs";
4-
rev = "329c3d2af6d1b618705150ea39f72c15eb4e613e";
4+
rev = "e0c84f9d0ad137f076dc957494f5b39885597d4f";
55
nixpkgs = import (builtins.fetchTarball {
66
url = "${repo}/archive/${rev}.tar.gz";
7-
sha256 = "0hkr1j8mm50gpxd55y85vq85bxxww8rhwf6mkvkrg0qw21dmvlmd";
7+
sha256 = "0mp3pbx4mznxf55mmr5nbrac1r9i38b0dyqpynxiqwcpfhz4kfrq";
88
}) arg;
99
in
1010
# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel

‎tools/nix/pkgs.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
arg:
22
let
33
repo = "https://github.com/NixOS/nixpkgs";
4-
rev = "bcdf747749ad31ab043d6341a18699a8b9b62ef0";
4+
rev = "6b5e5b7a6631f065bf6908986990b37d845f847f";
55
nixpkgs = import (builtins.fetchTarball {
66
url = "${repo}/archive/${rev}.tar.gz";
7-
sha256 = "10vv47y0b3k3aq2l52rqd5qzk50a7jbdcamd8rwc0g02mm6blxn8";
7+
sha256 = "0vi99516bn335vdzcjmvrkff8ikj0brpmjfcfdrjnb8bfd0wlr5j";
88
}) arg;
99
in
1010
# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel

0 commit comments

Comments
 (0)