@@ -23,7 +23,7 @@ let
2323 src = builtins.fetchGit {
2424 url = "https://github.com/protocolbuffers/protobuf";
2525 rev = "52b2447247f535663ac1c292e088b4b27d2910ef";
26− inherit ref;
26+ ref = "refs/tags/${ref}";
2727 };
2828 };
2929 protobuf_repo_v3_14_0 = rec {
@@ -31,7 +31,7 @@ let
3131 src = builtins.fetchGit {
3232 url = "https://github.com/protocolbuffers/protobuf";
3333 rev = "2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10";
34− inherit ref;
34+ ref = "refs/tags/${ref}";
3535 };
3636 };
3737 protobuf_repo_v3_15_8 = rec {
@@ -39,7 +39,7 @@ let
3939 src = builtins.fetchGit {
4040 url = "https://github.com/protocolbuffers/protobuf";
4141 rev = "436bd7880e458532901c58f4d9d1ea23fa7edd52";
42− inherit ref;
42+ ref = "refs/tags/${ref}";
4343 };
4444 };
4545
@@ -60,13 +60,13 @@ let
6060 configurePhase = ''
6161 ./autogen.sh
6262 ./configure --prefix=$out
63− '';
63+ '';
6464 buildPhase = ''
6565 make --jobs=$NIX_BUILD_CORES
6666 cd conformance
6767 make
6868 cd ..
69− '';
69+ '';
7070 installPhase = ''
7171 mkdir -p $out
7272 make install
@@ -77,17 +77,18 @@ let
7777 rsync -am --include='*.proto' --include='*/' --exclude='*' src $out/
7878 mkdir -p $out/conformance
7979 cp ./conformance/conformance.proto $out/conformance/
80− '';
80+ '';
8181 LC_ALL = "C.UTF-8";
8282 };
8383
84−in {
85−inherit protobuf_repo_v3_9_2;
86−inherit protobuf_repo_v3_14_0;
87−inherit protobuf_repo_v3_15_8;
88−protobuf_v3_9_2 = mkProtobuf protobuf_repo_v3_9_2;
89−protobuf_v3_14_0 = mkProtobuf protobuf_repo_v3_14_0;
90−protobuf_v3_15_8 = mkProtobuf protobuf_repo_v3_15_8;
84+in
85+{
86+ inherit protobuf_repo_v3_9_2;
87+ inherit protobuf_repo_v3_14_0;
88+ inherit protobuf_repo_v3_15_8;
89+ protobuf_v3_9_2 = mkProtobuf protobuf_repo_v3_9_2;
90+ protobuf_v3_14_0 = mkProtobuf protobuf_repo_v3_14_0;
91+ protobuf_v3_15_8 = mkProtobuf protobuf_repo_v3_15_8;
9192}
9293
9394