Merge pull request #195539 from helsinki-systems/upd/openssl_1_1

Changed files
+2 -4
pkgs
development
libraries
openssl
top-level
+2 -2
pkgs/development/libraries/openssl/default.nix
···
openssl_1_1 = common rec {
-
version = "1.1.1q";
-
sha256 = "sha256-15Oc5hQCnN/wtsIPDi5XAxWKSJpyslB7i9Ub+Mj9EMo=";
patches = [
./1.1/nix-ssl-cert-file.patch
···
openssl_1_1 = common rec {
+
version = "1.1.1r";
+
sha256 = "sha256-44k1KuPVrk04WXv4pU8dy2+zyLUPT+WKlLsb9/hdgqA=";
patches = [
./1.1/nix-ssl-cert-file.patch
-2
pkgs/top-level/all-packages.nix
···
krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
inherit (buildPackages.darwin) bootstrap_cmds;
-
# TODO: can be removed once we have 1.20
-
openssl = openssl_1_1;
};
krb5Full = krb5;
libkrb5 = krb5.override { type = "lib"; };
···
krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
inherit (buildPackages.darwin) bootstrap_cmds;
};
krb5Full = krb5;
libkrb5 = krb5.override { type = "lib"; };