Skip to content

Commit 61f3d46

Browse files
dezgegdezgeg
committedNov 4, 2017
Merge remote-tracking branch 'upstream/master' into staging
2 parents eed6e0a + d902478 commit 61f3d46

File tree

31 files changed

+726
-477
lines changed

31 files changed

+726
-477
lines changed
 

‎doc/meta.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,9 @@ meta-attributes</title>
200200
meta.platforms = stdenv.lib.platforms.linux;
201201
</programlisting>
202202

203-
Attribute Set <varname>stdenv.lib.platforms</varname> in
204-
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/platforms.nix">
205-
<filename>nixpkgs/lib/platforms.nix</filename></link> defines various common
206-
lists of platforms types.
207-
</para></listitem>
203+
Attribute Set <varname>stdenv.lib.platforms</varname> defines
204+
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix">
205+
various common lists</link> of platforms types.</para></listitem>
208206
</varlistentry>
209207

210208
<varlistentry>

‎nixos/doc/manual/release-notes/rl-1803.xml

+8
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@ following incompatible changes:</para>
9090
That means that old configuration is not overwritten by default when update to the znc options are made.
9191
</para>
9292
</listitem>
93+
<listitem>
94+
<para>
95+
The option <option>services.xserver.desktopManager.default</option> is now <literal>none</literal> by default.
96+
An assertion failure is thrown if WM's and DM's default are <literal>none</literal>.
97+
To explicitly run a plain X session without and DM or WM, the newly introduced option <option>services.xserver.plainX</option>
98+
must be set to true.
99+
</para>
100+
</listitem>
93101
</itemizedlist>
94102

95103
</section>

‎nixos/modules/services/x11/desktop-managers/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ in
8787

8888
default = mkOption {
8989
type = types.str;
90-
default = "";
91-
example = "none";
90+
default = "none";
91+
example = "plasma5";
9292
description = "Default desktop manager loaded if none have been chosen.";
9393
apply = defaultDM:
9494
if defaultDM == "" && cfg.session.list != [] then

‎nixos/modules/services/x11/xserver.nix

+12
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,15 @@ in
161161
'';
162162
};
163163

164+
plainX = mkOption {
165+
type = types.bool;
166+
default = false;
167+
description = ''
168+
Whether the X11 session can be plain (without DM/WM) and
169+
the Xsession script will be used as fallback or not.
170+
'';
171+
};
172+
164173
autorun = mkOption {
165174
type = types.bool;
166175
default = true;
@@ -552,6 +561,9 @@ in
552561
+ "${toString (length primaryHeads)} heads set to primary: "
553562
+ concatMapStringsSep ", " (x: x.output) primaryHeads;
554563
})
564+
{ assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX;
565+
message = "Either the desktop manager or the window manager shouldn't be `none`! To explicitly allow this, you can also set `services.xserver.plainX` to `true`.";
566+
}
555567
];
556568

557569
environment.etc =

‎nixos/release.nix

+5-1
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,10 @@ in rec {
270270
tests.plasma5 = callTest tests/plasma5.nix {};
271271
tests.keymap = callSubTests tests/keymap.nix {};
272272
tests.initrdNetwork = callTest tests/initrd-network.nix {};
273+
tests.kafka_0_9 = callTest tests/kafka_0_9.nix {};
274+
tests.kafka_0_10 = callTest tests/kafka_0_10.nix {};
275+
tests.kafka_0_11 = callTest tests/kafka_0_11.nix {};
276+
tests.kafka_1_0 = callTest tests/kafka_1_0.nix {};
273277
tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
274278
tests.kernel-latest = callTest tests/kernel-latest.nix {};
275279
tests.kernel-lts = callTest tests/kernel-lts.nix {};
@@ -330,7 +334,7 @@ in rec {
330334
tests.wordpress = callTest tests/wordpress.nix {};
331335
tests.xfce = callTest tests/xfce.nix {};
332336
tests.xmonad = callTest tests/xmonad.nix {};
333-
337+
tests.zookeeper = callTest tests/zookeeper.nix {};
334338

335339
/* Build a bunch of typical closures so that Hydra can keep track of
336340
the evolution of closure sizes. */

‎nixos/tests/kafka_0_10.nix

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import ./make-test.nix ({ pkgs, lib, ... } :
2+
let
3+
kafkaPackage = pkgs.apacheKafka_0_10;
4+
in {
5+
name = "kafka_0_10";
6+
meta = with pkgs.stdenv.lib.maintainers; {
7+
maintainers = [ nequissimus ];
8+
};
9+
10+
nodes = {
11+
zookeeper1 = { config, ... }: {
12+
services.zookeeper = {
13+
enable = true;
14+
};
15+
16+
networking.firewall.allowedTCPPorts = [ 2181 ];
17+
};
18+
kafka = { config, ... }: {
19+
services.apache-kafka = {
20+
enable = true;
21+
extraProperties = ''
22+
offsets.topic.replication.factor = 1
23+
'';
24+
package = kafkaPackage;
25+
zookeeper = "zookeeper1:2181";
26+
};
27+
28+
networking.firewall.allowedTCPPorts = [ 9092 ];
29+
virtualisation.memorySize = 2048;
30+
};
31+
};
32+
33+
testScript = ''
34+
startAll;
35+
36+
$zookeeper1->waitForUnit("zookeeper");
37+
$zookeeper1->waitForUnit("network.target");
38+
$zookeeper1->waitForOpenPort(2181);
39+
40+
$kafka->waitForUnit("apache-kafka");
41+
$kafka->waitForUnit("network.target");
42+
$kafka->waitForOpenPort(9092);
43+
44+
$kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
45+
$kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
46+
$kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
47+
'';
48+
})

‎nixos/tests/kafka_0_11.nix

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import ./make-test.nix ({ pkgs, lib, ... } :
2+
let
3+
kafkaPackage = pkgs.apacheKafka_0_11;
4+
in {
5+
name = "kafka_0_11";
6+
meta = with pkgs.stdenv.lib.maintainers; {
7+
maintainers = [ nequissimus ];
8+
};
9+
10+
nodes = {
11+
zookeeper1 = { config, ... }: {
12+
services.zookeeper = {
13+
enable = true;
14+
};
15+
16+
networking.firewall.allowedTCPPorts = [ 2181 ];
17+
};
18+
kafka = { config, ... }: {
19+
services.apache-kafka = {
20+
enable = true;
21+
extraProperties = ''
22+
offsets.topic.replication.factor = 1
23+
'';
24+
package = kafkaPackage;
25+
zookeeper = "zookeeper1:2181";
26+
};
27+
28+
networking.firewall.allowedTCPPorts = [ 9092 ];
29+
virtualisation.memorySize = 2048;
30+
};
31+
};
32+
33+
testScript = ''
34+
startAll;
35+
36+
$zookeeper1->waitForUnit("zookeeper");
37+
$zookeeper1->waitForUnit("network.target");
38+
$zookeeper1->waitForOpenPort(2181);
39+
40+
$kafka->waitForUnit("apache-kafka");
41+
$kafka->waitForUnit("network.target");
42+
$kafka->waitForOpenPort(9092);
43+
44+
$kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
45+
$kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
46+
$kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
47+
'';
48+
})

‎nixos/tests/kafka_0_9.nix

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import ./make-test.nix ({ pkgs, lib, ... } :
2+
let
3+
kafkaPackage = pkgs.apacheKafka_0_9;
4+
in {
5+
name = "kafka_0_9";
6+
meta = with pkgs.stdenv.lib.maintainers; {
7+
maintainers = [ nequissimus ];
8+
};
9+
10+
nodes = {
11+
zookeeper1 = { config, ... }: {
12+
services.zookeeper = {
13+
enable = true;
14+
};
15+
16+
networking.firewall.allowedTCPPorts = [ 2181 ];
17+
};
18+
kafka = { config, ... }: {
19+
services.apache-kafka = {
20+
enable = true;
21+
extraProperties = ''
22+
offsets.topic.replication.factor = 1
23+
'';
24+
package = kafkaPackage;
25+
zookeeper = "zookeeper1:2181";
26+
};
27+
28+
networking.firewall.allowedTCPPorts = [ 9092 ];
29+
virtualisation.memorySize = 2048;
30+
};
31+
};
32+
33+
testScript = ''
34+
startAll;
35+
36+
$zookeeper1->waitForUnit("zookeeper");
37+
$zookeeper1->waitForUnit("network.target");
38+
$zookeeper1->waitForOpenPort(2181);
39+
40+
$kafka->waitForUnit("apache-kafka");
41+
$kafka->waitForUnit("network.target");
42+
$kafka->waitForOpenPort(9092);
43+
44+
$kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
45+
$kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
46+
$kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
47+
'';
48+
})

‎nixos/tests/kafka_1_0.nix

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import ./make-test.nix ({ pkgs, lib, ... } :
2+
let
3+
kafkaPackage = pkgs.apacheKafka_1_0;
4+
in {
5+
name = "kafka_1_0";
6+
meta = with pkgs.stdenv.lib.maintainers; {
7+
maintainers = [ nequissimus ];
8+
};
9+
10+
nodes = {
11+
zookeeper1 = { config, ... }: {
12+
services.zookeeper = {
13+
enable = true;
14+
};
15+
16+
networking.firewall.allowedTCPPorts = [ 2181 ];
17+
};
18+
kafka = { config, ... }: {
19+
services.apache-kafka = {
20+
enable = true;
21+
extraProperties = ''
22+
offsets.topic.replication.factor = 1
23+
'';
24+
package = kafkaPackage;
25+
zookeeper = "zookeeper1:2181";
26+
};
27+
28+
networking.firewall.allowedTCPPorts = [ 9092 ];
29+
virtualisation.memorySize = 2048;
30+
};
31+
};
32+
33+
testScript = ''
34+
startAll;
35+
36+
$zookeeper1->waitForUnit("zookeeper");
37+
$zookeeper1->waitForUnit("network.target");
38+
$zookeeper1->waitForOpenPort(2181);
39+
40+
$kafka->waitForUnit("apache-kafka");
41+
$kafka->waitForUnit("network.target");
42+
$kafka->waitForOpenPort(9092);
43+
44+
$kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
45+
$kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
46+
$kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
47+
'';
48+
})

‎nixos/tests/zookeeper.nix

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import ./make-test.nix ({ pkgs, ...} : {
2+
name = "zookeeper";
3+
meta = with pkgs.stdenv.lib.maintainers; {
4+
maintainers = [ nequissimus ];
5+
};
6+
7+
nodes = {
8+
server = { pkgs, config, ... }: {
9+
services.zookeeper = {
10+
enable = true;
11+
};
12+
13+
networking.firewall.allowedTCPPorts = [ 2181 ];
14+
};
15+
};
16+
17+
testScript = ''
18+
startAll;
19+
20+
$server->waitForUnit("zookeeper");
21+
$server->waitForUnit("network.target");
22+
$server->waitForOpenPort(2181);
23+
24+
$server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 create /foo bar");
25+
$server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 set /foo hello");
26+
$server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello");
27+
'';
28+
})

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ let
3232
build_dir=$PWD
3333
cd $TMPDIR
3434
35-
local_path=$(basename ${store_path} .zip | sed -e 's/^[a-z0-9]*-//')
35+
local_path=$(basename ${url} .zip)
3636
3737
cp -r ${store_path} $local_path
3838
chmod u+rwX -R $local_path

‎pkgs/applications/misc/synergy/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99

1010
src = fetchFromGitHub {
1111
owner = "symless";
12-
repo = "synergy";
12+
repo = "synergy-core";
1313
rev = "v${version}-stable";
1414
sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
1515
};

‎pkgs/applications/misc/tilix/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
stdenv.mkDerivation rec {
66
name = "tilix-${version}";
7-
version = "1.6.4";
7+
version = "1.7.1";
88

99
src = fetchFromGitHub {
1010
owner = "gnunn1";
1111
repo = "tilix";
1212
rev = "${version}";
13-
sha256 = "1vqi68jlbbaky1569kd4lr6p02zsiv7v2rfb8j1pzwj7gydblaac";
13+
sha256 = "0x0bnb26hjvxmvvd7c9k8fw97gcm3z5ssr6r8x90xbyyw6h58hhh";
1414
};
1515

1616
nativeBuildInputs = [

0 commit comments

Comments
 (0)
Please sign in to comment.