Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ADP-3302] Allow cabal to create a build plan with 8.9.0 node dependencies #4495

Closed
wants to merge 5 commits into from
Closed

[ADP-3302] Allow cabal to create a build plan with 8.9.0 node dependencies #4495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ac7aac
Update flake input CHaP
HeinrichApfelmus Mar 19, 2024
bdbf019
Update flake input hackage
HeinrichApfelmus Mar 19, 2024
b71440f
Update index-state in cabal.project
HeinrichApfelmus Mar 19, 2024
dd71599
Update nix/project-package-list.nix
HeinrichApfelmus Mar 19, 2024
2427dd4
bump node dependency to 8.9.0
paolino Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
--------------------------------------------------------------------------------

-- Custom repository for cardano haskell packages, see
-- https://github.com/input-output-hk/cardano-haskell-packages
-- https://github.com/intersectmbo/cardano-haskell-packages
-- for more information.
repository cardano-haskell-packages
url: https://input-output-hk.github.io/cardano-haskell-packages
url: https://chap.intersectmbo.org/
secure: True
root-keys:
3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
Expand All @@ -50,11 +50,11 @@ repository cardano-haskell-packages
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

-- repeating the index-state for hackage to work around hackage.nix parsing limitation
index-state: 2024-01-12T11:04:55Z
index-state: 2024-03-19T15:29:53Z

index-state:
, hackage.haskell.org 2024-01-12T11:04:55Z
, cardano-haskell-packages 2023-12-18T12:30:16Z
, hackage.haskell.org 2024-03-19T15:29:53Z
, cardano-haskell-packages 2024-03-15T17:07:52Z

packages:
lib/address-derivation-discovery
Expand Down Expand Up @@ -201,15 +201,17 @@ constraints:
, bech32 == 1.1.3

-- Cardano Node dependencies:
, cardano-api ^>= 8.36.1.1
, cardano-crypto-class ==2.1.4.0
, cardano-crypto-class +secp256k1-support
, cardano-slotting ^>= 0.1.2
, optparse-applicative-fork == 0.18.1.0
, ouroboros-network ^>= 0.10.2.1
, plutus-core == 1.15.0.1
, plutus-core -with-cert -with-inline-r
, plutus-ledger-api ==1.15.0.1
, cardano-node == 8.9.0
-- , cardano-api ^>= 8.36.1.1
-- , cardano-cli == 8.18.0.0
-- , cardano-crypto-class ==2.1.4.0
-- , cardano-crypto-class +secp256k1-support
-- , cardano-slotting ^>= 0.1.2
-- , optparse-applicative-fork == 0.18.1.0
-- , ouroboros-network ^>= 0.10.2.1
-- , plutus-core == 1.15.0.1
-- , plutus-core -with-cert -with-inline-r
-- , plutus-ledger-api ==1.15.0.1

-- TH Name shadowing warnings need to be addressed when bumping to 2.13.3.5
, persistent ^>= 2.14.6.0
Expand Down
16 changes: 8 additions & 8 deletions flake.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
nixpkgs.follows = "haskellNix/nixpkgs-unstable";
hostNixpkgs.follows = "nixpkgs";
CHaP = {
url = "github:input-output-hk/cardano-haskell-packages?ref=repo";
url = "github:intersectmbo/cardano-haskell-packages?ref=repo";
flake = false;
};
haskellNix = {
Expand Down
4 changes: 2 additions & 2 deletions nix/haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
filter = lib.cleanSourceFilter;
};

indexState = "2024-01-12T11:04:55Z";
indexState = "2024-03-15T17:07:52Z";

localClusterConfigs = config.src + /lib/local-cluster/test/data/cluster-configs;

Expand Down Expand Up @@ -159,7 +159,7 @@ hls: CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
shellHook = "export LOCAL_CLUSTER_CONFIGS=${localClusterConfigs}";
};

inputMap = { "https://input-output-hk.github.io/cardano-haskell-packages" = CHaP; };
inputMap = { "https://chap.intersectmbo.org/" = CHaP; };

modules =
let inherit (config) src coverage profiling;
Expand Down
2 changes: 1 addition & 1 deletion nix/project-package-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[ "address-derivation-discovery" "cardano-api-extra" "cardano-balance-tx" "cardano-coin-selection" "cardano-numeric" "cardano-wallet" "cardano-wallet-api" "cardano-wallet-benchmarks" "cardano-wallet-blackbox-benchmarks" "cardano-wallet-integration" "cardano-wallet-launcher" "cardano-wallet-network-layer" "cardano-wallet-primitive" "cardano-wallet-read" "cardano-wallet-secrets" "cardano-wallet-test-utils" "cardano-wallet-unit" "customer-deposit-wallet" "delta-store" "delta-table" "delta-types" "faucet" "local-cluster" "text-class" "wai-middleware-logging" ]
[ "address-derivation-discovery" "cardano-api-extra" "cardano-balance-tx" "cardano-coin-selection" "cardano-numeric" "cardano-wallet" "cardano-wallet-benchmarks" "cardano-wallet-blackbox-benchmarks" "cardano-wallet-integration" "cardano-wallet-launcher" "cardano-wallet-network-layer" "cardano-wallet-primitive" "cardano-wallet-read" "cardano-wallet-secrets" "cardano-wallet-test-utils" "cardano-wallet-unit" "customer-deposit-wallet" "delta-store" "delta-table" "delta-types" "faucet" "local-cluster" "text-class" "wai-middleware-logging" ]
Loading