lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Expose officialRelease from the flake

Browse source 
Change-Id: If87beb3f31dfb5d59862294ac2e1c821ea864277
This commit is contained in:
jade 2024-06-06 14:06:07 -07:00
parent c32a01f9eb
commit bdf1b264ad
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -189,7 +189,7 @@
}; };
nix = final.callPackage ./package.nix { nix = final.callPackage ./package.nix {
inherit versionSuffix; inherit versionSuffix officialRelease;
stdenv = currentStdenv; stdenv = currentStdenv;
busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell; busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
}; };
@ -365,7 +365,7 @@
pkgs: stdenv: pkgs: stdenv:
let let
nix = pkgs.callPackage ./package.nix { nix = pkgs.callPackage ./package.nix {
inherit stdenv versionSuffix; inherit stdenv officialRelease versionSuffix;
busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox; busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox;
internalApiDocs = true; internalApiDocs = true;
}; };

2
package.nix
View file

@ -386,6 +386,8 @@ stdenv.mkDerivation (finalAttrs: {
passthru = { passthru = {
inherit (__forDefaults) boehmgc-nix editline-lix build-release-notes; inherit (__forDefaults) boehmgc-nix editline-lix build-release-notes;
inherit officialRelease;
# The collection of dependency logic for this derivation is complicated enough that # 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. # it's easier to parameterize the devShell off an already called package.nix.
mkDevShell = mkDevShell =