Skip to content

Commit

Permalink
Don't import a symlink
Browse files Browse the repository at this point in the history
This is a workaround to avoid differing evaluation results between Nix
2.19 and >= 2.20 (#12449).

(cherry picked from commit 2e20a5f)

# Conflicts:
#	packaging/components.nix
  • Loading branch information
edolstra authored and mergify[bot] committed Feb 12, 2025
1 parent d3a52c2 commit 025d798
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions packaging/components.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,18 @@ in
# Will replace `nix` once the old build system is gone.
nix-ng = callPackage ../src/nix/package.nix { };

<<<<<<< HEAD
nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { };
nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { };
=======
nix-functional-tests = callPackage ../tests/functional/package.nix {
version = fineVersion;
};

nix-manual = callPackage ../doc/manual/package.nix { version = fineVersion; };
nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { version = fineVersion; };
nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { version = fineVersion; };
>>>>>>> 2e20a5f82 (Don't import a symlink)

nix-perl-bindings = callPackage ../src/perl/package.nix { };
}

0 comments on commit 025d798

Please sign in to comment.