Skip to content

Commit 4924766

Browse files
authored
Merge pull request #48 from input-output-hk/next-2025-06-06
Node-ng 10.5.0, Cli-ng 10.11.0.0, ssh over ssm
2 parents 39d3d10 + 99261db commit 4924766

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+6877
-2362
lines changed

.envrc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
1+
# shellcheck disable=SC2148
12
if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
23
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
34
fi
45

56
IGREEN='\033[0;92m'
67
IRED='\033[0;91m'
78
NC='\033[0m'
8-
if [ $(nix eval --impure --expr 'let f = builtins.getFlake "git+file://${toString ./.}"; in f.lib.versionAtLeast builtins.nixVersion "2.17.0"') != "true" ]; then
9+
if [ "$(nix eval --impure --expr "let f = builtins.getFlake \"git+file://\${toString ./.}\"; in f.lib.versionAtLeast builtins.nixVersion \"2.17.0\"")" != "true" ]; then
910
echo -e "The nix version must be at least ${IGREEN}2.17.0${NC} for fetchClosure of pure packages."
1011
echo -e "Your version is ${IRED}$(nix --version)${NC}"
1112
exit
1213
fi
1314

14-
if [ $(nix eval --expr 'builtins ? fetchClosure') != "true" ]; then
15+
if [ "$(nix eval --expr 'builtins ? fetchClosure')" != "true" ]; then
1516
echo -e "Experimental nix feature \"${IGREEN}fetch-closure${NC}\" ${IRED}must be enabled${NC} for fetchClosure of pure packages."
1617
echo "You may need to add the following to your nix config:"
1718
echo
1819
echo "nix.settings.extraOptions = \"experimental-features = fetch-closure\";"
1920
exit
2021
fi
2122

23+
# shellcheck disable=SC1091
2224
[ -f .envrc.local ] && source .envrc.local
2325

2426
if [ -z "${SOPS_AGE_KEY_FILE:-}" ] && [ -f ~/.age/credentials ]; then
2527
export SOPS_AGE_KEY_FILE=~/.age/credentials
2628
fi
2729

2830
if [ -n "${DEVSHELL_TARGET:-}" ]; then
29-
use flake .#${DEVSHELL_TARGET}
31+
use flake ".#$DEVSHELL_TARGET"
3032
else
3133
use flake
3234
fi

0 commit comments

Comments
 (0)