feat(jj): Pin to version supporting gerrit send
Gerrit send support is added in https://github.com/martinvonz/jj/pull/2845
We want it, so let's pull in the latest commit from that branch... it's
not perfect but from PR comments it seems stable enough
Change-Id: I9032158d455619374818989ffd37788d6f004684
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/778
Tested-by: Skyler Grey <minion@clicks.codes>
Reviewed-by: Samuel Shuert <coded@clicks.codes>
diff --git a/flake.lock b/flake.lock
index 1bfb671..9770979 100644
--- a/flake.lock
+++ b/flake.lock
@@ -108,7 +108,7 @@
},
"crate2nix_stable": {
"inputs": {
- "flake-utils": "flake-utils_3"
+ "flake-utils": "flake-utils_4"
},
"locked": {
"lastModified": 1702842982,
@@ -127,7 +127,7 @@
},
"devshell": {
"inputs": {
- "flake-utils": "flake-utils_4",
+ "flake-utils": "flake-utils_5",
"nixpkgs": [
"niri-flake",
"crate2nix",
@@ -311,7 +311,7 @@
},
"flake-utils-plus": {
"inputs": {
- "flake-utils": "flake-utils_6"
+ "flake-utils": "flake-utils_7"
},
"locked": {
"lastModified": 1715533576,
@@ -351,6 +351,24 @@
"systems": "systems_4"
},
"locked": {
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_4": {
+ "inputs": {
+ "systems": "systems_5"
+ },
+ "locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
@@ -364,9 +382,9 @@
"type": "github"
}
},
- "flake-utils_4": {
+ "flake-utils_5": {
"inputs": {
- "systems": "systems_5"
+ "systems": "systems_6"
},
"locked": {
"lastModified": 1701680307,
@@ -382,9 +400,9 @@
"type": "github"
}
},
- "flake-utils_5": {
+ "flake-utils_6": {
"inputs": {
- "systems": "systems_6"
+ "systems": "systems_7"
},
"locked": {
"lastModified": 1710146030,
@@ -400,9 +418,9 @@
"type": "github"
}
},
- "flake-utils_6": {
+ "flake-utils_7": {
"inputs": {
- "systems": "systems_7"
+ "systems": "systems_8"
},
"locked": {
"lastModified": 1694529238,
@@ -476,6 +494,29 @@
"type": "github"
}
},
+ "jujutsu": {
+ "inputs": {
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": [
+ "nixpkgs"
+ ],
+ "rust-overlay": "rust-overlay"
+ },
+ "locked": {
+ "lastModified": 1718224411,
+ "narHash": "sha256-qu+y8Np5dzO6UJoYi6fSHzQPLaynoq9aCowMqpI6LI0=",
+ "owner": "martinvonz",
+ "repo": "jj",
+ "rev": "e71a4eefe1d3be84fa80ab4f5d762cad2b8d948f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "martinvonz",
+ "repo": "jj",
+ "rev": "e71a4eefe1d3be84fa80ab4f5d762cad2b8d948f",
+ "type": "github"
+ }
+ },
"lix": {
"flake": false,
"locked": {
@@ -495,7 +536,7 @@
},
"lix-module": {
"inputs": {
- "flake-utils": "flake-utils_2",
+ "flake-utils": "flake-utils_3",
"flakey-profile": "flakey-profile",
"lix": [
"lix"
@@ -761,7 +802,7 @@
"crate2nix",
"flake-compat"
],
- "flake-utils": "flake-utils_5",
+ "flake-utils": "flake-utils_6",
"gitignore": "gitignore",
"nixpkgs": [
"niri-flake",
@@ -797,6 +838,7 @@
"ewwsalmoomedits--eww-widgets": "ewwsalmoomedits--eww-widgets",
"firefox-sidebery-gnome": "firefox-sidebery-gnome",
"home-manager": "home-manager",
+ "jujutsu": "jujutsu",
"lix": "lix",
"lix-module": "lix-module",
"niri-flake": "niri-flake",
@@ -809,6 +851,27 @@
"templates": "templates"
}
},
+ "rust-overlay": {
+ "inputs": {
+ "nixpkgs": [
+ "jujutsu",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1719281921,
+ "narHash": "sha256-LIBMfhM9pMOlEvBI757GOK5l0R58SRi6YpwfYMbf4yc=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "b6032d3a404d8a52ecfc8571ff0c26dfbe221d07",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
"snowfall-lib": {
"inputs": {
"flake-compat": "flake-compat_2",
@@ -956,6 +1019,21 @@
"type": "github"
}
},
+ "systems_8": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"templates": {
"locked": {
"lastModified": 1708553502,
diff --git a/flake.nix b/flake.nix
index febc83b..583cbbf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,6 +31,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
+ jujutsu = {
+ url = "github:martinvonz/jj?rev=e71a4eefe1d3be84fa80ab4f5d762cad2b8d948f";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
lix = {
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix
index 61d3eb1..835a285 100644
--- a/modules/home/git/default.nix
+++ b/modules/home/git/default.nix
@@ -1,4 +1,6 @@
{
+ inputs,
+ system,
config,
lib,
pkgs,
@@ -98,7 +100,7 @@
home.packages =
(if config.chimera.git.gitReview.enable then [ pkgs.git-review ] else [ ])
++ (if config.chimera.git.stgit.enable then [ pkgs.stgit ] else [ ])
- ++ (if config.chimera.git.jj.enable then [ pkgs.jujutsu ] else [ ]);
+ ++ (if config.chimera.git.jj.enable then [ inputs.jujutsu.packages.${system}.jujutsu ] else [ ]);
programs.zsh.shellAliases =
if config.chimera.git.gitReview.enable then { "gr!" = "git review"; } else { };