Merge pull request #11863 from DeterminateSystems/restore-nix-package

Provide a "nix" package again
This commit is contained in:
Robert Hensing 2024-11-12 18:26:30 +01:00 committed by GitHub
commit 14edb78d53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions

View File

@ -218,8 +218,9 @@
# for which we don't apply the full build matrix such as cross or static. # for which we don't apply the full build matrix such as cross or static.
inherit (nixpkgsFor.${system}.native) inherit (nixpkgsFor.${system}.native)
changelog-d; changelog-d;
default = self.packages.${system}.nix;
# TODO probably should be `nix-cli` # TODO probably should be `nix-cli`
default = self.packages.${system}.nix-everything; nix = self.packages.${system}.nix-everything;
nix-manual = nixpkgsFor.${system}.native.nixComponents.nix-manual; nix-manual = nixpkgsFor.${system}.native.nixComponents.nix-manual;
nix-internal-api-docs = nixpkgsFor.${system}.native.nixComponents.nix-internal-api-docs; nix-internal-api-docs = nixpkgsFor.${system}.native.nixComponents.nix-internal-api-docs;
nix-external-api-docs = nixpkgsFor.${system}.native.nixComponents.nix-external-api-docs; nix-external-api-docs = nixpkgsFor.${system}.native.nixComponents.nix-external-api-docs;

View File

@ -95,6 +95,8 @@
nix-functional-tests nix-functional-tests
]; ];
passthru = prevAttrs.passthru // { passthru = prevAttrs.passthru // {
inherit (nix-cli) version;
/** /**
These are the libraries that are part of the Nix project. They are used These are the libraries that are part of the Nix project. They are used
by the Nix CLI and other tools. by the Nix CLI and other tools.