diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index a23b2489abe..66f2ac7ae26 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -1456,6 +1456,46 @@
desktop environments as needed.
+
+
+ The hadoop package has added support for
+ aarch64-linux and
+ aarch64-darwin as of 3.3.1
+ (#158613).
+
+
+
+
+ The R package now builds again on
+ aarch64-darwin
+ (#158992).
+
+
+
+
+ The spark3 package has been updated from
+ 3.1.2 to 3.2.1
+ (#160075):
+
+
+
+
+ Testing has been enabled for
+ aarch64-linux in addition to
+ x86_64-linux.
+
+
+
+
+ The spark3 package is now usable on
+ aarch64-darwin as a result of
+ #158613
+ and
+ #158992.
+
+
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 390ec7b2add..01893993955 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -537,4 +537,13 @@ In addition to numerous new and upgraded packages, this release has the followin
- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
+- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).
+
+- The `R` package now builds again on `aarch64-darwin` ([#158992](https://github.com/NixOS/nixpkgs/pull/158992)).
+
+- The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)):
+
+ - Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`.
+ - The `spark3` package is now usable on `aarch64-darwin` as a result of [#158613](https://github.com/NixOS/nixpkgs/pull/158613) and [#158992](https://github.com/NixOS/nixpkgs/pull/158992).
+
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index eee99fb5e97..6f4c6213595 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -485,7 +485,7 @@ in
sonarr = handleTest ./sonarr.nix {};
sourcehut = handleTest ./sourcehut.nix {};
spacecookie = handleTest ./spacecookie.nix {};
- spark = handleTestOn ["x86_64-linux"] ./spark {};
+ spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {};
sslh = handleTest ./sslh.nix {};
sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {};
sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 7876eb1c752..7770f98afe5 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -1,13 +1,26 @@
-{ lib, stdenv, fetchzip, makeWrapper, jdk8, python3Packages, extraPythonPackages ? [], coreutils, hadoop
-, RSupport? true, R
+{ lib
+, stdenv
+, fetchzip
+, makeWrapper
+, jdk8
+, python3Packages
+, extraPythonPackages ? [ ]
+, coreutils
+, hadoop
+, RSupport ? true
+, R
}:
with lib;
let
- spark = { pname, version, src }:
+ spark = { pname, version, sha256 }:
stdenv.mkDerivation rec {
- inherit pname version src;
+ inherit pname version;
+ src = fetchzip {
+ url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
+ sha256 = sha256;
+ };
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk8 python3Packages.python ]
++ extraPythonPackages
@@ -45,31 +58,29 @@ let
'';
meta = {
- description = "Apache Spark is a fast and general engine for large-scale data processing";
- homepage = "https://spark.apache.org/";
- license = lib.licenses.asl20;
- platforms = lib.platforms.all;
- maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ];
+ description = "Apache Spark is a fast and general engine for large-scale data processing";
+ homepage = "https://spark.apache.org/";
+ license = lib.licenses.asl20;
+ platforms = lib.platforms.all;
+ maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ];
repositories.git = "git://git.apache.org/spark.git";
};
};
-in {
- spark3 = spark rec {
+in
+{
+ spark_3_2 = spark rec {
+ pname = "spark";
+ version = "3.2.1";
+ sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d";
+ };
+ spark_3_1 = spark rec {
pname = "spark";
version = "3.1.2";
-
- src = fetchzip {
- url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
- sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf";
- };
+ sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf";
};
- spark2 = spark rec {
+ spark_2_4 = spark rec {
pname = "spark";
version = "2.4.8";
-
- src = fetchzip {
- url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
- sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
- };
+ sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68f51ad97c0..7183ba02e06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14163,8 +14163,11 @@ with pkgs;
self = pkgsi686Linux.callPackage ../development/interpreters/self { };
inherit (callPackages ../applications/networking/cluster/spark { })
- spark3
- spark2;
+ spark_3_2
+ spark_3_1
+ spark_2_4;
+ spark3 = spark_3_2;
+ spark2 = spark_2_4;
spark = spark3;
sparkleshare = callPackage ../applications/version-management/sparkleshare { };