Unverified Commit 5902d07a authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #202852 from NixOS/backport-202345-to-release-22.11 

[Backport release-22.11] pam_p11: fix by pinning libp11 to openssl_1_1 as well
parents 4a6b04bc d8502809

pkgs/development/libraries/libp11/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec { 


  enableParallelBuilding = true;



  passthru = { inherit openssl; };



  meta = with lib; {

    description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";

    homepage = "https://github.com/OpenSC/libp11";

pkgs/os-specific/linux/pam_p11/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam, libintl }:

{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libp11, pam, libintl }:



stdenv.mkDerivation rec {

  pname = "pam_p11";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec { 
  };



  nativeBuildInputs = [ autoreconfHook pkg-config ];

  buildInputs = [ pam openssl libp11 ]

  buildInputs = [ pam libp11.passthru.openssl libp11 ]

    ++ lib.optionals stdenv.isDarwin [ libintl ];



  meta = with lib; {

pkgs/tools/security/rng-tools/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec { 
    ++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone ]

    ++ lib.optionals withJitterEntropy [ jitterentropy ]

    ++ lib.optionals withNistBeacon    [ curl jansson libxml2 ]

    ++ lib.optionals withPkcs11        [ libp11 openssl ]

    ++ lib.optionals withPkcs11        [ libp11 libp11.passthru.openssl ]

    ++ lib.optionals withRtlsdr        [ librtlsdr ];



  enableParallelBuilding = true;

pkgs/top-level/all-packages.nix

+4 −4
Original line number Diff line number Diff line
@@ -20768,7 +20768,9 @@ with pkgs; 














  libow = callPackage ../development/libraries/libow { };



























  libp11 = callPackage ../development/libraries/libp11 { };













  libp11 = callPackage ../development/libraries/libp11 {













    openssl = openssl_1_1;













  };





























  libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { };
























@@ -25618,9 +25620,7 @@ with pkgs;



























  pam_mysql = callPackage ../os-specific/linux/pam_mysql { };



























  pam_p11 = callPackage ../os-specific/linux/pam_p11 {













    openssl = openssl_1_1;













  };













  pam_p11 = callPackage ../os-specific/linux/pam_p11 { };





























  pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { };