eldritch horrors
232f4feace
Don't attempt to `git add` ignored files
(cherry picked from commit 359990dfdc713c80aabd7ea6f7e4528628fbe108)
===
also added a regression test that isn't upstream to be sure we're
actually fixing the bug.
Change-Id: I8267a3d0ece9909d8008b7435b90e7b3eee366f6
46 lines
1.1 KiB
Bash
46 lines
1.1 KiB
Bash
source ../common.sh
|
|
|
|
# regression test for #8854 (nix develop fails when lockfile is ignored)
|
|
|
|
clearStore
|
|
rm -rf $TEST_HOME/.cache $TEST_HOME/.config $TEST_HOME/.local
|
|
|
|
# Create flake under test.
|
|
mkdir -p $TEST_HOME/t
|
|
cp ../shell-hello.nix ../config.nix $TEST_HOME/t
|
|
cat <<EOF >$TEST_HOME/t/flake.nix
|
|
{
|
|
inputs.nixpkgs.url = "$TEST_HOME/nixpkgs";
|
|
outputs = {self, nixpkgs}: {
|
|
packages.$system.hello = (import ./config.nix).mkDerivation {
|
|
name = "hello";
|
|
outputs = [ "out" "dev" ];
|
|
meta.outputsToInstall = [ "out" ];
|
|
buildCommand = "";
|
|
};
|
|
};
|
|
}
|
|
EOF
|
|
|
|
# Create fake nixpkgs flake.
|
|
mkdir -p $TEST_HOME/nixpkgs
|
|
cp ../config.nix ../shell.nix $TEST_HOME/nixpkgs
|
|
cat <<EOF >$TEST_HOME/nixpkgs/flake.nix
|
|
{
|
|
outputs = {self}: {
|
|
legacyPackages.$system.bashInteractive = (import ./shell.nix {}).bashInteractive;
|
|
};
|
|
}
|
|
EOF
|
|
|
|
cd $TEST_HOME/t
|
|
|
|
git init .
|
|
echo flake.lock > .gitignore
|
|
git add config.nix shell-hello.nix flake.nix .gitignore
|
|
|
|
# flake.lock is ignored, but nix develop should still not fail
|
|
nix develop .#hello <<<"true"
|
|
|
|
clearStore
|