Unverified Commit 89f21524 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 856b27a8 482eaefb

nixos/modules/security/polkit.nix

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ in 
    ];



    systemd.services.polkit.restartTriggers = [ config.system.path ];

    systemd.services.polkit.reloadTriggers = [

      config.environment.etc."polkit-1/rules.d/10-nixos.rules".source

    ];

    systemd.services.polkit.stopIfChanged = false;



    # The polkit daemon reads action/rule files

pkgs/applications/editors/vscode/extensions/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -3852,8 +3852,8 @@ let 
        mktplcRef = {

          publisher = "redhat";

          name = "java";

          version = "1.47.0";

          hash = "sha256-zxhNZJWi4mjENzHsO74FjOrztl5uZbVU3aMPO5DwGRo=";

          version = "1.48.0";

          hash = "sha256-/JW5PVM4USBflC5eloi8u9AgpdIzkpEmoHKYr1yVkgI=";

        };

        buildInputs = [ jdk ];

        meta = {
@@ -5318,8 +5318,8 @@ let 
        mktplcRef = {

          name = "php-debug";

          publisher = "xdebug";

          version = "1.37.0";

          hash = "sha256-7Dz8i66tWPStk2fgFdZPY2Jz3j4IquJVyQbSnV+SVpk=";

          version = "1.38.0";

          hash = "sha256-QOA8At2akj9zLYxIuQJLkDL2Zg/isPIssFG/UipRBbU=";

        };

        meta = {

          description = "PHP Debug Adapter";

pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix

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


    postPatch = ''

      substituteInPlace scripts/generateLicenses.mjs --replace-fail 'https://raw.githubusercontent.com/microsoft/vscode/refs/heads/main/LICENSE.txt' '${pkgs.vscode-json-languageserver.src}/LICENSE.txt'

      substituteInPlace webpack.config.mjs --replace-fail 'minify: TerserPlugin.swcMinify' 'minify: TerserPlugin.terserMinify'

      substituteInPlace webpack.config.mjs --replace-fail 'env.skipLint' 'true'

    '';



    nativeBuildInputs = [

pkgs/applications/emulators/libretro/cores/mupen64plus.nix

+3 −3
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 
}:

mkLibretroCore {

  core = "mupen64plus-next";

  version = "0-unstable-2025-08-20";

  version = "0-unstable-2025-11-14";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "mupen64plus-libretro-nx";

    rev = "222acbd3f98391458a047874d0372fe78e14fe94";

    hash = "sha256-esssh/0nxNUDW/eMDQbWEdcSPuqLjnKLkK4mKN17HjQ=";

    rev = "680e033fc8ed1a49df7b156d97164e0050ee13bc";

    hash = "sha256-oBsOC1YtHx+mTgi9rwucU7rVeFt6RbxKrxHyPDx0eXg=";

  };



  # Fix for GCC 14

pkgs/applications/networking/cluster/terraform-providers/providers.json

+8 −8
Original line number Diff line number Diff line
@@ -886,13 +886,13 @@ 
    "vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0="

  },

  "metio_migadu": {

    "hash": "sha256-Itfy/EZiBI6j4GU9I3pQGpsMkykN8FVZ4FPhcUre8a0=",

    "hash": "sha256-ZTaibLqcmbKYFbk497Z/fwYhx7LKH2LHkmQYvY+Lkm0=",

    "homepage": "https://registry.terraform.io/providers/metio/migadu",

    "owner": "metio",

    "repo": "terraform-provider-migadu",

    "rev": "2025.10.30",

    "rev": "2025.11.13",

    "spdx": "0BSD",

    "vendorHash": "sha256-LMCFXZYZ9qwuu0/hA8mRNktCwwC4DRaqveW2dAJWQTQ="

    "vendorHash": "sha256-chCFJXf0M2w9oxan9Jj/gwphnN3T/5v7PZKv5H0bcLI="

  },

  "mongey_kafka": {

    "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",
@@ -1003,13 +1003,13 @@ 
    "vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="

  },

  "okta_okta": {

    "hash": "sha256-7vjNorBNdfF3cTu1ANx+5Uh5chAL54lWZ7R9cMI/gpA=",

    "hash": "sha256-CZSh4NEFC3cT9/WoOrIFHx3RAt3q70Fmd0/bEU1aJTU=",

    "homepage": "https://registry.terraform.io/providers/okta/okta",

    "owner": "okta",

    "repo": "terraform-provider-okta",

    "rev": "v6.4.0",

    "rev": "v6.5.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-gLFMFVw44jJcuVzY6OcUHJ74rRCIQuon4p9RNoQPLPs="

    "vendorHash": "sha256-YFxDfmWjB8QWBqX0KHlsr6DyzAEhkSFm/VaEmH1+VYg="

  },

  "oktadeveloper_oktaasa": {

    "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
@@ -1129,11 +1129,11 @@ 
    "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="

  },

  "rootlyhq_rootly": {

    "hash": "sha256-8UlBt9gmQflO5sB++U4Ih40+6p+U6N8PE1npQYg9D8U=",

    "hash": "sha256-RlEQd09iCT3XAuDKCvDAe7iVgx8cDkEqogK/xpVCPrA=",

    "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",

    "owner": "rootlyhq",

    "repo": "terraform-provider-rootly",

    "rev": "v4.3.7",

    "rev": "v4.3.8",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-IpWN8hCZlXm9hbPr2VcjzU7wtqivUk2h+LOaaz4KyP4="

  },