Put back files for now

We'll revert this sometime later
This commit is contained in:
John Ericson 2024-07-01 00:25:57 -04:00
parent 11946817f0
commit 451f8a8c19
237 changed files with 129 additions and 121 deletions

10
.gitignore vendored
View File

@ -49,22 +49,22 @@ perl/Makefile.config
/src/libexpr/parser-tab.output /src/libexpr/parser-tab.output
/src/libexpr/nix.tbl /src/libexpr/nix.tbl
/src/libexpr/tests /src/libexpr/tests
/src/nix-expr-tests/libnixexpr-tests /tests/unit/libexpr/libnixexpr-tests
# /src/libfetchers # /src/libfetchers
/src/nix-fetchers-tests/libnixfetchers-tests /tests/unit/libfetchers/libnixfetchers-tests
# /src/libflake # /src/libflake
/src/nix-flake-tests/libnixflake-tests /tests/unit/libflake/libnixflake-tests
# /src/libstore/ # /src/libstore/
*.gen.* *.gen.*
/src/libstore/tests /src/libstore/tests
/src/nix-store-tests/libnixstore-tests /tests/unit/libstore/libnixstore-tests
# /src/libutil/ # /src/libutil/
/src/libutil/tests /src/libutil/tests
/src/nix-util-tests/libnixutil-tests /tests/unit/libutil/libnixutil-tests
/src/nix/nix /src/nix/nix

View File

@ -15,7 +15,7 @@
excludes = [ excludes = [
# We don't want to format test data # We don't want to format test data
# ''tests/(?!nixos/).*\.nix'' # ''tests/(?!nixos/).*\.nix''
''^src/[^/]*-tests/data/.*$'' ''^tests/unit/[^/]*/data/.*$''
# Don't format vendored code # Don't format vendored code
''^doc/manual/redirects\.js$'' ''^doc/manual/redirects\.js$''
@ -429,65 +429,65 @@
''^tests/nixos/ca-fd-leak/sender\.c'' ''^tests/nixos/ca-fd-leak/sender\.c''
''^tests/nixos/ca-fd-leak/smuggler\.c'' ''^tests/nixos/ca-fd-leak/smuggler\.c''
''^tests/nixos/user-sandboxing/attacker\.c'' ''^tests/nixos/user-sandboxing/attacker\.c''
''^src/nix-expr-test-support/tests/libexpr\.hh'' ''^tests/unit/libexpr-support/tests/libexpr\.hh''
''^src/nix-expr-test-support/tests/value/context\.cc'' ''^tests/unit/libexpr-support/tests/value/context\.cc''
''^src/nix-expr-test-support/tests/value/context\.hh'' ''^tests/unit/libexpr-support/tests/value/context\.hh''
''^src/nix-expr-tests/derived-path\.cc'' ''^tests/unit/libexpr/derived-path\.cc''
''^src/nix-expr-tests/error_traces\.cc'' ''^tests/unit/libexpr/error_traces\.cc''
''^src/nix-expr-tests/eval\.cc'' ''^tests/unit/libexpr/eval\.cc''
''^src/nix-expr-tests/json\.cc'' ''^tests/unit/libexpr/json\.cc''
''^src/nix-expr-tests/main\.cc'' ''^tests/unit/libexpr/main\.cc''
''^src/nix-expr-tests/primops\.cc'' ''^tests/unit/libexpr/primops\.cc''
''^src/nix-expr-tests/search-path\.cc'' ''^tests/unit/libexpr/search-path\.cc''
''^src/nix-expr-tests/trivial\.cc'' ''^tests/unit/libexpr/trivial\.cc''
''^src/nix-expr-tests/value/context\.cc'' ''^tests/unit/libexpr/value/context\.cc''
''^src/nix-expr-tests/value/print\.cc'' ''^tests/unit/libexpr/value/print\.cc''
''^src/nix-fetchers-tests/public-key\.cc'' ''^tests/unit/libfetchers/public-key\.cc''
''^src/nix-flake-tests/flakeref\.cc'' ''^tests/unit/libflake/flakeref\.cc''
''^src/nix-flake-tests/url-name\.cc'' ''^tests/unit/libflake/url-name\.cc''
''^src/nix-store-test-support/tests/derived-path\.cc'' ''^tests/unit/libstore-support/tests/derived-path\.cc''
''^src/nix-store-test-support/tests/derived-path\.hh'' ''^tests/unit/libstore-support/tests/derived-path\.hh''
''^src/nix-store-test-support/tests/nix_api_store\.hh'' ''^tests/unit/libstore-support/tests/nix_api_store\.hh''
''^src/nix-store-test-support/tests/outputs-spec\.cc'' ''^tests/unit/libstore-support/tests/outputs-spec\.cc''
''^src/nix-store-test-support/tests/outputs-spec\.hh'' ''^tests/unit/libstore-support/tests/outputs-spec\.hh''
''^src/nix-store-test-support/tests/path\.cc'' ''^tests/unit/libstore-support/tests/path\.cc''
''^src/nix-store-test-support/tests/path\.hh'' ''^tests/unit/libstore-support/tests/path\.hh''
''^src/nix-store-test-support/tests/protocol\.hh'' ''^tests/unit/libstore-support/tests/protocol\.hh''
''^src/nix-store-tests/common-protocol\.cc'' ''^tests/unit/libstore/common-protocol\.cc''
''^src/nix-store-tests/content-address\.cc'' ''^tests/unit/libstore/content-address\.cc''
''^src/nix-store-tests/derivation\.cc'' ''^tests/unit/libstore/derivation\.cc''
''^src/nix-store-tests/derived-path\.cc'' ''^tests/unit/libstore/derived-path\.cc''
''^src/nix-store-tests/downstream-placeholder\.cc'' ''^tests/unit/libstore/downstream-placeholder\.cc''
''^src/nix-store-tests/machines\.cc'' ''^tests/unit/libstore/machines\.cc''
''^src/nix-store-tests/nar-info-disk-cache\.cc'' ''^tests/unit/libstore/nar-info-disk-cache\.cc''
''^src/nix-store-tests/nar-info\.cc'' ''^tests/unit/libstore/nar-info\.cc''
''^src/nix-store-tests/outputs-spec\.cc'' ''^tests/unit/libstore/outputs-spec\.cc''
''^src/nix-store-tests/path-info\.cc'' ''^tests/unit/libstore/path-info\.cc''
''^src/nix-store-tests/path\.cc'' ''^tests/unit/libstore/path\.cc''
''^src/nix-store-tests/serve-protocol\.cc'' ''^tests/unit/libstore/serve-protocol\.cc''
''^src/nix-store-tests/worker-protocol\.cc'' ''^tests/unit/libstore/worker-protocol\.cc''
''^src/nix-util-test-support/tests/characterization\.hh'' ''^tests/unit/libutil-support/tests/characterization\.hh''
''^src/nix-util-test-support/tests/hash\.cc'' ''^tests/unit/libutil-support/tests/hash\.cc''
''^src/nix-util-test-support/tests/hash\.hh'' ''^tests/unit/libutil-support/tests/hash\.hh''
''^src/nix-util-tests/args\.cc'' ''^tests/unit/libutil/args\.cc''
''^src/nix-util-tests/canon-path\.cc'' ''^tests/unit/libutil/canon-path\.cc''
''^src/nix-util-tests/chunked-vector\.cc'' ''^tests/unit/libutil/chunked-vector\.cc''
''^src/nix-util-tests/closure\.cc'' ''^tests/unit/libutil/closure\.cc''
''^src/nix-util-tests/compression\.cc'' ''^tests/unit/libutil/compression\.cc''
''^src/nix-util-tests/config\.cc'' ''^tests/unit/libutil/config\.cc''
''^src/nix-util-tests/file-content-address\.cc'' ''^tests/unit/libutil/file-content-address\.cc''
''^src/nix-util-tests/git\.cc'' ''^tests/unit/libutil/git\.cc''
''^src/nix-util-tests/hash\.cc'' ''^tests/unit/libutil/hash\.cc''
''^src/nix-util-tests/hilite\.cc'' ''^tests/unit/libutil/hilite\.cc''
''^src/nix-util-tests/json-utils\.cc'' ''^tests/unit/libutil/json-utils\.cc''
''^src/nix-util-tests/logging\.cc'' ''^tests/unit/libutil/logging\.cc''
''^src/nix-util-tests/lru-cache\.cc'' ''^tests/unit/libutil/lru-cache\.cc''
''^src/nix-util-tests/pool\.cc'' ''^tests/unit/libutil/pool\.cc''
''^src/nix-util-tests/references\.cc'' ''^tests/unit/libutil/references\.cc''
''^src/nix-util-tests/suggestions\.cc'' ''^tests/unit/libutil/suggestions\.cc''
''^src/nix-util-tests/tests\.cc'' ''^tests/unit/libutil/tests\.cc''
''^src/nix-util-tests/url\.cc'' ''^tests/unit/libutil/url\.cc''
''^src/nix-util-tests/xml-writer\.cc'' ''^tests/unit/libutil/xml-writer\.cc''
]; ];
}; };
shellcheck = { shellcheck = {
@ -666,7 +666,7 @@
''^tests/functional/user-envs\.sh$'' ''^tests/functional/user-envs\.sh$''
''^tests/functional/why-depends\.sh$'' ''^tests/functional/why-depends\.sh$''
''^tests/functional/zstd\.sh$'' ''^tests/functional/zstd\.sh$''
''^src/nix-util-tests/data/git/check-data\.sh$'' ''^tests/unit/libutil/data/git/check-data\.sh$''
]; ];
}; };
# TODO: nixfmt, https://github.com/NixOS/nixfmt/issues/153 # TODO: nixfmt, https://github.com/NixOS/nixfmt/issues/153

View File

@ -9,24 +9,24 @@ in
nix-util = callPackage ../src/libutil/package.nix { }; nix-util = callPackage ../src/libutil/package.nix { };
nix-util-c = callPackage ../src/libutil-c/package.nix { }; nix-util-c = callPackage ../src/libutil-c/package.nix { };
nix-util-test-support = callPackage ../src/nix-util-test-support/package.nix { }; nix-util-test-support = callPackage ../tests/unit/libutil-support/package.nix { };
nix-util-tests = callPackage ../src/nix-util-tests/package.nix { }; nix-util-tests = callPackage ../tests/unit/libutil/package.nix { };
nix-store = callPackage ../src/libstore/package.nix { }; nix-store = callPackage ../src/libstore/package.nix { };
nix-store-c = callPackage ../src/libstore-c/package.nix { }; nix-store-c = callPackage ../src/libstore-c/package.nix { };
nix-store-test-support = callPackage ../src/nix-store-test-support/package.nix { }; nix-store-test-support = callPackage ../tests/unit/libstore-support/package.nix { };
nix-store-tests = callPackage ../src/nix-store-tests/package.nix { }; nix-store-tests = callPackage ../tests/unit/libstore/package.nix { };
nix-fetchers = callPackage ../src/libfetchers/package.nix { }; nix-fetchers = callPackage ../src/libfetchers/package.nix { };
nix-fetchers-tests = callPackage ../src/nix-fetchers-tests/package.nix { }; nix-fetchers-tests = callPackage ../tests/unit/libfetchers/package.nix { };
nix-expr = callPackage ../src/libexpr/package.nix { }; nix-expr = callPackage ../src/libexpr/package.nix { };
nix-expr-c = callPackage ../src/libexpr-c/package.nix { }; nix-expr-c = callPackage ../src/libexpr-c/package.nix { };
nix-expr-test-support = callPackage ../src/nix-expr-test-support/package.nix { }; nix-expr-test-support = callPackage ../tests/unit/libexpr-support/package.nix { };
nix-expr-tests = callPackage ../src/nix-expr-tests/package.nix { }; nix-expr-tests = callPackage ../tests/unit/libexpr/package.nix { };
nix-flake = callPackage ../src/libflake/package.nix { }; nix-flake = callPackage ../src/libflake/package.nix { };
nix-flake-tests = callPackage ../src/nix-flake-tests/package.nix { }; nix-flake-tests = callPackage ../tests/unit/libflake/package.nix { };
nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { }; nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { };
nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { }; nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { };

1
src/nix-expr-test-support Symbolic link
View File

@ -0,0 +1 @@
../tests/unit/libexpr-support

View File

@ -1 +0,0 @@
../../.version

View File

@ -1 +0,0 @@
../../build-utils-meson

1
src/nix-expr-tests Symbolic link
View File

@ -0,0 +1 @@
../tests/unit/libexpr

View File

@ -1 +0,0 @@
../../.version

View File

@ -1 +0,0 @@
../../build-utils-meson

1
src/nix-fetchers-tests Symbolic link
View File

@ -0,0 +1 @@
../tests/unit/libfetchers

View File

@ -1 +0,0 @@
../../.version

View File

@ -1 +0,0 @@
../../build-utils-meson

1
src/nix-flake-tests Symbolic link
View File

@ -0,0 +1 @@
../tests/unit/libflake

View File

@ -1 +0,0 @@
../../.version

View File

@ -1 +0,0 @@
../../build-utils-meson

1
src/nix-store-test-support Symbolic link
View File

@ -0,0 +1 @@
../tests/unit/libstore-support

View File

@ -1 +0,0 @@
../../.version

View File

@ -1 +0,0 @@
../../build-utils-meson

1
src/nix-store-tests Symbolic link
View File

@ -0,0 +1 @@
../tests/unit/libstore

View File

@ -1 +0,0 @@
../../.version

View File

@ -1 +0,0 @@
../../build-utils-meson

View File

@ -1 +0,0 @@
../../../../tests/functional/derivation/advanced-attributes-defaults.drv

View File

@ -1 +0,0 @@
../../../../tests/functional/derivation/advanced-attributes-structured-attrs-defaults.drv

View File

@ -1 +0,0 @@
../../../../tests/functional/derivation/advanced-attributes-structured-attrs.drv

View File

@ -1 +0,0 @@
../../../../tests/functional/derivation/advanced-attributes.drv

1
src/nix-util-test-support Symbolic link
View File

@ -0,0 +1 @@
../tests/unit/libutil-support

View File

@ -1 +0,0 @@
../../.version

View File

@ -1 +0,0 @@
../../build-utils-meson

1
src/nix-util-tests Symbolic link
View File

@ -0,0 +1 @@
../tests/unit/libutil

View File

@ -1 +0,0 @@
../../.version

View File

@ -1 +0,0 @@
../../build-utils-meson

View File

@ -0,0 +1 @@
../../../.version

View File

@ -0,0 +1 @@
../../../build-utils-meson/

View File

@ -29,9 +29,9 @@ mkMesonDerivation (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../../build-utils-meson
./build-utils-meson ./build-utils-meson
../../.version ../../../.version
./.version ./.version
./meson.build ./meson.build
# ./meson.options # ./meson.options
@ -58,7 +58,7 @@ mkMesonDerivation (finalAttrs: {
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
chmod u+w ./.version chmod u+w ./.version
echo ${version} > ../../.version echo ${version} > ../../../.version
''; '';
mesonFlags = [ mesonFlags = [

1
tests/unit/libexpr/.version Symbolic link
View File

@ -0,0 +1 @@
../../../.version

View File

@ -0,0 +1 @@
../../../build-utils-meson/

View File

@ -32,9 +32,9 @@ mkMesonDerivation (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../../build-utils-meson
./build-utils-meson ./build-utils-meson
../../.version ../../../.version
./.version ./.version
./meson.build ./meson.build
# ./meson.options # ./meson.options
@ -63,7 +63,7 @@ mkMesonDerivation (finalAttrs: {
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
chmod u+w ./.version chmod u+w ./.version
echo ${version} > ../../.version echo ${version} > ../../../.version
''; '';
mesonFlags = [ mesonFlags = [

View File

@ -0,0 +1 @@
../../../.version

View File

@ -0,0 +1 @@
../../../build-utils-meson/

View File

@ -31,9 +31,9 @@ mkMesonDerivation (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../../build-utils-meson
./build-utils-meson ./build-utils-meson
../../.version ../../../.version
./.version ./.version
./meson.build ./meson.build
# ./meson.options # ./meson.options
@ -61,7 +61,7 @@ mkMesonDerivation (finalAttrs: {
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
chmod u+w ./.version chmod u+w ./.version
echo ${version} > ../../.version echo ${version} > ../../../.version
''; '';
mesonFlags = [ mesonFlags = [

View File

@ -0,0 +1 @@
../../../.version

View File

@ -0,0 +1 @@
../../../build-utils-meson/

View File

@ -31,9 +31,9 @@ mkMesonDerivation (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../../build-utils-meson
./build-utils-meson ./build-utils-meson
../../.version ../../../.version
./.version ./.version
./meson.build ./meson.build
# ./meson.options # ./meson.options
@ -61,7 +61,7 @@ mkMesonDerivation (finalAttrs: {
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
chmod u+w ./.version chmod u+w ./.version
echo ${version} > ../../.version echo ${version} > ../../../.version
''; '';
mesonFlags = [ mesonFlags = [

View File

@ -0,0 +1 @@
../../../.version

View File

@ -0,0 +1 @@
../../../build-utils-meson/

View File

@ -29,9 +29,9 @@ mkMesonDerivation (finalAttrs: {
workDir = ./.; workDir = ./.;
fileset = fileset.unions [ fileset = fileset.unions [
../../build-utils-meson ../../../build-utils-meson
./build-utils-meson ./build-utils-meson
../../.version ../../../.version
./.version ./.version
./meson.build ./meson.build
# ./meson.options # ./meson.options
@ -58,7 +58,7 @@ mkMesonDerivation (finalAttrs: {
# Do the meson utils, without modification. # Do the meson utils, without modification.
'' ''
chmod u+w ./.version chmod u+w ./.version
echo ${version} > ../../.version echo ${version} > ../../../.version
''; '';
mesonFlags = [ mesonFlags = [

View File

@ -0,0 +1 @@
../../../.version

View File

@ -0,0 +1 @@
../../../build-utils-meson/

View File

@ -0,0 +1 @@
../../../../functional/derivation/advanced-attributes-defaults.drv

Some files were not shown because too many files have changed in this diff Show More