Merge pull request #165184 from armeenm/munin-python3
This commit is contained in:
commit
1a53950a2e
1 changed files with 3 additions and 3 deletions
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages
|
||||
, python2, ruby, jre, nettools, bc
|
||||
, python3, ruby, jre, nettools, bc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
perlPackages.ListMoreUtils
|
||||
perlPackages.LWP
|
||||
perlPackages.DBDPg
|
||||
python2
|
||||
python3
|
||||
ruby
|
||||
jre
|
||||
# tests
|
||||
|
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
|
|||
"DESTDIR=$(out)"
|
||||
"PERLLIB=$(out)/${perlPackages.perl.libPrefix}"
|
||||
"PERL=${perlPackages.perl.outPath}/bin/perl"
|
||||
"PYTHON=${python2.outPath}/bin/python"
|
||||
"PYTHON=${python3.interpreter}"
|
||||
"RUBY=${ruby.outPath}/bin/ruby"
|
||||
"JAVARUN=${jre.outPath}/bin/java"
|
||||
"PLUGINUSER=munin"
|
||||
|
|
Loading…
Reference in a new issue