JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #24157 from mdaiter/riakTouchups

Browse Source 
riak: switch interpreter version
This commit is contained in:
Daiderd Jordan 2017-03-21 12:18:29 +01:00 committed by GitHub
commit 4ea01af4e9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/nosql/riak/2.2.0.nix
View File

@ -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;

4
pkgs/top-level/all-packages.nix
View File

@ -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;