git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #51813 from samueldr/aarch64/disable-non-arm-builds-part-1

aarch64: ZHF for aarch64 (1/??)

commit3c38cc80582dfa52023fef2f2259fecc32dd356b authorSamuel Dionne-Riel <samuel@dionne-riel.com> dateThu 20 Dec 2018, 21:06 (8 years ago) parent7b2b5b31670768
19 files changed+41−6
nixos/modules/services/databases/aerospike.nix+1 pkgs/applications/audio/ams-lv2/default.nix+2 pkgs/applications/audio/artyFX/default.nix+2 pkgs/applications/science/logic/aspino/default.nix+2 pkgs/applications/science/logic/avy/default.nix+3 pkgs/applications/science/logic/glucose/default.nix+2 pkgs/development/compilers/chez/default.nix+1 pkgs/development/interpreters/angelscript/2.22.nix+1 pkgs/development/libraries/aften/default.nix+1−1 pkgs/development/libraries/beignet/default.nix+2 pkgs/development/libraries/boost/generic.nix+2−1 pkgs/development/libraries/bootil/default.nix+2 pkgs/development/libraries/gsl/gsl-1_16.nix+2 pkgs/development/libraries/openbabel/default.nix+9−1 pkgs/misc/emulators/blastem/default.nix+2 pkgs/servers/nosql/aerospike/default.nix+1−2 pkgs/tools/networking/bud/default.nix+2 pkgs/tools/package-management/cde/default.nix+2 pkgs/tools/security/b2sum/default.nix+2−1
nixos/modules/services/databases/aerospike.nix+1
@@ -43,6 +43,7 @@ in
4343
4444 package = mkOption {
4545 default = pkgs.aerospike;
46+ defaultText = "pkgs.aerospike";
4647 type = types.package;
4748 description = "Which Aerospike derivation to use";
4849 };
pkgs/applications/audio/ams-lv2/default.nix+2
@@ -21,5 +21,7 @@ stdenv.mkDerivation rec {
2121 license = licenses.gpl3;
2222 maintainers = [ maintainers.goibhniu ];
2323 platforms = platforms.linux;
24+ # Build uses `-msse` and `-mfpmath=sse`
25+ badPlatforms = [ "aarch64-linux" ];
2426 };
2527}
pkgs/applications/audio/artyFX/default.nix+2
@@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
2020 license = licenses.gpl2;
2121 maintainers = [ maintainers.magnetophon ];
2222 platforms = platforms.linux;
23+ # Build uses `-msse` and `-mfpmath=sse`
24+ badPlatforms = [ "aarch64-linux" ];
2325 };
2426}
pkgs/applications/science/logic/aspino/default.nix+2
@@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
4444 platforms = platforms.unix;
4545 license = licenses.asl20;
4646 homepage = http://alviano.net/software/maxino/;
47+ # See pkgs/applications/science/logic/glucose/default.nix
48+ badPlatforms = [ "aarch64-linux" ];
4749 };
4850}
pkgs/applications/science/logic/avy/default.nix+3
@@ -46,5 +46,8 @@ stdenv.mkDerivation rec {
4646 license = stdenv.lib.licenses.mit;
4747 maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
4848 platforms = stdenv.lib.platforms.linux;
49+ # See pkgs/applications/science/logic/glucose/default.nix
50+ # (The error is different due to glucose-fenv.patch, but the same)
51+ badPlatforms = [ "aarch64-linux" ];
4952 };
5053}
pkgs/applications/science/logic/glucose/default.nix+2
@@ -23,5 +23,7 @@ stdenv.mkDerivation rec {
2323 license = licenses.mit;
2424 platforms = platforms.unix;
2525 maintainers = with maintainers; [ gebner ];
26+ # Build uses _FPU_EXTENDED macro
27+ badPlatforms = [ "aarch64-linux" ];
2628 };
2729}
pkgs/development/compilers/chez/default.nix+1
@@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
8383 homepage = https://cisco.github.io/ChezScheme/;
8484 license = stdenv.lib.licenses.asl20;
8585 platforms = stdenv.lib.platforms.unix;
86+ badPlatforms = [ "aarch64-linux" ];
8687 maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
8788 };
8889}
pkgs/development/interpreters/angelscript/2.22.nix+1
@@ -38,6 +38,7 @@ stdenv.mkDerivation {
3838 license = stdenv.lib.licenses.zlib ;
3939 maintainers = [stdenv.lib.maintainers.raskin];
4040 platforms = stdenv.lib.platforms.linux;
41+ badPlatforms = [ "aarch64-linux" ];
4142 downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
4243 homepage="http://www.angelcode.com/angelscript/";
4344 };
pkgs/development/libraries/aften/default.nix+1−1
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
1616 description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
1717 homepage = "http://aften.sourceforge.net/";
1818 license = stdenv.lib.licenses.lgpl2;
19− platforms = stdenv.lib.platforms.unix;
19+ platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
2020 };
2121}
pkgs/development/libraries/beignet/default.nix+2
@@ -107,5 +107,7 @@ stdenv.mkDerivation rec {
107107 license = licenses.lgpl21Plus;
108108 maintainers = with maintainers; [ artuuge zimbatm ];
109109 platforms = platforms.linux;
110+ # Requires libdrm_intel
111+ badPlatforms = [ "aarch64-linux" ];
110112 };
111113}
pkgs/development/libraries/boost/generic.nix+2−1
@@ -111,7 +111,8 @@ stdenv.mkDerivation {
111111 description = "Collection of C++ libraries";
112112 license = stdenv.lib.licenses.boost;
113113
114− platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) (platforms.unix ++ platforms.windows);
114+ platforms = (platforms.unix ++ platforms.windows);
115+ badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux";
115116 maintainers = with maintainers; [ peti wkennington ];
116117 };
117118
pkgs/development/libraries/bootil/default.nix+2
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
1010 license = stdenv.lib.licenses.free;
1111 maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ];
1212 platforms = stdenv.lib.platforms.all;
13+ # Build uses `-msse` and `-mfpmath=sse`
14+ badPlatforms = [ "aarch64-linux" ];
1315 };
1416
1517 src = fetchFromGitHub {
pkgs/development/libraries/gsl/gsl-1_16.nix+2
@@ -36,5 +36,7 @@ stdenv.mkDerivation rec {
3636 extensive test suite.
3737 '';
3838 platforms = stdenv.lib.platforms.unix;
39+ # Failing "eigen" tests on aarch64.
40+ badPlatforms = [ "aarch64-linux" ];
3941 };
4042}
pkgs/development/libraries/openbabel/default.nix+9−1
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
1+{stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }:
22
33stdenv.mkDerivation rec {
44 name = "openbabel-${version}";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
99 sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
1010 };
1111
12+ patches = [
13+ # ARM / AArch64 fixes.
14+ (fetchpatch {
15+ url = https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch;
16+ sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g";
17+ })
18+ ];
19+
1220 # TODO : perl & python bindings;
1321 # TODO : wxGTK: I have no time to compile
1422 # TODO : separate lib and apps
pkgs/misc/emulators/blastem/default.nix+2
@@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
4444 maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
4545 license = stdenv.lib.licenses.gpl3;
4646 platforms = stdenv.lib.platforms.linux;
47+ # Makefile:140: *** aarch64 is not a supported architecture. Stop.
48+ badPlatforms = [ "aarch64-linux" ];
4749 };
4850}
pkgs/servers/nosql/aerospike/default.nix+1−2
@@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
3030 description = "Flash-optimized, in-memory, NoSQL database";
3131 homepage = http://aerospike.com/;
3232 license = licenses.agpl3;
33− #platforms = [ "x86_64-linux" ]; # breaks eval of nixos manual for aarch64
34− platforms = platforms.linux;
33+ platforms = [ "x86_64-linux" ];
3534 maintainers = with maintainers; [ kalbasit ];
3635 };
3736}
pkgs/tools/networking/bud/default.nix+2
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
2929 description = "A TLS terminating proxy";
3030 license = licenses.mit;
3131 platforms = platforms.linux;
32+ # Does not build on aarch64-linux.
33+ badPlatforms = [ "aarch64-linux" ];
3234 maintainers = with maintainers; [ cstrahan ];
3335 };
3436}
pkgs/tools/package-management/cde/default.nix+2
@@ -33,5 +33,7 @@ stdenv.mkDerivation rec {
3333 license = licenses.gpl3;
3434 maintainers = [ maintainers.rlupton20 ];
3535 platforms = platforms.linux;
36+ # error: architecture aarch64 is not supported by strace
37+ badPlatforms = [ "aarch64-linux" ];
3638 };
3739}
pkgs/tools/security/b2sum/default.nix+2−1
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
2323 homepage = "https://blake2.net";
2424 license = with licenses; [ asl20 cc0 openssl ];
2525 maintainers = with maintainers; [ kirelagin ];
26− platforms = platforms.all;
26+ # "This code requires at least SSE2."
27+ platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin;
2728 };
2829}