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

Merge master into staging-next

parents 66f0ec84 5d34f071

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -6945,6 +6945,12 @@ 
    email = "nix@quidecco.pl";

    name = "Isidor Zeuner";

  };

  gmacon = {

    name = "George Macon";

    matrix = "@gmacon:matrix.org";

    github = "gmacon";

    githubId = 238853;

  };

  gmemstr = {

    email = "git@gmem.ca";

    github = "gmemstr";

nixos/tests/kernel-generic.nix

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ let 
      linux_6_1_hardened

      linux_6_5_hardened

      linux_6_6_hardened

      linux_6_7_hardened

      linux_rt_5_4

      linux_rt_5_10

      linux_rt_5_15

pkgs/applications/audio/monkeys-audio/default.nix

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



stdenv.mkDerivation (finalAttrs: {

  version = "10.43";

  version = "10.44";

  pname = "monkeys-audio";



  src = fetchzip {

    url = "https://monkeysaudio.com/files/MAC_${

      builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";

    sha256 = "sha256-Y1X0KWf87L8Qjx/G6/RV37iiN7enwXTAaqQ+45FfTT4=";

    sha256 = "sha256-1JuzlCp9CI979ZT3a3zYfJIowrtQ42p1f9PPG6clQ4s=";

    stripRoot = false;

  };

  nativeBuildInputs = [

pkgs/applications/audio/tauon/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "tauon";

  version = "7.7.0";

  version = "7.7.1";



  src = fetchFromGitHub {

    owner = "Taiko2k";

    repo = "TauonMusicBox";

    rev = "v${finalAttrs.version}";

    hash = "sha256-FNRG0NKHQpPHb3P1M0eshFuGu9lyWFgmufFC5aqr7n0=";

    hash = "sha256-rRYM8wdvwfetoIpS/lzAV/uV5XVpXyXsHSrClPWcsCo=";

  };



  postUnpack = ''

pkgs/applications/backup/unifi-protect-backup/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,14 +5,14 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "unifi-protect-backup";

  version = "0.10.3";

  version = "0.10.4";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ep1cman";

    repo = "unifi-protect-backup";

    rev = "refs/tags/v${version}";

    hash = "sha256-jICnm9EfPyOLVbZfF+TYcQJo0ZXUDpFgYpL5Zf9b8Bc=";

    hash = "sha256-KT2saPpkAS/6X491i0Y8+jr8JPD51iQx+YGT5zRTtcU=";

  };



  pythonRelaxDeps = [