terminal user interface to jujutsu. Focused on speed and clarity
updated flakes
+106
-82
+1
.envrc
+1
.envrc
···
1
+
use flake
+30
flake.lock
+30
flake.lock
···
1
1
{
2
2
"nodes": {
3
+
"flake-parts": {
4
+
"inputs": {
5
+
"nixpkgs-lib": "nixpkgs-lib"
6
+
},
7
+
"locked": {
8
+
"lastModified": 1714641030,
9
+
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
10
+
"owner": "hercules-ci",
11
+
"repo": "flake-parts",
12
+
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
13
+
"type": "github"
14
+
},
15
+
"original": {
16
+
"id": "flake-parts",
17
+
"type": "indirect"
18
+
}
19
+
},
3
20
"nixpkgs": {
4
21
"locked": {
5
22
"lastModified": 1713537308,
···
13
30
"type": "indirect"
14
31
}
15
32
},
33
+
"nixpkgs-lib": {
34
+
"locked": {
35
+
"lastModified": 1714640452,
36
+
"narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
37
+
"type": "tarball",
38
+
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
39
+
},
40
+
"original": {
41
+
"type": "tarball",
42
+
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
43
+
}
44
+
},
16
45
"root": {
17
46
"inputs": {
47
+
"flake-parts": "flake-parts",
18
48
"nixpkgs": "nixpkgs"
19
49
}
20
50
}
+48
-81
flake.nix
+48
-81
flake.nix
···
8
8
9
9
};
10
10
# Flake outputs
11
-
outputs = { self, nixpkgs, ... }@inputs:
12
-
let
13
-
# Systems supported
14
-
allSystems =
11
+
outputs = { self, nixpkgs, flake-parts, ... }@inputs:
12
+
flake-parts.lib.mkFlake { inherit inputs; } {
13
+
systems =
15
14
[ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
16
-
17
-
# Helper to provide system-specific attributes
18
-
forAllSystems = f:
19
-
nixpkgs.lib.genAttrs allSystems (system:
20
-
f (let pkgs = import nixpkgs { inherit system; };
21
-
in {
22
-
pkgs = pkgs;
23
-
# OCaml packages available on nixpkgs
24
-
ocamlPackages =
25
-
nixpkgs.legacyPackages.${system}.ocamlPackages; # Legacy packages that have not been converted to flakes
26
-
ocamlPackagesStatic =
27
-
nixpkgs.legacyPackages.${system}.pkgsMusl.ocamlPackages; # Legacy packages that have not been converted to flakes
28
-
}));
29
-
30
-
in {
31
-
packages = forAllSystems ({ pkgs, ocamlPackages,ocamlPackagesStatic}:
15
+
perSystem = { config, self', inputs', pkgs, system, ... }:
32
16
let
33
-
eio-process = ocamlPackages.buildDunePackage {
17
+
# OCaml packages available on nixpkgs
18
+
inherit (pkgs) ocamlPackages mkShell lib;
19
+
inherit (ocamlPackages) buildDunePackage;
20
+
ocamlPkgssStatic =
21
+
pkgs.pkgsMusl.ocamlPackages; # Legacy packages that have not been converted to flakes
22
+
eio-process = buildDunePackage {
34
23
pname = "eio-process";
35
24
version = "0.1.0";
36
25
duneVersion = "3";
···
41
30
rev = "482ba341884dc8711f93ec9cc6d7c941099e0faa";
42
31
sha256 = "sha256-/Y2U+1y+nDMBrRfDAYif0WJp0vPWmvbSMt39wAB/rS8=";
43
32
};
44
-
nativeBuildInputs = with pkgs;
45
-
[
46
-
# gmp
47
-
# stdenv.cc.cc.lib
48
-
# dune_3
49
-
# clang
50
-
# ocaml
51
-
# opam
52
-
53
-
];
54
33
55
34
buildInputs = with ocamlPackages; [
56
35
base
···
66
45
];
67
46
68
47
strictDeps = true;
69
-
70
-
preBuild = ''
71
-
#make home which is needed for opam
72
-
# export HOME=$(pwd)/build-home
73
-
# mkdir -p $HOME
74
-
75
-
# opam init .
76
-
77
-
# opam install . opam-monorepo
78
-
# opam monorepo pull
79
-
'';
80
48
};
81
-
jj_tui= pkgs: ocamlPackages:
82
-
ocamlPackages.buildDunePackage {
83
-
pname = "jj_tui";
84
-
version = "0.1.0";
85
-
duneVersion = "3";
86
-
src = ./.;
49
+
jj_tui_build_pkgs =
87
50
88
-
buildInputs = [
51
+
[
89
52
eio-process
90
53
ocamlPackages.parsexp
91
54
ocamlPackages.eio_main
···
99
62
100
63
# Ocaml package dependencies needed to build go here.
101
64
];
102
-
env={
103
-
DUNE_PROFILE="static";
104
-
105
-
};
65
+
jj_tui = pkgs: ocamlPackages:
66
+
ocamlPackages.buildDunePackage {
67
+
pname = "jj_tui";
68
+
version = "0.1.0";
69
+
duneVersion = "3";
70
+
src = ./.;
106
71
107
-
strictDeps = true;
72
+
buildInputs = jj_tui_build_pkgs;
73
+
env = {
74
+
DUNE_PROFILE = "static";
108
75
109
-
preBuild = ''
110
-
#make home which is needed for opam
111
-
# export HOME=$(pwd)/build-home
112
-
# mkdir -p $HOME
76
+
};
113
77
114
-
export DUNE_PROFILE=static
115
-
# opam init .
78
+
strictDeps = true;
116
79
117
-
# opam install . opam-monorepo
118
-
# opam monorepo pull
119
-
'';
120
-
};
80
+
preBuild = ''
81
+
export DUNE_PROFILE=static
82
+
'';
83
+
};
121
84
122
85
in {
123
-
default =jj_tui pkgs ocamlPackages; # Development environment output
124
-
pkgsMusl.default=jj_tui pkgs.pkgsMusl ocamlPackagesStatic; # Development environment output
125
-
});
126
-
devShells = forAllSystems ({ pkgs, ... }: {
127
-
default =
128
-
129
-
pkgs.mkShell {
130
-
packages = with pkgs; [
131
-
gmp
132
-
stdenv.cc.cc.lib
133
-
dune_3
134
-
ocaml
135
-
opam
136
-
fish
137
-
];
86
+
packages = {
87
+
default =
88
+
jj_tui pkgs ocamlPackages; # Development environment output
89
+
pkgsMusl.default = jj_tui pkgs.pkgsMusl
90
+
pkgs.pkgsMusl.ocamlPackages; # Development environment output
138
91
};
139
-
140
-
});
92
+
devShells = {
93
+
default = mkShell.override { stdenv = pkgs.gccStdenv; } {
94
+
buildInputs = with ocamlPackages; [
95
+
dune_3
96
+
ocaml
97
+
utop
98
+
ocamlformat
99
+
];
100
+
inputsFrom = [ self'.packages.default ];
101
+
packages = builtins.attrValues {
102
+
inherit (pkgs) gcc pkg-config;
103
+
inherit (ocamlPackages) ocaml-lsp ocamlformat-rpc-lib;
104
+
};
105
+
};
106
+
};
141
107
108
+
};
142
109
};
143
110
}
+1
-1
jj_tui.opam
+1
-1
jj_tui.opam
+25
log
+25
log
···
1
+
◉ [1m[38;5;5myq[0m[38;5;8mytskyk[39m [38;5;3meli.jambu@gmail.com[39m [38;5;6m2024-05-13 09:34:43[39m [1m[38;5;4mb[0m[38;5;8m432b3c1[39m
2
+
│ test reorganise
3
+
@ [1m[38;5;13mtw[38;5;8msoqryt[39m [38;5;3meli.jambu@gmail.com[39m [38;5;14m2024-05-13 09:34:43[39m [38;5;12m87[38;5;8md4ffad[39m[0m
4
+
│ [1mupdated flakes[0m
5
+
◉ [1m[38;5;5mys[0m[38;5;8mzqynxv[39m [38;5;3meli.jambu@gmail.com[39m [38;5;6m2024-05-13 08:22:36[39m [38;5;2mHEAD@git[39m [1m[38;5;4m65[0m[38;5;8md9b7dc[39m
6
+
│ opam template
7
+
◉ [1m[38;5;5mkr[0m[38;5;8mzvxzyw[39m [38;5;3meli.jambu@gmail.com[39m [38;5;6m2024-05-13 07:53:04[39m [1m[38;5;4m0c[0m[38;5;8mf0a9b8[39m
8
+
│ different strat
9
+
◉ [1m[38;5;5ml[0m[38;5;8mzrkyqxq[39m [38;5;3meli.jambu@gmail.com[39m [38;5;6m2024-05-12 20:28:46[39m [38;5;5mmaster?? master?? master@git master@origin[39m [1m[38;5;4me3[0m[38;5;8me2ba28[39m
10
+
│ remove vendor libs
11
+
│ ◉ [1m[38;5;5mq[0m[38;5;8mpqzkuss[39m [38;5;3meli.jambu@gmail.com[39m [38;5;6m2024-05-12 21:07:29[39m [1m[38;5;4m5[0m[38;5;8m1e7fabe[39m
12
+
│ │ [38;5;3m(no description set)[39m
13
+
│ ◉ [1m[38;5;5mx[0m[38;5;8mpqmtrmp[39m [38;5;3meli.jambu@gmail.com[39m [38;5;6m2024-05-12 20:31:20[39m [1m[38;5;4me5[0m[38;5;8mcaae1c[39m
14
+
├─╯ remove old nix file
15
+
◉ [1m[38;5;5mzx[0m[38;5;8mpskuop[39m [38;5;3meli.jambu@gmail.com[39m [38;5;6m2024-05-12 00:43:25[39m [1m[38;5;4m3[0m[38;5;8m3771185[39m
16
+
│ Update README.md
17
+
◌ [38;5;8m(elided revisions)[39m
18
+
│ ◉ [1m[38;5;5mn[0m[38;5;8mwxyqxuv[39m [38;5;3meli.jambu@gmail.com[39m [38;5;6m2024-05-11 14:11:37[39m [1m[38;5;4m89[0m[38;5;8m392bc6[39m
19
+
├─╯ [38;5;3m(no description set)[39m
20
+
◉ [1m[38;5;5mkm[0m[38;5;8mosytmo[39m [38;5;3meli.jambu@gmail.com[39m [38;5;6m2024-05-11 14:11:37[39m [1m[38;5;4m4[0m[38;5;8m1122b29[39m
21
+
│ backup opam
22
+
◌ [38;5;8m(elided revisions)[39m
23
+
│ ◉ [1m[38;5;5mto[0m[38;5;8moppyyl[39m [38;5;3meli.jambu@gmail.com[39m [38;5;6m2024-05-11 03:29:14[39m [1m[38;5;4m6f[0m[38;5;8md850b1[39m
24
+
├─╯ test
25
+
◉ [1m[38;5;5mzz[0m[38;5;8mzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m00[0m[38;5;8m000000[39m