This will make nixos-vm build much faster. Also it reveals the mess around dependency graph which we should fix.
Signed-off-by: Seongmin Lee git@boltless.me
+104
-24
Diff
round #0
+47
-20
nix/pkgs/knot-unwrapped.nix
+47
-20
nix/pkgs/knot-unwrapped.nix
···
1
-
{
2
-
buildGoApplication,
3
-
modules,
4
-
sqlite-lib,
5
-
src,
6
-
}: let
1
+
{ lib, buildGoApplication, modules, sqlite-lib, }:
2
+
let
7
3
version = "1.13.0-alpha";
8
-
in
9
-
buildGoApplication {
10
-
pname = "knot";
11
-
inherit src version modules;
4
+
src = lib.fileset.toSource {
5
+
root = ../..;
6
+
fileset = lib.fileset.unions [
7
+
../../go.mod
8
+
../../cmd/knot
12
9
13
-
doCheck = false;
10
+
../../guard
11
+
../../hook
12
+
../../keyfetch
13
+
../../knotserver
14
14
15
-
subPackages = ["cmd/knot"];
16
-
tags = ["libsqlite3"];
17
-
18
-
ldflags = [
19
-
"-X tangled.org/core/knotserver/xrpc.version=${version}"
15
+
../../api/tangled
16
+
../../appview/filetree
17
+
../../appview/models
18
+
../../appview/pages/markup
19
+
../../appview/pages/repoinfo
20
+
../../appview/pagination
21
+
../../appview/state/userutil
22
+
../../idresolver
23
+
../../jetstream
24
+
../../log
25
+
../../notifier
26
+
../../orm
27
+
../../patchutil
28
+
../../rbac
29
+
../../sets
30
+
../../spindle/models
31
+
../../spindle/secrets
32
+
../../tid
33
+
../../types
34
+
../../workflow
35
+
../../xrpc
20
36
];
37
+
};
38
+
in buildGoApplication {
39
+
pname = "knot";
40
+
inherit src version modules;
41
+
42
+
doCheck = false;
43
+
44
+
subPackages = [ "cmd/knot" ];
45
+
tags = [ "libsqlite3" ];
46
+
47
+
ldflags = [ "-X tangled.org/core/knotserver/xrpc.version=${version}" ];
21
48
22
-
env.CGO_CFLAGS = "-I ${sqlite-lib}/include ";
23
-
env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib";
24
-
CGO_ENABLED = 1;
25
-
}
49
+
env.CGO_CFLAGS = "-I ${sqlite-lib}/include ";
50
+
env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib";
51
+
CGO_ENABLED = 1;
52
+
}
+27
-2
nix/pkgs/knotmirror.nix
+27
-2
nix/pkgs/knotmirror.nix
···
1
1
{
2
+
lib,
2
3
buildGoApplication,
3
4
modules,
4
-
src,
5
-
}:
5
+
}: let
6
+
src = lib.fileset.toSource {
7
+
root = ../..;
8
+
fileset = lib.fileset.unions [
9
+
../../go.mod
10
+
../../cmd/knotmirror
11
+
../../knotmirror
12
+
../../log
13
+
../../patchutil
14
+
../../sets
15
+
../../tapc
16
+
../../types
17
+
../../api/tangled
18
+
../../workflow
19
+
../../knotserver
20
+
../../spindle/models
21
+
../../spindle/secrets
22
+
../../appview/filetree
23
+
../../appview/models
24
+
../../appview/pages/markup
25
+
../../appview/pages/repoinfo
26
+
../../appview/pagination
27
+
../../appview/state/userutil
28
+
];
29
+
};
30
+
in
6
31
buildGoApplication {
7
32
pname = "knotmirror";
8
33
version = "0.1.0";
+30
-2
nix/pkgs/spindle.nix
+30
-2
nix/pkgs/spindle.nix
···
1
1
{
2
+
lib,
2
3
buildGoApplication,
3
4
modules,
4
5
sqlite-lib,
5
-
src,
6
-
}:
6
+
}: let
7
+
src = lib.fileset.toSource {
8
+
root = ../..;
9
+
fileset = lib.fileset.unions [
10
+
../../go.mod
11
+
../../cmd/spindle
12
+
../../spindle
13
+
../../eventconsumer
14
+
../../idresolver
15
+
../../jetstream
16
+
../../rbac
17
+
../../xrpc
18
+
../../log
19
+
../../sets
20
+
../../notifier
21
+
../../tid
22
+
../../types
23
+
../../api/tangled
24
+
../../workflow
25
+
../../appview/cache
26
+
../../appview/db
27
+
../../appview/models
28
+
../../patchutil
29
+
../../appview/filetree
30
+
../../appview/pagination
31
+
../../orm
32
+
];
33
+
};
34
+
in
7
35
buildGoApplication {
8
36
pname = "spindle";
9
37
version = "0.1.0";
History
1 round
0 comments
boltless.me
submitted
#0
1 commit
expand
collapse
nix/pkgs: fileset based source
Signed-off-by: Seongmin Lee <git@boltless.me>
merge conflicts detected
expand
collapse
expand
collapse
- knotmirror/knotmirror.go:3
- knotmirror/xrpc/git_list_branches.go:82
- knotmirror/xrpc/proxy.go:63
- knotmirror/xrpc/xrpc.go:9