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

chore!: spring cleaning

Browse source 
Make `nix-darwin` follow flake's version `nixpkgs`
`neovim-nighlty-overlay` - `.overlay` -> `.overlays.default`
`nixVersions` - `stable` -> `latest`
Check `${SHLVL}` before reloading `nix-daemon.sh` (shadows `nix shell`s)
`fetchFromGitHub` - `sha256` -> `hash`
Create `-monitored` packages only for valid `nixVersions`
This commit is contained in:
reo101 2024-05-26 12:41:24 +03:00
parent ff04252a67
commit 6e713090c3
Signed by: reo101
GPG key ID: 675AA7EF13964ACB
9 changed files with 208 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

53
overlays/default.nix
View file

@ -35,29 +35,36 @@
nix-output-monitor = prev.nix-output-monitor;
};
nixVersions = prev.nixVersions // {
stable-monitored = inputs.nix-monitored.packages.${final.system}.default.override {
nix = prev.nixVersions.stable;
nix-output-monitor = prev.nix-output-monitor;
};
unstable-monitored = inputs.nix-monitored.packages.${final.system}.default.override {
nix = prev.nixVersions.unstable;
nix-output-monitor = prev.nix-output-monitor;
};
};
himalaya = prev.himalaya.overrideAttrs (oldAttrs: rec {
buildInputs =
(prev.buildInputs or [ ]) ++
final.lib.optionals final.stdenv.isDarwin ([
(with final.darwin.apple_sdk.frameworks; [
Security
])
(with final; [
iconv
])
]);
});
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;
};
}
);
river = prev.river.overrideAttrs (oldAttrs: rec {
xwaylandSupport = true;