From e8c7f31d9898f969322679ce9e1ad78b81432185 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Fri, 2 Jun 2023 17:02:50 +0200 Subject: [PATCH 1/2] Personal changes --- .envrc | 8 ++++ .gitignore | 93 +++++++++---------------------------- cabal.project | 111 ++++++++++++++++++++++++++++++++++++-------- cabal.project.local | 13 ++++++ hie.yaml | 2 + 5 files changed, 135 insertions(+), 92 deletions(-) create mode 100644 .envrc create mode 100644 cabal.project.local create mode 100644 hie.yaml diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..83b3b23 --- /dev/null +++ b/.envrc @@ -0,0 +1,8 @@ +strict_env +if has ghcup; then + GHC_VER="$(grep -oP '^with-compiler: ghc-\K[\d.]+' cabal.project.local)" + PATH_add $(ghcup run --ghc "$GHC_VER" -i 2>/dev/null) +fi + +load_prefix /usr +load_prefix /usr/local diff --git a/.gitignore b/.gitignore index 52c85c4..58827d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,73 +1,22 @@ -.stack-work/ -.ghc.environment.* -.nix-shell-cabal.project -/cabal.project.diff -/cabal.project.freeze -/cabal.project.local* -/cabal.project.old -configuration/defaults/simpleview/genesis/ -configuration/defaults/liveview/genesis/ -dist-newstyle/ -dist-profiled/ -dist/ -*~ -\#* -\.#* -*.swp -.dir-locals.el -.Rhistory -result* -/launch-* -stack.yaml.lock -/.cache -/db -/db-[0-9] -/logs -/mainnet -/profile -/launch_* -/state-* -*.eventlog -*.hp -*.prof -*.stats -/cluster -/cluster.* -/run -supervisord.pid - -tags -/config -/data -./*.skey -./*.vkey -./*.cert - -# For now require that users generate their own hie.yaml -hie.yaml - -# Ignore Visual Studio code configuration -.vscode/tasks.json - -# Ignore files generated by tests -tmp -logs -/chairman/db -/html - -# Ignore files generated by haddock -/haddocks -/*.socket - -# Ignore files generated by scripts -/example -/testnet - -.vscode/ - -# Test artifacts -cardano-tracer/cardano-tracer-test - -# IntellIJ project folder -.idea/ +# this ignores everything except meta-project configuration files +# this allows users to keep anything they want in this directory like +# temporarily cloned repos with dependencies for the time being +* + +# metaproject configuration files +!.envrc +!.gitignore +!.gitmodules +!README.md +!cabal.project +!cabal-hackage.project +!cabal.project.local +!hie.yaml +!get-chap-versions.sh + +# cardano projects +!cardano-dev +!cardano-api +!cardano-cli +!cardano-node diff --git a/cabal.project b/cabal.project index a5c9467..d4cdfb6 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,4 @@ --- Custom repository for cardano haskell packages, see CONTRIBUTING for more + repository cardano-haskell-packages url: https://input-output-hk.github.io/cardano-haskell-packages secure: True @@ -10,28 +10,43 @@ repository cardano-haskell-packages c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56 d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee --- See CONTRIBUTING for information about these, including some Nix commands --- you need to run if you change them index-state: - , hackage.haskell.org 2023-05-25T00:00:00Z - , cardano-haskell-packages 2023-06-21T00:00:00Z + , hackage.haskell.org 2023-07-11T00:00:00Z + , cardano-haskell-packages 2023-07-11T15:00:00Z packages: - cardano-api/cardano-api - cardano-api/cardano-api-gen - cardano-cli/cardano-cli - hedgehog-extras + cardano-cli/*/*.cabal + -- cardano-node/*/*.cabal + cardano-api/*/*.cabal -package cardano-api - ghc-options: -Werror + -- from: git@github.com:input-output-hk/hedgehog-extras.git + -- hedgehog-extras/*.cabal -package cardano-api-gen - ghc-options: -Werror + -- from: git@github.com:input-output-hk/ouroboros-network.git + -- ouroboros-network/cardano-ping/*.cabal + -- ouroboros-network/network-mux/*.cabal + -- ouroboros-consensus/ouroboros-consensus-cardano -package cryptonite - -- Using RDRAND instead of /dev/urandom as an entropy source for key - -- generation is dubious. Set the flag so we use /dev/urandom by default. - flags: -support_rdrand + -- from: git@github.com:input-output-hk/ouroboros-consensus.git + -- ouroboros-consensus/ouroboros-consensus + -- ouroboros-consensus/ouroboros-consensus-cardano + -- ouroboros-consensus/ouroboros-consensus-protocol + -- ouroboros-consensus/ouroboros-consensus-diffusion + + -- from: git@github.com:input-output-hk/cardano-ledger.git + -- cardano-ledger/eras/byron/ledger/impl + -- cardano-ledger/eras/byron/ledger/impl/test/ + -- cardano-ledger/eras/byron/chain/executable-spec + -- cardano-ledger/eras/byron/crypto/ + -- cardano-ledger/eras/byron/crypto/test/ + -- cardano-ledger/eras/byron/ledger/executable-spec + -- cardano-ledger/libs/cardano-data + -- cardano-ledger/libs/small-steps + -- cardano-ledger/libs/small-steps-test + -- cardano-ledger/libs/non-integral + + -- beware of repos with multiple cabal projects with different release cadence + -- thise may render the project unbuildable, like ouroboros-network tests: True @@ -40,6 +55,62 @@ test-show-details: direct -- Always write GHC env files, because they are needed for ghci. write-ghc-environment-files: always --- IMPORTANT --- Do NOT add more source-repository-package stanzas here unless they are strictly --- temporary! Please read the section in CONTRIBUTING about updating dependencies. +package * + ghc-options: -Wwarn + +package cardano-api + ghc-options: -fdefer-type-errors + +package cryptonite + -- Using RDRAND instead of /dev/urandom as an entropy source for key + -- generation is dubious. Set the flag so we use /dev/urandom by default. + flags: -support_rdrand + +package snap-server + flags: +openssl + +package cardano-crypto-praos + flags: -external-libsodium-vrf + +allow-newer: + , *:text + +if impl(ghc >= 9.6) + allow-newer: + , *:base + , *:ghc-prim + , *:template-haskell + +-- * SRPs for GHC 9.6 + + source-repository-package + type: git + location: https://github.com/input-output-hk/int-cast.git + -- branch with fixes for GHC 9.6 + tag: a95a5eb8d3a4633a2230dd058b38b7ae82dd19a2 + + source-repository-package + type: git + location: https://github.com/input-output-hk/cardano-ledger.git + tag: ece91ff62a15e329b6b9dd6bae5066c7b62d363a + subdir: + eras/byron/ledger/impl + eras/byron/ledger/impl/test/ + eras/byron/chain/executable-spec + eras/byron/crypto/ + eras/byron/crypto/test/ + eras/byron/ledger/executable-spec + libs/cardano-data + libs/small-steps + libs/small-steps-test + libs/non-integral + + source-repository-package + type: git + location: https://github.com/input-output-hk/ouroboros-consensus.git + tag: a71bc9e2b2c2d0db758bfcc3bcdc06d11abbfe84 + subdir: + ouroboros-consensus + ouroboros-consensus-cardano + ouroboros-consensus-protocol + ouroboros-consensus-diffusion diff --git a/cabal.project.local b/cabal.project.local new file mode 100644 index 0000000..0e807f5 --- /dev/null +++ b/cabal.project.local @@ -0,0 +1,13 @@ +jobs: $ncpus +ignore-project: False +optimization: False +test-show-details: direct + +program-options + ghc-options: -fobject-code -freverse-errors -Wwarn + +package cardano-crypto-praos + flags: -external-libsodium-vrf + +with-compiler: ghc-8.10.7 +-- with-compiler: ghc-9.6.2 diff --git a/hie.yaml b/hie.yaml new file mode 100644 index 0000000..04cd243 --- /dev/null +++ b/hie.yaml @@ -0,0 +1,2 @@ +cradle: + cabal: From ed4a8f0a74c8198d9aad99f4c518d62d627394a7 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Wed, 12 Jul 2023 16:35:13 +0200 Subject: [PATCH 2/2] Integration check --- cabal.project.local | 2 +- cardano-api | 2 +- cardano-cli | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cabal.project.local b/cabal.project.local index 0e807f5..cb81607 100644 --- a/cabal.project.local +++ b/cabal.project.local @@ -9,5 +9,5 @@ program-options package cardano-crypto-praos flags: -external-libsodium-vrf -with-compiler: ghc-8.10.7 +-- with-compiler: ghc-8.10.7 -- with-compiler: ghc-9.6.2 diff --git a/cardano-api b/cardano-api index 873c34f..e2fef97 160000 --- a/cardano-api +++ b/cardano-api @@ -1 +1 @@ -Subproject commit 873c34f38c9435717913eb9089ed24d19f2fe32c +Subproject commit e2fef97083c94e0a78ef0def69bb441efbe3c83b diff --git a/cardano-cli b/cardano-cli index d3bbfa4..5188a3d 160000 --- a/cardano-cli +++ b/cardano-cli @@ -1 +1 @@ -Subproject commit d3bbfa41341221789a3a0d0fd471908e5eeb0fb9 +Subproject commit 5188a3d3f21212b98de0a069c3cb2bd74d740269