overlays: refactor by using .asFlake attribute

This commit is contained in:
Primrose 2025-09-02 18:51:52 +08:00
parent 52e027ddd2
commit f30709cdea
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
6 changed files with 21 additions and 21 deletions

View file

@ -1,9 +1,7 @@
let let
sources = import ../../npins; sources = import ../../npins;
inherit (sources) agenix;
inherit (agenix.repository) owner repo;
in in
final: _: { final: _: {
# Use flake so the package inputs is pinned # Use flake so the package inputs is pinned
agenix = (builtins.getFlake "github:${owner}/${repo}/${agenix.revision}").packages.${final.system}.default; agenix = sources.agenix.asFlake.packages.${final.system}.default;
} }

View file

@ -2,7 +2,5 @@ let
sources = import ../../npins; sources = import ../../npins;
in in
final: _: { final: _: {
disko = disko = sources.disko.asFlake.packages.${final.system}.default;
final.callPackage (sources.disko + "/package.nix")
{diskoVersion = sources.disko.version;};
} }

View file

@ -1,8 +1,6 @@
let let
sources = import ../../npins; sources = import ../../npins;
inherit (sources) dix;
inherit (dix.repository) owner repo;
in in
final: _: { final: _: {
dix = (builtins.getFlake "github:${owner}/${repo}/${dix.revision}").packages.${final.system}.default; dix = sources.dix.asFlake.packages.${final.system}.default;
} }

View file

@ -1,8 +1,6 @@
let let
sources = import ../../npins; sources = import ../../npins;
inherit (sources) eepy;
inherit (eepy.repository) owner repo;
in in
final: _: { final: _: {
eepy = (builtins.getFlake "github:${owner}/${repo}/${eepy.revision}").packages.${final.system}.default; eepy = sources.eepy.asFlake.packages.${final.system}.default;
} }

View file

@ -1,9 +1,22 @@
# Run the one with my cool feature here for now # Run the one with my cool feature here for now
let let
sources = import ../../npins; sources = import ../../npins;
inherit (sources) nil;
inherit (nil.repository) owner repo;
in in
final: _: { final: _: {
nil = (builtins.getFlake "github:${owner}/${repo}/${nil.revision}").packages.${final.system}.default; nil = let
pkg = sources.nil.asFlake.packages.${final.system}.default;
in
pkg.overrideAttrs (
oldAttrs: {
patches =
oldAttrs.patches or []
++ [
(final.fetchpatch {
name = "fix-handling-inherit-and-patfield-in-inline-assist";
url = "https://github.com/oxalica/nil/pull/178.patch";
hash = "sha256-4f7DeWJtt63IyOjqlwzz0f05rv1NBYZO4JWEkFeDimk=";
})
];
}
);
} }

View file

@ -1,9 +1,4 @@
let let
sources = import ../../npins; sources = import ../../npins;
in in
_: prev: { sources.nur.asFlake.overlays.default
nur = import sources.nur {
nurpkgs = prev;
pkgs = prev;
};
}