Skip to content

Commit

Permalink
fix: update Nix setup
Browse files Browse the repository at this point in the history
  • Loading branch information
euonymos committed Sep 5, 2024
2 parents 326c5f2 + 58eb488 commit 45cd138
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 73 deletions.
7 changes: 1 addition & 6 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
# https://github.com/nix-community/nix-direnv A fast, persistent use_nix/use_flake implementation for direnv:
if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
fi
# https://github.com/input-output-hk/devx Slightly opinionated shared GitHub Action for Cardano-Haskell projects
use flake "github:input-output-hk/devx?rev=54ea65610338600bd4c4afd04b0b6ff612988fd4#ghc96-iog-full"
use flake
4 changes: 3 additions & 1 deletion atlas-cardano.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ category: Blockchain, Cardano, Framework
homepage: https://github.com/geniusyield/atlas#readme
bug-reports: https://github.com/geniusyield/atlas/issues
extra-source-files: README.md
tested-with: GHC ==9.6.5
tested-with:
GHC ==9.6.5
|| ==9.6.6

source-repository head
type: git
Expand Down
5 changes: 4 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ source-repository-package
lib/wallet-benchmarks/
lib/wallet/

package postgresql-libpq
flags: +use-pkg-config

------ Following is mostly from @cardano-wallet@'s @cabal.project@ file. -------

--------------------------------------------------------------------------------
Expand Down Expand Up @@ -173,7 +176,7 @@ package cardano-node
flags: -systemd

package bitvec
flags: -simd
flags: -simd

-- -------------------------------------------------------------------------

Expand Down
124 changes: 60 additions & 64 deletions flake.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
hixProject =
final.haskell-nix.project' {
src = ./.;
compiler-nix-name = "ghc964";
compiler-nix-name = "ghc966";
# This is used by `nix develop .` to open a shell for use with
# `cabal`, `hlint` and `haskell-language-server`
shell.tools = {
Expand Down

0 comments on commit 45cd138

Please sign in to comment.