diff options
Diffstat (limited to 'pkgs/development')
14 files changed, 54 insertions, 35 deletions
diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index db94a3b07fe..b23db8e1edf 100644 --- 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"; }; diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 7c733742d2b..1163b6cb15b 100644 --- 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"; }; diff --git a/pkgs/development/perl-modules/DBD-Oracle/default.nix b/pkgs/development/perl-modules/DBD-Oracle/default.nix index 9db926bf94d..a7ec1e2d182 100644 --- 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"; }; diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index f6b31aafaf6..33979121538 100644 --- 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"; }; diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index ff84de40b30..5a24687c2b0 100644 --- 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; diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 5365e0c6b95..54df32f3eb2 100644 --- 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"; }; diff --git a/pkgs/development/perl-modules/DBD-sybase/default.nix b/pkgs/development/perl-modules/DBD-sybase/default.nix index ced458396da..e863663fc94 100644 --- 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"; }; diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index d37fb1f12da..d63e3a48727 100644 --- 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"; }; diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix index dbb167e27b3..def32abf881 100644 --- 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"; diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 3a28c50be39..073b0f1c5ad 100644 --- 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) ]; diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index fabb3824129..b23b7afa7a3 100644 --- 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"; }; diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index 7db46005f45..6259756794d 100644 --- 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" ]; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index df793866cbb..af3b45a8e62 100644 --- 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 { diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 44ce36b76dd..82faf32a321 100644 --- 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"; }; |