Merge pull request #63572 from volth/cpan2nix-2019-06-20

buildPerlPackage: name -> (pname, version)
2019-06-28 17:54:30 -04:00 · 2019-06-28 17:54:30 -04:00 · 0daecd2d7a
commit 0daecd2d7a
parent 159b9d8f4e b3cc65f8b9
34 changed files with 4470 additions and 3056 deletions
--- a/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/pkgs/applications/graphics/gscan2pdf/default.nix
@ -6,11 +6,11 @@
 with stdenv.lib;

 perlPackages.buildPerlPackage rec {
-  name = "gscan2pdf-${version}";
+  pname = "gscan2pdf";
  version = "2.3.0";

  src = fetchurl {
-    url = "mirror://sourceforge/gscan2pdf/${version}/${name}.tar.xz";
+    url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
    sha256 = "0mcsmly0j9pmyzh6py8r6sfa30hc6gv300hqq3dxj4hv653vhkk9";
  };

--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@ -3,7 +3,7 @@
 with stdenv.lib;

 perlPackages.buildPerlPackage rec {
-  name = "get_iplayer-${version}";
+  pname = "get_iplayer";
  version = "2.99";

  src = fetchFromGitHub {
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@ -1,10 +1,11 @@
 {buildPerlPackage, fetchurl, db}:

-buildPerlPackage rec {
-  name = "BerkeleyDB-0.61";
+buildPerlPackage {
+  pname = "BerkeleyDB";
+  version = "0.61";

  src = fetchurl {
-    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.61.tar.gz";
    sha256 = "0l65v301cz6a9dxcw6a4ps2mnr5zq358yn81favap6i092krggiz";
  };

--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@ -1,10 +1,11 @@
 { fetchurl, buildPerlPackage, zlib, stdenv }:

-buildPerlPackage rec {
-  name = "Compress-Raw-Zlib-2.086";
+buildPerlPackage {
+  pname = "Compress-Raw-Zlib";
+  version = "2.086";

  src = fetchurl {
-    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.086.tar.gz;
    sha256 = "0va93wc968p4l2ql0k349bz189l2vbs09bpn865cvc36amqxwv9z";
  };

--- a/pkgs/development/perl-modules/DBD-Oracle/default.nix
+++ b/pkgs/development/perl-modules/DBD-Oracle/default.nix
@ -1,10 +1,11 @@
 { fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }:

-buildPerlPackage rec {
-  name = "DBD-Oracle-1.76";
+buildPerlPackage {
+  pname = "DBD-Oracle";
+  version = "1.76";

  src = fetchurl {
-    url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/${name}.tar.gz";
+    url = mirror://cpan/authors/id/Z/ZA/ZARQUON/DBD-Oracle-1.76.tar.gz;
    sha256 = "b6db7f43c6252179274cfe99c1950b93e248f8f0fe35b07e50388c85d814d5f3";
  };

--- a/pkgs/development/perl-modules/DBD-Pg/default.nix
+++ b/pkgs/development/perl-modules/DBD-Pg/default.nix
@ -1,10 +1,11 @@
 { stdenv, fetchurl, buildPerlPackage, DBI, postgresql }:

-buildPerlPackage rec {
-  name = "DBD-Pg-3.7.4";
+buildPerlPackage {
+  pname = "DBD-Pg";
+  version = "3.7.4";

  src = fetchurl {
-    url = "mirror://cpan/authors/id/T/TU/TURNSTEP/${name}.tar.gz";
+    url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.7.4.tar.gz";
    sha256 = "0gkqlvbmzbdm0g4k328nlkjdg3wrjm5i2n9jxj1i8sqxkm79rylz";
  };

--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@ -1,7 +1,8 @@
 { stdenv, fetchurl, buildPerlPackage, perl, DBI, sqlite }:

-buildPerlPackage rec {
-  name = "DBD-SQLite-1.62";
+buildPerlPackage {
+  pname = "DBD-SQLite";
+  version = "1.62";

  src = fetchurl {
    url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.62.tar.gz;
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@ -1,10 +1,11 @@
 { fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }:

 buildPerlPackage rec {
-  name = "DBD-mysql-4.050";
+  pname = "DBD-mysql";
+  version = "4.050";

  src = fetchurl {
-    url = "mirror://cpan/authors/id/D/DV/DVEEDEN/${name}.tar.gz";
+    url = mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz;
    sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g";
  };

--- a/pkgs/development/perl-modules/DBD-sybase/default.nix
+++ b/pkgs/development/perl-modules/DBD-sybase/default.nix
@ -1,10 +1,11 @@
 { fetchurl, buildPerlPackage, DBI, freetds }:

-buildPerlPackage rec {
-  name = "DBD-Sybase-1.16";
+buildPerlPackage {
+  pname = "DBD-Sybase";
+  version = "1.16";

  src = fetchurl {
-    url = "mirror://cpan/authors/id/M/ME/MEWP/${name}.tar.gz";
+    url = mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.16.tar.gz;
    sha256 = "1k6n261nrrcll9wxn5xwi4ibpavqv1il96687k62mbpznzl2gx37";
  };

--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@ -1,10 +1,11 @@
 {fetchurl, buildPerlPackage, db}:

-buildPerlPackage rec {
-  name = "DB_File-1.851";
+buildPerlPackage {
+  pname = "DB_File";
+  version = "1.851";

  src = fetchurl {
-    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.851.tar.gz";
    sha256 = "1j276mng1nwxxdxnb3my427s5lb6zlnssizcnxricnvaa170kdv8";
  };

--- a/pkgs/development/perl-modules/MNI/default.nix
+++ b/pkgs/development/perl-modules/MNI/default.nix
@ -1,7 +1,8 @@
 { fetchFromGitHub, buildPerlPackage, stdenv }:

-buildPerlPackage rec {
-  name = "MNI-Perllib-2012-04-13";
+buildPerlPackage {
+  pname = "MNI-Perllib";
+  version = "2012-04-13";

  src = fetchFromGitHub {
    owner  = "BIC-MNI";
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@ -1,7 +1,14 @@
 { lib, stdenv, perl, buildPerl, toPerlModule }:

-{ buildInputs ? [], nativeBuildInputs ? [], name, ... } @ attrs:
+{ buildInputs ? [], nativeBuildInputs ? [], ... } @ attrs:

+assert attrs?pname -> attrs?version;
+assert attrs?pname -> !(attrs?name);
+
+(if attrs ? name then
+  lib.trivial.warn "builtPerlPackage: `name' (\"${attrs.name}\") is deprecated, use `pname' and `version' instead"
+ else
+  (x: x))
 toPerlModule(stdenv.mkDerivation (
  (
  lib.recursiveUpdate
@ -27,14 +34,15 @@ toPerlModule(stdenv.mkDerivation (
    # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC
    PERL_USE_UNSAFE_INC = "1";

-    meta.homepage = "https://metacpan.org/release/${(builtins.parseDrvName name).name}";
+    meta.homepage = "https://metacpan.org/release/${attrs.pname or (builtins.parseDrvName attrs.name).name}"; # TODO: phase-out `attrs.name`
    meta.platforms = perl.meta.platforms;
  }
  attrs
  )
  //
  {
-    name = "perl${perl.version}-${name}";
+    pname = "perl${perl.version}-${attrs.pname or (builtins.parseDrvName attrs.name).name}"; # TODO: phase-out `attrs.name`
+    version = attrs.version or (builtins.parseDrvName attrs.name).version;                   # TODO: phase-out `attrs.name`
    builder = ./builder.sh;
    buildInputs = buildInputs ++ [ perl ];
    nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ];
--- a/pkgs/development/perl-modules/maatkit/default.nix
+++ b/pkgs/development/perl-modules/maatkit/default.nix
@ -1,10 +1,11 @@
 {buildPerlPackage, stdenv, fetchurl, DBDmysql}:

-buildPerlPackage rec {
-  name = "maatkit-7540";
+buildPerlPackage {
+  pname = "maatkit";
+  version = "7540";

  src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/${name}.tar.gz";
+    url = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/maatkit-7540.tar.gz;
    sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1";
  };

--- a/pkgs/development/tools/analysis/egypt/default.nix
+++ b/pkgs/development/tools/analysis/egypt/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, perlPackages }:

 perlPackages.buildPerlPackage rec {
-  name = "egypt-${version}";
+  pname = "egypt";
  version = "1.10";

  src = fetchurl {
    sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m";
-    url = "https://www.gson.org/egypt/download/${name}.tar.gz";
+    url = "https://www.gson.org/egypt/download/${pname}-${version}.tar.gz";
  };

  outputs = [ "out" ];
--- a/pkgs/development/tools/misc/ninka/default.nix
+++ b/pkgs/development/tools/misc/ninka/default.nix
@ -3,7 +3,7 @@
 assert stdenv ? glibc;

 perlPackages.buildPerlPackage rec {
-  name = "ninka-${version}";
+  pname = "ninka";
  version = "2.0-pre";

  src = fetchFromGitHub {
--- a/pkgs/development/web/wml/default.nix
+++ b/pkgs/development/web/wml/default.nix
@ -1,10 +1,11 @@
 { stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }:

 perlPackages.buildPerlPackage rec {
-  name = "wml-2.0.11";
+  pname = "wml";
+  version = "2.0.11";

  src = fetchurl {
-    url = "http://thewml.org/distrib/${name}.tar.gz";
+    url = "http://thewml.org/distrib/wml-2.0.11.tar.gz";
    sha256 = "0jjxpq91x7y2mgixz7ghqp01m24qa37wl3zz515rrzv7x8cyy4cf";
  };

--- a/pkgs/servers/foswiki/default.nix
+++ b/pkgs/servers/foswiki/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchurl, perlPackages }:

 perlPackages.buildPerlPackage rec {
-  name = "foswiki-${version}";
+  pname = "foswiki";
  version = "2.1.0";

  src = fetchurl {
@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec {
    EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree
    IOSocketSSL JSON
    LocaleMaketextLexicon LocaleMsgfmt
-    LWP URI perlPackages.version
+    LWP URI perlPackages.Version
    /*# optional dependencies
    libapreq2 DBI DBDmysql DBDPg DBDSQLite FCGI FCGIProcManager
    CryptSMIME CryptX509 ConvertPEM
--- a/pkgs/servers/mail/postfix/pflogsumm.nix
+++ b/pkgs/servers/mail/postfix/pflogsumm.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, perlPackages }:

 perlPackages.buildPerlPackage rec {
-  name = "pflogsumm-${version}";
+  pname = "pflogsumm";
  version = "1.1.3";

  src = fetchurl {
-    url = "https://jimsun.linxnet.com/downloads/${name}.tar.gz";
+    url = "https://jimsun.linxnet.com/downloads/${pname}-${version}.tar.gz";
    sha256 = "0hkim9s5f1yg5sfs5048jydhy3sbxafls496wcjk0cggxb113py4";
  };

--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@ -1,10 +1,11 @@
 { stdenv, fetchurl, perlPackages, makeWrapper, gnupg }:

 perlPackages.buildPerlPackage rec {
-  name = "SpamAssassin-3.4.2";
+  pname = "SpamAssassin";
+  version = "3.4.2";

  src = fetchurl {
-    url = "mirror://apache/spamassassin/source/Mail-${name}.tar.bz2";
+    url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2";
    sha256 = "1np8h293bzg33i0xn9gj9krwgr7k6xbyf1yhxr2j2xci95d080yg";
  };

--- a/pkgs/servers/monitoring/fusion-inventory/default.nix
+++ b/pkgs/servers/monitoring/fusion-inventory/default.nix
@ -3,7 +3,7 @@
 }:

 perlPackages.buildPerlPackage rec {
-  name = "FusionInventory-Agent-${version}";
+  pname = "FusionInventory-Agent";
  version = "2.3.21";

  src = fetchFromGitHub {
--- a/pkgs/servers/openxpki/default.nix
+++ b/pkgs/servers/openxpki/default.nix
@ -3,7 +3,8 @@
 , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }:

 perlPackages.buildPerlPackage {
-  name = "openxpki-git20150807";
+  pname = "openxpki";
+  version = "git20150807";

  src = fetchgit {
    url = "https://github.com/openxpki/openxpki";
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@ -2,7 +2,7 @@
 , perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }:

 perlPackages.buildPerlPackage rec {
-  name = "slimserver-${version}";
+  pname = "slimserver";
  version = "7.9.1";

  src = fetchurl {
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@ -3,16 +3,18 @@
 let
  # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES
  Mojolicious-6-46 = perlPackages.buildPerlPackage rec {
-    name = "Mojolicious-6.46";
+    pname = "Mojolicious";
+    version = "6.46";
    src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
+      url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz";
      sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr";
    };
  };
  MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec {
-    name = "Mojo-IOLoop-ForkCall-0.17";
+    pname = "Mojo-IOLoop-ForkCall";
+    version = "0.17";
    src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz";
+      url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz";
      sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8";
    };
    propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ];
--- a/pkgs/tools/filesystems/file-rename/default.nix
+++ b/pkgs/tools/filesystems/file-rename/default.nix
@ -1,10 +1,11 @@
 { stdenv, fetchurl, perlPackages, makeWrapper }:

-perlPackages.buildPerlPackage rec {
-  name = "File-Rename-0.20";
+perlPackages.buildPerlPackage {
+  pname = "File-Rename";
+  version = "0.20";

  src = fetchurl {
-    url = "mirror://cpan/authors/id/R/RM/RMBARKER/${name}.tar.gz";
+    url = mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz;
    sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy";
  };

--- a/pkgs/tools/graphics/feedgnuplot/default.nix
+++ b/pkgs/tools/graphics/feedgnuplot/default.nix
@ -9,7 +9,7 @@ let
 in

 perlPackages.buildPerlPackage rec {
-  name = "feedgnuplot-${version}";
+  pname = "feedgnuplot";
  version = "1.51";

  src = fetchFromGitHub {
--- a/pkgs/tools/graphics/graph-easy/default.nix
+++ b/pkgs/tools/graphics/graph-easy/default.nix
@ -1,10 +1,10 @@
 { stdenv, perlPackages, fetchurl }:

-perlPackages.buildPerlPackage rec {
-  name = "Graph-Easy-${version}";
+perlPackages.buildPerlPackage {
+  pname = "Graph-Easy";
  version = "0.76";
  src = fetchurl {
-    url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+    url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Graph-Easy-0.76.tar.gz";
    sha256 = "d4a2c10aebef663b598ea37f3aa3e3b752acf1fbbb961232c3dbe1155008d1fa";
  };

--- a/pkgs/tools/misc/rename/default.nix
+++ b/pkgs/tools/misc/rename/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perlPackages }:

 perlPackages.buildPerlPackage rec {
-  name = "rename-${version}";
+  pname = "rename";
  version = "1.9";
  outputs = [ "out" ];
  src = fetchFromGitHub {
--- a/pkgs/tools/misc/shelldap/default.nix
+++ b/pkgs/tools/misc/shelldap/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchurl, perlPackages }:
 perlPackages.buildPerlPackage rec {
-  name = "shelldap-${version}";
+  pname = "shelldap";
  version = "1.4.0";
  src = fetchurl {
    url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz";
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, perlPackages, iproute, perl }:

 perlPackages.buildPerlPackage rec {
-  name = "ddclient-${version}";
+  pname = "ddclient";
  version = "3.9.0";

  src = fetchurl {
-    url = "mirror://sourceforge/ddclient/${name}.tar.gz";
+    url = "mirror://sourceforge/ddclient/${pname}-${version}.tar.gz";
    sha256 = "0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw";
  };

--- a/pkgs/tools/system/awstats/default.nix
+++ b/pkgs/tools/system/awstats/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, perlPackages, jdk }:

 perlPackages.buildPerlPackage rec {
-  name = "awstats-${version}";
+  pname = "awstats";
  version = "7.7";

  src = fetchurl {
-    url = "mirror://sourceforge/awstats/${name}.tar.gz";
+    url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz";
    sha256 = "0z3p77jnpjilajs9yv87r8xla2x1gjqlvrhpbgbh5ih73386v3j2";
  };

--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@ -4,8 +4,8 @@ let
  biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs);
 in

-perlPackages.buildPerlModule rec {
-  name = "biber-${version}";
+perlPackages.buildPerlModule {
+  pname = "biber";
  inherit (biberSource) version;

  src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@ -285,7 +285,8 @@ dvipng = stdenv.mkDerivation {


 latexindent = perlPackages.buildPerlPackage rec {
-  inherit (src) name version;
+  pname = "latexindent";
+  inherit (src) version;

  src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs);

--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perlPackages, makeWrapper}:

 perlPackages.buildPerlPackage rec {
-  name = "linode-cli-${version}";
+  pname = "linode-cli";
  version = "1.4.7";

  src = fetchFromGitHub {
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix