movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse source 
Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Tuomas Tynkkynen 2018-05-18 03:54:33 +03:00
commit 003473613a
81 changed files with 1420 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/tests/kafka.nix
View file

@ -65,4 +65,5 @@ in with pkgs; {
kafka_0_10 = makeKafkaTest "kafka_0_10" apacheKafka_0_10;
kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11;
kafka_1_0 = makeKafkaTest "kafka_1_0" apacheKafka_1_0;
kafka_1_1 = makeKafkaTest "kafka_1_1" apacheKafka_1_1;
}