public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stdenv-updates

Browse Source
This commit is contained in:
Eelco Dolstra
2013-01-17 14:19:14 +01:00
parent b4dd943f16 3544f32231
commit 5bb548d2e4
120 changed files with 2870 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch Normal file
View File

@@ -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/