From f65dfb3caf8f4cff1e5a1c3f63c564b860eeae1f Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 23:10:38 +0000 Subject: buildPerlPackage -> perlPackages.buildPerlPackage --- pkgs/applications/misc/get_iplayer/default.nix | 8 ++++---- pkgs/development/tools/analysis/egypt/default.nix | 4 ++-- pkgs/development/tools/misc/ninka/default.nix | 6 +++--- pkgs/servers/mail/postfix/pflogsumm.nix | 5 ++--- pkgs/servers/mail/spamassassin/default.nix | 4 ++-- pkgs/servers/monitoring/fusion-inventory/default.nix | 4 ++-- pkgs/servers/openxpki/default.nix | 4 ++-- pkgs/servers/slimserver/default.nix | 4 ++-- pkgs/tools/graphics/feedgnuplot/default.nix | 4 ++-- pkgs/tools/graphics/graph-easy/default.nix | 4 ++-- pkgs/tools/misc/rename/default.nix | 4 ++-- pkgs/tools/networking/ddclient/default.nix | 4 ++-- pkgs/tools/virtualization/linode-cli/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 ++---- 15 files changed, 32 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index d024b0fce99..5e8bb629ce2 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -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; -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "get_iplayer-${version}"; version = "2.99"; - + src = fetchFromGitHub { owner = "get-iplayer"; repo = "get_iplayer"; @@ -34,5 +34,5 @@ buildPerlPackage rec { homepage = https://squarepenguin.co.uk/; platforms = platforms.all; }; - + } diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index 07bcd57a121..defc39a9f74 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPerlPackage }: +{ stdenv, fetchurl, perlPackages }: -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "egypt-${version}"; version = "1.10"; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index 9cd1a56e68f..df793866cbb 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, perl, perlPackages, buildPerlPackage }: +{ stdenv, fetchFromGitHub, perl, perlPackages }: assert stdenv ? glibc; -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "ninka-${version}"; version = "2.0-pre"; @@ -12,7 +12,7 @@ buildPerlPackage rec { rev = "b89b59ecd057dfc939d0c75acaddebb58fcd8cba"; sha256 = "1grlis1kycbcjvjgqvn7aw81q1qx49ahvxg2k7cgyr79mvgpgi9m"; }; - + buildInputs = with perlPackages; [ perl TestOutput DBDSQLite DBI TestPod TestPodCoverage SpreadsheetParseExcel ]; doCheck = false; # hangs diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index 3d48e952781..82199938060 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchurl, buildPerlPackage, perlPackages -}: +{ stdenv, fetchurl, perlPackages }: -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "pflogsumm-${version}"; version = "1.1.3"; diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index acbc50fd42b..d3295721013 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -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 }: -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "SpamAssassin-3.4.1"; src = fetchurl { diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index d9e8ccf1454..33725cb6283 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -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 }: -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "FusionInventory-Agent-${version}"; version = "2.3.21"; diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index ccfbbd60903..2b1000d0d85 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -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. , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }: -buildPerlPackage { +perlPackages.buildPerlPackage { name = "openxpki-git20150807"; src = fetchgit { diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index cf0fddd6699..fe14f0f33c8 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,7 +1,7 @@ -{ stdenv, buildPerlPackage, fetchurl, fetchpatch, makeWrapper +{ stdenv, fetchurl, fetchpatch, makeWrapper , perl, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "slimserver-${version}"; version = "7.9.1"; diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index fef5c657a7a..4ff769eadf5 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPerlPackage, makeWrapper, gawk +{ stdenv, fetchFromGitHub, makeWrapper, gawk , makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages }: @@ -8,7 +8,7 @@ let in -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "feedgnuplot-${version}"; version = "1.51"; diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index 9b4c4677962..c21fc02753e 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPerlPackage, fetchurl }: +{ stdenv, perlPackages, fetchurl }: -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "Graph-Easy-${version}"; version = "0.76"; src = fetchurl { diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix index 3f2a66bf4c8..89f76bb9b1b 100644 --- a/pkgs/tools/misc/rename/default.nix +++ b/pkgs/tools/misc/rename/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildPerlPackage }: +{ stdenv, fetchFromGitHub, perlPackages }: -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "rename-${version}"; version = "1.9"; outputs = [ "out" ]; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 93828c10d13..14de1fea479 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPerlPackage, fetchurl, perlPackages, iproute }: +{ stdenv, fetchurl, perlPackages, iproute }: -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "ddclient-${version}"; version = "3.8.3"; diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 12852265c40..c4fb74cf1a1 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildPerlPackage, perlPackages, makeWrapper}: +{ stdenv, fetchFromGitHub, perlPackages, makeWrapper}: -buildPerlPackage rec { +perlPackages.buildPerlPackage rec { name = "linode-cli-${version}"; version = "1.4.7"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f45808686f4..fce35aed5cf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -54,6 +54,7 @@ mapAliases ({ buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11 buildbot-ui = pythonPackages.buildbot-ui; # 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 cantarell_fonts = cantarell-fonts; # added 2018-03-03 checkbashism = checkbashisms; # added 2016-08-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b77dbf8d420..a98846a3a61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5026,9 +5026,7 @@ with pkgs; gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas; }; - rename = callPackage ../tools/misc/rename { - inherit (perlPackages) buildPerlPackage; - }; + rename = callPackage ../tools/misc/rename { }; renameutils = callPackage ../tools/misc/renameutils { }; @@ -12933,7 +12931,7 @@ with pkgs; }); perlPackages = perl528Packages; - inherit (perlPackages) perl buildPerlPackage; + inherit (perlPackages) perl; perlXMLParser = perlPackages.XMLParser; -- cgit 1.4.1