diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2b1df2f0..04179cb5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,7 +18,7 @@ jobs: submodules: true - name: ❄️ Install Nix - uses: cachix/install-nix-action@v18 + uses: cachix/install-nix-action@v20 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 102f4b8c..2efa01a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,20 @@ -### [2.4.0] - 2022-02-23 +### [2.4.1] - 2023-06-29 + +#### Added + +N/A + +#### Changed + +- Fix ANSI colors of logs in TTY terminals + +- Fix internal dependency causing build issues for ouroboros-consensus + +#### Removed + +N/A + +### [2.4.0] - 2023-02-23 #### Added @@ -35,7 +51,7 @@ N/A -### [2.3.4] - 2022-01-26 +### [2.3.4] - 2023-01-26 #### Added @@ -49,7 +65,7 @@ N/A N/A -### [2.3.3] - 2022-01-23 +### [2.3.3] - 2023-01-23 #### Added @@ -63,7 +79,7 @@ N/A N/A -### [2.3.2] - 2022-01-18 +### [2.3.2] - 2023-01-18 #### Added @@ -82,7 +98,7 @@ N/A N/A -### [2.3.1] - 2022-01-09 +### [2.3.1] - 2023-01-09 #### Added @@ -113,7 +129,7 @@ N/A N/A -### [2.3.0] - 2022-01-05 +### [2.3.0] - 2023-01-05 #### Added diff --git a/Makefile b/Makefile index bdedb2d5..2ea9ebc1 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,8 @@ OS := $(shell uname -s) ARCH := $(shell uname -m) VERSION := $(shell cat package.yaml| grep "version:" | sed "s/.*\([0-9]\)\(.[0-9].[0-9]\)*\(-.*\)*/\1\2\3/") STYLISH_HASKELL_VERSION := 0.13.0.0 - -# replace with local setup -CONFIG := /usr/local/share/cardano/network/preview +NETWORK := preview +CONFIG := $(shell pwd)/config/network/$(NETWORK) LD_LIBRARY_PATH := $(shell echo $$LD_LIBRARY_PATH | sed "s/:/ /g") LIBSODIUM := $(shell find $(LD_LIBRARY_PATH) -type file -name "*libsodium.*.dylib" | uniq) diff --git a/README.md b/README.md index 2ae0f879..17857fda 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ Key difference(s): cardano-db-sync synchronizes ALL data from the Cardano blockc Key differences(s): In a similar fashion to Carp, Marconi offers a modular indexer infrastructure where users can customize data streams through standalone plugins (however written in Haskell). It synchronizes data across multiple streams (utxo, datums and scripts), filters them based on custom plugins and stores them in a SQLite database. At this stage, Marconi is also in at an early development phase.

- Learn more + Learn more

diff --git a/cabal.project b/cabal.project index 6e92c7d9..7c51c891 100644 --- a/cabal.project +++ b/cabal.project @@ -10,7 +10,7 @@ repository cardano-haskell-packages d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee index-state: 2022-09-27T00:00:00Z -index-state: cardano-haskell-packages 2022-10-25T20:00:00Z +index-state: cardano-haskell-packages 2022-10-25T23:59:59Z packages: ./ @@ -61,6 +61,7 @@ constraints: , resource-pool == 0.3.1.0 , strict-containers == 0.1.0.0 , systemd >= 2.3.0 + , unix-bytestring == 0.3.7.8 , word-array == 0.1.0.0 -- Cardano packages diff --git a/config b/config index 36a75a92..9c1ceaf6 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 36a75a920de312519c3a9086061daccb997f9cd0 +Subproject commit 9c1ceaf666f1b6492d8d02d71be881f07a6a0245 diff --git a/docs/api/v2.4.0.yaml b/docs/api/v2.4.1.yaml similarity index 99% rename from docs/api/v2.4.0.yaml rename to docs/api/v2.4.1.yaml index 05726bb3..d8256c9b 100644 --- a/docs/api/v2.4.0.yaml +++ b/docs/api/v2.4.1.yaml @@ -5,7 +5,7 @@ servers: info: title: Kupo - version: v2.4.0 + version: v2.4.1 license: name: MPL-2.0 url: https://raw.githubusercontent.com/cardanosolutions/kupo/master/LICENSE diff --git a/docs/index.html b/docs/index.html index ba36d50a..c3647efc 100644 --- a/docs/index.html +++ b/docs/index.html @@ -127,7 +127,7 @@
v2.3.4 - v2.4.0 + v2.4.1 nightly