Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 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 @@ -15,7 +15,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
cardano-node = {
url = "github:IntersectMBO/cardano-node/10.6.2";
url = "github:IntersectMBO/cardano-node/10.6.3";
flake = false; # otherwise, +2k dependencies we don’t really use
};
nix-bundle-exe = {
Expand Down
11 changes: 8 additions & 3 deletions nix/internal.nix
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,9 @@ in rec {
printf '%s\n' "$_new" > "$PWD/cabal.project"
fi

_chap_marker="$CABAL_DIR/.chap-store-path"
_chap_marker="$CABAL_DIR/.chap-index-id"
if [ ! -e "$_chap_marker" ] || [ "$(cat "$_chap_marker")" != "${chap-store-path}" ]; then
rm -rf "$CABAL_DIR/packages/cardano-haskell-packages"
mkdir -p "$CABAL_DIR/packages/cardano-haskell-packages"
cabal update cardano-haskell-packages 2>/dev/null
printf '%s' '${chap-store-path}' >"$_chap_marker"
Expand Down Expand Up @@ -302,10 +303,14 @@ in rec {
printf '%s\n' "$_new" > "$PRJ_ROOT/cabal.project"
fi
# Re-index the local CHaP only when the underlying Nix store
# path changes (i.e. after a flake.lock update). A marker
# path changes (i.e. after a flake.lock update). A marker
# file records the store path that was last indexed.
_chap_marker="$CABAL_DIR/.chap-store-path"
_chap_marker="$CABAL_DIR/.chap-index-id"
if [ ! -e "$_chap_marker" ] || [ "$(cat "$_chap_marker")" != "${chap-store-path}" ]; then
# We delete the old cache first because cabal's incremental
# update does not always rebuild the uncompressed index tar
# from the new tar.gz, leaving a stale 01-index.tar behind.
rm -rf "$CABAL_DIR/packages/cardano-haskell-packages"
mkdir -p "$CABAL_DIR/packages/cardano-haskell-packages"
cabal update cardano-haskell-packages 2>/dev/null
printf '%s' '${chap-store-path}' >"$_chap_marker"
Expand Down
2 changes: 1 addition & 1 deletion testgen-hs/testgen-hs.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ synopsis:
CBOR test case generator and deserializer for cross-checking other implementations

-- Version tracks cardano-node, adding a patch segment:
version: 10.6.2.0
version: 10.6.3.0

executable testgen-hs
main-is: Main.hs
Expand Down
Loading