diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-12-20 21:06:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-20 21:06:52 -0500 |
commit | 3c38cc80582dfa52023fef2f2259fecc32dd356b (patch) | |
tree | ac398b2f5fa46f80bc58679bf9dabda555282c68 | |
parent | 7b2b5b3f47717916fb6a850d80382a9f576e0361 (diff) | |
parent | 167076877e0c7be52fceca87f9d1c3d1b37c81da (diff) | |
download | nixpkgs-3c38cc80582dfa52023fef2f2259fecc32dd356b.tar nixpkgs-3c38cc80582dfa52023fef2f2259fecc32dd356b.tar.gz nixpkgs-3c38cc80582dfa52023fef2f2259fecc32dd356b.tar.bz2 nixpkgs-3c38cc80582dfa52023fef2f2259fecc32dd356b.tar.lz nixpkgs-3c38cc80582dfa52023fef2f2259fecc32dd356b.tar.xz nixpkgs-3c38cc80582dfa52023fef2f2259fecc32dd356b.tar.zst nixpkgs-3c38cc80582dfa52023fef2f2259fecc32dd356b.zip |
Merge pull request #51813 from samueldr/aarch64/disable-non-arm-builds-part-1
aarch64: ZHF for aarch64 (1/??)
19 files changed, 41 insertions, 6 deletions
diff --git a/nixos/modules/services/databases/aerospike.nix b/nixos/modules/services/databases/aerospike.nix index 5f33164998b..4b905f90529 100644 --- a/nixos/modules/services/databases/aerospike.nix +++ b/nixos/modules/services/databases/aerospike.nix @@ -43,6 +43,7 @@ in package = mkOption { default = pkgs.aerospike; + defaultText = "pkgs.aerospike"; type = types.package; description = "Which Aerospike derivation to use"; }; diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 3475f62dcbb..7383623a5ff 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -21,5 +21,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + # Build uses `-msse` and `-mfpmath=sse` + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 9a9095d2fc1..91a0a1f140c 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -20,5 +20,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; + # Build uses `-msse` and `-mfpmath=sse` + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index d7a5e7b4c83..bf8d3cf03b8 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -44,5 +44,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; homepage = http://alviano.net/software/maxino/; + # See pkgs/applications/science/logic/glucose/default.nix + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 218006e15d5..6c2d2f0a062 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -46,5 +46,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.linux; + # See pkgs/applications/science/logic/glucose/default.nix + # (The error is different due to glucose-fenv.patch, but the same) + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index a0035f96539..bc8d372ce42 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -23,5 +23,7 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; + # Build uses _FPU_EXTENDED macro + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 09d68084e77..5b02aed274f 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { homepage = https://cisco.github.io/ChezScheme/; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; + badPlatforms = [ "aarch64-linux" ]; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix index c9097bec5dc..0449572da02 100644 --- a/pkgs/development/interpreters/angelscript/2.22.nix +++ b/pkgs/development/interpreters/angelscript/2.22.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.zlib ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + badPlatforms = [ "aarch64-linux" ]; downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; homepage="http://www.angelcode.com/angelscript/"; }; diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index fb16c71fd19..22e91ee61d7 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; homepage = "http://aften.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 02c67d7dbf8..ba6fc7cb541 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -107,5 +107,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ artuuge zimbatm ]; platforms = platforms.linux; + # Requires libdrm_intel + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index c79b874ecb6..3e488acee74 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -111,7 +111,8 @@ stdenv.mkDerivation { description = "Collection of C++ libraries"; license = stdenv.lib.licenses.boost; - platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) (platforms.unix ++ platforms.windows); + platforms = (platforms.unix ++ platforms.windows); + badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux"; maintainers = with maintainers; [ peti wkennington ]; }; diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index 0ed223832b6..3c27281571a 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; platforms = stdenv.lib.platforms.all; + # Build uses `-msse` and `-mfpmath=sse` + badPlatforms = [ "aarch64-linux" ]; }; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index f569d9c3ea1..69fe1b0db55 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -36,5 +36,7 @@ stdenv.mkDerivation rec { extensive test suite. ''; platforms = stdenv.lib.platforms.unix; + # Failing "eigen" tests on aarch64. + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index bfbf6f1212f..81754ffad4d 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: +{stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: stdenv.mkDerivation rec { name = "openbabel-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r"; }; + patches = [ + # ARM / AArch64 fixes. + (fetchpatch { + url = https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch; + sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g"; + }) + ]; + # TODO : perl & python bindings; # TODO : wxGTK: I have no time to compile # TODO : separate lib and apps diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index afc555cb51e..666f953f6b5 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -44,5 +44,7 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; + # Makefile:140: *** aarch64 is not a supported architecture. Stop. + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index 124daa4a5cc..c5290709b62 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { description = "Flash-optimized, in-memory, NoSQL database"; homepage = http://aerospike.com/; license = licenses.agpl3; - #platforms = [ "x86_64-linux" ]; # breaks eval of nixos manual for aarch64 - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kalbasit ]; }; } diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix index c0383b7c822..386642614bc 100644 --- a/pkgs/tools/networking/bud/default.nix +++ b/pkgs/tools/networking/bud/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { description = "A TLS terminating proxy"; license = licenses.mit; platforms = platforms.linux; + # Does not build on aarch64-linux. + badPlatforms = [ "aarch64-linux" ]; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index 17150c75466..e45906688ad 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -33,5 +33,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.rlupton20 ]; platforms = platforms.linux; + # error: architecture aarch64 is not supported by strace + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index 1679b7fddd0..f9d2855e739 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://blake2.net"; license = with licenses; [ asl20 cc0 openssl ]; maintainers = with maintainers; [ kirelagin ]; - platforms = platforms.all; + # "This code requires at least SSE2." + platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; }; } |