mirror of
https://codeberg.org/leana8959/.files.git
synced 2025-12-06 06:39:14 +00:00
overlays: create indirection
This commit is contained in:
parent
e0a89ab571
commit
0fcbb8064d
3 changed files with 37 additions and 36 deletions
|
|
@ -15,9 +15,5 @@
|
|||
};
|
||||
|
||||
packages = import ./nix/packages;
|
||||
|
||||
overlays = {
|
||||
default = import ./nix/overlays;
|
||||
packages = import ./nix/overlays/packages.nix;
|
||||
};
|
||||
overlays = import ./nix/overlays;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,5 @@
|
|||
let
|
||||
sources = import ../sources.nix;
|
||||
lib = import (sources.nixpkgs + "/lib");
|
||||
in
|
||||
lib.composeManyExtensions [
|
||||
(final: _: {
|
||||
# Isabelle version 2023
|
||||
inherit (import sources.pin-isabelle {}) isabelle;
|
||||
|
||||
# Wireshark bug
|
||||
# https://gitlab.com/wireshark/wireshark/-/issues/19574
|
||||
inherit (import sources.pin-wireshark {}) wireshark;
|
||||
|
||||
wallpapers = final.callPackage sources.wallpapers {};
|
||||
|
||||
inherit (final.callPackage sources.agenix {}) agenix;
|
||||
|
||||
disko =
|
||||
final.callPackage (sources.disko + "/package.nix")
|
||||
{diskoVersion = sources.disko.version;};
|
||||
})
|
||||
|
||||
(_: prev: {
|
||||
nur = import sources.nur {
|
||||
nurpkgs = prev;
|
||||
pkgs = prev;
|
||||
};
|
||||
})
|
||||
|
||||
((import sources.wired-notify).overlays.default)
|
||||
]
|
||||
{
|
||||
default = import ./top-level.nix;
|
||||
}
|
||||
// import ./by-name.nix
|
||||
// {packages = import ./packages.nix;}
|
||||
|
|
|
|||
31
nix/overlays/top-level.nix
Normal file
31
nix/overlays/top-level.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
let
|
||||
sources = import ../sources.nix;
|
||||
lib = import (sources.nixpkgs + "/lib");
|
||||
in
|
||||
lib.composeManyExtensions [
|
||||
(final: _: {
|
||||
# Isabelle version 2023
|
||||
inherit (import sources.pin-isabelle {}) isabelle;
|
||||
|
||||
# Wireshark bug
|
||||
# https://gitlab.com/wireshark/wireshark/-/issues/19574
|
||||
inherit (import sources.pin-wireshark {}) wireshark;
|
||||
|
||||
wallpapers = final.callPackage sources.wallpapers {};
|
||||
|
||||
inherit (final.callPackage sources.agenix {}) agenix;
|
||||
|
||||
disko =
|
||||
final.callPackage (sources.disko + "/package.nix")
|
||||
{diskoVersion = sources.disko.version;};
|
||||
})
|
||||
|
||||
(_: prev: {
|
||||
nur = import sources.nur {
|
||||
nurpkgs = prev;
|
||||
pkgs = prev;
|
||||
};
|
||||
})
|
||||
|
||||
((import sources.wired-notify).overlays.default)
|
||||
]
|
||||
Loading…
Add table
Add a link
Reference in a new issue