From a8272280d7f46bd71a8e40669c3bc4564d295757 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 16 Apr 2016 18:33:30 +0200 Subject: [PATCH] perl-CPAN: depend on ModuleBuild Also fix license field and minor other cleanups. --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5b740915ce8..e8d6c1173ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2252,16 +2252,16 @@ let self = _self // overrides; _self = with self; { }; }; - CPAN = buildPerlPackage { + CPAN = buildPerlPackage rec { name = "CPAN-2.10"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.10.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; sha256 = "090e9e3d9fca83b89341a75c514c7411b743c887743723dbfe80f30d4ee5f3ad"; }; - propagatedBuildInputs = [ ArchiveZip CompressBzip2 Expect FileHomeDir FileWhich JSONPP LWP ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck ]; + propagatedBuildInputs = [ ArchiveZip CompressBzip2 Expect FileHomeDir FileWhich JSONPP LWP ModuleBuild ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck ]; meta = { description = "Query, download and build perl modules from CPAN sites"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; };