nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 02:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #268950 from stigtsp/perl/fix-hailo

Browse Source 
perlPackages.Hailo: fix tests
This commit is contained in:
Stig 2023-11-21 16:19:17 +01:00 committed by GitHub
commit 5142b86410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/perl-modules/Hailo-fix-test-gld.patch Normal file
View File

@ -0,0 +1,28 @@
commit ce474dbca0c95c06a85a3a329fcdbcc97b8ad317
Author: Stig Palmquist <git@stig.io>
Date: 2023-11-21 13:27:46 +0100
Fix t/shell.t compat with Getopt-Long-Descriptive 0.106
diff --git a/t/command/shell.t b/t/command/shell.t
index ebd67d8..a09afd2 100644
--- a/t/command/shell.t
+++ b/t/command/shell.t
@@ -28,7 +28,7 @@ run_ok( $app, [ '--no-help' ], "Don't help me" );
cmp_ok($return, '==', 1, 'Exit status is correct');
like($stderr, qr/^$/s, 'no stderr');
like($stdout, qr{usage: hailo}, 'Got usage header');
- like($stdout, qr{progress\s+Display progress}, 'Got --progress');
+ like($stdout, qr{progress\s*(?:\(or -p\))?\s+Display progress}, 'Got --progress');
like($stdout, qr{files are assumed to be UTF-8 encoded}, 'Got UTF-8 note');
unlike($stdout, qr{examples:}, "no examples on normal output");
}
@@ -75,7 +75,7 @@ run_ok( $app, [ '--no-help' ], "Don't help me" );
like($stderr, qr/^$/s, 'no stderr');
like($stdout, qr/Unknown option: blah-blah-blah/, 'Unknown option');
like($stdout, qr{usage: hailo}, 'Got usage header');
- like($stdout, qr{progress\s+Display progress}, 'Got --progress');
+ like($stdout, qr{progress\s*(?:\(or -p\))?\s+Display progress}, 'Got --progress');
like($stdout, qr{files are assumed to be UTF-8 encoded}, 'Got UTF-8 note');
unlike($stdout, qr{examples:}, "no examples on error");

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

@ -11348,6 +11348,9 @@ with self; {
buildInputs = [ BotTrainingMegaHAL BotTrainingStarCraft DataSection FileSlurp PodSection TestException TestExpect TestOutput TestScript TestScriptRun ];
propagatedBuildInputs = [ ClassLoad DBDSQLite DataDump DirSelf FileCountLines GetoptLongDescriptive IOInteractive IPCSystemSimple ListMoreUtils Moose MooseXGetopt MooseXStrictConstructor MooseXTypes RegexpCommon TermSk namespaceclean ];
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
patches = [
../development/perl-modules/Hailo-fix-test-gld.patch
];
postPatch = ''
patchShebangs bin
'';