pyrox.dev / nixpkgs
lol
fork atom

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

authored by Martin Weinelt and committed by GitHub 1a0c8a44 c3ddd95c

+2 -4
unified split
+2 -2
pkgs/development/libraries/openssl/default.nix
··· 213 214 215 openssl_1_1 = common rec { 216 - version = "1.1.1q"; 217 - sha256 = "sha256-15Oc5hQCnN/wtsIPDi5XAxWKSJpyslB7i9Ub+Mj9EMo="; 218 patches = [ 219 ./1.1/nix-ssl-cert-file.patch 220
··· 213 214 215 openssl_1_1 = common rec { 216 + version = "1.1.1r"; 217 + sha256 = "sha256-44k1KuPVrk04WXv4pU8dy2+zyLUPT+WKlLsb9/hdgqA="; 218 patches = [ 219 ./1.1/nix-ssl-cert-file.patch 220
-2
pkgs/top-level/all-packages.nix
··· 19410 19411 krb5 = callPackage ../development/libraries/kerberos/krb5.nix { 19412 inherit (buildPackages.darwin) bootstrap_cmds; 19413 - # TODO: can be removed once we have 1.20 19414 - openssl = openssl_1_1; 19415 }; 19416 krb5Full = krb5; 19417 libkrb5 = krb5.override { type = "lib"; };
··· 19410 19411 krb5 = callPackage ../development/libraries/kerberos/krb5.nix { 19412 inherit (buildPackages.darwin) bootstrap_cmds; 19413 }; 19414 krb5Full = krb5; 19415 libkrb5 = krb5.override { type = "lib"; };