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

Merge master into staging-next

parents b2429718 75d8eea6

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

+2 −0
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@ 


- The logrotate service has received hardening and now requires enabling `allowNetworking`, if logrotate needs to access the network.



- `mautrix-whatsapp` has been updated to version 0.11.0, which is a major rewrite of the bridge. Config file changes are required.



- qBittorrent has been updated to major version 5, which drops support for Qt 5.

  The `qbittorrent-qt5` package has been removed.

nixos/modules/services/desktop-managers/plasma6.nix

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ in { 
        kio-fuse # fuse interface for KIO

        kpackage # provides kpackagetool tool

        kservice # provides kbuildsycoca6 tool

        kunifiedpush # provides a background service and a KCM

        kwallet # provides helper service

        kwallet-pam # provides helper service

        kwalletmanager # provides KCMs and stuff

pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { 
    name = "tinymist";

    publisher = "myriad-dreamin";

    inherit (tinymist) version;

    hash = "sha256-CQVujtl1SFcUmEG7O1cvN2gr6v3kcWMMZz+oYEkclKI=";

    hash = "sha256-NQ7LsX8/1h7sSI5mPdDgu4MVc29iNJ1vl0K7fMCBmlc=";

  };



  nativeBuildInputs = [

pkgs/applications/misc/tellico/default.nix

+6 −3
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitLab

, mkDerivation

, cmake
@@ -20,18 +21,19 @@ 
, qtwebengine

, solid

, taglib

, wrapQtAppsHook

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "tellico";

  version = "3.5.5";

  version = "4.0.1";



  src = fetchFromGitLab {

    domain = "invent.kde.org";

    owner = "office";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-0I4oDMLYWomAF+wpPeA1NQk4nnhUV1RT6IYKJdOUcas=";

    hash = "sha256-5oP/uGUw1oYnrnOU83Pocr9YdwAU+DaUaGHg+6NzmRU=";

  };



  nativeBuildInputs = [
@@ -39,6 +41,7 @@ mkDerivation rec { 
    extra-cmake-modules

    kdoctools

    makeWrapper

    wrapQtAppsHook

  ];



  buildInputs = [

pkgs/applications/networking/cluster/helmfile/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ 


buildGoModule rec {

  pname = "helmfile";

  version = "0.168.0";

  version = "0.169.0";



  src = fetchFromGitHub {

    owner = "helmfile";

    repo = "helmfile";

    rev = "v${version}";

    hash = "sha256-qpYTYOzQWhjuVANOPpLDsYZyhvRl6FnNQz5ssDZHohw=";

    hash = "sha256-HGdNCGCJ8LsXyRSinNu1EDy9XuI7mTHONAgti2SETWw=";

  };



  vendorHash = "sha256-pCP5PxxOLlqQBmqufpo6G69v4M+NxMpTlIUY6TnclVA=";

  vendorHash = "sha256-zWgza1eiO4UF/RL2Z4R4bvO+tgcN1KT8nBZor/plY+A=";



  proxyVendor = true; # darwin/linux hash mismatch