diff options
| author | Shea Levy <shea@shealevy.com> | 2013-01-16 13:59:15 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-01-16 13:59:15 -0500 |
| commit | f1054e5051dd7c604655309166d9ca960ee406f3 (patch) | |
| tree | e578469d86bb40c6f8457a4014084595d81300a8 /pkgs | |
| parent | 729a112f726177a2f663d13d6e5ed7e4fdfe256a (diff) | |
Add patch to handle /**/-style comments in Google::ProtocolBuffers
Patch thanks to Daniel Zinn
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch | 12 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch b/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch new file mode 100644 index 000000000000..6b634d0d2424 --- /dev/null +++ b/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch @@ -0,0 +1,12 @@ +diff -Naur Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm +--- Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm 2008-10-23 13:46:01.000000000 -0400 ++++ Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm 2013-01-16 13:52:09.855063997 -0500 +@@ -16,7 +16,7 @@ +
+ my $grammar = <<'END_OF_GRAMMAR';
+
+-proto : <skip: qr! (?: //.*\n | \s+ )* !x>
++proto : <skip: qr! (?: //.*?\n | \s+ | /\*.*?\*/\s* )* !xs>
+ ## list of top level declarations.
+ ## Skip empty declarations and ";".
+ (message | extend | enum | import | package | option | service | syntax | ";")(s) /\Z/
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1f6130cabb5e..b1a9283fca97 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1781,6 +1781,9 @@ rec { sha256 = "0pxfphg671wh56h59pf0zrj7m1cr0yga95hf3w54563pzcw2vqv3"; }; propagatedBuildInputs = [ ClassAccessor ParseRecDescent ]; + patches = [ + ../development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch + ]; }; Graph = buildPerlPackage rec { |