diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
| commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
| tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected | |
| parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
| parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
| download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip | |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected')
| -rw-r--r-- | nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected index 51479e22d26f..16292c0c0eb1 100644 --- a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected @@ -1 +1,9 @@ -pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument. +- Because pkgs/by-name/no/nonDerivation exists, the attribute `pkgs.nonDerivation` must be defined like + + nonDerivation = callPackage ./pkgs/by-name/no/nonDerivation/package.nix { /* ... */ }; + + However, in this PR, the first `callPackage` argument is the wrong path. See the definition in all-packages.nix:2: + + nonDerivation = callPackage ./someDrv.nix { /* ... */ }; + +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. |