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

Merge master into staging-next

parents dfbae786 0b9c8af0

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -11902,6 +11902,12 @@ 
    github = "Mephistophiles";

    githubId = 4850908;

  };

  mevatron = {

    email = "mevatron@gmail.com";

    name = "mevatron";

    github = "mevatron";

    githubId = 714585;

  };

  mfossen = {

    email = "msfossen@gmail.com";

    github = "mfossen";

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

+4 −3
Original line number Diff line number Diff line
@@ -51,9 +51,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS.



- `k9s` was updated to v0.30. There have been various breaking changes in the config file format,

  check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0) and

  [v0.30](https://github.com/derailed/k9s/releases/tag/v0.30.0) for details. It is recommended

- `k9s` was updated to v0.31. There have been various breaking changes in the config file format,

  check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0),

  [v0.30](https://github.com/derailed/k9s/releases/tag/v0.30.0) and

  [v0.31](https://github.com/derailed/k9s/releases/tag/v0.31.0) for details. It is recommended

  to back up your current configuration and let k9s recreate the new base configuration.



- `idris2` was updated to v0.7.0. This version introduces breaking changes. Check out the [changelog](https://github.com/idris-lang/Idris2/blob/v0.7.0/CHANGELOG.md#v070) for details.

pkgs/applications/emulators/yuzu/compat-list.nix

+3 −3
Original line number Diff line number Diff line 
{ stdenv, fetchFromGitHub, unstableGitUpdater }:

stdenv.mkDerivation {

  pname = "yuzu-compatibility-list";

  version = "unstable-2023-12-28";

  version = "unstable-2024-01-08";



  src = fetchFromGitHub {

    owner = "flathub";

    repo = "org.yuzu_emu.yuzu";

    rev = "0b9bf10851d6ad54441dc4f687d5755ed2c6f7a8";

    hash = "sha256-oWEeAhyxFO1TFH3d+/ivRf1KnNUU8y5c/7NtOzlpKXg=";

    rev = "0f5500f50e2a5ac7e40e6f5f8aeb160d46348828";

    hash = "sha256-0JHl7myoa3MlfucmbKB5tubJ6sQ2IlTIL3i2yveOvaU=";

  };



  buildCommand = ''

pkgs/applications/emulators/yuzu/early-access/sources.nix

+4 −4
Original line number Diff line number Diff line 
# Generated by ./update.sh - do not update manually!

# Last updated: 2023-12-29

# Last updated: 2024-01-10

{

  version = "4037";

  distHash = "sha256:0pw56hj13fm9j5nja1lhj839d88w00kcr30kygasr36w9c7yv2n7";

  fullHash = "sha256:0f42fp8z333b3k4pn8j0cp3480llvlygl5p6qfgywhq3g5hcpzpb";

  version = "4056";

  distHash = "sha256:14qd5v238pka9axrxjbaawr0kpkkbd95mzri6jdjxjyzbkk03hmb";

  fullHash = "sha256:0fb4i6708q59ql9ffrw2myanqgxpy20z971y6l7yvxm1pqw9qhyx";

}

pkgs/applications/emulators/yuzu/mainline.nix

+2 −2
Original line number Diff line number Diff line
@@ -47,13 +47,13 @@ 
}:

stdenv.mkDerivation(finalAttrs: {

  pname = "yuzu";

  version = "1665";

  version = "1676";



  src = fetchFromGitHub {

    owner = "yuzu-emu";

    repo = "yuzu-mainline";

    rev = "mainline-0-${finalAttrs.version}";

    hash = "sha256-xzSup1oz83GPpOGh9aJJ5YjoFX/cBI8RV6SvDYNH/zA=";

    hash = "sha256-vRrliVuGXI/Dpmdkbj+P5hshzPzB6nijrXQfLXHaGqk=";

    fetchSubmodules = true;

  };