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

Merge master into haskell-updates

parents ff303118 f4a33546
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -305,6 +305,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/nixos/modules/services/misc/matrix-conduit.nix            @piegamesde
/nixos/tests/matrix-conduit.nix                            @piegamesde

# Forgejo
nixos/modules/services/misc/forgejo.nix      @bendlas @emilylange
pkgs/applications/version-management/forgejo @bendlas @emilylange

# Dotnet
/pkgs/build-support/dotnet                  @IvarWithoutBones
/pkgs/development/compilers/dotnet          @IvarWithoutBones
+2 −2
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspe

## Built-in emoji picker {#sec-ibus-typing-booster-emoji-picker}

The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed:
The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-color-emoji` is needed:

On NixOS, it can be installed using the following expression:

```nix
{ pkgs, ... }: {
  fonts.packages = with pkgs; [ noto-fonts-emoji ];
  fonts.packages = with pkgs; [ noto-fonts-color-emoji ];
}
```
+17 −6
Original line number Diff line number Diff line
@@ -876,6 +876,12 @@
    githubId = 153175;
    name = "Andrew Marshall";
  };
  amaxine = {
    email = "max@ine.dev";
    github = "amaxine";
    githubId = 35892750;
    name = "Maxine Aubrey";
  };
  ambroisie = {
    email = "bruno.nixpkgs@belanyi.fr";
    github = "ambroisie";
@@ -1516,6 +1522,11 @@
    githubId = 11037075;
    name = "Ashley Hooper";
  };
  ashvith-shetty = {
    github = "Ashvith10";
    githubId = 113123021;
    name = "Ashvith Shetty";
  };
  aske = {
    email = "aske@fmap.me";
    github = "aske";
@@ -10323,6 +10334,12 @@
    githubId = 782440;
    name = "Luna Nova";
  };
  luochen1990 = {
    email = "luochen1990@gmail.com";
    github = "luochen1990";
    githubId = 2309868;
    name = "Luo Chen";
  };
  lurkki = {
    email = "jussi.kuokkanen@protonmail.com";
    github = "Lurkki14";
@@ -10874,12 +10891,6 @@
    githubId = 502805;
    name = "Max Zerzouri";
  };
  maxeaubrey = {
    email = "maxeaubrey@gmail.com";
    github = "maxeaubrey";
    githubId = 35892750;
    name = "Maxine Aubrey";
  };
  maxhbr = {
    email = "nixos@maxhbr.dev";
    github = "maxhbr";
+5 −4
Original line number Diff line number Diff line
@@ -102,12 +102,13 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]:

        alias = before_equal
        alias_unquoted = before_equal.strip('"')
        after_equal_list = [x.strip(";:") for x in after_equal.split()]
        replacement = next(x.strip(";:") for x in after_equal.split())
        replacement = replacement.removeprefix("pkgs.")

        converted = (
            f"{indent}{alias} = throw \"'{alias_unquoted}' has been renamed to/replaced by"
            f" '{after_equal_list.pop(0)}'\";"
            f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}'
            f"{indent}{alias} = throw \"'{alias_unquoted}' has been"
            f" renamed to/replaced by '{replacement}'\";"
            f" # Converted to throw {datetime.today().strftime('%Y-%m-%d')}"
        )
        converted_list.append((line, converted))

+13 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ with lib.maintainers; {
      hedning
      jtojnar
      dasj19
      maxeaubrey
      amaxine
    ];
    githubTeams = [
      "gnome"
@@ -918,6 +918,18 @@ with lib.maintainers; {
    shortName = "Vim/Neovim";
  };

  wdz = {
    members = [
      n0emis
      netali
      vidister
      johannwagner
      yuka
    ];
    scope = "Group registration for WDZ GmbH team members who collectively maintain packages.";
    shortName = "WDZ GmbH";
  };

  xfce = {
    members = [
      bobby285271
Loading