Skip to content

Commit fcf782a

Browse files
authored
Merge pull request #906 from NixOS/nixos-25.11
Update to NixOS 25.11
2 parents 3f52618 + 1d4cbb7 commit fcf782a

Some content is hidden

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

47 files changed

+584
-669
lines changed

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
name: Feature request
33
about: Suggest an improvement for this project
4-
title: ''
4+
title: ""
55
labels: enhancement
6-
assignees: ''
6+
assignees: ""
77
---
88

99
**Is your feature request related to a problem? Please describe.**

.github/ISSUE_TEMPLATE/service_disruption.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
name: Service disruption report
33
about: Use this to report service instabilities
4-
title: '<service-name>: '
4+
title: "<service-name>: "
55
labels: bug
6-
assignees: ''
6+
assignees: ""
77
---
88

99
**Affected service**

build/common.nix

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515

1616
nixpkgs.config.allowUnfree = true;
1717

18-
nixpkgs.overlays = [
19-
(_prev: final: {
20-
# fails to find nix-main against nix 2.28.x
21-
# https://github.com/NixOS/infra/pull/620#issuecomment-2784979947
22-
nixos-option = final.nixos-option.override { nix = pkgs.nixVersions.nix_2_24; };
23-
})
24-
];
25-
2618
hardware.enableAllFirmware = true;
2719
hardware.cpu.amd.updateMicrocode = true;
2820
hardware.cpu.intel.updateMicrocode = true;

build/diffoscope.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let
1111
echo ""
1212
echo "non-determinism detected in $2; diff with previous round follows:"
1313
echo ""
14-
time ${pkgs.utillinux}/bin/runuser -u diffoscope -- ${pkgs.diffoscope}/bin/diffoscope "$1" "$2"
14+
time ${pkgs.util-linux}/bin/runuser -u diffoscope -- ${pkgs.diffoscope}/bin/diffoscope "$1" "$2"
1515
exit 0
1616
'';
1717

build/flake-module.nix

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ in
2323
haumea = { };
2424
pluto = { };
2525
mimas = { };
26+
titan = { };
2627
};
2728

2829
flake = {
@@ -55,6 +56,16 @@ in
5556
./mimas
5657
];
5758
};
59+
60+
nixosConfigurations.titan = lib.nixosSystem {
61+
system = "x86_64-linux";
62+
63+
specialArgs = { inherit inputs; };
64+
modules = [
65+
flakesModule
66+
./titan
67+
];
68+
};
5869
};
5970

6071
perSystem =

build/hydra-proxy.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
recommendedOptimisation = true;
3535
recommendedProxySettings = true;
3636
recommendedTlsSettings = true;
37-
recommendedZstdSettings = true;
3837

3938
proxyTimeout = "900s";
4039

build/mimas/firewall.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ in
5151
Group = "nft-asblock";
5252
ExecStart = toString (
5353
[
54-
(lib.getExe inputs.nft-prefix-import.packages.${pkgs.hostPlatform.system}.default)
54+
(lib.getExe inputs.nft-prefix-import.packages.${pkgs.stdenv.hostPlatform.system}.default)
5555
"--table"
5656
"abuse"
5757
"--ipv4set"

build/pluto/prometheus/exporters/channel.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ in
1212
(pkgs.python3.withPackages (
1313
pypkgs: with pypkgs; [
1414
requests
15-
dateutil
16-
prometheus_client
15+
prometheus-client
16+
python-dateutil
1717
]
1818
))
1919
];

build/pluto/prometheus/exporters/github.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ in
3333
path = [
3434
(pkgs.python3.withPackages (
3535
ps: with ps; [
36-
prometheus_client
36+
prometheus-client
3737
requests
3838
]
3939
))

build/pluto/prometheus/exporters/hydra.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
python = pkgs.python3.withPackages (
1717
ps: with ps; [
1818
requests
19-
prometheus_client
19+
prometheus-client
2020
]
2121
);
2222
in

0 commit comments

Comments
 (0)