diff --git a/tools/nix/openssl-matrix.nix b/tools/nix/openssl-matrix.nix index 56cc7d506ad6..66cfb129c432 100644 --- a/tools/nix/openssl-matrix.nix +++ b/tools/nix/openssl-matrix.nix @@ -1,6 +1,6 @@ { pkgs ? import ./pkgs.nix { - config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; + config.permittedInsecurePackages = [ ]; }, }: @@ -11,7 +11,6 @@ # Other OpenSSL variants we want to test for: inherit (pkgs) boringssl - openssl_1_1 openssl_3 openssl_3_6 openssl_4_0 diff --git a/tools/nix/pkgs-26.05.nix b/tools/nix/pkgs-26.05.nix index 7a1167a798d1..daa955f8a6c4 100644 --- a/tools/nix/pkgs-26.05.nix +++ b/tools/nix/pkgs-26.05.nix @@ -1,10 +1,10 @@ arg: let repo = "https://github.com/NixOS/nixpkgs"; - rev = "329c3d2af6d1b618705150ea39f72c15eb4e613e"; + rev = "e0c84f9d0ad137f076dc957494f5b39885597d4f"; nixpkgs = import (builtins.fetchTarball { url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "0hkr1j8mm50gpxd55y85vq85bxxww8rhwf6mkvkrg0qw21dmvlmd"; + sha256 = "0mp3pbx4mznxf55mmr5nbrac1r9i38b0dyqpynxiqwcpfhz4kfrq"; }) arg; in # Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel diff --git a/tools/nix/pkgs.nix b/tools/nix/pkgs.nix index 9b999f68c29c..5032bc381e8c 100644 --- a/tools/nix/pkgs.nix +++ b/tools/nix/pkgs.nix @@ -1,10 +1,10 @@ arg: let repo = "https://github.com/NixOS/nixpkgs"; - rev = "bcdf747749ad31ab043d6341a18699a8b9b62ef0"; + rev = "044bfe75bfe4c7bbe043dc17b5e42ea823b84a09"; nixpkgs = import (builtins.fetchTarball { url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "10vv47y0b3k3aq2l52rqd5qzk50a7jbdcamd8rwc0g02mm6blxn8"; + sha256 = "1sns414dii8jmydcvps6sw5xlwnlzfx61h9ggvnl0kclf9v4q4kw"; }) arg; in # Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel