diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-11 15:24:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:14:45 +0000 |
| commit | 89c4dccbd5f33f71808d4b1baafe619696af1162 (patch) | |
| tree | fb1b8d3a2f171164a05d404ab2340cfb1a9d3e21 /nixpkgs/pkgs/servers/nosql | |
| parent | 8920a0e4d962a919238bab69ddc607d7f3396f70 (diff) | |
| parent | e19054ab3cd5b7cc9a01d0efc71c8fe310541065 (diff) | |
| download | nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.gz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.bz2 nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.lz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.xz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.zst nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.zip | |
Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'
Diffstat (limited to 'nixpkgs/pkgs/servers/nosql')
| -rw-r--r-- | nixpkgs/pkgs/servers/nosql/arangodb/default.nix | 14 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/nosql/mongodb/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/servers/nosql/arangodb/default.nix b/nixpkgs/pkgs/servers/nosql/arangodb/default.nix index 11695d753e28..871e335628ce 100644 --- a/nixpkgs/pkgs/servers/nosql/arangodb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/arangodb/default.nix @@ -33,13 +33,13 @@ let "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" # also avoid using builder's /proc/cpuinfo ] ++ - { "westmere" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "sandybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "ivybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "haswell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "broadwell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "skylake" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "skylake-avx512" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/default.nix b/nixpkgs/pkgs/servers/nosql/mongodb/default.nix index 2864449267a6..4c4ac4c5cb63 100644 --- a/nixpkgs/pkgs/servers/nosql/mongodb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/mongodb/default.nix @@ -20,7 +20,7 @@ let version = "3.4.10"; "yaml" ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "mongodb"; inherit version; diff --git a/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix b/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix index 36b29b57bf97..4ebcbafde5dc 100644 --- a/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "riak_cs-2.1.1"; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix b/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix index 1524ca207009..5fe4ce45f84b 100644 --- a/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "stanchion-2.1.1"; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix b/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix index 170b0d5f22f9..efa43f7a844f 100644 --- a/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix +++ b/nixpkgs/pkgs/servers/nosql/riak/2.2.0.nix @@ -25,7 +25,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "riak-2.2.0"; buildInputs = [ |