Unverified Commit 980f61ac authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #322068 from mweinelt/openssl_1_1-exception 

pkgs/top-level: stop permitting openssl 1.1
parents b4eaf504 b0b4d2d0

pkgs/top-level/release-python.nix

+0 −6
Original line number Diff line number Diff line
@@ -12,12 +12,6 @@ 
  nixpkgsArgs ? { config = {

    allowUnfree = false;

    inHydra = true;

    permittedInsecurePackages = [

      # Keep evaluating home-assistant, which is transitively affected

      # by home-assistant-chip-core consuming OpenSSL 1.1. Affects roughly

      # 800 jobs.

      "openssl-1.1.1w"

    ];

  }; }

}:

pkgs/top-level/release.nix

+0 −8
Original line number Diff line number Diff line
@@ -29,14 +29,6 @@ 
, nixpkgsArgs ? { config = {

    allowUnfree = false;

    inHydra = true;

    permittedInsecurePackages = [

      # *Exceptionally*, those packages will be cached with their *secure* dependents

      # because they will reach EOL in the middle of the 23.05 release

      # and it will be too much painful for our users to recompile them

      # for no real reason.

      # Remove them for 23.11.

      "openssl-1.1.1w"

    ];

  }; }



  # This flag, if set to true, will inhibit the use of `mapTestOn`