Unverified Commit 12efa44d authored by dunklecat's avatar dunklecat Committed by GitHub
Browse files

Merge branch 'NixOS:master' into master

parents c28ad410 eb623a57

nixos/modules/services/mail/postfix.nix

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ in 
      };



      submissionOptions = mkOption {

        type = types.attrs;

        type = with types; attrsOf str;

        default = {

          smtpd_tls_security_level = "encrypt";

          smtpd_sasl_auth_enable = "yes";
@@ -312,7 +312,7 @@ in 
      };



      submissionsOptions = mkOption {

        type = types.attrs;

        type = with types; attrsOf str;

        default = {

          smtpd_sasl_auth_enable = "yes";

          smtpd_client_restrictions = "permit_sasl_authenticated,reject";

pkgs/applications/misc/pass-secret-service/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -19,9 +19,8 @@ python3.pkgs.buildPythonApplication rec { 
  # /etc/ in check phase.

  postPatch = ''

    substituteInPlace Makefile \

      --replace \

        "dbus-run-session" \

        "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf"

      --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" \

      --replace '-p $(relpassstore)' '-p $(PASSWORD_STORE_DIR)'

  '';



  propagatedBuildInputs = with python3.pkgs; [

pkgs/data/fonts/noto-fonts/tools.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


buildPythonPackage rec {

  pname = "nototools";

  version = "0.2.13";

  version = "0.2.16";



  disabled = pythonOlder "3.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec { 
    owner = "googlefonts";

    repo = "nototools";

    rev = "v${version}";

    sha256 = "0ggp65xgkf9y7jamncm65lkm84wapsa47abf133pcb702875v8jz";

    sha256 = "14rrdamkmhrykff8ln07fq9cm8zwj3k113lzwjcy0lgz23g51jyl";

  };



  postPatch = ''

pkgs/data/misc/wireless-regdb/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


stdenv.mkDerivation rec {

  pname = "wireless-regdb";

  version = "2021.07.14";

  version = "2021.08.28";



  src = fetchurl {

    url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";

    sha256 = "sha256-Li3SFqXxoxC4SXdK9j5jCdlMIgfDR3GlNMR64YsWJ0I=";

    sha256 = "sha256-z/NwxBDR5tMWrgp/qKxieP3x78pdPWZKynz9Kq+lREY=";

  };



  dontBuild = true;

pkgs/development/libraries/science/math/p4est-sc/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -22,11 +22,12 @@ stdenv.mkDerivation { 
    sha256 = "14vm0b162jh8399pgpsikbwq4z5lkrw9vfzy3drqykw09n6nc53z";

  };



  strictDeps = true;

  nativeBuildInputs = [ autoreconfHook pkg-config ];

  propagatedBuildInputs = [ zlib ]

    ++ lib.optional mpiSupport mpi

  propagatedNativeBuildInputs = lib.optional mpiSupport mpi

    ++ lib.optional isOpenmpi openssh

  ;

  propagatedBuildInputs = [ zlib ];

  inherit debugEnable mpiSupport;



  postPatch = ''