Merge pull request #6561 from IntersectMBO/mgalazyn/chore/remove-proto-lens-srp-bump-hackage

Bump hackage. Remove proto-lens srp

Author: carbolymer

bench/plutus-scripts-bench/plutus-scripts-bench.cabal

@@ -53,7 +53,7 @@ common common-definitions
     -fobject-code -fno-full-laziness
 
   if flag(defer-plugin-errors)
-    ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
+    ghc-options: -fplugin-opt=PlutusTx.Plugin:defer-errors
 
 library
   import:          common-definitions

cabal.project

@@ -13,7 +13,7 @@ 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-26T20:21:33Z
+  , hackage.haskell.org 2026-04-17T09:20:55Z
   , cardano-haskell-packages 2026-05-02T16:21:41Z
 
 active-repositories:
@@ -24,7 +24,9 @@ constraints:
   -- haskell.nix patch does not work for 1.6.8
   , any.crypton-x509-system < 1.6.8
   -- haskell.nix tries to use 0.7.1.5 for some reason
-  , any.proto-lens >= 0.7.1.6
+  , any.proto-lens >= 0.7.1.7
+  -- https://github.com/channable/alfred-margaret/pull/76
+  , any.alfred-margaret < 2.1.1.0 || > 2.1.1.0
 
 -- acts has a finitary flag; disabling it avoids pulling in finitary entirely,
 -- which sidesteps the GHC type-checker plugin incompatibility with
@@ -89,25 +91,3 @@ allow-newer:
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
 
-if impl(ghc >= 9.12)
-  -- GHC 9.12 support - master branch
-  source-repository-package
-    type: git
-    location: https://github.com/google/proto-lens
-    tag: 13ce67409ad87e8c29eea58b31aa37f44e82457c
-    --sha256: sha256-8XPGLheOo5ZStL7YD5x29GechWFjubw+in5GsUrKWPc=
-    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
-
-

flake.lock

@@ -377,7 +377,7 @@
           # Once building, windowsProject candidate for win-arm64 is project.projectCross.ucrtAarch64.
           // optionalAttrs (elem system ["x86_64-linux"]) {
             windows = let
-              windowsProject = (project.appendModule {compiler-nix-name = windowsCompilerNixName;}).projectCross.mingwW64;
+              windowsProject = (project.appendModule {compiler-nix-name = windowsCompilerNixName;}).projectCross.ucrt64;
               projectExes = collectExes windowsProject;
             in
               projectExes

flake.nix

@@ -19,27 +19,7 @@ let
                                        , buildProject
                                        , ...
                                        }:
-    let
-      # Fetch proto-lens with submodules and fix symlinks for plan and build phases
-      protoLensSrc = pkgs.fetchgit {
-        url = "https://github.com/google/proto-lens";
-        rev = "20de5227947b0c37dd6852dcc6f2db1cd5889cee";
-        sha256 = "sha256-VUYU2swjU7L8Zdu6Zfz6jo2ulW5uPhAamt2GjH5hZRY=";
-        fetchSubmodules = true;
-      };
-      fixProtoLensSrc = pkgs.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
-      '';
-    in {
+    {
       src = ../.;
       name = "cardano-node";
       compiler-nix-name = lib.mkDefault (if pkgs.stdenv.hostPlatform.isWindows then windowsCompilerNixName else "ghc967");
@@ -67,7 +47,6 @@ let
       '';
       inputMap = {
         "https://chap.intersectmbo.org/" = CHaP;
-        "https://github.com/google/proto-lens/20de5227947b0c37dd6852dcc6f2db1cd5889cee" = fixProtoLensSrc;
       };
       shell = {
         name = lib.mkDefault "cabal-dev-shell";
@@ -90,6 +69,13 @@ let
         ];
 
         withHoogle = true;
+
+        # https://github.com/channable/alfred-margaret/pull/76
+        tools.hoogle = {
+          cabalProjectLocal = ''
+            constraints: any.alfred-margaret <2.1.1.0 || >2.1.1.0
+          '';
+        };
       };
 
 
@@ -178,6 +164,12 @@ let
             #  export ISERV_ARGS="-v +RTS -Dl"
             #  export PROXY_ARGS=-v
             #'';
+
+            # Tests broken under Wine: System.IO.Temp file operations fail
+            packages.cardano-profile.components.tests.cardano-profile-test.buildable = lib.mkForce false;
+            packages.cardano-topology.components.tests.cardano-topology-test.buildable = lib.mkForce false;
+            packages.cardano-recon-framework.components.tests.cardano-recon-integration-test.buildable = lib.mkForce false;
+            packages.trace-schema-gen.components.tests.trace-schema-gen-test.buildable = lib.mkForce false;
           })
           ({ lib, pkgs, config, ... }: lib.mkIf (builtins.compareVersions config.compiler.version "9.4" >= 0) {
             # lib:ghc is a bit annoying in that it comes with it's own build-type:Custom, and then tries
@@ -390,30 +382,6 @@ let
           # TODO add flags to packages (like cs-ledger) so we can turn off tests that will
           # not build for windows on a per package bases (rather than using --disable-tests).
           # configureArgs = lib.optionalString stdenv.hostPlatform.isWindows "--disable-tests";
-
-          # 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}"); });
-          })
         ];
     });
 in

nix/haskell.nix

@@ -207,7 +207,7 @@ in with final;
   );
 
   # Disable failing python uvloop tests
-  python310 = prev.python310.override {
+  python311 = prev.python311.override {
     packageOverrides = pythonFinal: pythonPrev: {
       uvloop = pythonPrev.uvloop.overrideAttrs (attrs: {
         disabledTestPaths = [ "tests/test_tcp.py" "tests/test_sourcecode.py" "tests/test_dns.py" ];