Remove proto-lens SRP

Author: carbolymer

.changes/20260417_cardano_api_bump_cardano_ledger_core.yml

@@ -0,0 +1,6 @@
+project: cardano-api
+pr: 1185
+kind:
+  - breaking
+description: |
+  Bump `cardano-ledger-core` lower bound to `>=1.20` (required by `ouroboros-consensus-3.0.x`).

.changes/20260417_cardano_api_remove_proto_lens_srp.yml

@@ -0,0 +1,7 @@
+project: cardano-api
+pr: 1185
+kind:
+  - maintenance
+description: |
+  Remove `proto-lens` source-repository-package now that `proto-lens >=0.7.1.7` is on Hackage.
+  Pin `buf` to `v1.66.1` in the dev shell and CI workflow.

.changes/20260417_cardano_rpc_proto_lens_bump.yml

@@ -0,0 +1,7 @@
+project: cardano-rpc
+pr: 1185
+kind:
+  - maintenance
+description: |
+  Bump `proto-lens` lower bound to `>=0.7.1.7`.
+  Regenerate `gen/**` with `buf v1.66.1`.

.github/workflows/haskell.yml

@@ -97,8 +97,10 @@ jobs:
 
     - name: '[Linux] [cardano-rpc] Install buf tool'
       if: runner.os == 'Linux'
+      # buf version must match the one in flake.nix dev shell (buf is not
+      # backwards-compatible across minor versions for `buf generate` output).
       run: |
-        curl -sSL "https://github.com/bufbuild/buf/releases/latest/download/buf-Linux-x86_64" -o "/usr/local/bin/buf"
+        curl -sSL "https://github.com/bufbuild/buf/releases/download/v1.66.1/buf-Linux-x86_64" -o "/usr/local/bin/buf"
         chmod +x /usr/local/bin/buf
 
     - name: '[Linux] [cardano-rpc] Install proto-lens-protoc tool'

cabal.project

@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2026-03-22T23:17:32Z
-  , cardano-haskell-packages 2026-04-09T12:05:18Z
+  , hackage.haskell.org 2026-04-17T09:20:55Z
+  , cardano-haskell-packages 2026-04-15T11:20:53Z
 
 active-repositories:
   , :rest
@@ -144,27 +144,6 @@ if arch(wasm32)
   package digest
      flags: -pkg-config
 
--- GHC 9.12 and later support in master
-if impl(ghc >= 9.12)
-  source-repository-package
-    type: git
-    location: https://github.com/google/proto-lens
-    tag: 9b41fe0e10e8fe12ec508a3b361d0f0c2217c491
-    --sha256: sha256-ruTbbUKVJBPANnm6puigtp26mmiVDd0jMpLfJLOuUpU=
-    subdir:
-      discrimination-ieee754
-      proto-lens-arbitrary
-      proto-lens-benchmarks
-      proto-lens-discrimination
-      proto-lens-optparse
-      proto-lens-protobuf-types
-      proto-lens-protoc
-      proto-lens-runtime
-      proto-lens-setup
-      proto-lens-tests-dep
-      proto-lens-tests
-      proto-lens
-
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.

cardano-api/cardano-api.cabal

@@ -146,7 +146,7 @@ library
     cardano-ledger-binary >=1.6,
     cardano-ledger-byron >=1.2,
     cardano-ledger-conway >=1.19,
-    cardano-ledger-core >=1.17 && <1.20,
+    cardano-ledger-core >=1.20,
     cardano-ledger-dijkstra >=0.1,
     cardano-ledger-mary >=1.8,
     cardano-ledger-shelley >=1.16,

cardano-rpc/cardano-rpc.cabal

@@ -87,7 +87,7 @@ library
     generic-data,
     grapesy,
     grpc-spec,
-    proto-lens >=0.7.1.6,
+    proto-lens >=0.7.1.7,
     proto-lens-protobuf-types,
     random,
     rio,

flake.lock

@@ -123,26 +123,6 @@
 
         # We use cabalProject' to ensure we don't build the plan for
         # all systems.
-        # Fetch proto-lens with submodules and fix symlinks for plan and build phases
-        protoLensSrc = nixpkgs.fetchgit {
-          url = "https://github.com/google/proto-lens";
-          rev = "9b41fe0e10e8fe12ec508a3b361d0f0c2217c491";
-          sha256 = "sha256-ruTbbUKVJBPANnm6puigtp26mmiVDd0jMpLfJLOuUpU=";
-          fetchSubmodules = true;
-        };
-        fixProtoLensSrc = nixpkgs.runCommand "proto-lens-fixed" {} ''
-          mkdir -p $out
-          cp -a ${protoLensSrc}/. $out/
-          chmod -R +w $out
-          # Fix proto-lens-imports symlink in proto-lens
-          rm -rf $out/proto-lens/proto-lens-imports/google
-          cp -r ${protoLensSrc}/google/protobuf/src/google $out/proto-lens/proto-lens-imports/
-          # Fix proto-src symlink in proto-lens-protobuf-types
-          rm -rf $out/proto-lens-protobuf-types/proto-src
-          cp -r ${protoLensSrc}/google/protobuf/src $out/proto-lens-protobuf-types/proto-src
-          chmod -R -w $out
-        '';
-
         cabalProject = nixpkgs.haskell-nix.cabalProject' ({config, ...}: {
           src = ./.;
           name = "cardano-api";
@@ -160,7 +140,6 @@
           #
           inputMap = {
             "https://chap.intersectmbo.org/" = inputs.CHaP;
-            "https://github.com/google/proto-lens/9b41fe0e10e8fe12ec508a3b361d0f0c2217c491" = protoLensSrc;
           };
           # Also currently needed to make `nix flake lock --update-input CHaP` work.
           cabalProjectLocal = ''
@@ -209,7 +188,10 @@
             shellcheck
             snappy
             protobuf
-            buf
+            # buf version must match `.github/workflows/haskell.yml` (buf is
+            # not backwards-compatible across minor versions for
+            # `buf generate` output).
+            unstable.buf
             blst
             inputs.cardano-dev.packages.${system}.herald
             (writeShellScriptBin "haskell-language-server-wrapper" ''exec haskell-language-server "$@"'')
@@ -228,34 +210,6 @@
           # package customizations as needed. Where cabal.project is not
           # specific enough, or doesn't allow setting these.
           modules = [
-            # TODO remove this module when removing proto-lens SRP
-            # Override proto-lens source to use fixed symlinks (inputMap provides the fixed
-            # source for plan computation; this module provides it for the build phase)
-            ({
-              lib,
-              config,
-              ...
-            }: let
-              protoLensPackages = [
-                "proto-lens"
-                "proto-lens-arbitrary"
-                "proto-lens-discrimination"
-                "proto-lens-optparse"
-                "proto-lens-protobuf-types"
-                "proto-lens-protoc"
-                "proto-lens-runtime"
-                "proto-lens-setup"
-                "proto-lens-tests-dep"
-                "proto-lens-tests"
-                "discrimination-ieee754"
-                "proto-lens-benchmarks"
-              ];
-            in {
-              packages =
-                lib.genAttrs
-                (builtins.filter (p: config.packages ? ${p}) protoLensPackages)
-                (p: {src = lib.mkForce (fixProtoLensSrc + "/${p}");});
-            })
             ({...}: {
               packages.cardano-api = {
                 configureFlags = ["--ghc-option=-Werror"];