From ff55d0a608fdf21996b258b5cbf0fbe9032d9873 Mon Sep 17 00:00:00 2001 From: enricobuehler Date: Thu, 16 Jul 2026 20:40:12 +0200 Subject: [PATCH] chore(packaging): move nix/ into packaging/nix/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- flake.nix | 6 +++--- packaging/README.md | 2 +- {nix => packaging/nix}/README.md | 0 {nix => packaging/nix}/nixos-module.nix | 0 {nix => packaging/nix}/packages.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename {nix => packaging/nix}/README.md (100%) rename {nix => packaging/nix}/nixos-module.nix (100%) rename {nix => packaging/nix}/packages.nix (99%) diff --git a/flake.nix b/flake.nix index 645820aa..7e47f99e 100644 --- a/flake.nix +++ b/flake.nix @@ -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; }; } diff --git a/packaging/README.md b/packaging/README.md index 44ed8f3d..8055b958 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -27,7 +27,7 @@ The other packaging targets have their own READMEs: [`debian/`](debian/README.md [`flatpak/`](flatpak/README.md) (the client), [`windows/`](windows/README.md) (host installer + drivers), plus `kde/` and `linux/` helpers. **NixOS / Nix** users get a flake (`flake.nix` at the repo root) with reproducible host + client packages and a `services.punktfunk` NixOS module — -see [`../nix/README.md`](../nix/README.md). +see [`nix/README.md`](nix/README.md). ## What's needed beyond base Fedora diff --git a/nix/README.md b/packaging/nix/README.md similarity index 100% rename from nix/README.md rename to packaging/nix/README.md diff --git a/nix/nixos-module.nix b/packaging/nix/nixos-module.nix similarity index 100% rename from nix/nixos-module.nix rename to packaging/nix/nixos-module.nix diff --git a/nix/packages.nix b/packaging/nix/packages.nix similarity index 99% rename from nix/packages.nix rename to packaging/nix/packages.nix index 5739a9bc..e5d1ce05 100644 --- a/nix/packages.nix +++ b/packaging/nix/packages.nix @@ -177,7 +177,7 @@ in # build needs the full gn/ninja/python toolchain + network-fetched third-party. The `ui` feature # is explicitly droppable (clients/session/Cargo.toml: "same streaming, stats on stdout only"), # so build the session without it. The GTK shell (punktfunk-client-linux) is skia-free and full. - # Re-adding the Skia OSD under Nix is tracked in nix/README.md. + # Re-adding the Skia OSD under Nix is tracked in packaging/nix/README.md. cargoExtraArgs = "--locked -p punktfunk-client-linux -p punktfunk-client-session " + "--no-default-features --features punktfunk-client-session/pyrowave";