diff options
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | package.nix | 16 |
2 files changed, 18 insertions, 7 deletions
@@ -195,16 +195,19 @@ busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell; }; - pegtl = final.callPackage ./misc/pegtl.nix { }; + pegtl = final.nix.passthru.pegtl; # Export the patched version of boehmgc that Lix uses into the overlay # for consumers of this flake. - boehmgc-nix = final.nix.boehmgc-nix; + boehmgc-nix = final.nix.passthru.boehmgc-nix; # And same thing for our build-release-notes package. - build-release-notes = final.nix.build-release-notes; + build-release-notes = final.nix.passthru.build-release-notes; }; in { + # for repl debugging + inherit self; + # A Nixpkgs overlay that overrides the 'nix' and # 'nix.perl-bindings' packages. overlays.default = overlayFor (p: p.stdenv); diff --git a/package.nix b/package.nix index f75454254..f70cbb3b1 100644 --- a/package.nix +++ b/package.nix @@ -14,6 +14,7 @@ boost, brotli, bzip2, + callPackage, cmake, curl, doxygen, @@ -34,7 +35,7 @@ meson, ninja, openssl, - pegtl, + pegtl ? __forDefaults.pegtl, pkg-config, python3, rapidcheck, @@ -75,8 +76,10 @@ configureFlags = prev.configureFlags or [ ] ++ [ (lib.enableFeature true "sigstop") ]; }); - lix-doc = pkgs.callPackage ./lix-doc/package.nix { }; - build-release-notes = pkgs.callPackage ./maintainers/build-release-notes.nix { }; + lix-doc = callPackage ./lix-doc/package.nix { }; + build-release-notes = callPackage ./maintainers/build-release-notes.nix { }; + + pegtl = callPackage ./misc/pegtl.nix { }; }, }: let @@ -380,7 +383,12 @@ stdenv.mkDerivation (finalAttrs: { # Export the patched version of boehmgc. # flake.nix exports that into its overlay. passthru = { - inherit (__forDefaults) boehmgc-nix editline-lix build-release-notes; + inherit (__forDefaults) + boehmgc-nix + editline-lix + build-release-notes + pegtl + ; inherit officialRelease; |