buildPerlPackage -> perlPackages.buildPerlPackage

This commit is contained in:
volth 2018-10-12 23:10:38 +00:00 committed by Frederik Rietdijk
parent 9fd328a7a6
commit f65dfb3caf
15 changed files with 32 additions and 34 deletions

View File

@ -1,11 +1,11 @@
{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}: {stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}:
with stdenv.lib; with stdenv.lib;
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "get_iplayer-${version}"; name = "get_iplayer-${version}";
version = "2.99"; version = "2.99";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "get-iplayer"; owner = "get-iplayer";
repo = "get_iplayer"; repo = "get_iplayer";
@ -34,5 +34,5 @@ buildPerlPackage rec {
homepage = https://squarepenguin.co.uk/; homepage = https://squarepenguin.co.uk/;
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, buildPerlPackage }: { stdenv, fetchurl, perlPackages }:
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "egypt-${version}"; name = "egypt-${version}";
version = "1.10"; version = "1.10";

View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, perl, perlPackages, buildPerlPackage }: { stdenv, fetchFromGitHub, perl, perlPackages }:
assert stdenv ? glibc; assert stdenv ? glibc;
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "ninka-${version}"; name = "ninka-${version}";
version = "2.0-pre"; version = "2.0-pre";
@ -12,7 +12,7 @@ buildPerlPackage rec {
rev = "b89b59ecd057dfc939d0c75acaddebb58fcd8cba"; rev = "b89b59ecd057dfc939d0c75acaddebb58fcd8cba";
sha256 = "1grlis1kycbcjvjgqvn7aw81q1qx49ahvxg2k7cgyr79mvgpgi9m"; sha256 = "1grlis1kycbcjvjgqvn7aw81q1qx49ahvxg2k7cgyr79mvgpgi9m";
}; };
buildInputs = with perlPackages; [ perl TestOutput DBDSQLite DBI TestPod TestPodCoverage SpreadsheetParseExcel ]; buildInputs = with perlPackages; [ perl TestOutput DBDSQLite DBI TestPod TestPodCoverage SpreadsheetParseExcel ];
doCheck = false; # hangs doCheck = false; # hangs

View File

@ -1,7 +1,6 @@
{ stdenv, fetchurl, buildPerlPackage, perlPackages { stdenv, fetchurl, perlPackages }:
}:
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "pflogsumm-${version}"; name = "pflogsumm-${version}";
version = "1.1.3"; version = "1.1.3";

View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, buildPerlPackage, perl, perlPackages, HTMLParser, NetDNS, NetAddrIP, DBFile { stdenv, fetchurl, perl, perlPackages, HTMLParser, NetDNS, NetAddrIP, DBFile
, HTTPDate, MailDKIM, LWP, IOSocketSSL, makeWrapper, gnupg1 , HTTPDate, MailDKIM, LWP, IOSocketSSL, makeWrapper, gnupg1
}: }:
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "SpamAssassin-3.4.1"; name = "SpamAssassin-3.4.1";
src = fetchurl { src = fetchurl {

View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools { stdenv, lib, fetchurl, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
, fetchFromGitHub, makeWrapper , fetchFromGitHub, makeWrapper
}: }:
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "FusionInventory-Agent-${version}"; name = "FusionInventory-Agent-${version}";
version = "2.3.21"; version = "2.3.21";

View File

@ -1,8 +1,8 @@
{ stdenv, buildPerlPackage, fetchgit, perl, openssl, perlPackages, gettext, python3Packages { stdenv, fetchgit, perl, openssl, perlPackages, gettext, python3Packages
# TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere. # TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere.
, extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }: , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }:
buildPerlPackage { perlPackages.buildPerlPackage {
name = "openxpki-git20150807"; name = "openxpki-git20150807";
src = fetchgit { src = fetchgit {

View File

@ -1,7 +1,7 @@
{ stdenv, buildPerlPackage, fetchurl, fetchpatch, makeWrapper { stdenv, fetchurl, fetchpatch, makeWrapper
, perl, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: , perl, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }:
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "slimserver-${version}"; name = "slimserver-${version}";
version = "7.9.1"; version = "7.9.1";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildPerlPackage, makeWrapper, gawk { stdenv, fetchFromGitHub, makeWrapper, gawk
, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages , makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages
}: }:
@ -8,7 +8,7 @@ let
in in
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "feedgnuplot-${version}"; name = "feedgnuplot-${version}";
version = "1.51"; version = "1.51";

View File

@ -1,6 +1,6 @@
{ stdenv, buildPerlPackage, fetchurl }: { stdenv, perlPackages, fetchurl }:
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "Graph-Easy-${version}"; name = "Graph-Easy-${version}";
version = "0.76"; version = "0.76";
src = fetchurl { src = fetchurl {

View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPerlPackage }: { stdenv, fetchFromGitHub, perlPackages }:
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "rename-${version}"; name = "rename-${version}";
version = "1.9"; version = "1.9";
outputs = [ "out" ]; outputs = [ "out" ];

View File

@ -1,6 +1,6 @@
{ stdenv, buildPerlPackage, fetchurl, perlPackages, iproute }: { stdenv, fetchurl, perlPackages, iproute }:
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "ddclient-${version}"; name = "ddclient-${version}";
version = "3.8.3"; version = "3.8.3";

View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPerlPackage, perlPackages, makeWrapper}: { stdenv, fetchFromGitHub, perlPackages, makeWrapper}:
buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "linode-cli-${version}"; name = "linode-cli-${version}";
version = "1.4.7"; version = "1.4.7";

View File

@ -54,6 +54,7 @@ mapAliases ({
buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11 buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11
buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11 buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11
buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11 buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11
buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
bundler_HEAD = bundler; # added 2015-11-15 bundler_HEAD = bundler; # added 2015-11-15
cantarell_fonts = cantarell-fonts; # added 2018-03-03 cantarell_fonts = cantarell-fonts; # added 2018-03-03
checkbashism = checkbashisms; # added 2016-08-16 checkbashism = checkbashisms; # added 2016-08-16

View File

@ -5026,9 +5026,7 @@ with pkgs;
gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas; gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas;
}; };
rename = callPackage ../tools/misc/rename { rename = callPackage ../tools/misc/rename { };
inherit (perlPackages) buildPerlPackage;
};
renameutils = callPackage ../tools/misc/renameutils { }; renameutils = callPackage ../tools/misc/renameutils { };
@ -12933,7 +12931,7 @@ with pkgs;
}); });
perlPackages = perl528Packages; perlPackages = perl528Packages;
inherit (perlPackages) perl buildPerlPackage; inherit (perlPackages) perl;
perlXMLParser = perlPackages.XMLParser; perlXMLParser = perlPackages.XMLParser;