From bdd02f96666435738b32c79cf5035f4274d64120 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Wed, 4 Dec 2024 19:32:57 -0700 Subject: [PATCH 1/7] Fix flake --- flake.lock | 2 +- flake.nix | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 8e06a79..e792b95 100644 --- a/flake.lock +++ b/flake.lock @@ -11,7 +11,7 @@ "type": "github" }, "original": { - "owner": "input-output-hk", + "owner": "intersectmbo", "ref": "repo", "repo": "cardano-haskell-packages", "type": "github" diff --git a/flake.nix b/flake.nix index 3232c5f..a7b32f6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,11 @@ inputs = { haskellNix.url = "github:input-output-hk/haskell.nix"; - haskellNix.inputs.tullia.follows = "tullia"; nixpkgs.follows = "haskellNix/nixpkgs-unstable"; iohkNix.url = "github:input-output-hk/iohk-nix"; flake-utils.url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs"; - CHaP.url = "github:input-output-hk/cardano-haskell-packages?ref=repo"; + CHaP.url = "github:intersectmbo/cardano-haskell-packages?ref=repo"; CHaP.flake = false; # cicero @@ -53,7 +52,7 @@ # nix flake lock --update-input CHaP # inputMap = { - "https://input-output-hk.github.io/cardano-haskell-packages" = inputs.CHaP; + "https://chap.intersectmbo.org/" = inputs.CHaP; }; # tools we want in our shell @@ -78,9 +77,6 @@ # specific enough, or doesn't allow setting these. modules = [ ({pkgs, ...}: { - # Use our forked libsodium from iohk-nix crypto overlay. - packages.cardano-crypto-class.components.library.pkgconfig = lib.mkForce [[pkgs.libsodium-vrf pkgs.secp256k1]]; - packages.cardano-crypto-praos.components.library.pkgconfig = lib.mkForce [[pkgs.libsodium-vrf]]; packages.ekg-forward = { configureFlags = ["--ghc-option=-Werror"]; components = { From e430f30d2084e1abb3b11e667bce407da7ee82e4 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Wed, 4 Dec 2024 17:37:52 -0700 Subject: [PATCH 2/7] Update CHaP --- cabal.project | 2 +- flake.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cabal.project b/cabal.project index 9b7c8fc..9ecd5b4 100644 --- a/cabal.project +++ b/cabal.project @@ -17,7 +17,7 @@ repository cardano-haskell-packages index-state: , hackage.haskell.org 2024-10-24T18:39:40Z - , cardano-haskell-packages 2024-10-24T07:10:59Z + , cardano-haskell-packages 2024-11-27T20:49:28Z packages: ./. diff --git a/flake.lock b/flake.lock index e792b95..9fb438e 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1710529033, - "narHash": "sha256-vcxum8uDTGEGV1/h8UWRJmdPXcLhrAqpty/N2LbxRb4=", - "owner": "input-output-hk", + "lastModified": 1733132525, + "narHash": "sha256-qD1Mo1MUxaNJnJCAQHMo5cfgMoHv6nb7nTS087CPkio=", + "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "a744b5fe534c57a42cbc2645b9211bb619c7c243", + "rev": "4bd42413109a7935695346cabdf4f528f0e4f36f", "type": "github" }, "original": { From aed5f352a3ec0f9389bfb0c4ac0133f25f39a0dd Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Wed, 4 Dec 2024 17:40:31 -0700 Subject: [PATCH 3/7] Update haskellNix flake input --- flake.lock | 172 +++++++++++++++++++++++++++++------------------------ 1 file changed, 93 insertions(+), 79 deletions(-) diff --git a/flake.lock b/flake.lock index 9fb438e..4a18fbc 100644 --- a/flake.lock +++ b/flake.lock @@ -301,43 +301,6 @@ "type": "github" } }, - "ghc910X": { - "flake": false, - "locked": { - "lastModified": 1709693152, - "narHash": "sha256-j7K/oZLy1ZZIpOsjq101IF7cz/i/UxY1ofIeNUfuuXc=", - "ref": "ghc-9.10", - "rev": "21e3f3250e88640087a1a60bee2cc113bf04509f", - "revCount": 62524, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "ref": "ghc-9.10", - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, - "ghc911": { - "flake": false, - "locked": { - "lastModified": 1710286031, - "narHash": "sha256-fz71zsU/ZukFMUsRNk2Ro3xTNMKsNrpvQtRtPqRI60c=", - "ref": "refs/heads/master", - "rev": "e6bfb85c842edca36754bb8914e725fbaa1a83a6", - "revCount": 62586, - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://gitlab.haskell.org/ghc/ghc" - } - }, "gomod2nix": { "inputs": { "nixpkgs": "nixpkgs_3", @@ -360,11 +323,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1710721411, - "narHash": "sha256-0B1YATLPUKKOexhhfSFkTQlZH6o4yWJ/0WJeyZMxBKg=", + "lastModified": 1733272207, + "narHash": "sha256-4gCU1d7x8dK3+5dmGVPZLf+DlLgIWDw2IWA8pKXn/yw=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "99719945242bc0c965560ed708868aa088748524", + "rev": "1e119d9d07d2cced932cb00dbb389753783ef660", "type": "github" }, "original": { @@ -382,8 +345,6 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc910X": "ghc910X", - "ghc911": "ghc911", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", @@ -392,10 +353,12 @@ "hls-2.4": "hls-2.4", "hls-2.5": "hls-2.5", "hls-2.6": "hls-2.6", + "hls-2.7": "hls-2.7", + "hls-2.8": "hls-2.8", + "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", - "nix-tools-static": "nix-tools-static", "nixpkgs": [ "haskellNix", "nixpkgs-unstable" @@ -407,16 +370,17 @@ "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", + "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1710723015, - "narHash": "sha256-2qi4uMWfBWjVfVJgyUpcIy3RQZI4yHu2WzSEZZ4tGRc=", + "lastModified": 1733277137, + "narHash": "sha256-nVn2lBIwcOsXy94cAUhYPvtpRW9XUKEe67D0tzsNf14=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "4e75d25fc02dccb3ee350b2401fba529942eb77b", + "rev": "5ce912ea381df1746c33255d0a976560972c15f7", "type": "github" }, "original": { @@ -544,6 +508,57 @@ "type": "github" } }, + "hls-2.7": { + "flake": false, + "locked": { + "lastModified": 1708965829, + "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.7.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.8": { + "flake": false, + "locked": { + "lastModified": 1715153580, + "narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "dd1be1beb16700de59e0d6801957290bcf956a0a", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.8.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.9": { + "flake": false, + "locked": { + "lastModified": 1720003792, + "narHash": "sha256-qnDx8Pk0UxtoPr7BimEsAZh9g2WuTuMB/kGqnmdryKs=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "0c1817cb2babef0765e4e72dd297c013e8e3d12b", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.9.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -629,11 +644,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1708894040, - "narHash": "sha256-Rv+PajrnuJ6AeyhtqzMN+bcR8z9+aEnrUass+N951CQ=", + "lastModified": 1717479972, + "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "2f2a318fd8837f8063a0d91f329aeae29055fba9", + "rev": "2ed34002247213fc435d0062350b91bab920626e", "type": "github" }, "original": { @@ -739,23 +754,6 @@ "type": "github" } }, - "nix-tools-static": { - "flake": false, - "locked": { - "lastModified": 1706266250, - "narHash": "sha256-9t+GRk3eO9muCtKdNAwBtNBZ5dH1xHcnS17WaQyftwA=", - "owner": "input-output-hk", - "repo": "haskell-nix-example", - "rev": "580cb6db546a7777dad3b9c0fa487a366c045c4e", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "haskell-nix-example", - "type": "github" - } - }, "nix2container": { "inputs": { "flake-utils": "flake-utils_2", @@ -905,11 +903,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1701362232, - "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { @@ -921,11 +919,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1701386440, - "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "lastModified": 1719957072, + "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "type": "github" }, "original": { @@ -935,6 +933,22 @@ "type": "github" } }, + "nixpkgs-2405": { + "locked": { + "lastModified": 1729242558, + "narHash": "sha256-VgcLDu4igNT0eYua6OAl9pWCI0cYXhDbR+pWP44tte0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4a3f2d3195b60d07530574988df92e049372c10e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-24.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -953,17 +967,17 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1694822471, - "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", + "lastModified": 1729980323, + "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, @@ -1183,11 +1197,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1710461339, - "narHash": "sha256-l2/ekwA4Z4NjiaCZytZrBTag2VaAOBUvsNttsH6kH4E=", + "lastModified": 1733271141, + "narHash": "sha256-VqqVkeRYgfcV96TMekq0BDYcUe6vjjw/Yk155xZESSs=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "724970b7dc837bf0d813b91f821948c3c5cc719f", + "rev": "d6216685e9e976123f1df884963873473672bf54", "type": "github" }, "original": { From 61a837bdfb275cb4af6af17df93868960e34dfdb Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Wed, 4 Dec 2024 19:40:39 -0700 Subject: [PATCH 4/7] ouroboros-network upgrade: use the new namespace for Network.Mux types --- ekg-forward.cabal | 1 + src/System/Metrics/Network/Acceptor.hs | 11 ++++++----- src/System/Metrics/Network/Forwarder.hs | 17 +++++++++-------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ekg-forward.cabal b/ekg-forward.cabal index 049a75b..894ff25 100644 --- a/ekg-forward.cabal +++ b/ekg-forward.cabal @@ -64,6 +64,7 @@ library , ekg-core , io-classes >= 1.4.1 , network + , network-mux , ouroboros-network-api , ouroboros-network-framework ^>= 0.14 , singletons ^>= 3.0 diff --git a/src/System/Metrics/Network/Acceptor.hs b/src/System/Metrics/Network/Acceptor.hs index 08000b5..2d7cc9a 100644 --- a/src/System/Metrics/Network/Acceptor.hs +++ b/src/System/Metrics/Network/Acceptor.hs @@ -18,6 +18,7 @@ import qualified Data.ByteString.Lazy as LBS import qualified Data.Text as T import Data.Time.Clock (NominalDiffTime) import Data.Void (Void) +import qualified Network.Mux as Mux import qualified Network.Socket as Socket import Ouroboros.Network.Context (MinimalInitiatorContext, ResponderContext) import Ouroboros.Network.Driver.Limits (ProtocolTimeLimits) @@ -26,7 +27,7 @@ import Ouroboros.Network.IOManager (withIOManager) import Ouroboros.Network.Driver.Simple (runPeer) import Ouroboros.Network.Mux (MiniProtocol (..), MiniProtocolCb (..), MiniProtocolLimits (..), - MiniProtocolNum (..), MuxMode (..), + MiniProtocolNum (..), OuroborosApplication (..), RunMiniProtocol (..), miniProtocolLimits, miniProtocolNum, miniProtocolRun) @@ -83,7 +84,7 @@ doListenToForwarder -> (fd -> addr -> IO ()) -- ^ configure socket -> addr -> ProtocolTimeLimits (Handshake UnversionedProtocol Term) - -> OuroborosApplication 'ResponderMode + -> OuroborosApplication 'Mux.ResponderMode (MinimalInitiatorContext addr) (ResponderContext addr) LBS.ByteString IO Void () @@ -114,7 +115,7 @@ acceptorApp :: AcceptorConfiguration -> (ResponderContext addr -> IO (EKG.Store, TVar MetricsLocalStore)) -> (ResponderContext addr -> IO ()) - -> OuroborosApplication 'ResponderMode + -> OuroborosApplication 'Mux.ResponderMode (MinimalInitiatorContext addr) (ResponderContext addr) LBS.ByteString IO Void () @@ -131,7 +132,7 @@ acceptEKGMetricsResp :: AcceptorConfiguration -> (responderCtx -> IO (EKG.Store, TVar MetricsLocalStore)) -> (responderCtx -> IO ()) - -> RunMiniProtocol 'ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void () + -> RunMiniProtocol 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void () acceptEKGMetricsResp config mkStores peerErrorHandler = ResponderProtocolOnly $ runPeerWithStores config mkStores peerErrorHandler @@ -139,7 +140,7 @@ acceptEKGMetricsInit :: AcceptorConfiguration -> (initiatorCtx -> IO (EKG.Store, TVar MetricsLocalStore)) -> (initiatorCtx -> IO ()) - -> RunMiniProtocol 'InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void + -> RunMiniProtocol 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void acceptEKGMetricsInit config mkStores peerErrorHandler = InitiatorProtocolOnly $ runPeerWithStores config mkStores peerErrorHandler diff --git a/src/System/Metrics/Network/Forwarder.hs b/src/System/Metrics/Network/Forwarder.hs index 54c2435..fbb0573 100644 --- a/src/System/Metrics/Network/Forwarder.hs +++ b/src/System/Metrics/Network/Forwarder.hs @@ -20,6 +20,7 @@ import "contra-tracer" Control.Tracer (nullTracer) import qualified Data.ByteString.Lazy as LBS import qualified Data.Text as T import Data.Void (Void, absurd) +import qualified Network.Mux as Mux import qualified Network.Socket as Socket import Network.TypedProtocol.Codec import Control.Exception (throwIO) @@ -28,7 +29,7 @@ import Ouroboros.Network.Driver.Simple (runPeer) import Ouroboros.Network.Driver.Limits (ProtocolTimeLimits) import Ouroboros.Network.IOManager (withIOManager) import Ouroboros.Network.Mux (MiniProtocol (..), MiniProtocolCb (..), MiniProtocolLimits (..), MiniProtocolNum (..), - MuxMode (..), OuroborosApplication (..), RunMiniProtocol (..), + OuroborosApplication (..), RunMiniProtocol (..), miniProtocolLimits, miniProtocolNum, miniProtocolRun) import Ouroboros.Network.Protocol.Handshake.Codec (VersionDataCodec, noTimeLimitsHandshake, timeLimitsHandshake) @@ -74,7 +75,7 @@ doConnectToAcceptor -> (fd -> IO ()) -- ^ configure socket -> addr -> ProtocolTimeLimits (Handshake UnversionedProtocol Term) - -> OuroborosApplication 'InitiatorMode + -> OuroborosApplication 'Mux.InitiatorMode (MinimalInitiatorContext addr) (ResponderContext addr) LBS.ByteString IO () Void @@ -97,7 +98,7 @@ doConnectToAcceptor snocket makeBearer configureSocket address timeLimits app = } versions :: Versions UnversionedProtocol UnversionedProtocolData - (OuroborosApplication 'InitiatorMode (MinimalInitiatorContext addr) (ResponderContext addr) LBS.ByteString IO () Void) + (OuroborosApplication 'Mux.InitiatorMode (MinimalInitiatorContext addr) (ResponderContext addr) LBS.ByteString IO () Void) versions = simpleSingletonVersions UnversionedProtocol UnversionedProtocolData @@ -125,7 +126,7 @@ doConnectToAcceptor snocket makeBearer configureSocket address timeLimits app = forwarderApp :: ForwarderConfiguration -> EKG.Store - -> OuroborosApplication 'InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void + -> OuroborosApplication 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void forwarderApp config ekgStore = OuroborosApplication [ MiniProtocol @@ -138,7 +139,7 @@ forwarderApp config ekgStore = forwardEKGMetrics :: ForwarderConfiguration -> EKG.Store - -> RunMiniProtocol 'InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void + -> RunMiniProtocol 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void forwardEKGMetrics config ekgStore = InitiatorProtocolOnly $ MiniProtocolCb \_ctx channel -> runPeer @@ -151,7 +152,7 @@ forwardEKGMetrics config ekgStore = forwardEKGMetricsResp :: ForwarderConfiguration -> EKG.Store - -> RunMiniProtocol 'ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void () + -> RunMiniProtocol 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void () forwardEKGMetricsResp config ekgStore = ResponderProtocolOnly $ MiniProtocolCb \_ctx channel -> runPeer @@ -162,7 +163,7 @@ forwardEKGMetricsResp config ekgStore = (Forwarder.ekgForwarderPeer $ mkResponse config ekgStore) forwardEKGMetricsDummy - :: RunMiniProtocol 'InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void + :: RunMiniProtocol 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void forwardEKGMetricsDummy = InitiatorProtocolOnly $ MiniProtocolCb \_ctx channel -> runPeer @@ -173,7 +174,7 @@ forwardEKGMetricsDummy = (Forwarder.ekgForwarderPeer mkResponseDummy) forwardEKGMetricsRespDummy - :: RunMiniProtocol 'ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void () + :: RunMiniProtocol 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void () forwardEKGMetricsRespDummy = ResponderProtocolOnly $ MiniProtocolCb \_ctx channel -> runPeer From 4ba8bb693093f6cf54d43d6e9bbce1e08b0457dd Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Wed, 4 Dec 2024 19:33:14 -0700 Subject: [PATCH 5/7] Add srp for ouroboros-network --- cabal.project | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cabal.project b/cabal.project index 9ecd5b4..0e825a1 100644 --- a/cabal.project +++ b/cabal.project @@ -31,3 +31,22 @@ if impl(ghc >= 9.6) , *:base , ekg-core:* , protolude:* + +source-repository-package + type: git + location: https://github.com/IntersectMBO/ouroboros-network.git + tag: 7e8909f97d6ecc9fff320b3ac2b785aec74751c6 + --sha256: sha256-Evv2EwaXbr2tXlxnHVr/AAV+QB7B8EWJbQR6t4IvOQ4= + subdir: + cardano-client + cardano-ping + monoidal-synchronisation + network-mux + ntp-client + ouroboros-network + ouroboros-network-api + ouroboros-network-framework + ouroboros-network-mock + ouroboros-network-protocols + ouroboros-network-testing + quickcheck-monoids From d51ade51b2367345183095ae623bdddb708b8b22 Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Thu, 2 Jan 2025 17:00:02 +0100 Subject: [PATCH 6/7] Allow to use ouroboros-network-framework-0.15 from CHaP --- cabal.project | 21 +-------------------- ekg-forward.cabal | 2 +- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/cabal.project b/cabal.project index 0e825a1..4fb0f07 100644 --- a/cabal.project +++ b/cabal.project @@ -17,7 +17,7 @@ repository cardano-haskell-packages index-state: , hackage.haskell.org 2024-10-24T18:39:40Z - , cardano-haskell-packages 2024-11-27T20:49:28Z + , cardano-haskell-packages 2025-01-02T14:22:02Z packages: ./. @@ -31,22 +31,3 @@ if impl(ghc >= 9.6) , *:base , ekg-core:* , protolude:* - -source-repository-package - type: git - location: https://github.com/IntersectMBO/ouroboros-network.git - tag: 7e8909f97d6ecc9fff320b3ac2b785aec74751c6 - --sha256: sha256-Evv2EwaXbr2tXlxnHVr/AAV+QB7B8EWJbQR6t4IvOQ4= - subdir: - cardano-client - cardano-ping - monoidal-synchronisation - network-mux - ntp-client - ouroboros-network - ouroboros-network-api - ouroboros-network-framework - ouroboros-network-mock - ouroboros-network-protocols - ouroboros-network-testing - quickcheck-monoids diff --git a/ekg-forward.cabal b/ekg-forward.cabal index 894ff25..886484e 100644 --- a/ekg-forward.cabal +++ b/ekg-forward.cabal @@ -66,7 +66,7 @@ library , network , network-mux , ouroboros-network-api - , ouroboros-network-framework ^>= 0.14 + , ouroboros-network-framework ^>= 0.14 || ^>= 0.15 , singletons ^>= 3.0 , serialise , stm From 0bfcd208e9aa36bc3ad86d0a39ed2132880ba533 Mon Sep 17 00:00:00 2001 From: Marcin Szamotulski Date: Thu, 2 Jan 2025 18:08:25 +0100 Subject: [PATCH 7/7] Only support `ouroboros-network-framework-0.15` --- CHANGELOG.md | 4 ++++ ekg-forward.cabal | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf1cda1..4b6750e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.8 + +* Updated to `network-mux-0.6` and `ouroboros-network-framework-0.15` + ## 0.7 - Oct 2024 * Updated to `typed-protocols-0.3`. diff --git a/ekg-forward.cabal b/ekg-forward.cabal index 886484e..2636531 100644 --- a/ekg-forward.cabal +++ b/ekg-forward.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: ekg-forward -version: 0.7 +version: 0.8 synopsis: See README for more info description: See README for more info homepage: https://github.com/input-output-hk/ekg-forward @@ -66,7 +66,7 @@ library , network , network-mux , ouroboros-network-api - , ouroboros-network-framework ^>= 0.14 || ^>= 0.15 + , ouroboros-network-framework ^>= 0.15 , singletons ^>= 3.0 , serialise , stm