summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-10-09 14:39:37 +0200
committerVladimír Čunát <v@cunat.cz>2019-10-09 16:54:03 +0200
commitde513680c50faf05bf1ee585fb5c9128dcf4e67c (patch)
treef267a9db2d190b40628b9ab67ba7fa1b07c8c8a8
parentd16545fc953ff0bc46554ea4bcdbddb5c8382d32 (diff)
downloadnixpkgs-de513680c50faf05bf1ee585fb5c9128dcf4e67c.tar
nixpkgs-de513680c50faf05bf1ee585fb5c9128dcf4e67c.tar.gz
nixpkgs-de513680c50faf05bf1ee585fb5c9128dcf4e67c.tar.bz2
nixpkgs-de513680c50faf05bf1ee585fb5c9128dcf4e67c.tar.lz
nixpkgs-de513680c50faf05bf1ee585fb5c9128dcf4e67c.tar.xz
nixpkgs-de513680c50faf05bf1ee585fb5c9128dcf4e67c.tar.zst
nixpkgs-de513680c50faf05bf1ee585fb5c9128dcf4e67c.zip
scylladb: remove the "broken" mark, add "big-parallel"
The build is really CPU-intensive, and requires around
2 * --cores GiB RAM.
-rw-r--r--pkgs/servers/scylladb/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix
index ec8cd2a05a8..6f8f925602a 100644
--- a/pkgs/servers/scylladb/default.nix
+++ b/pkgs/servers/scylladb/default.nix
@@ -95,6 +95,6 @@ gcc8Stdenv.mkDerivation {
     license = licenses.agpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.farlion ];
-    broken = true;
+    requiredSystemFeatures = [ "big-parallel" ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b9fb0c2fd2..b251dc342e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24494,8 +24494,8 @@ in
   sct = callPackage ../tools/X11/sct {};
 
   scylladb = callPackage ../servers/scylladb {
-   thrift = thrift-0_10;
-   };
+    thrift = thrift-0_10;
+  };
 
   seafile-shared = callPackage ../misc/seafile-shared { };