From daa188107d7f04d486416faef882958571cc7d23 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Jan 2016 18:24:20 +0100 Subject: [PATCH 1/7] perl-if: 0.0601 -> 0.0606 Also, move the package into an attribute called "if" with the old "if_" attribute referencing the new one. --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e8dfa91d2d..70dbec44429 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5899,14 +5899,22 @@ let self = _self // overrides; _self = with self; { }; }; - if_ = buildPerlPackage { - name = "if-0.0601"; + "if" = buildPerlPackage rec { + name = "if-0.0606"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.0601.tar.gz; - sha256 = "fb2b7329aa111a673cd22dc2889167e52058aead0de2fe0855b32dd658d5c1b7"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "63d69282d6c4c9e76370b78d770ca720cea88cfe5ee5b612709240fc6078d50e"; + }; + meta = { + description = "C a Perl module if a condition holds (also can C a module)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; + # For backwards compatibility. + if_ = self."if"; + ImageSize = buildPerlPackage rec { name = "Image-Size-3.232"; src = fetchurl { From f79c8df3e8f84c86391b9af55ddeca5736b14c84 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Jan 2016 19:01:39 +0100 Subject: [PATCH 2/7] perl-CGI: 4.21 -> 4.25 Also add license information and myself as maintainer. --- pkgs/top-level/perl-packages.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 70dbec44429..708935b3129 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1415,17 +1415,19 @@ let self = _self // overrides; _self = with self; { }; }; - CGI = buildPerlPackage { - name = "CGI-4.21"; + "CGI" = buildPerlPackage rec { + name = "CGI-4.25"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.21.tar.gz; - sha256 = "340d20a2b67211752d7c270c589e463d71aea8b8d75d9417250618219d3cf884"; + url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz"; + sha256 = "efb3e5235ada6a91f97ca2905399a686bedea60f6b525e52f4a147baff4f131a"; }; - propagatedBuildInputs = [ HTMLParser if_ ]; - doCheck = false; + buildInputs = [ TestDeep TestWarn ]; + propagatedBuildInputs = [ HTMLParser self."if" ]; meta = { homepage = https://metacpan.org/module/CGI; description = "Handle Common Gateway Interface requests and responses"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From f53ecf051d2079b4715638357b45db7465216b86 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Jan 2016 21:48:18 +0100 Subject: [PATCH 3/7] perl-SubExporterForMethods: 0.100051 -> 0.100052 --- pkgs/top-level/perl-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 708935b3129..902fb031fd2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10707,16 +10707,19 @@ let self = _self // overrides; _self = with self; { }; }; - SubExporterForMethods = buildPerlPackage { - name = "Sub-Exporter-ForMethods-0.100051"; + "SubExporterForMethods" = buildPerlPackage rec { + name = "Sub-Exporter-ForMethods-0.100052"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100051.tar.gz; - sha256 = "127wniw53p7pp7r2vazicply3v1gmnhw4w7jl6p74i0grnsixipm"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "421fbba4f6ffcf13c4335f2c20630d709e6fa659c07545d094dbc5a558ad3006"; }; + buildInputs = [ namespaceautoclean ]; propagatedBuildInputs = [ SubExporter SubName ]; meta = { + homepage = https://github.com/rjbs/Sub-Exporter-ForMethods; description = "Helper routines for using Sub::Exporter to build methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From d8b8344b0e0a64be3837ca46b95d944ce5f1a4b8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Jan 2016 19:03:05 +0100 Subject: [PATCH 4/7] perl-MooseXTypes: 0.45 -> 0.46 Also fix license field and add myself as maintainer. --- pkgs/top-level/perl-packages.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 902fb031fd2..f000a565325 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8234,18 +8234,19 @@ let self = _self // overrides; _self = with self; { [ ClassMOP Moose namespaceautoclean ListMoreUtils ]; }; - MooseXTypes = buildPerlPackage { - name = "MooseX-Types-0.45"; + "MooseXTypes" = buildPerlPackage rec { + name = "MooseX-Types-0.46"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.45.tar.gz; - sha256 = "d01ff4a3db78e1150101b4b63569e4bce3ced3b5b0024c52c87575e0820609c7"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a"; }; - buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires if_ ]; - propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubName namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires self."if" ]; + propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Types; description = "Organise your Moose types in libraries"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From 6190c57226b9f93affab244ec89dfc6a3092f4e3 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Jan 2016 19:03:44 +0100 Subject: [PATCH 5/7] perl-MooseXTypesCommon: 0.001008 -> 0.001013 Also add some meta data and myself as maintainer. --- pkgs/top-level/perl-packages.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f000a565325..71d8bd41e42 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8250,17 +8250,19 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesCommon = buildPerlPackage rec { - name = "MooseX-Types-Common-0.001008"; + "MooseXTypesCommon" = buildPerlPackage rec { + name = "MooseX-Types-Common-0.001013"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "0s0z6v32vyykni8an6jzyvl0icr5d5b8kbi4qqp4vwc5438jrpdz"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "ff0c963f5e8304acb5f64bdf9ba1f19284311148e1a8f0d1f81f123f9950f5f2"; }; - buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ Moose MooseXTypes ]; + buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ]; + propagatedBuildInputs = [ MooseXTypes self."if" ]; meta = { - maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; + homepage = https://github.com/moose/MooseX-Types-Common; + description = "A library of commonly used type constraints"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ ocharles rycee ]; }; }; From ddda098446e06fef5f8e1e01322b1428530e304e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Jan 2016 19:08:03 +0100 Subject: [PATCH 6/7] perl-TestWarnings: 0.021 -> 0.026 Also add myself as maintainer. --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 71d8bd41e42..e9e3a9f777d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11969,17 +11969,18 @@ let self = _self // overrides; _self = with self; { }; }; - TestWarnings = buildPerlPackage rec { - name = "Test-Warnings-0.021"; + "TestWarnings" = buildPerlPackage rec { + name = "Test-Warnings-0.026"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "0i1crkhqfl5gs55i5nrvsw3xy946ajgnvp4gqrzvsn1x6cp1i2nr"; + sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08"; }; - buildInputs = [ TestTester if_ CPANMetaCheck ModuleMetadata ]; + buildInputs = [ TestTester CPANMetaCheck ModuleMetadata self."if" ]; meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From 54174a3553425d196b52a4a5c9059414c4142ac9 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 23 Jan 2016 20:32:30 +0100 Subject: [PATCH 7/7] perl-DevelDeclare: 0.006011 -> 0.006018 --- pkgs/top-level/perl-packages.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e9e3a9f777d..8b9f4d339ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3513,19 +3513,18 @@ let self = _self // overrides; _self = with self; { }; }; - DevelDeclare = buildPerlPackage { - name = "Devel-Declare-0.006011"; + "DevelDeclare" = buildPerlPackage rec { + name = "Devel-Declare-0.006018"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Devel-Declare-0.006011.tar.gz; - sha256 = "0wqa9n4mdlsld4cmhy2mg8ncqr5gsra1913x0kypisgdqvviin2k"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "bb3607bc7546bcf8d9ac57acd8de4e4ca5567ace836ab823d5f5b450216f466a"; }; - buildInputs = [ BHooksOPCheck ExtUtilsDepends ]; + buildInputs = [ BHooksOPCheck ExtUtilsDepends TestRequires ]; propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; meta = { description = "Adding keywords to perl, in perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ ocharles rycee ]; }; };