chore(packaging): move nix/ into packaging/nix/
ci / web (push) Successful in 49s
ci / docs-site (push) Successful in 1m2s
decky / build-publish (push) Successful in 20s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 11s
apple / swift (push) Successful in 1m16s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 11s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 9s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 9s
apple / screenshots (push) Successful in 4m25s
ci / bench (push) Successful in 5m54s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 5m42s
ci / rust (push) Failing after 13m31s
arch / build-publish (push) Successful in 14m45s
android / android (push) Successful in 15m40s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 14m21s
deb / build-publish (push) Successful in 15m45s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 13m54s
docker / deploy-docs (push) Successful in 24s
ci / web (push) Successful in 49s
ci / docs-site (push) Successful in 1m2s
decky / build-publish (push) Successful in 20s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 11s
apple / swift (push) Successful in 1m16s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 11s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 9s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 9s
apple / screenshots (push) Successful in 4m25s
ci / bench (push) Successful in 5m54s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 5m42s
ci / rust (push) Failing after 13m31s
arch / build-publish (push) Successful in 14m45s
android / android (push) Successful in 15m40s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 14m21s
deb / build-publish (push) Successful in 15m45s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 13m54s
docker / deploy-docs (push) Successful in 24s
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
|
let
|
||||||
pkgs = pkgsFor system;
|
pkgs = pkgsFor system;
|
||||||
in
|
in
|
||||||
pkgs.callPackage ./nix/packages.nix {
|
pkgs.callPackage ./packaging/nix/packages.nix {
|
||||||
craneLib = craneLibFor pkgs;
|
craneLib = craneLibFor pkgs;
|
||||||
src = self;
|
src = self;
|
||||||
inherit version;
|
inherit version;
|
||||||
@@ -128,10 +128,10 @@
|
|||||||
|
|
||||||
formatter = forAllSystems (system: (pkgsFor system).nixfmt-rfc-style);
|
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 ];
|
# imports = [ punktfunk.nixosModules.default ];
|
||||||
# services.punktfunk.host.enable = true;
|
# 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;
|
nixosModules.punktfunk = self.nixosModules.default;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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 +
|
[`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
|
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 —
|
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
|
## What's needed beyond base Fedora
|
||||||
|
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ in
|
|||||||
# build needs the full gn/ninja/python toolchain + network-fetched third-party. The `ui` feature
|
# 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"),
|
# 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.
|
# 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 =
|
cargoExtraArgs =
|
||||||
"--locked -p punktfunk-client-linux -p punktfunk-client-session "
|
"--locked -p punktfunk-client-linux -p punktfunk-client-session "
|
||||||
+ "--no-default-features --features punktfunk-client-session/pyrowave";
|
+ "--no-default-features --features punktfunk-client-session/pyrowave";
|
||||||
Reference in New Issue
Block a user