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

Merge master into staging-nixos

parents e971cab9 a4f2660f

.editorconfig

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ insert_final_newline = unset 
end_of_line = unset

trim_trailing_whitespace = unset



[*.json]

insert_final_newline = unset



[*.lock]

indent_size = unset

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -10795,6 +10795,12 @@ 
    githubId = 51334444;

    name = "Akshat Agarwal";

  };

  humemm = {

    email = "nixpkgs.scabbed988@passinbox.com";

    github = "humemm";

    githubId = 75555696;

    name = "humemm";

  };

  hummeltech = {

    email = "hummeltech@sherpaguru.com";

    github = "hummeltech";

nixos/tests/fcitx5/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        enable = true;

        type = "fcitx5";

        fcitx5.addons = [

          pkgs.fcitx5-chinese-addons

          pkgs.qt6Packages.fcitx5-chinese-addons

          pkgs.fcitx5-hangul

          pkgs.fcitx5-m17n

          pkgs.fcitx5-mozc
@@ -81,7 +81,7 @@ 
      user = nodes.machine.users.users.alice;

      xauth = "${user.home}/.Xauthority";

    in

    ''

    /* python */ ''

      start_all()



      machine.wait_for_x()

pkgs/applications/editors/android-studio/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ let 
    sha256Hash = "sha256-xs9ABQ9f8/gtxcoiZkf/xEtmTOj6rb4Ty+w70/+C4Ss=";

  };

  betaVersion = {

    version = "2025.2.3.7"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 2"

    sha256Hash = "sha256-d5BcAUkYV7O25wyoifiZxfUsANPxLa/QkuT9u1qqfP8=";

    version = "2025.2.3.8"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 3"

    sha256Hash = "sha256-KHvWVIxNzwdgl9kdqXD5Cpvz58r8pWs2VRyPV3VrJH0=";

  };

  latestVersion = {

    version = "2025.3.1.2"; # "Android Studio Panda 1 | 2025.3.1 Canary 2"

    sha256Hash = "sha256-kgYPwMF/CypkCq4w/y+HnraNdPNHf53198x35S0i7OA=";

    version = "2025.3.1.4"; # "Android Studio Panda 1 | 2025.3.1 Canary 4"

    sha256Hash = "sha256-5ymB/HKSmi32AWV39+HYmfY11frkNxf2dq8Ld4f9qfA=";

  };

in

{

pkgs/applications/editors/emacs/sources.nix

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ let 
        homepage =

          {

            "mainline" = "https://www.gnu.org/software/emacs/";

            "macport" = "https://bitbucket.org/mituharu/emacs-mac/";

            "macport" = "https://github.com/jdtsmith/emacs-mac";

          }

          .${variant};

        description =