nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-19 03:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #176320 from stigtsp/package/perl-5.36.0-staging

Browse Source
This commit is contained in:
Sandro 2022-08-04 01:34:44 +02:00 committed by GitHub
commit c30985a8a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/interpreters/perl/default.nix
View File

@ -198,14 +198,14 @@ let
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
};
} // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
crossVersion = "31dac3e264a7f1f53dbf49570771123ebd514055"; # May 03, 2022
crossVersion = "c876045741f5159318085d2737b0090f35a842ca"; # June 5, 2022
perl-cross-src = fetchFromGitHub {
name = "perl-cross-unstable-${crossVersion}";
owner = "arsv";
repo = "perl-cross";
rev = crossVersion;
sha256 = "sha256-5hLUP34WwTFRsG0o8zSJm8WM3WfBAhHeYrrQF2MtMKc=";
sha256 = "sha256-m9UCoTQgXBxSgk9Q1Zv6wl3Qnd0aZm/jEPXkcMKti8U=";
};
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@ -222,14 +222,6 @@ let
setupHook = ./setup-hook-cross.sh;
});
in {
# Maint version
perl532 = common {
perl = pkgs.perl532;
buildPerl = buildPackages.perl532;
version = "5.32.1";
sha256 = "0b7brakq9xs4vavhg391as50nbhzryc7fy5i65r81bnq3j897dh3";
};
# Maint version
perl534 = common {
perl = pkgs.perl534;
@ -238,11 +230,19 @@ in {
sha256 = "sha256-NXlRpJGwuhzjYRJjki/ux4zNWB3dwkpEawM+JazyQqE=";
};
# Maint version
perl536 = common {
perl = pkgs.perl536;
buildPerl = buildPackages.perl536;
version = "5.36.0";
sha256 = "sha256-4mCFr4rDlvYq3YpTPDoOqMhJfYNvBok0esWr17ek4Ao=";
};
# the latest Devel version
perldevel = common {
perl = pkgs.perldevel;
buildPerl = buildPackages.perldevel;
version = "5.35.9";
sha256 = "sha256-/nmSCIIXHXoC68DxFM9b5GM2AKU4WlLbfWLgduanL7U=";
version = "5.37.0";
sha256 = "sha256-8RQO6gtH+WmghqzRafbqAH1MhKv/vJCcvysi7/+T9XI=";
};
}

8
pkgs/servers/http/unit/default.nix
View File

@ -3,8 +3,8 @@
, withPython3 ? true, python3, ncurses
, withPHP80 ? false, php80
, withPHP81 ? true, php81
, withPerl532 ? false, perl532
, withPerl534 ? true, perl534
, withPerl534 ? false, perl534
, withPerl536 ? true, perl536
, withPerldevel ? false, perldevel
, withRuby_2_7 ? true, ruby_2_7
, withRuby_3_0 ? false, ruby_3_0
@ -46,8 +46,8 @@ in stdenv.mkDerivation rec {
++ optionals withPython3 [ python3 ncurses ]
++ optional withPHP80 php80-unit
++ optional withPHP81 php81-unit
++ optional withPerl532 perl532
++ optional withPerl534 perl534
++ optional withPerl536 perl536
++ optional withPerldevel perldevel
++ optional withRuby_2_7 ruby_2_7
++ optional withRuby_3_0 ruby_3_0
@ -71,8 +71,8 @@ in stdenv.mkDerivation rec {
${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"}
${optionalString withPHP80 "./configure php --module=php80 --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"}
${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"}
${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"}
${optionalString withPerl534 "./configure perl --module=perl534 --perl=${perl534}/bin/perl"}
${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"}
${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"}
${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"}
${optionalString withRuby_3_0 "./configure ruby --module=ruby30 --ruby=${ruby_3_0}/bin/ruby"}

8
pkgs/top-level/all-packages.nix
View File

@ -22013,14 +22013,14 @@ with pkgs;
### DEVELOPMENT / PERL MODULES
perlInterpreters = callPackages ../development/interpreters/perl {};
inherit (perlInterpreters) perl532 perl534 perldevel;
inherit (perlInterpreters) perl534 perl536 perldevel;
perl532Packages = recurseIntoAttrs perl532.pkgs;
perl534Packages = recurseIntoAttrs perl534.pkgs;
perl536Packages = recurseIntoAttrs perl536.pkgs;
perldevelPackages = perldevel.pkgs;
perl = perl534;
perlPackages = perl534Packages;
perl = perl536;
perlPackages = perl536Packages;
ack = perlPackages.ack;

19
pkgs/top-level/perl-packages.nix
View File

@ -1533,10 +1533,10 @@ let
BKeywords = buildPerlPackage rec {
pname = "B-Keywords";
version = "1.22";
version = "1.24";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-${version}.tar.gz";
sha256 = "0i2ksp0w9wv1qc22hrdl3k48cww64syhmv8zf6x0kgyd4081hr56";
url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.24.tar.gz";
sha256 = "sha256-pc9rsoXQbRfO4id4O3I7snQhP9QVOl3uMR0kDhFpYG4=";
};
meta = {
description = "Lists of reserved barewords and symbol names";
@ -6420,18 +6420,11 @@ let
DBIxClass = buildPerlPackage {
pname = "DBIx-Class";
version = "0.082842";
version = "0.082843";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082842.tar.gz";
sha256 = "1rh7idjjbibc1zmiaaarask434lh0lx7f2xyfwmy37k9fa0xcpmh";
url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082843.tar.gz";
sha256 = "sha256-NB4Lbssp2MSRdKbAnXxtvzhym6QBXuf9cDYKT/7h8lE=";
};
patches = [
# https://github.com/Perl5/DBIx-Class/pull/141
(fetchpatch {
url = "https://github.com/Perl5/DBIx-Class/commit/fb896701d23fa4da622b5b1b2afbbba3da2dd8f3.patch";
sha256 = "sha256-MSbV9UfHu90NCdC5IFwuy/vpSDw4atfellYh7Ydvkm4=";
})
];
buildInputs = [ DBDSQLite TestDeep TestException TestWarn ];
propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction ModuleFind PathClass SQLAbstractClassic ScopeGuard SubName namespaceclean ];
meta = {