Skip to content

Commit dc39cc8

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge staging-next into staging
2 parents 567f18e + 3fa03bb commit dc39cc8

File tree

40 files changed

+316
-131
lines changed

40 files changed

+316
-131
lines changed

‎pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ in
7676

7777
cl-print = null; # builtin
7878

79+
# https://github.com/NixOS/nixpkgs/issues/483425
80+
consult = addPackageRequires super.consult [ self.flymake ];
81+
7982
# missing optional dependencies https://codeberg.org/rahguzar/consult-hoogle/issues/4
8083
consult-hoogle = addPackageRequiresIfOlder super.consult-hoogle [ self.consult ] "0.2.2";
8184

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,11 @@
310310
"vendorHash": null
311311
},
312312
"digitalocean_digitalocean": {
313-
"hash": "sha256-SmpbPDlJxsXT63d4KnUSzbPLSG5c2mPy6SCA8TCpxe4=",
313+
"hash": "sha256-inPOojpjliZpEN3Bk67mPdmq0XDCFHFpwthwuJjyIZg=",
314314
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
315315
"owner": "digitalocean",
316316
"repo": "terraform-provider-digitalocean",
317-
"rev": "v2.73.0",
317+
"rev": "v2.74.0",
318318
"spdx": "MPL-2.0",
319319
"vendorHash": null
320320
},
@@ -382,11 +382,11 @@
382382
"vendorHash": "sha256-M5cX70GwfdEJ22V8CwoaNEdEWb1CX7wsBgvj3GvjE0Q="
383383
},
384384
"exoscale_exoscale": {
385-
"hash": "sha256-8FIZO+iRqYa7y5Li8GoGnFT069vx4q4KczCgEB4SKuk=",
385+
"hash": "sha256-V7mG584wyr99myizr/jx9AadkAnBCZvUvAKF0sX/CIA=",
386386
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
387387
"owner": "exoscale",
388388
"repo": "terraform-provider-exoscale",
389-
"rev": "v0.67.1",
389+
"rev": "v0.67.2",
390390
"spdx": "MPL-2.0",
391391
"vendorHash": null
392392
},
@@ -472,13 +472,13 @@
472472
"vendorHash": "sha256-mzDFyk2oImRXt72kFV5Ln++ScgoecpJEJtzUKjvCaws="
473473
},
474474
"grafana_grafana": {
475-
"hash": "sha256-gfS+sJREaObaXSgfVK7oUAgm05EqSRhiLauGP6V9Vhw=",
475+
"hash": "sha256-EO18AHTtuchRpHxcXa5shmCpoLR91Ows8doBUTjollI=",
476476
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
477477
"owner": "grafana",
478478
"repo": "terraform-provider-grafana",
479-
"rev": "v4.23.0",
479+
"rev": "v4.25.0",
480480
"spdx": "MPL-2.0",
481-
"vendorHash": "sha256-sP86GbNZUmltn5a7AREyw54Fa3eFNwW/lMIFZIEj/Bo="
481+
"vendorHash": "sha256-5+nBYEAdiyNYsZsWvghciCYixQB3ojRlpSiSdjNWDHY="
482482
},
483483
"gridscale_gridscale": {
484484
"hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=",
@@ -923,13 +923,13 @@
923923
"vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
924924
},
925925
"mongodb_mongodbatlas": {
926-
"hash": "sha256-yVkhW1cYH+1biC1kUI6MdAK00QpiCyG/sGbOOxTEmm8=",
926+
"hash": "sha256-PACDH+CIEzUC/LYmppXin93vi0xp+1fMev2xn9iroRo=",
927927
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
928928
"owner": "mongodb",
929929
"repo": "terraform-provider-mongodbatlas",
930-
"rev": "v2.4.0",
930+
"rev": "v2.5.0",
931931
"spdx": "MPL-2.0",
932-
"vendorHash": "sha256-5xHm81ribxzdgSkMPAY7JEnlwf7wN/QGD8UyxUx2FOQ="
932+
"vendorHash": "sha256-3LMym5LFcrtEPA1exhrqbn3lqur7Vh8RP9wOwWChuKc="
933933
},
934934
"namecheap_namecheap": {
935935
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",

‎pkgs/by-name/ca/cargo-tally/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
rustPlatform.buildRustPackage rec {
88
pname = "cargo-tally";
9-
version = "1.0.71";
9+
version = "1.0.72";
1010

1111
src = fetchCrate {
1212
inherit pname version;
13-
hash = "sha256-jJj4aXhGMU5L7Yya65wi022M6lE/nHiyjozptSJcMGg=";
13+
hash = "sha256-YkjRCP6VAp2Az0iM5HIG984ScJ3b3iKm34j4YuIs0kQ=";
1414
};
1515

16-
cargoHash = "sha256-GC4rYaNwTLfbSAojnhZb0vi6FmNiXL6YJ5TEVtQom6M=";
16+
cargoHash = "sha256-SAO1VqlYzySIiBV3j6PCo7gknekmULpG/Two/8R0pv4=";
1717

1818
meta = {
1919
description = "Graph the number of crates that depend on your crate over time";

‎pkgs/by-name/fr/freefilesync/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ let
2929
in
3030
stdenv.mkDerivation (finalAttrs: {
3131
pname = "freefilesync";
32-
version = "14.6";
32+
version = "14.7";
3333

3434
src = fetchurl {
3535
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
3838
rm -f "$out"
3939
tryDownload "$url" "$out"
4040
'';
41-
hash = "sha256-OST2QIhPhKl9Qh4nHIno5XAJmLPNki0bU5A1ZXcUVTw=";
41+
hash = "sha256-WMSaKA3OA63V6Vis83vXa+y0ZRE0YxgXiB8YAyTSTc8=";
4242
};
4343

4444
sourceRoot = ".";

‎pkgs/by-name/fr/freefilesync/skip-missing-Animal.dat.patch‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@ diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/g
22
index a40eea3..23ec896 100644
33
--- a/FreeFileSync/Source/ui/gui_generated.cpp
44
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
5-
@@ -5573,8 +5573,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
6-
wxBoxSizer* bSizer183;
7-
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
5+
@@ -5553,8 +5553,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
6+
wxBoxSizer* bSizer183;
7+
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
88

9-
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
10-
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
9+
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
10+
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
1111

12-
wxPanel* m_panel39;
13-
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
14-
@@ -5587,13 +5585,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
15-
m_staticTextDonate->Wrap( -1 );
16-
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
12+
wxPanel* m_panel39;
13+
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
14+
@@ -5567,13 +5565,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
15+
m_staticTextDonate->Wrap( -1 );
16+
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
1717

18-
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
18+
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
1919

2020

21-
m_panel39->SetSizer( bSizer184 );
22-
m_panel39->Layout();
23-
bSizer184->Fit( m_panel39 );
24-
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
21+
m_panel39->SetSizer( bSizer184 );
22+
m_panel39->Layout();
23+
bSizer184->Fit( m_panel39 );
24+
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
2525

2626

27-
m_panelDonate->SetSizer( bSizer183 );
27+
m_panelDonate->SetSizer( bSizer183 );
2828
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
2929
index 933fe81..734201f 100644
3030
--- a/FreeFileSync/Source/ui/small_dlgs.cpp

pkgs/by-name/gn/gnome-settings-daemon46/add-gnome-session-ctl-option.patch renamed to pkgs/by-name/gn/gnome-settings-daemon48/add-gnome-session-ctl-option.patch

File renamed without changes.

pkgs/by-name/gn/gnome-settings-daemon46/fix-paths.patch renamed to pkgs/by-name/gn/gnome-settings-daemon48/fix-paths.patch

File renamed without changes.

pkgs/by-name/gn/gnome-settings-daemon46/package.nix renamed to pkgs/by-name/gn/gnome-settings-daemon48/package.nix

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
stdenv,
33
lib,
44
replaceVars,
5+
buildPackages,
56
fetchurl,
67
meson,
78
ninja,
@@ -36,15 +37,17 @@
3637
tzdata,
3738
gcr_4,
3839
gnome-session-ctl,
40+
udevCheckHook,
41+
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
3942
}:
4043

4144
stdenv.mkDerivation (finalAttrs: {
4245
pname = "gnome-settings-daemon";
43-
version = "46.0";
46+
version = "48.1";
4447

4548
src = fetchurl {
4649
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
47-
hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c=";
50+
hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4=";
4851
};
4952

5053
patches = [
@@ -56,17 +59,24 @@ stdenv.mkDerivation (finalAttrs: {
5659
})
5760
];
5861

62+
depsBuildBuild = [
63+
buildPackages.stdenv.cc
64+
pkg-config
65+
];
66+
5967
nativeBuildInputs = [
6068
meson
6169
ninja
6270
pkg-config
6371
perl
6472
gettext
73+
glib
6574
libxml2
6675
libxslt
6776
docbook_xsl
6877
wrapGAppsHook3
6978
python3
79+
udevCheckHook
7080
];
7181

7282
buildInputs = [
@@ -87,14 +97,19 @@ stdenv.mkDerivation (finalAttrs: {
8797
polkit
8898
geocode-glib_2
8999
geoclue2
90-
systemd
91100
libgudev
92101
libwacom
93102
gcr_4
103+
]
104+
++ lib.optionals withSystemd [
105+
systemd
94106
];
95107

96108
mesonFlags = [
97109
"-Dudev_dir=${placeholder "out"}/lib/udev"
110+
(lib.mesonBool "systemd" withSystemd)
111+
]
112+
++ lib.optionals withSystemd [
98113
"-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
99114
];
100115

@@ -103,12 +118,14 @@ stdenv.mkDerivation (finalAttrs: {
103118
env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
104119

105120
postPatch = ''
106-
for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do
121+
for f in plugins/power/gsd-power-constants-update.pl; do
107122
chmod +x $f
108123
patchShebangs $f
109124
done
110125
'';
111126

127+
doInstallCheck = true;
128+
112129
meta = {
113130
description = "GNOME Settings Daemon";
114131
homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/";

‎pkgs/by-name/gr/gradle-completion/package.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
stdenvNoCC.mkDerivation (finalAttrs: {
1010
pname = "gradle-completion";
11-
version = "1.6.0";
11+
version = "9.3.0";
1212

1313
src = fetchFromGitHub {
1414
owner = "gradle";
1515
repo = "gradle-completion";
1616
tag = "v${finalAttrs.version}";
17-
hash = "sha256-HY/woUOzkRVb6ekIaQrY1+5pKxd5+cpG74+xqzpkazs=";
17+
hash = "sha256-kmjlEO0MI7+OwZqgwkv5z8iX1iAZDiIpqevoeb1sDUU=";
1818
};
1919

2020
nativeBuildInputs = [

‎pkgs/by-name/gr/grafana-image-renderer/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66

77
buildGoModule (finalAttrs: {
88
pname = "grafana-image-renderer";
9-
version = "5.2.3";
9+
version = "5.4.0";
1010

1111
src = fetchFromGitHub {
1212
owner = "grafana";
1313
repo = "grafana-image-renderer";
1414
tag = "v${finalAttrs.version}";
15-
hash = "sha256-YoJ50PhpxXQLpZpq+fLiN2uYU1C6w8C2UVun/klee4E=";
15+
hash = "sha256-rCFdjM5ZBHcfl4/WXM4CPdLlIprJr3HATboBF89sMFA=";
1616
};
1717

1818
vendorHash = "sha256-kGLvstSkucM0tN5l+Vp78IP9EwDx62kukAiOwYD4Vfs=";
1919

2020
postPatch = ''
21-
substituteInPlace go.mod --replace-fail 'go 1.25.5' 'go 1.25.4'
21+
substituteInPlace go.mod --replace-fail 'go 1.25.6' 'go 1.25.5'
2222
'';
2323

2424
subPackages = [ "." ];

0 commit comments

Comments
 (0)