reo101/rix101
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(nix-monitored)!: put in nixVersions.monitored

Browse source 
Also fix `devShell`
  - did not correctly use the `monitored` version of `nix`
Also apply the overlays to the `pkgs` instance, used by `flake-parts`
This commit is contained in:
reo101 2024-06-01 16:07:36 +03:00
parent be2ad3ccfd
commit 1c809e1460
Signed by: reo101
GPG key ID: 675AA7EF13964ACB
4 changed files with 44 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

64
overlays/default.nix
View file

@ -35,36 +35,40 @@
nix-output-monitor = prev.nix-output-monitor;
};
nixVersions = prev.nixVersions // final.lib.flip final.lib.concatMapAttrs prev.nixVersions (version: package:
final.lib.optionalAttrs
(final.lib.and
(final.lib.all (prefix: ! final.lib.hasPrefix prefix version)
# TODO: smarter filtering of deprecated and non-packages
[
"nix_2_4"
"nix_2_5"
"nix_2_6"
"nix_2_7"
"nix_2_8"
"nix_2_9"
"nix_2_10"
"nix_2_11"
"nix_2_12"
"nix_2_13"
"nix_2_14"
"nix_2_15"
"nix_2_16"
"nix_2_17"
"unstable"
])
(final.lib.isDerivation package))
{
"${version}-monitored" = inputs.nix-monitored.packages.${final.system}.default.override {
nix = package;
nix-output-monitor = prev.nix-output-monitor;
};
}
);
nixVersions = prev.nixVersions // {
monitored =
final.lib.flip final.lib.concatMapAttrs prev.nixVersions (version: package:
final.lib.optionalAttrs
(final.lib.and
(final.lib.all (prefix: ! final.lib.hasPrefix prefix version)
# TODO: smarter filtering of deprecated and non-packages
[
"nix_2_4"
"nix_2_5"
"nix_2_6"
"nix_2_7"
"nix_2_8"
"nix_2_9"
"nix_2_10"
"nix_2_11"
"nix_2_12"
"nix_2_13"
"nix_2_14"
"nix_2_15"
"nix_2_16"
"nix_2_17"
"unstable"
])
(final.lib.isDerivation package))
{
# NOTE: `lib.getBin` is needed, otherwise the `-dev` output is chosen
"${version}" = final.lib.getBin (inputs.nix-monitored.packages.${final.system}.default.override {
nix = package;
nix-output-monitor = prev.nix-output-monitor;
});
}
);
};
river = prev.river.overrideAttrs (oldAttrs: rec {
xwaylandSupport = true;