Merge pull request #211809 from johnrichardrinehart/johnrichardrinehart/sqitch-upgraded-templates

sqitch: opt-in powerful templates
This commit is contained in:
Stig 2023-02-07 13:47:38 +01:00 committed by GitHub
commit 0336b53927
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions

View File

@ -5,13 +5,15 @@
, shortenPerlShebang , shortenPerlShebang
, mysqlSupport ? false , mysqlSupport ? false
, postgresqlSupport ? false , postgresqlSupport ? false
, templateToolkitSupport ? false
}: }:
let let
sqitch = perlPackages.AppSqitch; sqitch = perlPackages.AppSqitch;
modules = with perlPackages; [ ] modules = with perlPackages; [ ]
++ lib.optional mysqlSupport DBDmysql ++ lib.optional mysqlSupport DBDmysql
++ lib.optional postgresqlSupport DBDPg; ++ lib.optional postgresqlSupport DBDPg
++ lib.optional templateToolkitSupport TemplateToolkit;
in in
stdenv.mkDerivation { stdenv.mkDerivation {

View File

@ -915,11 +915,11 @@ let
}; };
AppSqitch = buildPerlModule { AppSqitch = buildPerlModule {
version = "1.1.0"; version = "1.3.1";
pname = "App-Sqitch"; pname = "App-Sqitch";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.1.0.tar.gz"; url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.3.1.tar.gz";
hash = "sha256-7hRs111jAIN+bKVZuwveJH1CEjyWssXUsoAPONPj0as="; hash = "sha256-9edo0pjNQEfuKuQjGXgujCzaMSc3vL2/r1gL1H7+i5Q=";
}; };
buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ];
propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ]; propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ];
@ -22922,10 +22922,10 @@ let
TemplateToolkit = buildPerlPackage { TemplateToolkit = buildPerlPackage {
pname = "Template-Toolkit"; pname = "Template-Toolkit";
version = "3.009"; version = "3.101";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.009.tar.gz"; url = "mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-3.101.tar.gz";
hash = "sha256-1q0ju/Y3pZtd/RrABkYN/LGFmC5IUs3ncVD70IXx9bY="; hash = "sha256-0qMt1sIeSzfGqT34CHyp6IDPrmE6Pl766jB7C9yu21g=";
}; };
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
propagatedBuildInputs = [ AppConfig ]; propagatedBuildInputs = [ AppConfig ];