Compare commits
No commits in common. "62b16ae836e2d214df303d0bb26c1cc81041fc8b" and "4b856ed7f97c08e1c3487036f922832cd1689b8a" have entirely different histories.
62b16ae836
...
4b856ed7f9
@ -170,9 +170,7 @@
|
|||||||
atool-wrapped = packages.atool;
|
atool-wrapped = packages.atool;
|
||||||
};
|
};
|
||||||
in [
|
in [
|
||||||
# TODO delete this, transfer all packages to new-packages overlay
|
|
||||||
packagesOverlay
|
packagesOverlay
|
||||||
self.overlays.new-packages
|
|
||||||
# various temporary fixes that automatically revert
|
# various temporary fixes that automatically revert
|
||||||
self.overlays.mitigations
|
self.overlays.mitigations
|
||||||
|
|
||||||
|
@ -201,7 +201,7 @@ in {
|
|||||||
# setting overlays at the home level; this allows for doing
|
# setting overlays at the home level; this allows for doing
|
||||||
# that while inheriting the system overlays.
|
# that while inheriting the system overlays.
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config = lib.mapAttrs (n: v: lib.mkDefault v) config.nixpkgs.config;
|
config = mapAttrs (n: v: lib.mkDefault v) config.nixpkgs.config;
|
||||||
# mkOrder 900 is after mkBefore but before default order
|
# mkOrder 900 is after mkBefore but before default order
|
||||||
overlays = lib.mkOrder 900 config.nixpkgs.overlays;
|
overlays = lib.mkOrder 900 config.nixpkgs.overlays;
|
||||||
};
|
};
|
||||||
|
@ -1,32 +1,11 @@
|
|||||||
|
{ config, lib, ... }:
|
||||||
{
|
{
|
||||||
config,
|
imports = [ ./legacy-module.nix ];
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [./legacy-module.nix];
|
|
||||||
config = {
|
config = {
|
||||||
perSystem = {
|
perSystem = { system, inputs', self', pkgs, ...}: {
|
||||||
system,
|
|
||||||
inputs',
|
|
||||||
self',
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
packages = {
|
packages = {
|
||||||
lucem = pkgs.callPackage ./lucem {};
|
lucem = pkgs.callPackage ./lucem { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
flake = {
|
|
||||||
overlays.new-packages = final: prev: let
|
|
||||||
inherit (final) callPackage;
|
|
||||||
currentSystem = config.perSystem "${prev.system}";
|
|
||||||
flakePackages = currentSystem.packages;
|
|
||||||
addPackages = packages: lib.genAttrs packages (package: callPackage flakePackages.${package}.override {});
|
|
||||||
in
|
|
||||||
addPackages [
|
|
||||||
"lucem"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user