Skip to content

Commit 89f2152

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge master into staging-next
2 parents 856b27a + 482eaef commit 89f2152

File tree

67 files changed

+1221
-456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1221
-456
lines changed

‎nixos/modules/security/polkit.nix‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ in
7373
];
7474

7575
systemd.services.polkit.restartTriggers = [ config.system.path ];
76+
systemd.services.polkit.reloadTriggers = [
77+
config.environment.etc."polkit-1/rules.d/10-nixos.rules".source
78+
];
7679
systemd.services.polkit.stopIfChanged = false;
7780

7881
# The polkit daemon reads action/rule files

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3852,8 +3852,8 @@ let
38523852
mktplcRef = {
38533853
publisher = "redhat";
38543854
name = "java";
3855-
version = "1.47.0";
3856-
hash = "sha256-zxhNZJWi4mjENzHsO74FjOrztl5uZbVU3aMPO5DwGRo=";
3855+
version = "1.48.0";
3856+
hash = "sha256-/JW5PVM4USBflC5eloi8u9AgpdIzkpEmoHKYr1yVkgI=";
38573857
};
38583858
buildInputs = [ jdk ];
38593859
meta = {
@@ -5318,8 +5318,8 @@ let
53185318
mktplcRef = {
53195319
name = "php-debug";
53205320
publisher = "xdebug";
5321-
version = "1.37.0";
5322-
hash = "sha256-7Dz8i66tWPStk2fgFdZPY2Jz3j4IquJVyQbSnV+SVpk=";
5321+
version = "1.38.0";
5322+
hash = "sha256-QOA8At2akj9zLYxIuQJLkDL2Zg/isPIssFG/UipRBbU=";
53235323
};
53245324
meta = {
53255325
description = "PHP Debug Adapter";

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ let
3030

3131
postPatch = ''
3232
substituteInPlace scripts/generateLicenses.mjs --replace-fail 'https://raw.githubusercontent.com/microsoft/vscode/refs/heads/main/LICENSE.txt' '${pkgs.vscode-json-languageserver.src}/LICENSE.txt'
33+
substituteInPlace webpack.config.mjs --replace-fail 'minify: TerserPlugin.swcMinify' 'minify: TerserPlugin.terserMinify'
34+
substituteInPlace webpack.config.mjs --replace-fail 'env.skipLint' 'true'
3335
'';
3436

3537
nativeBuildInputs = [

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
}:
1313
mkLibretroCore {
1414
core = "mupen64plus-next";
15-
version = "0-unstable-2025-08-20";
15+
version = "0-unstable-2025-11-14";
1616

1717
src = fetchFromGitHub {
1818
owner = "libretro";
1919
repo = "mupen64plus-libretro-nx";
20-
rev = "222acbd3f98391458a047874d0372fe78e14fe94";
21-
hash = "sha256-esssh/0nxNUDW/eMDQbWEdcSPuqLjnKLkK4mKN17HjQ=";
20+
rev = "680e033fc8ed1a49df7b156d97164e0050ee13bc";
21+
hash = "sha256-oBsOC1YtHx+mTgi9rwucU7rVeFt6RbxKrxHyPDx0eXg=";
2222
};
2323

2424
# Fix for GCC 14

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -886,13 +886,13 @@
886886
"vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0="
887887
},
888888
"metio_migadu": {
889-
"hash": "sha256-Itfy/EZiBI6j4GU9I3pQGpsMkykN8FVZ4FPhcUre8a0=",
889+
"hash": "sha256-ZTaibLqcmbKYFbk497Z/fwYhx7LKH2LHkmQYvY+Lkm0=",
890890
"homepage": "https://registry.terraform.io/providers/metio/migadu",
891891
"owner": "metio",
892892
"repo": "terraform-provider-migadu",
893-
"rev": "2025.10.30",
893+
"rev": "2025.11.13",
894894
"spdx": "0BSD",
895-
"vendorHash": "sha256-LMCFXZYZ9qwuu0/hA8mRNktCwwC4DRaqveW2dAJWQTQ="
895+
"vendorHash": "sha256-chCFJXf0M2w9oxan9Jj/gwphnN3T/5v7PZKv5H0bcLI="
896896
},
897897
"mongey_kafka": {
898898
"hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",
@@ -1003,13 +1003,13 @@
10031003
"vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
10041004
},
10051005
"okta_okta": {
1006-
"hash": "sha256-7vjNorBNdfF3cTu1ANx+5Uh5chAL54lWZ7R9cMI/gpA=",
1006+
"hash": "sha256-CZSh4NEFC3cT9/WoOrIFHx3RAt3q70Fmd0/bEU1aJTU=",
10071007
"homepage": "https://registry.terraform.io/providers/okta/okta",
10081008
"owner": "okta",
10091009
"repo": "terraform-provider-okta",
1010-
"rev": "v6.4.0",
1010+
"rev": "v6.5.0",
10111011
"spdx": "MPL-2.0",
1012-
"vendorHash": "sha256-gLFMFVw44jJcuVzY6OcUHJ74rRCIQuon4p9RNoQPLPs="
1012+
"vendorHash": "sha256-YFxDfmWjB8QWBqX0KHlsr6DyzAEhkSFm/VaEmH1+VYg="
10131013
},
10141014
"oktadeveloper_oktaasa": {
10151015
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
@@ -1129,11 +1129,11 @@
11291129
"vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
11301130
},
11311131
"rootlyhq_rootly": {
1132-
"hash": "sha256-8UlBt9gmQflO5sB++U4Ih40+6p+U6N8PE1npQYg9D8U=",
1132+
"hash": "sha256-RlEQd09iCT3XAuDKCvDAe7iVgx8cDkEqogK/xpVCPrA=",
11331133
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
11341134
"owner": "rootlyhq",
11351135
"repo": "terraform-provider-rootly",
1136-
"rev": "v4.3.7",
1136+
"rev": "v4.3.8",
11371137
"spdx": "MPL-2.0",
11381138
"vendorHash": "sha256-IpWN8hCZlXm9hbPr2VcjzU7wtqivUk2h+LOaaz4KyP4="
11391139
},

‎pkgs/applications/networking/cluster/terraform/default.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ rec {
194194
mkTerraform = attrs: pluggable (generic attrs);
195195

196196
terraform_1 = mkTerraform {
197-
version = "1.13.5";
198-
hash = "sha256-F8fpTI6kPrjOM+4N67uBCpsxMLQUR6sXzTr1SYFI9Ww=";
199-
vendorHash = "sha256-3skDvOcDlTOv8okiGmaB0bvkoMrQjutGdvpxcradqUk=";
197+
version = "1.14.0";
198+
hash = "sha256-G9GyrwELOuzQqTMimC+z2GJUjq+c5YJDoE313JSsX5w=";
199+
vendorHash = "sha256-T6baxFk5lrmhyeJgcn7s5cF+utaogSQOD9S5omEKTZg=";
200200
patches = [ ./provider-path-0_15.patch ];
201201
passthru = {
202202
inherit plugins;

‎pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go
2-
--- terraform.old/internal/command/init.go
3-
+++ terraform.new/internal/command/init.go
4-
@@ -7,6 +7,7 @@
5-
"context"
1+
diff -Naur terraform.old/internal/command/init_run.go terraform.new/internal/command/init_run.go
2+
--- terraform.old/internal/command/init_run.go
3+
+++ terraform.new/internal/command/init_run.go
4+
@@ -6,6 +6,7 @@
5+
import (
66
"errors"
77
"fmt"
88
+ "os"
9-
"log"
10-
"reflect"
11-
"sort"
12-
@@ -79,6 +80,11 @@
9+
"strings"
10+
11+
"github.com/hashicorp/hcl/v2"
12+
@@ -76,6 +77,11 @@
13+
if c.forceInitCopy {
1314
c.migrateState = true
1415
}
15-
16+
1617
+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
1718
+ if ok {
1819
+ initArgs.PluginPath = append(initArgs.PluginPath, val)

‎pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242

4343
stdenv.mkDerivation (finalAttrs: {
4444
pname = "telegram-desktop-unwrapped";
45-
version = "6.3.0";
45+
version = "6.3.1";
4646

4747
src = fetchFromGitHub {
4848
owner = "telegramdesktop";
4949
repo = "tdesktop";
5050
rev = "v${finalAttrs.version}";
5151
fetchSubmodules = true;
52-
hash = "sha256-YExl9mn2aEL1WOqT2fuX/KxKAV28q0WKVG1AMvPANwA=";
52+
hash = "sha256-kIiOHXFOjHCE3GaizNvpu8rUCuJKBN5Oi7p0NvHYy04=";
5353
};
5454

5555
nativeBuildInputs = [

0 commit comments

Comments
 (0)