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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
flake.nix
View file

@ -52,6 +52,7 @@
nix-monitored = { nix-monitored = {
url = "github:ners/nix-monitored"; url = "github:ners/nix-monitored";
inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = { disko = {
@ -143,7 +144,13 @@
"x86_64-darwin" "x86_64-darwin"
]; ];
perSystem = { pkgs, ... }: { perSystem = { pkgs, lib, system, ... }: {
_module.args.pkgs = import inputs.nixpkgs {
inherit system;
overlays = lib.attrValues outputs.overlays;
config = { };
};
# Packages (`nix build`) # Packages (`nix build`)
packages = import ./pkgs { inherit pkgs; }; packages = import ./pkgs { inherit pkgs; };

2
machines/nix-darwin/aarch64-darwin/limonka/configuration.nix
View file

@ -10,7 +10,7 @@
nix = { nix = {
# Ensure we can work with flakes # Ensure we can work with flakes
package = pkgs.nixVersions.latest-monitored; package = pkgs.nixVersions.monitored.latest;
# extraOptions = '' # extraOptions = ''
# # Enable flakes and new 'nix' command # # Enable flakes and new 'nix' command

64
overlays/default.nix
View file

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

2
shells/default/default.nix
View file

@ -8,7 +8,7 @@
extra-experimental-features = nix-command flakes extra-experimental-features = nix-command flakes
''; '';
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
nix nixVersions.monitored.latest
home-manager home-manager
git git
wireguard-tools wireguard-tools