summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2018-12-09 14:46:13 -0500
committerSamuel Dionne-Riel <samuel@dionne-riel.com>2018-12-10 14:55:19 -0500
commitabcb25bd8df9bb53af359392ac7949533ddb85b4 (patch)
treed8b6a50e30c59147d982790148b06b962ff532e6
parente85c1f586807b5acd244df4c45a5130aa3f0734d (diff)
downloadnixpkgs-abcb25bd8df9bb53af359392ac7949533ddb85b4.tar
nixpkgs-abcb25bd8df9bb53af359392ac7949533ddb85b4.tar.gz
nixpkgs-abcb25bd8df9bb53af359392ac7949533ddb85b4.tar.bz2
nixpkgs-abcb25bd8df9bb53af359392ac7949533ddb85b4.tar.lz
nixpkgs-abcb25bd8df9bb53af359392ac7949533ddb85b4.tar.xz
nixpkgs-abcb25bd8df9bb53af359392ac7949533ddb85b4.tar.zst
nixpkgs-abcb25bd8df9bb53af359392ac7949533ddb85b4.zip
aerospike: Disables build on aarch64
The issue with its inclusion in the manual has been side-stepped by
matching on the platforms in supports.
-rw-r--r--nixos/modules/services/databases/aerospike.nix1
-rw-r--r--pkgs/servers/nosql/aerospike/default.nix3
2 files changed, 2 insertions, 2 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/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 ];
   };
 }