Use cardano-ping fix from IntersectMBO/ouroboros-network#3193

input-output-hk · Jun 3, 2021 · a242ba4 · a242ba4
1 parent 4dacd47
commit a242ba4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/nix/cardano.nix b/nix/cardano.nix
@@ -5,14 +5,17 @@ let
   cardano-rosetta-pkgs = import (self.sourcePaths.cardano-rosetta + "/nix") {};
   cardanoNodePkgs = import (self.sourcePaths.cardano-node + "/nix") { gitrev = self.sourcePaths.cardano-node.rev; };
   cardanoNodeServicePkgs = import (self.sourcePaths.cardano-node-service + "/nix") { gitrev = self.sourcePaths.cardano-node-service.rev; };
+  ouroboros-network-pkgs = import (self.sourcePaths.ouroboros-network + "/nix") {};
 in rec {
   inherit cardanoNodeServicePkgs;
   inherit (cardano-db-sync-pkgs) cardanoDbSyncHaskellPackages;
   inherit cardano-explorer-app-pkgs cardanoNodePkgs;
   inherit (cardanoNodePkgs.cardanoNodeHaskellPackages.cardano-cli.components.exes) cardano-cli;
   inherit (cardanoNodePkgs.cardanoNodeHaskellPackages.cardano-submit-api.components.exes) cardano-submit-api;
   inherit (cardanoNodePkgs.cardanoNodeHaskellPackages.cardano-node.components.exes) cardano-node;
-  inherit (cardanoNodePkgs.cardanoNodeHaskellPackages.network-mux.components.exes) cardano-ping;
+  inherit ((if (self.sourcePaths ? ouroboros-network)
+    then ouroboros-network-pkgs.ouroborosNetworkHaskellPackages
+    else cardanoNodePkgs.cardanoNodeHaskellPackages).network-mux.components.exes) cardano-ping;
   inherit (cardano-rosetta-pkgs) cardano-rosetta-server;
 
   cardano-node-eventlogged = cardanoNodePkgs.cardanoNodeEventlogHaskellPackages.cardano-node.components.exes.cardano-node;

diff --git a/nix/sources.json b/nix/sources.json
@@ -168,6 +168,18 @@
         "url": "https://github.com/input-output-hk/ops-lib/archive/a249abf99bddc11ebd5617fa6243068bc968d238.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "ouroboros-network": {
+        "branch": "karknu/cardano-ping-v7",
+        "description": "An implementation of the Ouroboros family of consensus algorithms, with its networking support",
+        "homepage": "",
+        "owner": "input-output-hk",
+        "repo": "ouroboros-network",
+        "rev": "1249f6f667ef8642582ce05ca5e905abbe5049a8",
+        "sha256": "08s14wz8xrb4cyxb63z7p7flvyn3pscij278s4j45jd4kwdwh9qz",
+        "type": "tarball",
+        "url": "https://github.com/input-output-hk/ouroboros-network/archive/1249f6f667ef8642582ce05ca5e905abbe5049a8.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "smash": {
         "branch": "refs/tags/v1.4.0",
         "description": "Stakepool Metadata Aggregation Server",