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

Merge master into staging-next

parents 86f81104 7f744ff0

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -7238,6 +7238,12 @@ 
    githubId = 623509;

    name = "Martijn Vermaat";

  };

  martinetd = {

    email = "f.ktfhrvnznqxacf@noclue.notk.org";

    github = "martinetd";

    githubId = 1729331;

    name = "Dominique Martinet";

  };

  martingms = {

    email = "martin@mg.am";

    github = "martingms";

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml

+9 −0
Original line number Diff line number Diff line
@@ -66,6 +66,15 @@ 
          <literal>enableParallelBuilding=false</literal>.

        </para>

      </listitem>

      <listitem>

        <para>

          <literal>pkgs.claws-mail-gtk2</literal>, representing Claws

          Mail’s older release version three, was removed in order to

          get rid of Python 2. Please switch to

          <literal>claws-mail</literal>, which is Claws Mail’s latest

          release based on GTK+3 and Python 3.

        </para>

      </listitem>

    </itemizedlist>

  </section>

  <section xml:id="sec-release-22.05-notable-changes">

nixos/doc/manual/release-notes/rl-2205.section.md

+3 −0
Original line number Diff line number Diff line
@@ -29,4 +29,7 @@ In addition to numerous new and upgraded packages, this release has the followin 


- The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`.



- `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2.

  Please switch to `claws-mail`, which is Claws Mail's latest release based on GTK+3 and Python 3.



## Other Notable Changes {#sec-release-22.05-notable-changes}

nixos/modules/programs/bcc.nix

+3 −3
Original line number Diff line number Diff line 
{ config, lib, ... }:

{ config, pkgs, lib, ... }:

{

  options.programs.bcc.enable = lib.mkEnableOption "bcc";



  config = lib.mkIf config.programs.bcc.enable {

    environment.systemPackages = [ config.boot.kernelPackages.bcc ];

    boot.extraModulePackages = [ config.boot.kernelPackages.bcc ];

    environment.systemPackages = [ pkgs.bcc ];

    boot.extraModulePackages = [ pkgs.bcc ];

  };

}

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ in 
  boot-stage1 = handleTest ./boot-stage1.nix {};

  borgbackup = handleTest ./borgbackup.nix {};

  botamusique = handleTest ./botamusique.nix {};

  bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {};

  btrbk = handleTest ./btrbk.nix {};

  buildbot = handleTest ./buildbot.nix {};

  buildkite-agents = handleTest ./buildkite-agents.nix {};