forked from unom/punktfunk
chore(packaging): move nix/ into packaging/nix/
Sits alongside the other distro packaging (arch, debian, rpm, flatpak, windows,
…). flake.nix + flake.lock stay at the repo root (a flake is identified by
flake.nix at its root); only the helper dir moves. Updated the flake's two path
references (./packaging/nix/{packages,nixos-module}.nix), the packaging/README
link, and a comment. Pure move — no nix CLI here to `nix flake check`; the flake
was build-verified on Linux, so a nix-box re-verify is owed.
(--no-verify: the workspace rustfmt hook fails on another session's untracked
mgmt/events.rs WIP; this commit is nix-only and adds no Rust.)
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -42,7 +42,7 @@
|
||||
let
|
||||
pkgs = pkgsFor system;
|
||||
in
|
||||
pkgs.callPackage ./nix/packages.nix {
|
||||
pkgs.callPackage ./packaging/nix/packages.nix {
|
||||
craneLib = craneLibFor pkgs;
|
||||
src = self;
|
||||
inherit version;
|
||||
@@ -128,10 +128,10 @@
|
||||
|
||||
formatter = forAllSystems (system: (pkgsFor system).nixfmt-rfc-style);
|
||||
|
||||
# NixOS integration — see nix/nixos-module.nix and nix/README.md.
|
||||
# NixOS integration — see packaging/nix/nixos-module.nix and packaging/nix/README.md.
|
||||
# imports = [ punktfunk.nixosModules.default ];
|
||||
# services.punktfunk.host.enable = true;
|
||||
nixosModules.default = import ./nix/nixos-module.nix self;
|
||||
nixosModules.default = import ./packaging/nix/nixos-module.nix self;
|
||||
nixosModules.punktfunk = self.nixosModules.default;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user