lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

package: default the build-release-notes arg like we do with lix-doc

Browse source 
Change-Id: I0e2df55efc1cd6ea0a3252b9f26676e84612fdb6
This commit is contained in:
Qyriad 2024-05-07 14:40:18 -06:00
parent b9be46fb31
commit 8822fd7dd5
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -161,7 +161,6 @@
# Forward from the previous stage as we don’t want it to pick the lowdown override # Forward from the previous stage as we don’t want it to pick the lowdown override
nixUnstable = prev.nixUnstable; nixUnstable = prev.nixUnstable;
build-release-notes = final.buildPackages.callPackage ./maintainers/build-release-notes.nix { };
check-headers = final.buildPackages.callPackage ./maintainers/check-headers.nix { }; check-headers = final.buildPackages.callPackage ./maintainers/check-headers.nix { };
clangbuildanalyzer = final.buildPackages.callPackage ./misc/clangbuildanalyzer.nix { }; clangbuildanalyzer = final.buildPackages.callPackage ./misc/clangbuildanalyzer.nix { };
@ -199,6 +198,8 @@
# for consumers of this flake. # for consumers of this flake.
boehmgc-nix = final.nix.boehmgc-nix; boehmgc-nix = final.nix.boehmgc-nix;
libseccomp-nix = final.nix.libseccomp-nix; libseccomp-nix = final.nix.libseccomp-nix;
# And same thing for our build-release-notes package.
build-release-notes = final.nix.build-release-notes;
}; };
in in
{ {

5
package.nix
View file

@ -11,7 +11,7 @@
boehmgc, boehmgc,
nlohmann_json, nlohmann_json,
bison, bison,
build-release-notes, build-release-notes ? __forDefaults.build-release-notes,
boost, boost,
brotli, brotli,
bzip2, bzip2,
@ -78,6 +78,7 @@
}; };
lix-doc = pkgs.callPackage ./lix-doc/package.nix { }; lix-doc = pkgs.callPackage ./lix-doc/package.nix { };
build-release-notes = pkgs.callPackage ./maintainers/build-release-notes.nix { };
# FIXME remove when we have libsecomp 2.5.5 (currently in staging-23.11) # FIXME remove when we have libsecomp 2.5.5 (currently in staging-23.11)
libseccomp-nix = libseccomp.overrideAttrs (_: rec { libseccomp-nix = libseccomp.overrideAttrs (_: rec {
@ -377,6 +378,6 @@ stdenv.mkDerivation (finalAttrs: {
# Export the patched version of boehmgc & libseccomp. # Export the patched version of boehmgc & libseccomp.
# flake.nix exports that into its overlay. # flake.nix exports that into its overlay.
passthru = { passthru = {
inherit (__forDefaults) boehmgc-nix libseccomp-nix; inherit (__forDefaults) boehmgc-nix build-release-notes libseccomp-nix;
}; };
}) })