Skip to content

Commit 149500a

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge release-25.11 into staging-next-25.11
2 parents 5249bbc + ed8628e commit 149500a

19 files changed

Lines changed: 277 additions & 175 deletions

File tree

‎nixos/modules/services/mail/roundcube.nix‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ let
1010
localDB = cfg.database.host == "localhost";
1111
user = cfg.database.username;
1212
phpWithPspell = pkgs.php83.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);
13+
14+
env = {
15+
ASPELL_CONF = "dict-dir ${pkgs.aspellWithDicts (_: cfg.dicts)}/lib/aspell";
16+
};
1317
in
1418
{
1519
options.services.roundcube = {
@@ -263,7 +267,7 @@ in
263267
"catch_workers_output" = true;
264268
};
265269
phpPackage = phpWithPspell;
266-
phpEnv.ASPELL_CONF = "dict-dir ${pkgs.aspellWithDicts (_: cfg.dicts)}/lib/aspell";
270+
phpEnv = env;
267271
};
268272
systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ];
269273

@@ -282,6 +286,8 @@ in
282286
after = [ "network-online.target" ];
283287
wantedBy = [ "multi-user.target" ];
284288

289+
environment = env;
290+
285291
path = [
286292
(if localDB then config.services.postgresql.package else pkgs.postgresql)
287293
];

‎nixos/modules/services/networking/netbird/dashboard.nix‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,12 @@ in
168168
enable = true;
169169

170170
virtualHosts.${cfg.domain} = {
171+
root = cfg.finalDrv;
172+
171173
locations = {
172-
"/" = {
173-
root = cfg.finalDrv;
174-
tryFiles = "$uri $uri.html $uri/ =404";
175-
};
174+
"/".tryFiles = "$uri $uri.html $uri/ =404";
176175

177-
"/404.html".extraConfig = ''
176+
"= /404.html".extraConfig = ''
178177
internal;
179178
'';
180179
};

‎pkgs/applications/networking/mailreaders/thunderbird/packages.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ rec {
6565
thunderbird = thunderbird-latest;
6666

6767
thunderbird-latest = common {
68-
version = "147.0.1";
69-
sha512 = "bae9adbcb1d45a7644e4d699215a3da85b612b9d99516bdf12f84482f1a6f89153ec4d5ab6dd8bcf69dc512cb50080db4630a5bb52525f22213c7af92b4b77d7";
68+
version = "147.0.2";
69+
sha512 = "4fe6d0389e8bc6078b3d4db79d1f8547666950de4a5a72e49ba24d5b60cb531908b88efa9f3dd32e154ee917a8b80786389ce9b1186b6c45fb0717d4e180e537";
7070

7171
updateScript = callPackage ./update.nix {
7272
attrPath = "thunderbirdPackages.thunderbird-latest";
@@ -79,8 +79,8 @@ rec {
7979
thunderbird-140 = common {
8080
applicationName = "Thunderbird ESR";
8181

82-
version = "140.7.0esr";
83-
sha512 = "92746d87ca2d5a59082c25aa3c3a816e5bf24ae3e095f8ec478a60c5cd890faea392ff98b5b510cc9a89b155240dce9d06c7ddd0f17f564722acc65105fb6cd2";
82+
version = "140.7.1esr";
83+
sha512 = "2d0f61758b0428eb4eb8294c58d914e03842c9ad7685cd2eec26c723cc1491634f90fc9fcf5ad6d3f13738e141e96c692cd8ff1599869346e3247a0cae2349f4";
8484

8585
updateScript = callPackage ./update.nix {
8686
attrPath = "thunderbirdPackages.thunderbird-140";

‎pkgs/by-name/an/anubis/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515

1616
buildGoModule (finalAttrs: {
1717
pname = "anubis";
18-
version = "1.24.0";
18+
version = "1.25.0";
1919

2020
src = fetchFromGitHub {
2121
owner = "TecharoHQ";
2222
repo = "anubis";
2323
tag = "v${finalAttrs.version}";
24-
hash = "sha256-CZpQT3Uu0TNC4ra9f+OZWfovOJ+xFyumomETc10fOGA=";
24+
hash = "sha256-9/XIwSMEmnS3L/Wzg6ABso7R6W3TYkJomC8aFMycxZo=";
2525
};
2626

2727
vendorHash = "sha256-9CMD8Rn4q8b+hyrph+BqqS32ijZyJRNsop6ML7z5Zuk=";
2828

2929
npmDeps = fetchNpmDeps {
3030
name = "anubis-npm-deps";
3131
inherit (finalAttrs) src;
32-
hash = "sha256-wozZu00ir7V3mO6BLBamaxhI5fTdWgXQK+xGvr3T1gU=";
32+
hash = "sha256-2U91Dt+ymspjYgTtgCjahCNr6fIs85TT/k+I8M2aC9s=";
3333
};
3434

3535
nativeBuildInputs = [

‎pkgs/by-name/bl/bluesky-pds/package.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ in
2424

2525
stdenv.mkDerivation (finalAttrs: {
2626
pname = "pds";
27-
version = "0.4.204";
27+
version = "0.4.208";
2828

2929
src = fetchFromGitHub {
3030
owner = "bluesky-social";
3131
repo = "pds";
3232
tag = "v${finalAttrs.version}";
33-
hash = "sha256-jYCMwHKKFIsfOgGYiKVrWtIT7atPA8NsetvfjDW05yE=";
33+
hash = "sha256-/porufe1XVtjEFMOv40+1G1n5WgaAJIvOv/KWkKgxuQ=";
3434
};
3535

3636
sourceRoot = "${finalAttrs.src.name}/service";
@@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
5959
sourceRoot
6060
;
6161
pnpm = pnpm_9;
62-
fetcherVersion = 2;
63-
hash = "sha256-G6xZfbfz+jud1N6lxwp5FA5baAkFwmofejsPt/Gaze8=";
62+
fetcherVersion = 3;
63+
hash = "sha256-TZ+lUdICkLZfHPvU1qEUeB3wasBKJpGo2lMk4eeyjas=";
6464
};
6565

6666
buildPhase = ''

‎pkgs/by-name/ec/echoip/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
buildGoModule {
1111
pname = "echoip";
12-
version = "0-unstable-2026-02-14";
12+
version = "0-unstable-2026-02-17";
1313

1414
src = fetchFromGitHub {
1515
owner = "mpolden";
1616
repo = "echoip";
17-
rev = "0405a55f7d0007c72aaf88e449b8416a62f16772";
18-
hash = "sha256-oMxbFyFQ1VYXgUU3wkDrfmIku8uigvF3bJInGNQAZkc=";
17+
rev = "c3394af786b05879fc1219eb0d33b82b8dd806b0";
18+
hash = "sha256-L1cLLEhPGtLYaJcbc26YPuUCZh8pmbceIWQ5iIEh4i4=";
1919
};
2020

2121
vendorHash = "sha256-gNXu1yfvJnviPDeG0oNJ9MD5R93rjEV/n8hrADi8ZnM=";

‎pkgs/by-name/fl/flake-checker/package.nix‎

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

77
rustPlatform.buildRustPackage rec {
88
pname = "flake-checker";
9-
version = "0.2.10";
9+
version = "0.2.11";
1010

1111
src = fetchFromGitHub {
1212
owner = "DeterminateSystems";
1313
repo = "flake-checker";
1414
rev = "v${version}";
15-
hash = "sha256-/hwcRsaVdLvjKnCjFzy4T/zdvWjWAMBtfgJX/cNpmOc=";
15+
hash = "sha256-0ftHzqFpFkKZKByWJ49/YySrXBU4lCxvcpbTuMY8ZXs=";
1616
};
1717

18-
cargoHash = "sha256-5pK0l84L4cEhw5d8n8j6JWEXEbsmWHmHJxB5ZMrnAU0=";
18+
cargoHash = "sha256-5zzSLk5QT3X6rdGEPHPelXFd5nOxNtlbqDHwV7fFDKY=";
1919

2020
meta = {
2121
description = "Health checks for your Nix flakes";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ let
3636
in
3737
stdenv.mkDerivation rec {
3838
pname = "freenet";
39-
version = "01505";
39+
version = "01506";
4040

4141
src = fetchFromGitHub {
4242
owner = "hyphanet";
4343
repo = "fred";
4444
tag = "build${version}";
45-
hash = "sha256-0ffYQ+8hZqFLjMk6A2rapKZsz/lZNpbG6K0wDqBSdY8=";
45+
hash = "sha256-MmI/e/Sh4WeSSw2//xpmJtF5/oC9+eauXnTMLuojb2A=";
4646
};
4747

4848
nativeBuildInputs = [

‎pkgs/by-name/jr/jrnl/package.nix‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ python3.pkgs.buildPythonApplication rec {
2424
--replace-fail "from pytest_bdd.steps import inject_fixture" "from pytest_bdd.compat import inject_fixture"
2525
'';
2626

27+
disabledTests = [
28+
"test_override_configured_linewrap_with_a_value_of_23"
29+
];
30+
2731
build-system = with python3.pkgs; [ poetry-core ];
2832

2933
dependencies = with python3.pkgs; [

‎pkgs/by-name/li/librewolf-unwrapped/src.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"packageVersion": "147.0.3-2",
2+
"packageVersion": "147.0.4-1",
33
"source": {
4-
"rev": "147.0.3-2",
5-
"hash": "sha256-Gnsk+dY0B0j/0npy//y/UItKvPrI9HELrH86x0QklBk="
4+
"rev": "147.0.4-1",
5+
"hash": "sha256-xdeYyD1zwhQ5BzHzbQNCb3oHr4DAfwHGzbtGr2E3MR0="
66
},
77
"firefox": {
8-
"version": "147.0.3",
9-
"hash": "sha512-N+OcR9aU7M3Ku32KCkz+GwKGCpf2BGU/Nkxg9OmHlv/H8carUSJrLlA0pLSAXMxuw5g/DYMMnzZpLfLsJhJz2Q=="
8+
"version": "147.0.4",
9+
"hash": "sha512-mBNokWWC4VZllKuOLAPKtHGq8EYT0sd6DU4GerFZu4G1kpqAG7rCDvBQbvBIzekbLi+JWY+o1OjWaoyAFrubMw=="
1010
}
1111
}

0 commit comments

Comments
 (0)