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

Merge master into staging-next

parents 6ff1451c e82297f9

maintainers/maintainer-list.nix

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

    githubId = 966992;

  };

  k3yss = {

    email = "rsi.dev17@gmail.com";

    name = "Rishi Kumar";

    github = "k3yss";

    githubId = 96657880;

  };

  k900 = {

    name = "Ilya K.";

    email = "me@0upti.me";

nixos/modules/config/nsswitch.nix

+20 −6
Original line number Diff line number Diff line
@@ -62,6 +62,18 @@ with lib; 
        default = [ ];

      };



      sudoers = mkOption {

        type = types.listOf types.str;

        description = ''

          List of sudoers entries to configure in {file}`/etc/nsswitch.conf`.



          Note that "files" is always prepended.



          This option only takes effect if nscd is enabled.

        '';

        default = [ ];

      };



      hosts = mkOption {

        type = types.listOf types.str;

        description = ''
@@ -112,6 +124,7 @@ with lib; 
      passwd:    ${concatStringsSep " " config.system.nssDatabases.passwd}

      group:     ${concatStringsSep " " config.system.nssDatabases.group}

      shadow:    ${concatStringsSep " " config.system.nssDatabases.shadow}

      sudoers:   ${concatStringsSep " " config.system.nssDatabases.sudoers}



      hosts:     ${concatStringsSep " " config.system.nssDatabases.hosts}

      networks:  files
@@ -126,6 +139,7 @@ with lib; 
      passwd = mkBefore [ "files" ];

      group = mkBefore [ "files" ];

      shadow = mkBefore [ "files" ];

      sudoers = mkBefore [ "files" ];

      hosts = mkMerge [

        (mkOrder 998 [ "files" ])

        (mkOrder 1499 [ "dns" ])

pkgs/applications/audio/famistudio/default.nix

+5 −2
Original line number Diff line number Diff line 
{ stdenv

, lib

, buildDotnetModule

, dotnetCorePackages

, callPackage

, fetchFromGitHub

, ffmpeg
@@ -22,13 +23,13 @@ let 
in

buildDotnetModule rec {

  pname = "famistudio";

  version = "4.1.3";

  version = "4.2.0";



  src = fetchFromGitHub {

    owner = "BleuBleu";

    repo = "FamiStudio";

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

    hash = "sha256-bryxhminkrTVe5qhGeMStZp3NTHBREXrsUlyQkfPkao=";

    hash = "sha256-ydEWLL05B86672j3MVo/90tgDHg8FJ2EZaesqrBZy4A=";

  };



  postPatch = let
@@ -85,6 +86,8 @@ buildDotnetModule rec { 


  projectFile = "FamiStudio/${csprojName}.csproj";

  nugetDeps = ./deps.nix;

  dotnet-sdk = dotnetCorePackages.sdk_7_0;

  dotnet-runtime = dotnetCorePackages.runtime_7_0;



  executables = [ "FamiStudio" ];

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

+6 −6
Original line number Diff line number Diff line
@@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) 
    if stdenv.isAarch64 then

      {

        pname = "brave";

        version = "1.65.126";

        url = "https://github.com/brave/brave-browser/releases/download/v1.65.126/brave-browser_1.65.126_arm64.deb";

        hash = "sha256-v2PbixM9g+AhvR6tJ9QDbaXF7ERlBBrNMIsLofFbAfU=";

        version = "1.66.110";

        url = "https://github.com/brave/brave-browser/releases/download/v1.66.110/brave-browser_1.66.110_arm64.deb";

        hash = "sha256-yElWlzGdI+mopmPgXTABXncoufojHngRX88TCy3AE+E=";

        platform = "aarch64-linux";

      }

    else if stdenv.isx86_64 then

      {

        pname = "brave";

        version = "1.65.126";

        url = "https://github.com/brave/brave-browser/releases/download/v1.65.126/brave-browser_1.65.126_amd64.deb";

        hash = "sha256-DbdwCu9LwCeoH46egVY4AsOxcJDWilD2MdpyNdyJizw=";

        version = "1.66.110";

        url = "https://github.com/brave/brave-browser/releases/download/v1.66.110/brave-browser_1.66.110_amd64.deb";

        hash = "sha256-2KtTI9QODfQR25YzXJMXJspuzCS11FpDx2L1B8DWmmc=";

        platform = "x86_64-linux";

      }

    else

pkgs/applications/networking/instant-messengers/ferdium/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ let 
    aarch64-linux = "arm64";

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

  hash = {

    amd64-linux_hash = "sha256-Q5fUMQQTQKgUkakmsiBFH2UwJdk/XV8wpQi6uRHi90U=";

    arm64-linux_hash = "sha256-axFIwz1AtzxO1+XkmCflHqi/CdsmeqD6QAxepATMqm4=";

    amd64-linux_hash = "sha256-4yMaW1ByEQaQHdn99TGpUez2jVi5Ad4ODpugzW6kTm8=";

    arm64-linux_hash = "sha256-oIkHF1l7Un4W6/zufa+DOLi9oujQ2Zaq8AaKoHDAMRc=";

  }."${arch}-linux_hash";

in

mkFranzDerivation rec {

  pname = "ferdium";

  name = "Ferdium";

  version = "6.7.3";

  version = "6.7.4";

  src = fetchurl {

    url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb";

    inherit hash;