clerie/nixfiles
1
0
Fork 0
Code Activity

flake.nix: Exclude build support from flake exported packages and make pkgs/pkgs.nix obsolete again

Browse Source
This commit is contained in:
clerie
2025-06-28 15:03:46 +02:00
parent a754af1ee9
commit 1d927638c5
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@@ -135,14 +135,17 @@
}; };
overlays = { overlays = {
nixfilesInputs = import ./flake/overlay.nix inputs; nixfilesInputs = import ./flake/inputs-overlay.nix inputs;
clerie = import ./pkgs/overlay.nix; clerie = import ./pkgs/overlay.nix;
clerie-build-support = import ./pkgs/build-support/overlay.nix;
default = self.overlays.clerie; default = self.overlays.clerie;
}; };
packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: let packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
let
pkgs = localNixpkgs.${system}; pkgs = localNixpkgs.${system};
in builtins.mapAttrs (name: value: pkgs."${name}") (import ./pkgs/pkgs.nix)); in builtins.mapAttrs (name: value: pkgs."${name}") (self.overlays.clerie null null)
);
inherit lib self; inherit lib self;

0
flake/overlay.nix → flake/inputs-overlay.nix
View File

3
flake/nixpkgs.nix
View File

@@ -10,6 +10,9 @@ let
overlays = [ overlays = [
self.overlays.nixfilesInputs self.overlays.nixfilesInputs
self.overlays.clerie self.overlays.clerie
(final: prev: {
clerie-build-support = self.overlays.clerie-build-support final prev;
})
]; ];
}; };

0
pkgs/build-support/default.nix → pkgs/build-support/overlay.nix
View File

2
pkgs/pkgs.nix
View File

@@ -1,6 +1,4 @@
{ {
clerie-build-support = final: prev: import ./build-support final prev;
clerie-backup = final: prev: final.callPackage ./clerie-backup {}; clerie-backup = final: prev: final.callPackage ./clerie-backup {};
clerie-cleanup-branches = final: prev: final.callPackage ./clerie-update-nixfiles/clerie-cleanup-branches.nix {}; clerie-cleanup-branches = final: prev: final.callPackage ./clerie-update-nixfiles/clerie-cleanup-branches.nix {};
clerie-keys = final: prev: final.callPackage ./clerie-keys {}; clerie-keys = final: prev: final.callPackage ./clerie-keys {};