Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5ed9d8b8aaa1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 25295972d42c
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Oct 2, 2019

  1. kafka: Add 2.3

    @NeQuissimus
    NeQuissimus committed Oct 2, 2019
    Copy the full SHA
    2529597 View commit details
Showing with 10 additions and 3 deletions.
  1. +1 −0 nixos/tests/kafka.nix
  2. +5 −0 pkgs/servers/apache-kafka/default.nix
  3. +4 −3 pkgs/top-level/all-packages.nix
1 change: 1 addition & 0 deletions nixos/tests/kafka.nix
View file
Original file line number Diff line number Diff line change
@@ -73,4 +73,5 @@ in with pkgs; {
kafka_2_0 = makeKafkaTest "kafka_2_0" apacheKafka_2_0;
kafka_2_1 = makeKafkaTest "kafka_2_1" apacheKafka_2_1;
kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2;
kafka_2_3 = makeKafkaTest "kafka_2_3" apacheKafka_2_3;
}
5 changes: 5 additions & 0 deletions pkgs/servers/apache-kafka/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,6 +43,11 @@ let
scalaVersion = "2.12";
sha256 = "1svdnhdzq9a6jsig513i0ahaysfgar5i385bq9fz7laga6a4z3qv";
};
"2.3" = {
kafkaVersion = "2.3.0";
scalaVersion = "2.12";
sha256 = "1rz3xqv26h0zv5pmk65znzn08gycmrfj6vvbmrvl9i7hm4hm2vyq";
};
};
in

7 changes: 4 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -9178,7 +9178,7 @@ in
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
ant = apacheAnt;

apacheKafka = apacheKafka_2_2;
apacheKafka = apacheKafka_2_3;
apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
@@ -9187,6 +9187,7 @@ in
apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; };
apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; };
apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; };
apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; };

kt = callPackage ../tools/misc/kt {};

@@ -15484,11 +15485,11 @@ in
bridge-utils = callPackage ../os-specific/linux/bridge-utils { };

busybox = callPackage ../os-specific/linux/busybox { };
busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix {
busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix {
# musl roadmap has RISC-V support projected for 1.1.20
busybox = if !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic"
then pkgsStatic.busybox
else busybox;
else busybox;
};

cachefilesd = callPackage ../os-specific/linux/cachefilesd { };