-
-
Notifications
You must be signed in to change notification settings - Fork 14k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
perlPackages.AppSqitch: 1.4.0 -> 1.4.1 #351171
base: master
Are you sure you want to change the base?
Conversation
@ofborg build perl540Packages.AppSqitch |
|
pkgs/top-level/perl-packages.nix
Outdated
url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.4.0.tar.gz"; | ||
hash = "sha256-sNs4cDH3dWJmLgA7xV16EComOAtK1/25qKO61XaeUBw="; | ||
url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.4.1.tar.gz"; | ||
hash = "sha256-yvMcyPdy46TJ1LP/Oo9oSm61sbPCYfTdwPkKiMNgB8Y="; | ||
}; | ||
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 ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apparently it also needs a dep on AlgorithmBackoff
:
Running phase: buildPhase
Checking prerequisites...
requires:
! Algorithm::Backoff::Exponential is not installed
(There's also atest_requires
on Test-Exit, but doesn't seem to break anything in this case.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should enable tests here to pick up on these kinds of errors, this patch sorts that:
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 37a5261383f3..a007e54fab50 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -998,9 +998,8 @@ with self; {
url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.4.1.tar.gz";
hash = "sha256-yvMcyPdy46TJ1LP/Oo9oSm61sbPCYfTdwPkKiMNgB8Y=";
};
- 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 ];
- doCheck = false; # Can't find home directory.
+ buildInputs = [ CaptureTiny TestExit 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 AlgorithmBackoff ];
meta = {
description = "Sensible database change management";
homepage = "https://sqitch.org";
@@ -22105,6 +22104,21 @@ with self; {
};
};
+ ReturnMultiLevel = buildPerlPackage {
+ pname = "Return-MultiLevel";
+ version = "0.08";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PL/PLICEASE/Return-MultiLevel-0.08.tar.gz";
+ hash = "sha256-UbGu8wxcQAn2QCZ6CFiSEuh9zRAYAPDSD5xjXJ/+iKE=";
+ };
+ buildInputs = [ TestFatal ];
+ meta = {
+ homepage = "https://metacpan.org/pod/Return::MultiLevel";
+ description = "Return across multiple call levels";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
ReturnValue = buildPerlPackage {
pname = "Return-Value";
version = "1.666005";
@@ -25039,6 +25053,20 @@ with self; {
};
};
+ TestExit = buildPerlPackage {
+ pname = "Test-Exit";
+ version = "0.11";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/A/AR/ARODLAND/Test-Exit-0.11.tar.gz";
+ hash = "sha256-+9qS034EgdGO68geSNAlIotXGExZstWm9r34cELox7I=";
+ };
+ propagatedBuildInputs = [ ReturnMultiLevel ];
+ meta = {
+ description = "Test whether code exits without terminating testing";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
TestExpect = buildPerlPackage {
pname = "Test-Expect";
version = "0.34";
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apparently it also needs a dep on
AlgorithmBackoff
:Running phase: buildPhase Checking prerequisites... requires: ! Algorithm::Backoff::Exponential is not installed
(There's also a
test_requires
on Test-Exit, but doesn't seem to break anything in this case.)
How did you get that info? From CI log? (trying to understand for future PRs)
EDIT: aha, its in logs/perl538Packages.AppSqitch*
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stigtsp I have pushed your patch to this PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nixpkgs-review pr 351171
thanks for the command. I was using nixpkgs-review rev HEAD
which seems to do something different (so I aborted that command when I tried it yesterday).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With that patch "required" prerequisites are gone. There are now "recommends":
patching ./t/firebird.t...
no configure script, doing nothing
Running phase: buildPhase
@nix { "action": "setPhase", "phase": "buildPhase" }
Checking prerequisites...
recommends:
* Class::XSAccessor is not installed
* Template is not installed
* Type::Tiny::XS is not installed
but my assumption is that these don't have to be added. Not sure what that even means, dependency to be recommended :|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep that should be fine - we can leave that to the consumers of the package to add recommended deps via overlays.
ReturnMultiLevel = buildPerlPackage { | ||
pname = "Return-MultiLevel"; | ||
version = "0.08"; | ||
src = fetchurl { | ||
url = "mirror://cpan/authors/id/P/PL/PLICEASE/Return-MultiLevel-0.08.tar.gz"; | ||
hash = "sha256-UbGu8wxcQAn2QCZ6CFiSEuh9zRAYAPDSD5xjXJ/+iKE="; | ||
}; | ||
buildInputs = [ TestFatal ]; | ||
meta = { | ||
homepage = "https://metacpan.org/pod/Return::MultiLevel"; | ||
description = "Return across multiple call levels"; | ||
license = with lib.licenses; [ artistic1 gpl1Plus ]; | ||
}; | ||
}; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please commit separately under perlPackages.ReturnMultiLevel: init at 0.08
TestExit = buildPerlPackage { | ||
pname = "Test-Exit"; | ||
version = "0.11"; | ||
src = fetchurl { | ||
url = "mirror://cpan/authors/id/A/AR/ARODLAND/Test-Exit-0.11.tar.gz"; | ||
hash = "sha256-+9qS034EgdGO68geSNAlIotXGExZstWm9r34cELox7I="; | ||
}; | ||
propagatedBuildInputs = [ ReturnMultiLevel ]; | ||
meta = { | ||
description = "Test whether code exits without terminating testing"; | ||
license = with lib.licenses; [ artistic1 gpl1Plus ]; | ||
}; | ||
}; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also commit this separately as perlPackages.TestExit: init at 0.11
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have rearanged the commits in git so they appear in a correct order based on dependencies:
[akegalj@x220:~/projects/nixpkgs]$ git log --pretty=format:%s HEAD^~2..HEAD
perlPackages.AppSqitch: 1.4.0 -> 1.4.1
perlPackages.TestExit: init at 0.11
perlPackages.ReturnMultiLevel: init at 0.08
Bump sqitch tool from v1.4.0 to v1.4.1
This realease https://github.com/sqitchers/sqitch/releases/tag/v1.4.1 mostly contains bug fixes. Most notably:
which is related to sqitch v1.4.0 failing on some machines due too bug in setting a locale. This was fixed here sqitchers/sqitch#806 (comment) and pushed to v1.4.1.
Other comments from release notes don't look like a breaking change. I have checked note:
And this doesn't seem like a breaking change as
TestWarn
is at version0.37
https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix#L26217Note: This package doesn't have tests so no automated tests are run
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.