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

Merge master into staging-next

parents c4244961 d275de71

maintainers/maintainer-list.nix

+20 −1
Original line number Diff line number Diff line
@@ -2795,6 +2795,12 @@ 
    githubId = 40476330;

    name = "brokenpip3";

  };

  brpaz = {

    email = "oss@brunopaz.dev";

    github = "brpaz";

    githubId = 184563;

    name = "Bruno Paz";

  };

  bryanasdev000 = {

    email = "bryanasdev000@gmail.com";

    matrix = "@bryanasdev000:matrix.org";
@@ -5259,6 +5265,13 @@ 
    github = "edlimerkaj";

    githubId = 71988351;

  };

  edmundmiller = {

    name = "Edmund Miller";

    email = "git@edmundmiller.dev";

    matrix = "@emiller:beeper.com";

    github = "edmundmiller";

    githubId = 20095261;

  };

  edrex = {

    email = "ericdrex@gmail.com";

    github = "edrex";
@@ -20444,7 +20457,6 @@ 
  };

  xfix = {

    email = "kamila@borowska.pw";

    matrix = "@xfix:matrix.org";

    github = "KamilaBorowska";

    githubId = 1297598;

    name = "Kamila Borowska";
@@ -20618,6 +20630,13 @@ 
    githubId = 11229748;

    name = "Lin Yinfeng";

  };

  yisraeldov = {

    email = "lebow@lebowtech.com";

    name = "Yisrael Dov Lebow";

    github = "yisraeldov";

    githubId = 138219;

    matrix = "@yisraeldov:matrix.org";

  };

  yisuidenghua = {

    email = "bileiner@gmail.com";

    name = "Milena Yisui";

nixos/modules/services/audio/navidrome.nix

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ in { 
        RuntimeDirectory = "navidrome";

        RootDirectory = "/run/navidrome";

        ReadWritePaths = "";

        BindPaths = lib.optional (cfg.settings ? DataFolder) cfg.settings.DataFolder;

        BindReadOnlyPaths = [

          # navidrome uses online services to download additional album metadata / covers

          "${config.environment.etc."ssl/certs/ca-certificates.crt".source}:/etc/ssl/certs/ca-certificates.crt"

pkgs/applications/audio/faustPhysicalModeling/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:

stdenv.mkDerivation rec {

  pname = "faustPhysicalModeling";

  version = "2.69.3";

  version = "2.70.3";



  src = fetchFromGitHub {

    owner = "grame-cncm";

    repo = "faust";

    rev = version;

    sha256 = "sha256-E7cHDeQV7NVKyoCgI8P3gennpBidk7JmdnFGSIulvvQ=";

    sha256 = "sha256-QkksliLu2TnJ1GoM91e+Qf3SlRv3T06WNU++S3qq3e0=";

  };



  buildInputs = [ faust2jaqt faust2lv2 ];

pkgs/applications/audio/reaper/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "reaper";

  version = "7.08";

  version = "7.09";



  src = fetchurl {

    url = url_for_platform version stdenv.hostPlatform.qemuArch;

    hash = if stdenv.isDarwin then "sha256-PgYAwSSRwew+QLx6/Gs+J1v3iZ4U22bn6V8XWZk8Pz0=" else {

      x86_64-linux = "sha256-lya/B9k9uWrvRbMnWRT0YDV9o+DpmjPGynBVPFij3rs=";

      aarch64-linux = "sha256-0ePUvVrArUdg0t+CQK37yXA4UlHlMj2Mafe0dTyz5JU=";

    hash = if stdenv.isDarwin then "sha256-MztA9Azj20tyg/nFtXmvojeABNX11HCkmIcgMhNYyMQ=" else {

      x86_64-linux = "sha256-Mo7k8XbKLUkBvo2A73qeqHgDtXD/fBVtSVv74k/WGRo=";

      aarch64-linux = "sha256-ttNHMC8Ouin2fNnIb5X5pnKwGrAML192oZdg/Q8SFlg=";

    }.${stdenv.hostPlatform.system};

  };

pkgs/applications/networking/browsers/vivaldi/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ let 
  vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";

in stdenv.mkDerivation rec {

  pname = "vivaldi";

  version = "6.5.3206.50";

  version = "6.5.3206.55";



  suffix = {

    aarch64-linux = "arm64";
@@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { 
  src = fetchurl {

    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";

    hash = {

      aarch64-linux = "sha256-8Ozhad6aRskhhNqtUQFYLT14JHZnhLnHtuB+SmtwL8g=";

      x86_64-linux = "sha256-hpWPDnnJGx2pokR1JFe3Uuq299HvsnjKMyg89wAo53I=";

      aarch64-linux = "sha256-lr+9+w1vRZSG/2dP5K3mcKLCQijckPdkM/I2DgjO4wg=";

      x86_64-linux = "sha256-ElkuuaZfK8F6CVA5xbKszkbqdcPACFR+xd0pRxnd6+U=";

    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

  };