aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJade Lovelace <lix@jade.fyi>2024-06-06 14:06:07 -0700
committerJade Lovelace <lix@jade.fyi>2024-06-06 20:53:08 -0700
commitbdf1b264add2a6e9aafab186e5c9b4bddb097b64 (patch)
treefa1a05c6ef59205de9b43af45096a72dc96eef0e
parentc32a01f9ebae026c1b7b8ba081411581453b4624 (diff)
Expose officialRelease from the flake
Change-Id: If87beb3f31dfb5d59862294ac2e1c821ea864277
-rw-r--r--flake.nix4
-rw-r--r--package.nix2
2 files changed, 4 insertions, 2 deletions
diff --git a/flake.nix b/flake.nix
index a61699b69..8460201b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -189,7 +189,7 @@
};
nix = final.callPackage ./package.nix {
- inherit versionSuffix;
+ inherit versionSuffix officialRelease;
stdenv = currentStdenv;
busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
};
@@ -365,7 +365,7 @@
pkgs: stdenv:
let
nix = pkgs.callPackage ./package.nix {
- inherit stdenv versionSuffix;
+ inherit stdenv officialRelease versionSuffix;
busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox;
internalApiDocs = true;
};
diff --git a/package.nix b/package.nix
index 005bdc6b1..9c108308d 100644
--- a/package.nix
+++ b/package.nix
@@ -386,6 +386,8 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
inherit (__forDefaults) boehmgc-nix editline-lix build-release-notes;
+ inherit officialRelease;
+
# The collection of dependency logic for this derivation is complicated enough that
# it's easier to parameterize the devShell off an already called package.nix.
mkDevShell =