From 000d06d85b0b3676b255c466837a00555b39d581 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 12 Nov 2024 16:42:43 +0100
Subject: [PATCH 1/2] Provide a "nix" package

---
 flake.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 4d339f6e7d6..06025e3b79c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -218,8 +218,9 @@
           # for which we don't apply the full build matrix such as cross or static.
           inherit (nixpkgsFor.${system}.native)
             changelog-d;
+          default = self.packages.${system}.nix;
           # 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-internal-api-docs = nixpkgsFor.${system}.native.nixComponents.nix-internal-api-docs;
           nix-external-api-docs = nixpkgsFor.${system}.native.nixComponents.nix-external-api-docs;

From 06769eb2bf5084b7a1cadfccc18050b831519383 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 12 Nov 2024 16:42:59 +0100
Subject: [PATCH 2/2] nix-everything: Pass through a version attribute

The existence of this attribute is assumed by the Determinate
Installer packaging and maybe others.
---
 packaging/everything.nix | 2 ++
 1 file changed, 2 insertions(+)

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