From a242ba4a92b95e8c92e3e5f55248490e563b08ea Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Mon, 31 May 2021 09:49:56 +0200 Subject: [PATCH] Use cardano-ping fix from https://github.com/input-output-hk/ouroboros-network/pull/3193 --- nix/cardano.nix | 5 ++++- nix/sources.json | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/nix/cardano.nix b/nix/cardano.nix index ae1f4a0e..3a7ec9cc 100644 --- a/nix/cardano.nix +++ b/nix/cardano.nix @@ -5,6 +5,7 @@ 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; @@ -12,7 +13,9 @@ in rec { 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 index 1dfa1093..84dba3c9 100644 --- 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///archive/.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///archive/.tar.gz" + }, "smash": { "branch": "refs/tags/v1.4.0", "description": "Stakepool Metadata Aggregation Server",