From 8822fd7dd5254e781660704858f2eca386bdf5a2 Mon Sep 17 00:00:00 2001 From: Qyriad Date: Tue, 7 May 2024 14:40:18 -0600 Subject: [PATCH] package: default the build-release-notes arg like we do with lix-doc Change-Id: I0e2df55efc1cd6ea0a3252b9f26676e84612fdb6 --- flake.nix | 3 ++- package.nix | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 029362202..141cb8f31 100644 --- a/flake.nix +++ b/flake.nix @@ -161,7 +161,6 @@ # Forward from the previous stage as we don’t want it to pick the lowdown override nixUnstable = prev.nixUnstable; - build-release-notes = final.buildPackages.callPackage ./maintainers/build-release-notes.nix { }; check-headers = final.buildPackages.callPackage ./maintainers/check-headers.nix { }; clangbuildanalyzer = final.buildPackages.callPackage ./misc/clangbuildanalyzer.nix { }; @@ -199,6 +198,8 @@ # for consumers of this flake. boehmgc-nix = final.nix.boehmgc-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 { diff --git a/package.nix b/package.nix index 579b33f3e..16b1013f1 100644 --- a/package.nix +++ b/package.nix @@ -11,7 +11,7 @@ boehmgc, nlohmann_json, bison, - build-release-notes, + build-release-notes ? __forDefaults.build-release-notes, boost, brotli, bzip2, @@ -78,6 +78,7 @@ }; 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) libseccomp-nix = libseccomp.overrideAttrs (_: rec { @@ -377,6 +378,6 @@ stdenv.mkDerivation (finalAttrs: { # Export the patched version of boehmgc & libseccomp. # flake.nix exports that into its overlay. passthru = { - inherit (__forDefaults) boehmgc-nix libseccomp-nix; + inherit (__forDefaults) boehmgc-nix build-release-notes libseccomp-nix; }; })