Skip to content

Commit

Permalink
Remove last remaining allow-newers
Browse files Browse the repository at this point in the history
- I made an upstream PR for the `katip` issue, which got merged and
  released.
- `ekg`, `ekg-json`, and `libsystemd-journal` are unmaintained, so I revised them in
  CHaP.
  • Loading branch information
michaelpj committed Mar 31, 2023
1 parent 0ac69d4 commit de19c8a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 33 deletions.
26 changes: 3 additions & 23 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ repository cardano-haskell-packages

-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state: 2023-03-18T05:24:58Z
index-state: 2023-03-30T00:00:00Z

index-state:
, hackage.haskell.org 2023-03-18T05:24:58Z
, cardano-haskell-packages 2023-03-22T09:20:07Z
, hackage.haskell.org 2023-03-30T00:00:00Z
, cardano-haskell-packages 2023-04-01T00:00:00Z

packages:
cardano-api
Expand Down Expand Up @@ -85,26 +85,6 @@ test-show-details: direct
package snap-server
flags: +openssl

package comonad
flags: -test-doctests

allow-newer:
-- ekg does not suport aeson 2: https://github.com/tibbe/ekg/issues/90
ekg:aeson
-- ekg does not suport newer snap
, ekg:snap-server
, ekg:snap-core
-- cardano-node-capi depends on aeson > 2.1, even our patched ekg-json only
-- supports between 2 and 2.1
, ekg-json:aeson
-- These are currently required for 9.2.
, enumerator:base
, MonadCatchIO-transformers:base
, katip:Win32
, ekg:base
, ekg:time
, libsystemd-journal:base

-- IMPORTANT
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions nix/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@ let
];
in
{
# Packages we wish to ignore version bounds of.
# This is similar to jailbreakCabal, however it
# does not require any messing with cabal files.
packages.katip.doExactConfig = true;
# split data output for ekg to reduce closure size
packages.ekg.components.library.enableSeparateDataOutput = true;
# cardano-cli tests depend on cardano-cli and some config files:
Expand Down

0 comments on commit de19c8a

Please sign in to comment.