[DDW-1220] Update cardano-node to 8.1.1 (via cardano-wallet)

Author: michalrus

flake.lock

@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
-    cardano-wallet-unpatched.url = "github:input-output-hk/cardano-wallet/v2023-04-14";
+    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/pull/4003/head"; # TODO: PR→release
     cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
     cardano-world.url = "github:input-output-hk/cardano-world/a0a315100ee320395be97fcc83f46678d5a7fb6e";
     cardano-world.flake = false; # otherwise, +19k quadratic dependencies in flake.lock…

flake.nix

@@ -1,12 +1,40 @@
+diff --git a/flake.nix b/flake.nix
+index 37ea1cfa12..8d0871d52b 100644
+--- a/flake.nix
++++ b/flake.nix
+@@ -217,8 +217,22 @@
+             collectChecks
+             check;
+ 
+-          nodePkgs = cardano-node-runtime.legacyPackages.${system};
+-          nodeProject = cardano-node-runtime.project.${system};
++          cardano-node-runtime-patched =
++            if system != "aarch64-darwin"
++            then cardano-node-runtime
++            else (import ./nix/flake-compat.nix {
++              src = {
++                outPath = toString (pkgs.runCommandLocal "patched-cardano-node" {} ''
++                  cp -r ${cardano-node-runtime} $out
++                  chmod -R +w $out
++                  cat ${./nix/supported-systems.nix} >$out/nix/supported-systems.nix
++                '');
++                inherit (cardano-node-runtime.sourceInfo) rev shortRev lastModified lastModifiedDate;
++              };
++            }).defaultNix;
++
++          nodePkgs = cardano-node-runtime-patched.legacyPackages.${system};
++          nodeProject = cardano-node-runtime-patched.project.${system};
+ 
+           project = (import ./nix/haskell.nix
+               CHaP
 diff --git a/nix/supported-systems.nix b/nix/supported-systems.nix
-index 6e3f0d94e3..5de7138b32 100644
+index 6e3f0d94e3..a0c0ae17dc 100644
 --- a/nix/supported-systems.nix
 +++ b/nix/supported-systems.nix
-@@ -1,6 +1,5 @@
- [
+@@ -2,5 +2,5 @@
    "x86_64-linux"
    "x86_64-darwin"
--  # TODO: Enable aarch64-darwin when there are Hydra builders for it
+   # TODO: Enable aarch64-darwin when there are Hydra builders for it
 -  # "aarch64-darwin"
 +  "aarch64-darwin"
  ]

nix/cardano-wallet--enable-aarch64-darwin.patch

@@ -21,26 +21,52 @@ let
         });
       };
     };
-  walletFlake = (import inputs.flake-compat {
-    # FIXME: add patches in `flake.nix` after <https://github.com/NixOS/nix/issues/3920>
-    src = pkgs.runCommand "cardano-wallet" {} ''
-      cp -r ${inputs.cardano-wallet-unpatched} $out
-      chmod -R +w $out
-      cd $out
-      patch -p1 -i ${./cardano-wallet--enable-aarch64-darwin.patch}
-      patch -p1 -i ${./cardano-wallet--expose-windowsPackages.patch}
-      patch -p1 -i ${./cardano-wallet--proper-runtimeNodePkgs.patch}
-    '';
-  }).defaultNix // {
-    inherit (inputs.cardano-wallet-unpatched) rev shortRev sourceInfo;
-  };
+  flake-compat = import inputs.flake-compat;
+
+  walletFlake = let
+    unpatched = inputs.cardano-wallet-unpatched;
+  in (flake-compat {
+    src = {
+      outPath = toString (pkgs.runCommand "source" {} ''
+        cp -r ${unpatched} $out
+        chmod -R +w $out
+        cd $out
+        patch -p1 -i ${./cardano-wallet--enable-aarch64-darwin.patch}
+        patch -p1 -i ${./cardano-wallet--expose-windowsPackages.patch}
+      '');
+      inherit (unpatched) rev shortRev lastModified lastModifiedDate;
+    };
+  }).defaultNix;
+
+  nodeFlake = let
+    unpatched = walletFlake.inputs.cardano-node-runtime;
+  in (flake-compat {
+    src = {
+      outPath = toString (pkgs.runCommand "source" {} ''
+        cp -r ${unpatched} $out
+        chmod -R +w $out
+        cd $out
+        cp ${walletFlake}/nix/supported-systems.nix $out/nix/supported-systems.nix
+      '');
+      inherit (unpatched.sourceInfo) rev shortRev lastModified lastModifiedDate;
+    };
+  }).defaultNix;
+
   walletPackages = {
     x86_64-windows = walletFlake.packages.x86_64-linux.windowsPackages;
     x86_64-linux = walletFlake.packages.x86_64-linux;
     x86_64-darwin = walletFlake.packages.x86_64-darwin;
     aarch64-darwin = walletFlake.packages.aarch64-darwin;
   }.${target};
-  cardanoWorldFlake = (import inputs.flake-compat { src = inputs.cardano-world; }).defaultNix.outputs;
+
+  nodePackages = {
+    x86_64-windows = nodeFlake.legacyPackages.x86_64-linux.hydraJobs.windows; # a bug in ${cardano-node}/flake.nix
+    x86_64-linux = nodeFlake.packages.x86_64-linux;
+    x86_64-darwin = nodeFlake.packages.x86_64-darwin;
+    aarch64-darwin = nodeFlake.packages.aarch64-darwin;
+  }.${target};
+
+  cardanoWorldFlake = (flake-compat { src = inputs.cardano-world; }).defaultNix.outputs;
   crossSystem = {
     x86_64-windows = pkgs.lib.systems.examples.mingwW64;
   }.${target} or null;
@@ -50,7 +76,7 @@ let
   ostable.aarch64-darwin = "macos64-arm";
 
   packages = self: {
-    inherit walletFlake cardanoWorldFlake cluster pkgs target;
+    inherit walletFlake nodeFlake cardanoWorldFlake cluster pkgs target;
     inherit (walletFlake.legacyPackages.${system}.pkgs) cardanoLib;
     daedalus-bridge = self.callPackage ./cardano-bridge.nix {};
 
@@ -59,10 +85,10 @@ let
     inherit (walletPackages) mock-token-metadata-server;
     cardano-shell = import inputs.cardano-shell { inherit system crossSystem; };
     local-cluster = if cluster == "selfnode" then walletPackages.local-cluster else null;
-    cardano-node = walletPackages.cardano-node;
-    cardanoNodeVersion = self.cardano-node.version + "-" + builtins.substring 0 9 walletFlake.inputs.cardano-node-1_35_4.rev;
+    cardano-node = nodePackages.cardano-node;
+    cardanoNodeVersion = self.cardano-node.identifier.version + "-" + builtins.substring 0 9 nodeFlake.rev;
     cardanoWalletVersion = self.daedalus-bridge.wallet-version + "-" + builtins.substring 0 9 walletFlake.rev;
-    cardano-cli = walletPackages.cardano-cli;
+    cardano-cli = nodePackages.cardano-cli;
 
     launcherConfigs = self.callPackage ./launcher-config.nix {
       inherit devShell system;