Maximilian Bosch 04cd2da84c Merge branch 'master' into structured-attrs-shell ... Conflicts: src/nix/develop.cc src/nix/get-env.sh tests/shell.nix		2021-07-12 15:49:39 +02:00
..
nix-build.cc	Merge branch 'master' into structured-attrs-shell	2021-07-12 15:49:39 +02:00