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

Merge "packaging: make pegtl use the __forDefaults mechanism" into main

Browse source
This commit is contained in:
jade 2024-06-26 22:11:52 +00:00 committed by Gerrit Code Review
parent 77c5364596 f7d54cb6b1
commit 5dc85e8b72
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
flake.nix
View file

@ -197,16 +197,19 @@
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;
}; };
pegtl = final.callPackage ./misc/pegtl.nix { }; pegtl = final.nix.passthru.pegtl;
# Export the patched version of boehmgc that Lix uses into the overlay # Export the patched version of boehmgc that Lix uses into the overlay
# for consumers of this flake. # 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. # 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 in
{ {
# for repl debugging
inherit self;
# A Nixpkgs overlay that overrides the 'nix' and # A Nixpkgs overlay that overrides the 'nix' and
# 'nix.perl-bindings' packages. # 'nix.perl-bindings' packages.
overlays.default = overlayFor (p: p.stdenv); overlays.default = overlayFor (p: p.stdenv);

16
package.nix
View file

@ -14,6 +14,7 @@
boost, boost,
brotli, brotli,
bzip2, bzip2,
callPackage,
cmake, cmake,
curl, curl,
doxygen, doxygen,
@ -34,7 +35,7 @@
meson, meson,
ninja, ninja,
openssl, openssl,
pegtl, pegtl ? __forDefaults.pegtl,
pkg-config, pkg-config,
python3, python3,
rapidcheck, rapidcheck,
@ -75,8 +76,10 @@
configureFlags = prev.configureFlags or [ ] ++ [ (lib.enableFeature true "sigstop") ]; configureFlags = prev.configureFlags or [ ] ++ [ (lib.enableFeature true "sigstop") ];
}); });
lix-doc = pkgs.callPackage ./lix-doc/package.nix { }; lix-doc = callPackage ./lix-doc/package.nix { };
build-release-notes = pkgs.callPackage ./maintainers/build-release-notes.nix { }; build-release-notes = callPackage ./maintainers/build-release-notes.nix { };
pegtl = callPackage ./misc/pegtl.nix { };
}, },
}: }:
let let
@ -380,7 +383,12 @@ stdenv.mkDerivation (finalAttrs: {
# Export the patched version of boehmgc. # Export the patched version of boehmgc.
# flake.nix exports that into its overlay. # flake.nix exports that into its overlay.
passthru = { passthru = {
inherit (__forDefaults) boehmgc-nix editline-lix build-release-notes; inherit (__forDefaults)
boehmgc-nix
editline-lix
build-release-notes
pegtl
;
inherit officialRelease; inherit officialRelease;