add final

Author: carbolymer

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2026-02-06T20:27:32Z
-  , cardano-haskell-packages 2026-03-03T10:50:34Z
+  , cardano-haskell-packages 2026-03-11T22:13:22Z
 
 constraints:
   -- haskell.nix patch does not work for 1.6.8
@@ -99,10 +99,3 @@ source-repository-package
     proto-lens-tests
     proto-lens
 
-source-repository-package
-  type: git
-  location: https://github.com/IntersectMBO/cardano-api
-  tag: 23b2f6ca68c0e5efbda31a6b121368dac0945d82
-  --sha256: sha256-H2aNFtGAXLXqo1TiMYY/w7Paxs8VZrwq4BRjmL77hCk=
-  subdir:
-    cardano-rpc

cardano-node/cardano-node.cabal

@@ -156,7 +156,7 @@ library
                       , cardano-prelude
                       , cardano-protocol-tpraos >= 1.4
                       , cardano-slotting >= 0.2
-                      , cardano-rpc ^>= 10.0
+                      , cardano-rpc ^>= 10.1
                       , cborg ^>= 0.2.4
                       , containers
                       , contra-tracer

cardano-node/src/Cardano/Node/Run.hs

@@ -557,7 +557,7 @@ handleSimpleNode blockType runP tracers nc onKernel = do
 
         ProtocolInfo{pInfoConfig} = fst $ Api.protocolInfo @IO runP
         networkMagic :: Api.NetworkMagic = getNetworkMagic $ Consensus.configBlock pInfoConfig
-    withAsync (runRpcServer (rpcTracer tracers) (pure (ncRpcConfig nc, networkMagic)))  $ \_ ->
+    withAsync (runRpcServer (rpcTracer tracers) (ncRpcConfig nc, networkMagic))  $ \_ ->
         Node.run
           nodeArgs {
               rnNodeKernelHook = \registry nodeKernel -> do

flake.lock

@@ -80,20 +80,15 @@
     # on darwin which calls this binary to find certificates
       pkgs.writeScriptBin "security" ''exec /usr/bin/security "$@"'';
 
+    windowsCompilerNixName = "ghc9122";
+
     supportedSystems = import ./nix/supported-systems.nix;
     defaultSystem = head supportedSystems;
     customConfig =
       recursiveUpdate
       (import ./nix/custom-config.nix customConfig)
       input.customConfig;
 
-    abseilOverlay = final: prev:
-      prev.lib.optionalAttrs prev.stdenv.hostPlatform.isWindows {
-        abseil-cpp = prev.abseil-cpp.overrideAttrs (finalAttrs: previousAttrs: {
-          buildInputs = previousAttrs.buildInputs ++ [prev.pkgs.windows.pthreads];
-        });
-      };
-
     overlays = [
       # Crypto needs to come before haskell.nix.
       # FIXME: _THIS_IS_BAD_
@@ -114,7 +109,6 @@
           // import ./nix/svclib.nix {inherit (final) pkgs;};
       })
       (import ./nix/pkgs.nix)
-      abseilOverlay
       self.overlay
     ];
 
@@ -365,7 +359,7 @@
           # Once building, windowsProject candidate for win-arm64 is project.projectCross.ucrtAarch64.
           // optionalAttrs (elem system ["x86_64-linux"]) {
             windows = let
-              windowsProject = project.projectCross.mingwW64;
+              windowsProject = (project.appendModule { compiler-nix-name = windowsCompilerNixName; }).projectCross.mingwW64;
               projectExes = collectExes windowsProject;
             in
               projectExes
@@ -491,7 +485,7 @@
         cardanoNodeProject =
           (import ./nix/haskell.nix {
             inherit (final) haskell-nix;
-            inherit CHaP incl;
+            inherit CHaP incl windowsCompilerNixName;
             macOS-security = macOS-security (final.pkgs);
           })
           .appendModule [

flake.nix

@@ -5,6 +5,7 @@
 , incl
 , CHaP
 , macOS-security
+, windowsCompilerNixName
 }:
 let
 
@@ -21,7 +22,7 @@ let
     {
       src = ../.;
       name = "cardano-node";
-      compiler-nix-name = lib.mkDefault (if pkgs.stdenv.hostPlatform.isWindows then "ghc9122" else "ghc967");
+      compiler-nix-name = lib.mkDefault (if pkgs.stdenv.hostPlatform.isWindows then windowsCompilerNixName else "ghc967");
       # Extra-compilers
       # flake.variants = lib.genAttrs ["ghc$VERSION"] (x: {compiler-nix-name = x;});
       cabalProjectLocal = ''
@@ -311,8 +312,8 @@ let
               '';
           })
           ({pkgs, ...}: {
-              packages.proto-lens-protobuf-types.components.library.build-tools = [ pkgs.protobuf ];
-              packages.cardano-rpc.components.library.build-tools = [ pkgs.protobuf ];
+              packages.proto-lens-protobuf-types.components.library.build-tools = [ pkgs.buildPackages.protobuf ];
+              packages.cardano-rpc.components.library.build-tools = [ pkgs.buildPackages.protobuf ];
           })
           ({ lib, pkgs, ... }: lib.mkIf (!pkgs.stdenv.hostPlatform.isDarwin) {
             # Needed for profiled builds to fix an issue loading recursion-schemes part of makeBaseFunctor

nix/haskell.nix

@@ -4,7 +4,7 @@ final: prev:
 let
   inherit (builtins) foldl' fromJSON listToAttrs map readFile;
   inherit (final) pkgs;
-  inherit (prev.pkgs) lib;
+  inherit (prev) lib;
   inherit (prev) customConfig;
   # Parametrized helper entrypoint for the workbench development environment.
   workbench = import ./workbench
@@ -225,3 +225,13 @@ in with final;
     ];
   });
 }
+// lib.optionalAttrs prev.stdenv.hostPlatform.isWindows {
+  abseil-cpp = prev.abseil-cpp.overrideAttrs (finalAttrs: previousAttrs: {
+    buildInputs = previousAttrs.buildInputs ++ [prev.windows.pthreads];
+  });
+}
+// lib.optionalAttrs prev.stdenv.hostPlatform.isMusl {
+  snappy = prev.snappy.overrideAttrs (old: {
+    cmakeFlags = map (f: if f == "-DBUILD_SHARED_LIBS=ON" then "-DBUILD_SHARED_LIBS=OFF" else f) (old.cmakeFlags or []);
+  });
+}