Unverified Commit b3a71c7e authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents d6721ede 27d7247c

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -213,6 +213,11 @@ lib.mapAttrs mkLicense ({ 
    fullName = "BSD 3-Clause Clear License";

  };



  bsd3Lbnl = {

    spdxId = "BSD-3-Clause-LBNL";

    fullName = "Lawrence Berkeley National Labs BSD variant license";

  };



  bsdOriginal = {

    spdxId = "BSD-4-Clause";

    fullName = ''BSD 4-clause "Original" or "Old" License'';

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -13474,6 +13474,12 @@ 
    githubId = 1709273;

    name = "Robin Hack";

  };

  marnym = {

    email = "markus@nyman.dev";

    github = "marnym";

    githubId = 56825922;

    name = "Markus Nyman";

  };

  marsupialgutz = {

    email = "mars@possums.xyz";

    github = "pupbrained";

nixos/modules/programs/firefox.nix

+3 −1
Original line number Diff line number Diff line
@@ -313,7 +313,9 @@ in 
            old.extraPrefsFiles or [ ]

            ++ cfg.autoConfigFiles

            ++ [ (pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig) ];

          nativeMessagingHosts = old.nativeMessagingHosts or [ ] ++ cfg.nativeMessagingHosts.packages;

          nativeMessagingHosts = lib.unique (

            old.nativeMessagingHosts or [ ] ++ cfg.nativeMessagingHosts.packages

          );

          cfg = (old.cfg or { }) // cfg.wrapperConfig;

        }))

      ];

nixos/tests/postgresql/anonymizer.nix

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ let 
          services.postgresql = {

            inherit package;

            enable = true;

            enableJIT = lib.hasInfix "-jit-" package.name;

            extraPlugins = ps: [ ps.anonymizer ];

            settings.shared_preload_libraries = [ "anon" ];

          };

nixos/tests/postgresql/pgjwt.nix

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ let 
          services.postgresql = {

            inherit package;

            enable = true;

            enableJIT = lib.hasInfix "-jit-" package.name;

            extraPlugins =

              ps: with ps; [

                pgjwt