cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #165184 from armeenm/munin-python3

Browse source
This commit is contained in:
Sandro 2022-03-23 05:01:22 +01:00 committed by GitHub
commit 1a53950a2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/servers/monitoring/munin/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages { lib, stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages
, python2, ruby, jre, nettools, bc , python3, ruby, jre, nettools, bc
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
perlPackages.ListMoreUtils perlPackages.ListMoreUtils
perlPackages.LWP perlPackages.LWP
perlPackages.DBDPg perlPackages.DBDPg
python2 python3
ruby ruby
jre jre
# tests # tests
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
"DESTDIR=$(out)" "DESTDIR=$(out)"
"PERLLIB=$(out)/${perlPackages.perl.libPrefix}" "PERLLIB=$(out)/${perlPackages.perl.libPrefix}"
"PERL=${perlPackages.perl.outPath}/bin/perl" "PERL=${perlPackages.perl.outPath}/bin/perl"
"PYTHON=${python2.outPath}/bin/python" "PYTHON=${python3.interpreter}"
"RUBY=${ruby.outPath}/bin/ruby" "RUBY=${ruby.outPath}/bin/ruby"
"JAVARUN=${jre.outPath}/bin/java" "JAVARUN=${jre.outPath}/bin/java"
"PLUGINUSER=munin" "PLUGINUSER=munin"