diff --git a/nix/pkgs/knot-unwrapped.nix b/nix/pkgs/knot-unwrapped.nix index f9101a42..bb984131 100644 --- a/nix/pkgs/knot-unwrapped.nix +++ b/nix/pkgs/knot-unwrapped.nix @@ -1,10 +1,44 @@ { + lib, buildGoApplication, modules, sqlite-lib, - src, }: let version = "1.14.0-alpha"; + src = lib.fileset.toSource { + root = ../..; + fileset = lib.fileset.unions [ + ../../go.mod + ../../cmd/knot + + ../../guard + ../../hook + ../../keyfetch + ../../knotserver + + ../../api/tangled + ../../appview/filetree + ../../appview/models + ../../appview/pages/markup + ../../appview/pages/repoinfo + ../../appview/pagination + ../../appview/state/userutil + ../../idresolver + ../../jetstream + ../../log + ../../notifier + ../../orm + ../../patchutil + ../../rbac + ../../sets + ../../spindle/models + ../../spindle/secrets + ../../tid + ../../types + ../../workflow + ../../xrpc + ]; + }; in buildGoApplication { pname = "knot"; @@ -15,9 +49,7 @@ in subPackages = ["cmd/knot"]; tags = ["libsqlite3"]; - ldflags = [ - "-X tangled.org/core/knotserver/xrpc.version=${version}" - ]; + ldflags = ["-X tangled.org/core/knotserver/xrpc.version=${version}"]; env.CGO_CFLAGS = "-I ${sqlite-lib}/include "; env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib"; diff --git a/nix/pkgs/knotmirror.nix b/nix/pkgs/knotmirror.nix index a933e9c7..cfda295b 100644 --- a/nix/pkgs/knotmirror.nix +++ b/nix/pkgs/knotmirror.nix @@ -1,18 +1,43 @@ { + lib, buildGoApplication, modules, - src, -}: -buildGoApplication { - pname = "knotmirror"; - version = "0.1.0"; - inherit src modules; +}: let + src = lib.fileset.toSource { + root = ../..; + fileset = lib.fileset.unions [ + ../../go.mod + ../../cmd/knotmirror + ../../knotmirror + ../../log + ../../patchutil + ../../sets + ../../tapc + ../../types + ../../api/tangled + ../../workflow + ../../knotserver + ../../spindle/models + ../../spindle/secrets + ../../appview/filetree + ../../appview/models + ../../appview/pages/markup + ../../appview/pages/repoinfo + ../../appview/pagination + ../../appview/state/userutil + ]; + }; +in + buildGoApplication { + pname = "knotmirror"; + version = "0.1.0"; + inherit src modules; - doCheck = false; + doCheck = false; - subPackages = ["cmd/knotmirror"]; + subPackages = ["cmd/knotmirror"]; - meta = { - mainProgram = "knotmirror"; - }; -} + meta = { + mainProgram = "knotmirror"; + }; + } diff --git a/nix/pkgs/spindle.nix b/nix/pkgs/spindle.nix index 6a9ffb1f..4a916013 100644 --- a/nix/pkgs/spindle.nix +++ b/nix/pkgs/spindle.nix @@ -1,20 +1,48 @@ { + lib, buildGoApplication, modules, sqlite-lib, - src, -}: -buildGoApplication { - pname = "spindle"; - version = "0.1.0"; - inherit src modules; +}: let + src = lib.fileset.toSource { + root = ../..; + fileset = lib.fileset.unions [ + ../../go.mod + ../../cmd/spindle + ../../spindle + ../../eventconsumer + ../../idresolver + ../../jetstream + ../../rbac + ../../xrpc + ../../log + ../../sets + ../../notifier + ../../tid + ../../types + ../../api/tangled + ../../workflow + ../../appview/cache + ../../appview/db + ../../appview/models + ../../patchutil + ../../appview/filetree + ../../appview/pagination + ../../orm + ]; + }; +in + buildGoApplication { + pname = "spindle"; + version = "0.1.0"; + inherit src modules; - doCheck = false; + doCheck = false; - subPackages = ["cmd/spindle"]; - tags = ["libsqlite3"]; + subPackages = ["cmd/spindle"]; + tags = ["libsqlite3"]; - env.CGO_CFLAGS = "-I ${sqlite-lib}/include "; - env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib"; - CGO_ENABLED = 1; -} + env.CGO_CFLAGS = "-I ${sqlite-lib}/include "; + env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib"; + CGO_ENABLED = 1; + }