fix: Move packaging files from dist/ to pkg/

This commit is contained in:
Ginger 2025-09-02 12:20:23 -04:00 committed by Jade Ellis
commit 58bbc0e676
13 changed files with 8 additions and 8 deletions

View file

@ -10,7 +10,7 @@ on:
- ".gitlab-ci.yml" - ".gitlab-ci.yml"
- ".gitignore" - ".gitignore"
- "renovate.json" - "renovate.json"
- "dist/**" - "pkg/**"
- "docker/**" - "docker/**"
- "docs/**" - "docs/**"
# Allows you to run this workflow manually from the Actions tab # Allows you to run this workflow manually from the Actions tab

View file

@ -15,5 +15,5 @@
<summary>systemd unit file</summary> <summary>systemd unit file</summary>
``` ```
{{#include ../../dist/conduwuit.service}} {{#include ../../pkg/conduwuit.service}}
``` ```

View file

@ -1 +1 @@
{{#include ../../dist/debian/README.md}} {{#include ../../pkg/debian/README.md}}

View file

@ -48,7 +48,7 @@
pkgs.lib.makeScope pkgs.newScope (self: { pkgs.lib.makeScope pkgs.newScope (self: {
inherit pkgs inputs; inherit pkgs inputs;
craneLib = (inputs.crane.mkLib pkgs).overrideToolchain (_: toolchain); craneLib = (inputs.crane.mkLib pkgs).overrideToolchain (_: toolchain);
main = self.callPackage ./dist/nix/pkgs/main { }; main = self.callPackage ./pkg/nix/pkgs/main { };
liburing = pkgs.liburing.overrideAttrs { liburing = pkgs.liburing.overrideAttrs {
# Tests weren't building # Tests weren't building
outputs = [ outputs = [

View file

@ -51,7 +51,7 @@ find .cargo/registry/ -executable -name "*.rs" -exec chmod -x {} +
%install %install
install -Dpm0755 target/rpm/conduwuit -t %{buildroot}%{_bindir} install -Dpm0755 target/rpm/conduwuit -t %{buildroot}%{_bindir}
install -Dpm0644 dist/conduwuit.service -t %{buildroot}%{_unitdir} install -Dpm0644 pkg/conduwuit.service -t %{buildroot}%{_unitdir}
install -Dpm0644 conduwuit-example.toml %{buildroot}%{_sysconfdir}/conduwuit/conduwuit.toml install -Dpm0644 conduwuit-example.toml %{buildroot}%{_sysconfdir}/conduwuit/conduwuit.toml
%files %files

View file

@ -32,10 +32,10 @@ a cool hard fork of Conduit, a Matrix homeserver written in Rust"""
section = "net" section = "net"
priority = "optional" priority = "optional"
conf-files = ["/etc/conduwuit/conduwuit.toml"] conf-files = ["/etc/conduwuit/conduwuit.toml"]
maintainer-scripts = "../../dist/debian/" maintainer-scripts = "../../pkg/debian/"
systemd-units = { unit-name = "conduwuit", start = false, unit-scripts = "../../dist/" } systemd-units = { unit-name = "conduwuit", start = false, unit-scripts = "../../pkg/" }
assets = [ assets = [
["../../dist/debian/README.md", "usr/share/doc/conduwuit/README.Debian", "644"], ["../../pkg/debian/README.md", "usr/share/doc/conduwuit/README.Debian", "644"],
["../../README.md", "usr/share/doc/conduwuit/", "644"], ["../../README.md", "usr/share/doc/conduwuit/", "644"],
["../../target/release/conduwuit", "usr/bin/conduwuit", "755"], ["../../target/release/conduwuit", "usr/bin/conduwuit", "755"],
["../../conduwuit-example.toml", "etc/conduwuit/conduwuit.toml", "640"], ["../../conduwuit-example.toml", "etc/conduwuit/conduwuit.toml", "640"],