Merge #223: ci: Replace nix-shell with equivalent nix develop command

ryanofsky · ryanofsky · commit a173f1704cef · 2025-11-06T08:21:33.000-05:00
18a2237 ci: Replace nix-shell with equivalent nix develop command (Ryan Ofsky) Pull request description: Functionality is the same, this just shows nicer status information when building locally. (For even nicer status information you can install nix-output-monitor and replace "nix develop" with "nom develop") ACKs for top commit: TheCharlatan: ACK 18a2237 Tree-SHA512: f826d18983b6561fc75da4ec89aa54d3129da68fc7ce6d6c6e48419da2d9138ba37d2ecba43e232c74fb3ca1c22c32075333c290817a09aabd5665c8c6c78a0f
diff --git a/ci/scripts/run.sh b/ci/scripts/run.sh
@@ -10,4 +10,4 @@ set -o errexit -o nounset -o pipefail -o xtrace
 
 [ "${CI_CONFIG+x}" ] && source "$CI_CONFIG"
 
-nix-shell --pure --keep CI_CONFIG --keep CI_CLEAN "${NIX_ARGS[@]+"${NIX_ARGS[@]}"}" --run ci/scripts/ci.sh shell.nix
+nix develop --ignore-environment --keep CI_CONFIG --keep CI_CLEAN "${NIX_ARGS[@]+"${NIX_ARGS[@]}"}" -f shell.nix --command ci/scripts/ci.sh

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@ set -o errexit -o nounset -o pipefail -o xtrace`
`10`	`10`
`11`	`11`	`[ "${CI_CONFIG+x}" ] && source "$CI_CONFIG"`
`12`	`12`
`13`		`-nix-shell --pure --keep CI_CONFIG --keep CI_CLEAN "${NIX_ARGS[@]+"${NIX_ARGS[@]}"}" --run ci/scripts/ci.sh shell.nix`
	`13`	`+nix develop --ignore-environment --keep CI_CONFIG --keep CI_CLEAN "${NIX_ARGS[@]+"${NIX_ARGS[@]}"}" -f shell.nix --command ci/scripts/ci.sh`