Unverified Commit e6218aa1 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 58e6bb17 73557c22

doc/release-notes/rl-2511.section.md

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
- The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader



- `base16-builder` node package has been removed due to lack of upstream maintenance.

- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.



## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -2652,6 +2652,11 @@ 
    githubId = 9315;

    name = "Zhong Jianxin";

  };

  b-fein = {

    github = "b-fein";

    githubId = 64250573;

    name = "Benedikt Fein";

  };

  b-m-f = {

    email = "maximilian@sodawa.com";

    github = "b-m-f";

nixos/tests/fontconfig-default-fonts.nix

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

      ];

      fonts.fontconfig.defaultFonts = {

        serif = [ "Gentium Plus" ];

        serif = [ "Gentium" ];

        sansSerif = [ "Cantarell" ];

        monospace = [ "Source Code Pro" ];

        emoji = [ "Twitter Color Emoji" ];
@@ -26,7 +26,7 @@ 
    };



  testScript = ''

    machine.succeed("fc-match serif | grep '\"Gentium Plus\"'")

    machine.succeed("fc-match serif | grep '\"Gentium\"'")

    machine.succeed("fc-match sans-serif | grep '\"Cantarell\"'")

    machine.succeed("fc-match monospace | grep '\"Source Code Pro\"'")

    machine.succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'")

nixos/tests/keepassxc.nix

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
      ];



      services.xserver.enable = true;

      programs.dconf.enable = true;



      # for better OCR

      environment.etc."icewm/prefoverride".text = ''

nixos/tests/nginx-http3.nix

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ builtins.listToAttrs ( 


          server.wait_for_unit("nginx")

          server.wait_for_open_port(443)

          client.wait_for_unit("network-online.target")



          # Check http connections

          client.succeed("curl --verbose --http3-only https://acme.test | grep 'Hello World!'")