diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-19 00:05:50 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-19 00:05:50 +0100 |
| commit | 9da086c08d73e90f8f7d624f67339c0508322e3a (patch) | |
| tree | ab7fa8a1f903a46c8809b2bb6885cf5ebc32eae4 /pkgs/development/perl-modules | |
| parent | cd5755845fe5a31711d223f5f7fc3f50f2f9212b (diff) | |
| parent | 23853fa81b86517a8a5705b77d4c816b42c917e6 (diff) | |
| download | nixpkgs-9da086c08d73e90f8f7d624f67339c0508322e3a.tar nixpkgs-9da086c08d73e90f8f7d624f67339c0508322e3a.tar.gz nixpkgs-9da086c08d73e90f8f7d624f67339c0508322e3a.tar.bz2 nixpkgs-9da086c08d73e90f8f7d624f67339c0508322e3a.tar.lz nixpkgs-9da086c08d73e90f8f7d624f67339c0508322e3a.tar.xz nixpkgs-9da086c08d73e90f8f7d624f67339c0508322e3a.tar.zst nixpkgs-9da086c08d73e90f8f7d624f67339c0508322e3a.zip | |
Merge remote-tracking branch 'origin/master' into systemd
Diffstat (limited to 'pkgs/development/perl-modules')
| -rw-r--r-- | pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch | 12 |
1 files changed, 12 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 00000000000..6b634d0d242 --- /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/ |