Skip to content

Commit 9be1c6c

Browse files
committed
feat(pkgs): mv jj unstable to overlays
1 parent 3959904 commit 9be1c6c

File tree

3 files changed

+30
-26
lines changed

3 files changed

+30
-26
lines changed

home.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ let
7979
# git-branchless # moved to local dev build
8080
dust
8181
bottom
82-
jujutsu
82+
jujutsu-unstable
8383
faketty
8484
procs
8585
wol

nixpkgs-config/overlays/mods.nix

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,35 @@ with prev;
3131
# ];
3232
# });
3333

34+
jujutsu-unstable = jujutsu.overrideAttrs (finalAttrs: { preCheck ? "", ... }: {
35+
## do not override version, otherwise versionCheckHook would fail
36+
# version = "0.36.0-unstable-2025-12-22";
37+
38+
src = fetchFromGitHub {
39+
owner = "jj-vcs";
40+
repo = "jj";
41+
rev = "1e521f564dcec8f93ba3b0a494259d38ef0d8341";
42+
hash = "sha256-/AsSdKo/iZ8Ub/5ljB6FL+/3o/0lsa/pIodEcqbUfzs=";
43+
};
44+
45+
cargoHash = "sha256-alfaTAgtJLRGI34Bz3ylhY84GHJTqJ0Qg+OqLkU4OR4=";
46+
# rebuild cargoDeps by hand because `.overrideAttrs cargoHash`
47+
# does not reconstruct cargoDeps (a known limitation):
48+
cargoDeps = rustPlatform.fetchCargoVendor {
49+
inherit (finalAttrs) src;
50+
name = "${finalAttrs.pname}-${finalAttrs.version}";
51+
hash = finalAttrs.cargoHash;
52+
patches = finalAttrs.cargoPatches or [];
53+
};
54+
55+
# necessary when not sandboxed
56+
preCheck = ''
57+
export LANG=C.UTF-8
58+
export LC_ALL=C.UTF-8
59+
${preCheck}
60+
'';
61+
});
62+
3463
# many flaky tests
3564
tailscale = tailscale.overrideAttrs {
3665
# doCheck = false;

nixpkgs-config/patches/jj-unstable.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)