Skip to content

Commit

Permalink
Fix test failures after formatting Nix files
Browse files Browse the repository at this point in the history
  • Loading branch information
infinisil committed Apr 18, 2024
1 parent 50ac546 commit c8525b8
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions tests/by-name-failure/expected
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ error:

… while evaluating attribute 'ByName'

at src/eval.nix:82:5:
at src/eval.nix:77:7:

81| inherit name;
82| value.ByName =
| ^
83| if ! pkgs ? ${name} then
76| inherit name;
77| value.ByName =
| ^
78| if !pkgs ? ${name} then

(stack trace truncated; use '--show-trace' to show the full trace)

Expand Down
8 changes: 4 additions & 4 deletions tests/multiple-failures/expected
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ pkgs/by-name/aa: This is a file, but it should be a directory.
pkgs/by-name/ba/bar: This path is a file, but it should be a directory.
pkgs/by-name/ba/baz: "package.nix" must be a file.
pkgs/by-name/ba/foo: Incorrect directory location, should be pkgs/by-name/fo/foo instead.
pkgs/by-name/ba/foo: File package.nix at line 2 contains the path expression "/bar" which cannot be resolved: No such file or directory (os error 2).
pkgs/by-name/ba/foo: File package.nix at line 3 contains the path expression "../." which may point outside the directory of that package.
pkgs/by-name/ba/foo: File package.nix at line 4 contains the nix search path expression "<nixpkgs>" which may point outside the directory of that package.
pkgs/by-name/ba/foo: File package.nix at line 5 contains the path expression "./${"test"}", which is not yet supported and may point outside the directory of that package.
pkgs/by-name/ba/foo: File package.nix at line 4 contains the path expression "/bar" which cannot be resolved: No such file or directory (os error 2).
pkgs/by-name/ba/foo: File package.nix at line 5 contains the path expression "../." which may point outside the directory of that package.
pkgs/by-name/ba/foo: File package.nix at line 6 contains the nix search path expression "<nixpkgs>" which may point outside the directory of that package.
pkgs/by-name/ba/foo: File package.nix at line 7 contains the path expression "./${"test"}", which is not yet supported and may point outside the directory of that package.
pkgs/by-name/fo/foo: Missing required "package.nix" file.
This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break.
2 changes: 1 addition & 1 deletion tests/override-different-file/expected
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

nonDerivation = callPackage ./../by-name/no/nonDerivation/package.nix { /* ... */ };

However, in this PR, the first `callPackage` argument is the wrong path. See the definition in pkgs/top-level/all-packages.nix:2:
However, in this PR, the first `callPackage` argument is the wrong path. See the definition in pkgs/top-level/all-packages.nix:1:

nonDerivation = callPackage ./../../someDrv.nix { /* ... */ };

Expand Down
2 changes: 1 addition & 1 deletion tests/override-empty-arg/expected
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

nonDerivation = callPackage ./../by-name/no/nonDerivation/package.nix { /* ... */ };

However, in this PR, the second argument is empty. See the definition in pkgs/top-level/all-packages.nix:2:
However, in this PR, the second argument is empty. See the definition in pkgs/top-level/all-packages.nix:1:

nonDerivation = self.callPackage ./../by-name/no/nonDerivation/package.nix { };

Expand Down
2 changes: 1 addition & 1 deletion tests/override-no-call-package/expected
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

nonDerivation = callPackage ./../by-name/no/nonDerivation/package.nix { /* ... */ };

However, in this PR, it isn't defined that way. See the definition in pkgs/top-level/all-packages.nix:2
However, in this PR, it isn't defined that way. See the definition in pkgs/top-level/all-packages.nix:1

nonDerivation = self.someDrv;

Expand Down
2 changes: 1 addition & 1 deletion tests/override-no-file/expected
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

nonDerivation = callPackage ./../by-name/no/nonDerivation/package.nix { /* ... */ };

However, in this PR, the first `callPackage` argument is not a path. See the definition in pkgs/top-level/all-packages.nix:2:
However, in this PR, the first `callPackage` argument is not a path. See the definition in pkgs/top-level/all-packages.nix:1:

nonDerivation = self.callPackage ({ someDrv }: someDrv) { };

Expand Down
2 changes: 1 addition & 1 deletion tests/ref-absolute/expected
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "/foo" which cannot be resolved: No such file or directory (os error 2).
pkgs/by-name/aa/aa: File package.nix at line 1 contains the path expression "/foo" which cannot be resolved: No such file or directory (os error 2).
This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break.
2 changes: 1 addition & 1 deletion tests/ref-escape/expected
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "../." which may point outside the directory of that package.
pkgs/by-name/aa/aa: File package.nix at line 1 contains the path expression "../." which may point outside the directory of that package.
This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break.
2 changes: 1 addition & 1 deletion tests/ref-nix-path/expected
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pkgs/by-name/aa/aa: File package.nix at line 2 contains the nix search path expression "<nixpkgs>" which may point outside the directory of that package.
pkgs/by-name/aa/aa: File package.nix at line 1 contains the nix search path expression "<nixpkgs>" which may point outside the directory of that package.
This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break.
2 changes: 1 addition & 1 deletion tests/ref-path-subexpr/expected
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "./${"test"}", which is not yet supported and may point outside the directory of that package.
pkgs/by-name/aa/aa: File package.nix at line 1 contains the path expression "./${"test"}", which is not yet supported and may point outside the directory of that package.
This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break.

0 comments on commit c8525b8

Please sign in to comment.