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

Merge master into staging-next

parents 07b331e8 64b6e492

maintainers/maintainer-list.nix

+9 −3
Original line number Diff line number Diff line
@@ -7998,6 +7998,12 @@ 
    githubId = 488556;

    name = "Javier Aguirre";

  };

  javimerino = {

    email = "merino.jav@gmail.com";

    name = "Javi Merino";

    github = "JaviMerino";

    githubId = 44926;

  };

  jayesh-bhoot = {

    name = "Jayesh Bhoot";

    email = "jb@jayeshbhoot.com";
@@ -14623,7 +14629,7 @@ 
  };

  quantenzitrone = {

    email = "quantenzitrone@protonmail.com";

    github = "Quantenzitrone";

    github = "quantenzitrone";

    githubId = 74491719;

    matrix = "@quantenzitrone:matrix.org";

    name = "quantenzitrone";
@@ -19387,11 +19393,11 @@ 
    name = "Uli Baum";

  };

  xfix = {

    email = "konrad@borowski.pw";

    email = "kamila@borowska.pw";

    matrix = "@xfix:matrix.org";

    github = "xfix";

    githubId = 1297598;

    name = "Konrad Borowski";

    name = "Kamila Borowska";

  };

  xfnw = {

    email = "xfnw+nixos@riseup.net";

nixos/modules/services/audio/wyoming/faster-whisper.nix

+2 −1
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ in 
          CapabilityBoundingSet = "";

          DeviceAllow = if builtins.elem options.device [ "cuda" "auto" ] then [

            # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf

            # CUDA not working? Check DeviceAllow and PrivateDevices first!

            "/dev/nvidia0"

            "/dev/nvidia1"

            "/dev/nvidia2"

            "/dev/nvidia3"
@@ -160,7 +162,6 @@ in 
          DevicePolicy = "closed";

          LockPersonality = true;

          MemoryDenyWriteExecute = true;

          PrivateDevices = true;

          PrivateUsers = true;

          ProtectHome = true;

          ProtectHostname = true;

nixos/modules/services/monitoring/netdata.nix

+11 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ let 
    ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin

    ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin

    ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin

    ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin

  '';



  plugins = [
@@ -254,7 +255,7 @@ in { 
        # Capabilities

        CapabilityBoundingSet = [

          "CAP_DAC_OVERRIDE"      # is required for freeipmi and slabinfo plugins

          "CAP_DAC_READ_SEARCH"   # is required for apps plugin

          "CAP_DAC_READ_SEARCH"   # is required for apps and systemd-journal plugin

          "CAP_FOWNER"            # is required for freeipmi plugin

          "CAP_SETPCAP"           # is required for apps, perf and slabinfo plugins

          "CAP_SYS_ADMIN"         # is required for perf plugin
@@ -263,6 +264,7 @@ in { 
          "CAP_NET_RAW"           # is required for fping app

          "CAP_SYS_CHROOT"        # is required for cgroups plugin

          "CAP_SETUID"            # is required for cgroups and cgroups-network plugins

          "CAP_SYSLOG"            # is required for systemd-journal plugin

        ];

        # Sandboxing

        ProtectSystem = "full";
@@ -318,6 +320,14 @@ in { 
        permissions = "u+rx,g+x,o-rwx";

      };



      "systemd-journal.plugin" = {

        source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org";

        capabilities = "cap_dac_read_search,cap_syslog+ep";

        owner = cfg.user;

        group = cfg.group;

        permissions = "u+rx,g+x,o-rwx";

      };



      "slabinfo.plugin" = {

        source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org";

        capabilities = "cap_dac_override+ep";

pkgs/applications/blockchains/polkadot/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { 
    description = "Polkadot Node Implementation";

    homepage = "https://polkadot.network";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ];

    maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ];

    platforms = platforms.unix;

  };

}

pkgs/applications/graphics/photoflare/default.nix

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


mkDerivation rec {

  pname = "photoflare";

  version = "1.6.12";

  version = "1.6.13";



  src = fetchFromGitHub {

    owner = "PhotoFlare";

    repo = "photoflare";

    rev = "v${version}";

    sha256 = "sha256-UIEHQil7NsdIKQlrNPpf7rxj6O6P1xlz0E7FNYTcdT4=";

    sha256 = "sha256-0eAuof/FBro2IKxkJ6JHauW6C96VTPxy7QtfPVzPFi4=";

  };



  nativeBuildInputs = [ qmake qttools ];