fix proto-lens

Author: functora

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "apps"]
 	path = apps
 	url = [email protected]:functora/apps.git
+[submodule "pub/proto-lens/proto-lens/proto-lens-imports/google/protobuf"]
+	path = pub/proto-lens/proto-lens/proto-lens-imports/google/protobuf
+	url = https://github.com/protocolbuffers/protobuf

cabal.project

@@ -61,8 +61,19 @@ else
                  secp256k1-haskell,
                  ghc,
     packages:
-      pub/proto-lens/proto-lens-protoc/*.cabal
       pub/network-bitcoin/*.cabal
+      pub/proto-lens/discrimination-ieee754/*.cabal
+      pub/proto-lens/proto-lens/*.cabal
+      pub/proto-lens/proto-lens-arbitrary/*.cabal
+      pub/proto-lens/proto-lens-benchmarks/*.cabal
+      pub/proto-lens/proto-lens-discrimination/*.cabal
+      pub/proto-lens/proto-lens-optparse/*.cabal
+      pub/proto-lens/proto-lens-protobuf-types/*.cabal
+      pub/proto-lens/proto-lens-protoc/*.cabal
+      pub/proto-lens/proto-lens-runtime/*.cabal
+      pub/proto-lens/proto-lens-setup/*.cabal
+      pub/proto-lens/proto-lens-tests/*.cabal
+      pub/proto-lens/proto-lens-tests-dep/*.cabal
       pub/hs-bitcoin-hash/bitcoin-hash/*.cabal
       pub/hs-bitcoin-keys/bitcoin-keys/*.cabal
       pub/haskell-bitcoin-script/*.cabal

pub/proto-lens/proto-lens/package.yaml

@@ -4,11 +4,11 @@ synopsis: A lens-based implementation of protocol buffers in Haskell.
 description: >
   The proto-lens library provides an API for protocol buffers using modern
   Haskell language and library patterns.  Specifically, it provides:
-   
+
   * Composable field accessors via lenses
-   
+
   * Simple field name resolution/overloading via type-level literals
-   
+
   * Type-safe reflection and encoding/decoding of messages via GADTs
 
 github: google/proto-lens/proto-lens
@@ -24,8 +24,8 @@ extra-source-files:
 # Usually this happens automatically as part of Data.ProtoLens.Setup,
 # but because of bootstrapping we don't use that module here.
 data-files:
-  - proto-lens-imports/google/protobuf/descriptor.proto
-  - proto-lens-imports/google/protobuf/compiler/plugin.proto
+  - proto-lens-imports/google/protobuf/src/google/protobuf/descriptor.proto
+  - proto-lens-imports/google/protobuf/src/google/protobuf/compiler/plugin.proto
 
 library:
   source-dirs: src
@@ -54,20 +54,20 @@ tests:
     main: parser_test.hs
     source-dirs: tests
     dependencies:
-    - base
-    - bytestring
-    - proto-lens
-    - QuickCheck
-    - tasty
-    - tasty-quickcheck
+      - base
+      - bytestring
+      - proto-lens
+      - QuickCheck
+      - tasty
+      - tasty-quickcheck
 
   growing_test:
     main: growing_test.hs
     source-dirs: tests
     dependencies:
-    - base
-    - vector
-    - proto-lens
-    - QuickCheck
-    - tasty
-    - tasty-quickcheck
+      - base
+      - vector
+      - proto-lens
+      - QuickCheck
+      - tasty
+      - tasty-quickcheck

pub/proto-lens/proto-lens/proto-lens-imports/google

@@ -1,18 +1,15 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.37.0.
+-- This file has been generated from package.yaml by hpack version 0.38.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           proto-lens
 version:        0.7.1.6
 synopsis:       A lens-based implementation of protocol buffers in Haskell.
 description:    The proto-lens library provides an API for protocol buffers using modern Haskell language and library patterns.  Specifically, it provides:
-                .
                 * Composable field accessors via lenses
-                .
                 * Simple field name resolution/overloading via type-level literals
-                .
                 * Type-safe reflection and encoding/decoding of messages via GADTs
 category:       Data
 homepage:       https://github.com/google/proto-lens#readme
@@ -26,8 +23,8 @@ build-type:     Simple
 extra-source-files:
     Changelog.md
 data-files:
-    proto-lens-imports/google/protobuf/descriptor.proto
-    proto-lens-imports/google/protobuf/compiler/plugin.proto
+    proto-lens-imports/google/protobuf/src/google/protobuf/descriptor.proto
+    proto-lens-imports/google/protobuf/src/google/protobuf/compiler/plugin.proto
 
 source-repository head
   type: git