Skip to content

Commit bd83355

Browse files
sternenseemannsternenseemann
committed
Merge remote-tracking branch 'origin/master' into haskell-updates
2 parents dd6a74b + a1386a8 commit bd83355

File tree

154 files changed

+5531
-11923
lines changed

Some content is hidden

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

154 files changed

+5531
-11923
lines changed

‎lib/systems/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ rec {
121121
({
122122
linux-kernel = args.linux-kernel or {};
123123
gcc = args.gcc or {};
124-
rustc = args.rust or {};
124+
rustc = args.rustc or {};
125125
} // platforms.select final)
126126
linux-kernel gcc rustc;
127127

‎maintainers/maintainer-list.nix‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6222,6 +6222,12 @@
62226222
githubId = 982322;
62236223
name = "Henrik Olsson";
62246224
};
6225+
henrirosten = {
6226+
email = "henri.rosten@unikie.com";
6227+
github = "henrirosten";
6228+
githubId = 49935860;
6229+
name = "Henri Rosten";
6230+
};
62256231
henrytill = {
62266232
email = "henrytill@gmail.com";
62276233
github = "henrytill";
@@ -9041,6 +9047,12 @@
90419047
fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49";
90429048
}];
90439049
};
9050+
lizelive = {
9051+
email = "nixpkgs@lize.live";
9052+
github = "lizelive";
9053+
githubId = 40217331;
9054+
name = "LizeLive";
9055+
};
90449056
lluchs = {
90459057
email = "lukas.werling@gmail.com";
90469058
github = "lluchs";

‎maintainers/team-list.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ with lib.maintainers; {
151151

152152
cuda = {
153153
members = [
154+
connorbaker
154155
SomeoneSerge
155156
];
156157
scope = "Maintain CUDA-enabled packages";

‎nixos/modules/services/monitoring/uptime-kuma.nix‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ in
4343
services.uptime-kuma.settings = {
4444
DATA_DIR = "/var/lib/uptime-kuma/";
4545
NODE_ENV = mkDefault "production";
46+
HOST = mkDefault "127.0.0.1";
47+
PORT = mkDefault "3001";
4648
};
4749

4850
systemd.services.uptime-kuma = {

‎nixos/modules/services/network-filesystems/webdav-server-rs.nix‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ in
2828
description = lib.mdDoc "Group to run under when setuid is not enabled.";
2929
};
3030

31+
debug = mkOption {
32+
type = types.bool;
33+
default = false;
34+
description = lib.mdDoc "Enable debug mode.";
35+
};
36+
3137
settings = mkOption {
3238
type = format.type;
3339
default = { };
@@ -111,7 +117,7 @@ in
111117
after = [ "network.target" ];
112118
wantedBy = [ "multi-user.target" ];
113119
serviceConfig = {
114-
ExecStart = "${pkgs.webdav-server-rs}/bin/webdav-server -c ${cfg.configFile}";
120+
ExecStart = "${pkgs.webdav-server-rs}/bin/webdav-server ${lib.optionalString cfg.debug "--debug"} -c ${cfg.configFile}";
115121

116122
CapabilityBoundingSet = [
117123
"CAP_SETUID"

‎nixos/tests/aaaaxy.nix‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@
33
meta.maintainers = with lib.maintainers; [ Luflosi ];
44

55
nodes.machine = {
6-
hardware.opengl.enable = true;
6+
imports = [
7+
./common/x11.nix
8+
];
79
};
810

911
# This starts the game from a known state, feeds it a prerecorded set of button presses
1012
# and then checks if the final game state is identical to the expected state.
1113
# This is also what AAAAXY's CI system does and serves as a good sanity check.
1214
testScript = ''
13-
machine.wait_for_unit("basic.target")
15+
machine.wait_for_x()
1416
1517
machine.succeed(
1618
# benchmark.dem needs to be in a mutable directory,
1719
# so we can't just refer to the file in the Nix store directly
1820
"mkdir -p '/tmp/aaaaxy/assets/demos/'",
1921
"ln -s '${pkgs.aaaaxy.testing_infra}/assets/demos/benchmark.dem' '/tmp/aaaaxy/assets/demos/'",
2022
"""
21-
'${pkgs.xvfb-run}/bin/xvfb-run' \
2223
'${pkgs.aaaaxy.testing_infra}/scripts/regression-test-demo.sh' \
2324
'aaaaxy' 'on track for Any%, All Paths and No Teleports' \
2425
'${pkgs.aaaaxy}/bin/aaaaxy' '/tmp/aaaaxy/assets/demos/benchmark.dem'

‎nixos/tests/geth.nix‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
1919
enable = true;
2020
port = 18545;
2121
};
22+
authrpc = {
23+
enable = true;
24+
port = 18551;
25+
};
2226
};
2327
};
2428

@@ -31,11 +35,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
3135
machine.wait_for_open_port(18545)
3236
3337
machine.succeed(
34-
'geth attach --exec eth.blockNumber http://localhost:8545 | grep \'^0$\' '
38+
'geth attach --exec "eth.blockNumber" http://localhost:8545 | grep \'^0$\' '
3539
)
3640
3741
machine.succeed(
38-
'geth attach --exec "eth.chainId()" http://localhost:18545 | grep \'"0x5"\' '
42+
'geth attach --exec "eth.blockNumber" http://localhost:18545 | grep \'^0$\' '
3943
)
4044
'';
4145
})

‎nixos/tests/nginx.nix‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,31 +87,39 @@ import ./make-test-python.nix ({ pkgs, ... }: {
8787
return etag
8888
8989
90-
webserver.wait_for_unit("nginx")
91-
webserver.wait_for_open_port(80)
90+
def wait_for_nginx_on_port(port):
91+
webserver.wait_for_unit("nginx")
92+
webserver.wait_for_open_port(port)
93+
94+
95+
# nginx can be ready before multi-user.target, in which case switching to
96+
# a different configuration might not realize it needs to restart nginx.
97+
webserver.wait_for_unit("multi-user.target")
98+
99+
wait_for_nginx_on_port(80)
92100
93101
with subtest("check ETag if serving Nix store paths"):
94102
old_etag = check_etag()
95103
webserver.succeed(
96104
"${etagSystem}/bin/switch-to-configuration test >&2"
97105
)
98-
webserver.sleep(1)
106+
wait_for_nginx_on_port(80)
99107
new_etag = check_etag()
100108
assert old_etag != new_etag
101109
102110
with subtest("config is reloaded on nixos-rebuild switch"):
103111
webserver.succeed(
104112
"${justReloadSystem}/bin/switch-to-configuration test >&2"
105113
)
106-
webserver.wait_for_open_port(8080)
114+
wait_for_nginx_on_port(8080)
107115
webserver.fail("journalctl -u nginx | grep -q -i stopped")
108116
webserver.succeed("journalctl -u nginx | grep -q -i reloaded")
109117
110118
with subtest("restart when nginx package changes"):
111119
webserver.succeed(
112120
"${reloadRestartSystem}/bin/switch-to-configuration test >&2"
113121
)
114-
webserver.wait_for_unit("nginx")
122+
wait_for_nginx_on_port(80)
115123
webserver.succeed("journalctl -u nginx | grep -q -i stopped")
116124
117125
with subtest("nixos-rebuild --switch should fail when there are configuration errors"):

‎pkgs/applications/audio/pbpctrl/default.nix‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
{ rustPlatform
1+
{ lib
2+
, rustPlatform
23
, fetchFromGitHub
34
, pkg-config
45
, dbus
56
, protobuf
6-
, lib
77
}:
88

99
rustPlatform.buildRustPackage rec {
1010
pname = "pbpctrl";
11-
12-
# https://github.com/qzed/pbpctrl/issues/4
13-
version = "unstable-2023-02-07";
11+
version = "0.1.3";
1412

1513
src = fetchFromGitHub {
1614
owner = "qzed";
1715
repo = "${pname}";
18-
rev = "9fef4bb88046a9f00719b189f8e378c8dbdb8ee6";
19-
hash = "sha256-8YbsBqqITJ9bKzbGX6d/CSBb8wzr6bDzy8vsyntL1CA=";
16+
rev = "v${version}";
17+
hash = "sha256-CYroQb6x2d4ay3RZUSiSrcGDF0IL3ETZtHAFt18sa5s=";
2018
};
2119

22-
cargoHash = "sha256-ZxJjjaT/ZpEPxvO42UWBy3xW/V5dhXGsKn3KmuM89YA==";
20+
cargoHash = "sha256-+YtnPKbxZENL6/u36RFFZA6F+19qHDAVx6Q8FSB/LCU=";
2321

2422
nativeBuildInputs = [ pkg-config protobuf ];
2523
buildInputs = [ dbus ];

‎pkgs/applications/editors/imhex/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ lib
2-
, gcc12Stdenv
2+
, stdenv
33
, cmake
44
, llvm
55
, fetchFromGitHub
@@ -32,7 +32,7 @@ let
3232
};
3333

3434
in
35-
gcc12Stdenv.mkDerivation rec {
35+
stdenv.mkDerivation rec {
3636
pname = "imhex";
3737
inherit version;
3838

0 commit comments

Comments
 (0)