···

       
3
       
3
       
 
       
, fetchFromGitHub

     

       
4
       
4
       
 
       
, autoreconfHook

     

       
5
       
5
       
 
       
, pkg-config

     

       
6
       
6
       
-
       
, protobuf

     

       
6
       
6
       
+
       
, protobuf_25

     

       
7
       
7
       
 
       
, zlib

     

       
8
       
8
       
 
       
, buildPackages

     

       
9
       
9
       
 
       
}:

     
···

       
19
       
19
       
 
       
    hash = "sha256-Dkpcc7ZfvAIVY91trRiHuiRFcUGUbQxbheYKTBcq80I=";

     

       
20
       
20
       
 
       
  };

     

       
21
       
21
       
 
       


     

       
22
       
22
       
-
       
  patches = [

     

       
23
       
23
       
-
       
    # https://github.com/protobuf-c/protobuf-c/issues/709

     

       
24
       
24
       
-
       
    # https://github.com/protobuf-c/protobuf-c/pull/711

     

       
25
       
25
       
-
       
    ./recent_protobuf_compat.patch

     

       
26
       
26
       
-
       
  ];

     

       
27
       
27
       
-
       


     

       
28
       
22
       
 
       
  outputs = [ "out" "dev" "lib" ];

     

       
29
       
23
       
 
       


     

       
30
       
24
       
 
       
  nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       
31
       
25
       
 
       


     

       
32
       
32
       
-
       
  buildInputs = [ protobuf zlib ];

     

       
26
       
26
       
+
       
  buildInputs = [ protobuf_25 zlib ];

     

       
33
       
27
       
 
       


     

       
34
       
34
       
-
       
  env.PROTOC = lib.getExe buildPackages.protobuf;

     

       
28
       
28
       
+
       
  env.PROTOC = lib.getExe buildPackages.protobuf_25;

     

       
35
       
29
       
 
       


     

       
36
       
30
       
 
       
  meta = with lib; {

     

       
37
       
31
       
 
       
    homepage = "https://github.com/protobuf-c/protobuf-c/";

     

···

       
1
       
1
       
-
       
diff --git a/protoc-c/c_file.cc b/protoc-c/c_file.cc

     

       
2
       
2
       
-
       
index ca0ad34..c6d8a24 100644

     

       
3
       
3
       
-
       
--- a/protoc-c/c_file.cc

     

       
4
       
4
       
-
       
+++ b/protoc-c/c_file.cc

     

       
5
       
5
       
-
       
@@ -117,14 +117,7 @@ FileGenerator::~FileGenerator() {}

     

       
6
       
6
       
-
       
 void FileGenerator::GenerateHeader(io::Printer* printer) {

     

       
7
       
7
       
-
       
   std::string filename_identifier = FilenameIdentifier(file_->name());

     

       
8
       
8
       
-
       
 

     

       
9
       
9
       
-
       
-  int min_header_version = 1000000;

     

       
10
       
10
       
-
       
-#if GOOGLE_PROTOBUF_VERSION >= 4023000

     

       
11
       
11
       
-
       
-  if (FileDescriptorLegacy(file_).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3) {

     

       
12
       
12
       
-
       
-#else

     

       
13
       
13
       
-
       
-  if (file_->syntax() == FileDescriptor::SYNTAX_PROTO3) {

     

       
14
       
14
       
-
       
-#endif

     

       
15
       
15
       
-
       
-    min_header_version = 1003000;

     

       
16
       
16
       
-
       
-  }

     

       
17
       
17
       
-
       
+  const int min_header_version = 1003000;

     

       
18
       
18
       
-
       
 

     

       
19
       
19
       
-
       
   // Generate top of header.

     

       
20
       
20
       
-
       
   printer->Print(

     

       
21
       
21
       
-
       
diff --git a/protoc-c/c_generator.h b/protoc-c/c_generator.h

     

       
22
       
22
       
-
       
index b8b44aa..4aeb579 100644

     

       
23
       
23
       
-
       
--- a/protoc-c/c_generator.h

     

       
24
       
24
       
-
       
+++ b/protoc-c/c_generator.h

     

       
25
       
25
       
-
       
@@ -93,6 +93,12 @@ class PROTOC_C_EXPORT CGenerator : public CodeGenerator {

     

       
26
       
26
       
-
       
                 const std::string& parameter,

     

       
27
       
27
       
-
       
                 OutputDirectory* output_directory,

     

       
28
       
28
       
-
       
                 std::string* error) const;

     

       
29
       
29
       
-
       
+

     

       
30
       
30
       
-
       
+#if GOOGLE_PROTOBUF_VERSION >= 5026000

     

       
31
       
31
       
-
       
+  uint64_t GetSupportedFeatures() const { return CodeGenerator::FEATURE_SUPPORTS_EDITIONS; }

     

       
32
       
32
       
-
       
+  Edition GetMinimumEdition() const { return Edition::EDITION_PROTO2; }

     

       
33
       
33
       
-
       
+  Edition GetMaximumEdition() const { return Edition::EDITION_PROTO3; }

     

       
34
       
34
       
-
       
+#endif

     

       
35
       
35
       
-
       
 };

     

       
36
       
36
       
-
       
 

     

       
37
       
37
       
-
       
 }  // namespace c

     

       
38
       
38
       
-
       
diff --git a/protoc-c/c_helpers.h b/protoc-c/c_helpers.h

     

       
39
       
39
       
-
       
index 062d330..be28b60 100644

     

       
40
       
40
       
-
       
--- a/protoc-c/c_helpers.h

     

       
41
       
41
       
-
       
+++ b/protoc-c/c_helpers.h

     

       
42
       
42
       
-
       
@@ -70,10 +70,6 @@

     

       
43
       
43
       
-
       
 #include <protobuf-c/protobuf-c.pb.h>

     

       
44
       
44
       
-
       
 #include <google/protobuf/io/printer.h>

     

       
45
       
45
       
-
       
 

     

       
46
       
46
       
-
       
-#if GOOGLE_PROTOBUF_VERSION >= 4023000

     

       
47
       
47
       
-
       
-# include <google/protobuf/descriptor_legacy.h>

     

       
48
       
48
       
-
       
-#endif

     

       
49
       
49
       
-
       
-

     

       
50
       
50
       
-
       
 namespace google {

     

       
51
       
51
       
-
       
 namespace protobuf {

     

       
52
       
52
       
-
       
 namespace compiler {

     

       
53
       
53
       
-
       
@@ -173,13 +169,21 @@ struct NameIndex

     

       
54
       
54
       
-
       
 int compare_name_indices_by_name(const void*, const void*);

     

       
55
       
55
       
-
       
 

     

       
56
       
56
       
-
       
 // Return the syntax version of the file containing the field.

     

       
57
       
57
       
-
       
-// This wrapper is needed to be able to compile against protobuf2.

     

       
58
       
58
       
-
       
 inline int FieldSyntax(const FieldDescriptor* field) {

     

       
59
       
59
       
-
       
-#if GOOGLE_PROTOBUF_VERSION >= 4023000

     

       
60
       
60
       
-
       
-  return FileDescriptorLegacy(field->file()).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3 ? 3 : 2;

     

       
61
       
61
       
-
       
-#else

     

       
62
       
62
       
-
       
-  return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? 3 : 2;

     

       
63
       
63
       
-
       
-#endif

     

       
64
       
64
       
-
       
+  auto proto = FileDescriptorProto();

     

       
65
       
65
       
-
       
+  field->file()->CopyTo(&proto);

     

       
66
       
66
       
-
       
+

     

       
67
       
67
       
-
       
+  if (proto.has_syntax()) {

     

       
68
       
68
       
-
       
+    auto syntax = proto.syntax();

     

       
69
       
69
       
-
       
+    assert(syntax == "proto2" || syntax == "proto3");

     

       
70
       
70
       
-
       
+    if (syntax == "proto2") {

     

       
71
       
71
       
-
       
+      return 2;

     

       
72
       
72
       
-
       
+    } else if (syntax == "proto3") {

     

       
73
       
73
       
-
       
+      return 3;

     

       
74
       
74
       
-
       
+    }

     

       
75
       
75
       
-
       
+  }

     

       
76
       
76
       
-
       
+

     

       
77
       
77
       
-
       
+  return 2;

     

       
78
       
78
       
-
       
 }

     

       
79
       
79
       
-
       
 

     

       
80
       
80
       
-
       
 // Work around changes in protobuf >= 22.x without breaking compilation against