Skip to content

Commit 0f4ec0a

Browse files
github-actions[bot]github-actions[bot]
authored
Merge staging-next-21.11 into staging-21.11
2 parents 0350e81 + 8ad7b9d commit 0f4ec0a

33 files changed

Lines changed: 169 additions & 184 deletions

File tree

‎nixos/modules/services/misc/matrix-synapse.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ in {
733733
after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service";
734734
wantedBy = [ "multi-user.target" ];
735735
preStart = ''
736-
${cfg.package}/bin/homeserver \
736+
${cfg.package}/bin/synapse_homeserver \
737737
--config-path ${configFile} \
738738
--keys-directory ${cfg.dataDir} \
739739
--generate-keys
@@ -753,7 +753,7 @@ in {
753753
chmod 0600 ${cfg.dataDir}/homeserver.signing.key
754754
'')) ];
755755
ExecStart = ''
756-
${cfg.package}/bin/homeserver \
756+
${cfg.package}/bin/synapse_homeserver \
757757
${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
758758
--keys-directory ${cfg.dataDir}
759759
'';

‎nixos/modules/services/networking/unifi.nix‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ let
77
@${cfg.jrePackage}/bin/java java \
88
${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
99
${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
10-
${optionalString (lib.versionOlder cfg.unifiPackage.version "6.5.54") "-Dlog4j2.formatMsgNoLookups=true"} \
1110
-jar ${stateDir}/lib/ace.jar
1211
'';
1312
in

‎nixos/tests/all-tests.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,7 @@ in
477477
ucarp = handleTest ./ucarp.nix {};
478478
udisks2 = handleTest ./udisks2.nix {};
479479
unbound = handleTest ./unbound.nix {};
480+
unifi = handleTest ./unifi.nix {};
480481
unit-php = handleTest ./web-servers/unit-php.nix {};
481482
upnp = handleTest ./upnp.nix {};
482483
usbguard = handleTest ./usbguard.nix {};

‎nixos/tests/docker-tools.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
215215
f"docker run --rm ${examples.layersOrder.imageName} cat /tmp/layer{index}"
216216
)
217217
218+
with subtest("Ensure layers unpacked in correct order before runAsRoot runs"):
219+
assert "abc" in docker.succeed(
220+
"docker load --input='${examples.layersUnpackOrder}'",
221+
"docker run --rm ${examples.layersUnpackOrder.imageName} cat /layer-order"
222+
)
223+
218224
with subtest("Ensure environment variables are correctly inherited"):
219225
docker.succeed(
220226
"docker load --input='${examples.environmentVariables}'"

‎nixos/tests/unifi.nix‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Test UniFi controller
2+
3+
{ system ? builtins.currentSystem
4+
, config ? { allowUnfree = true; }
5+
, pkgs ? import ../.. { inherit system config; }
6+
}:
7+
8+
with import ../lib/testing-python.nix { inherit system pkgs; };
9+
with pkgs.lib;
10+
11+
let
12+
makeAppTest = unifi: makeTest {
13+
name = "unifi-controller-${unifi.version}";
14+
meta = with pkgs.lib.maintainers; {
15+
maintainers = [ zhaofengli ];
16+
};
17+
18+
nodes.server = {
19+
services.unifi = {
20+
enable = true;
21+
unifiPackage = unifi;
22+
};
23+
};
24+
25+
testScript = ''
26+
server.wait_for_unit("unifi.service")
27+
server.wait_until_succeeds("curl -Lk https://localhost:8443 >&2", timeout=300)
28+
'';
29+
};
30+
in with pkgs; {
31+
unifiLTS = makeAppTest unifiLTS;
32+
unifi5 = makeAppTest unifi5;
33+
unifi6 = makeAppTest unifi6;
34+
}

‎pkgs/applications/graphics/hydrus/default.nix‎

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

1111
python3Packages.buildPythonPackage rec {
1212
pname = "hydrus";
13-
version = "464";
13+
version = "466";
1414
format = "other";
1515

1616
src = fetchFromGitHub {
1717
owner = "hydrusnetwork";
1818
repo = "hydrus";
1919
rev = "v${version}";
20-
sha256 = "sha256-ZAndODbl6cH0H1rA3Bhn3AlfIuba0LjxWxusGPDYvlA=";
20+
sha256 = "sha256-ih2BctOC9cuTYP8A9ikhGBqNP0SToSAkqmZhtBvgpIo=";
2121
};
2222

2323
nativeBuildInputs = [

‎pkgs/applications/networking/browsers/firefox/packages.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ in
77
rec {
88
firefox = common rec {
99
pname = "firefox";
10-
version = "95.0";
10+
version = "95.0.1";
1111
src = fetchurl {
1212
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
13-
sha512 = "350672a2cd99195c67dafc0e71c6eaf1e23e85a5fe92775697119a054f17c34a736035e23d7f2bb404b544f0f144efef3843cfc293596a6e61d1ea36efc3a724";
13+
sha512 = "54887c3adbf7202b835ae1ac928c3c95516ef11f9894456561dad500a1a61623f926b37f6e02fef0898e7ee0fd9147a71e5432634e6e0a2c2fecd08509799c37";
1414
};
1515

1616
meta = {

‎pkgs/applications/networking/gopher/sacc/default.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
stdenv.mkDerivation rec {
66
pname = "sacc";
7-
version = "1.04";
7+
version = "1.05";
88

99
src = fetchurl {
10-
url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz";
11-
sha512 = "1rjxs77a5k2mgpwr2ln1czn64fmss9yw59g0k60r25c2ny2la6ddfcl5zclawcikk346na6m96jrfwssmka0axr2spwpl61wm0lijnk";
10+
url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz";
11+
sha512 = "080vpacipdis396lrw3fxc1z7h2d0njm2zi63kvlk0n2m1disv97c968zx8dp76kfw1s03nvvr6v3vnpfkkywiz1idjc92s5rgcbsk1";
1212
};
1313

1414
inherit patches;

‎pkgs/applications/networking/shellhub-agent/default.nix‎

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

1010
buildGoModule rec {
1111
pname = "shellhub-agent";
12-
version = "0.7.2";
12+
version = "0.8.1";
1313

1414
src = fetchFromGitHub {
1515
owner = "shellhub-io";
1616
repo = "shellhub";
1717
rev = "v${version}";
18-
sha256 = "02ka7acynkwkml2pavlv4j5vkm6x5aq5sfxgydv26qzs39f1wdgc";
18+
sha256 = "LafREMle3v/XLLsfS+sNSE4Q9AwX4v8Mg9/9RngbN40=";
1919
};
2020

2121
modRoot = "./agent";
2222

23-
vendorSha256 = "18z3vwcwkyj6hcvl35qmj034237h9l18dvcbx1hxry7qdwv807c9";
23+
vendorSha256 = "sha256-3bHDDjfpXgmS6lpIOkpouTKTjHT1gMbUWnuskaOptUM=";
2424

2525
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
2626

‎pkgs/build-support/docker/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ rec {
235235
# Unpack all of the parent layers into the image.
236236
lowerdir=""
237237
extractionID=0
238-
for layerTar in $(tac layer-list); do
238+
for layerTar in $(cat layer-list); do
239239
echo "Unpacking layer $layerTar"
240240
extractionID=$((extractionID + 1))
241241

0 commit comments

Comments
 (0)