mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-15 21:57:02 +03:00
Merge pull request #24157 from mdaiter/riakTouchups
riak: switch interpreter version
This commit is contained in:
commit
4ea01af4e9
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, unzip, erlangR16, which, pam, coreutils }:
|
||||
{ stdenv, lib, fetchurl, unzip, erlang, which, pam, coreutils }:
|
||||
|
||||
let
|
||||
solrName = "solr-4.10.4-yz-2.tgz";
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
name = "riak-2.2.0";
|
||||
|
||||
buildInputs = [
|
||||
which unzip erlangR16 pam
|
||||
which unzip erlang pam
|
||||
];
|
||||
|
||||
src = srcs.riak;
|
||||
|
@ -10801,7 +10801,9 @@ with pkgs;
|
||||
|
||||
mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
|
||||
|
||||
riak = callPackage ../servers/nosql/riak/2.2.0.nix { };
|
||||
riak = callPackage ../servers/nosql/riak/2.2.0.nix {
|
||||
erlang = erlang_basho_R16B02;
|
||||
};
|
||||
|
||||
riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
|
||||
|
Loading…
Reference in New Issue
Block a user