From ef67f8f25d17fdb574ea6a4cbe1356c77b3b82fb Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Tue, 28 Jan 2025 16:26:46 +0100
Subject: [PATCH] flake: add jujutsu to base programs
---
base/programs.nix | 1 +
flake.lock | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
flake.nix | 8 ++++
3 files changed, 103 insertions(+), 2 deletions(-)
diff --git a/base/programs.nix b/base/programs.nix
index 3655de8..08a62ad 100644
--- a/base/programs.nix
+++ b/base/programs.nix
@@ -30,6 +30,7 @@
pciutils
usbutils
# development
+ jujutsu
git
git-crypt
git-lfs
diff --git a/flake.lock b/flake.lock
index 68b0e32..371c4b4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -85,6 +85,24 @@
"inputs": {
"systems": "systems_3"
},
+ "locked": {
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_3": {
+ "inputs": {
+ "systems": "systems_4"
+ },
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@@ -156,6 +174,27 @@
"type": "github"
}
},
+ "jujutsu": {
+ "inputs": {
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": "nixpkgs_3",
+ "rust-overlay": "rust-overlay"
+ },
+ "locked": {
+ "lastModified": 1735790175,
+ "narHash": "sha256-5J1ZfPNyniUK5D3Pt1aKuJ+/8vad3JPxCztBRY591N8=",
+ "owner": "jj-vcs",
+ "repo": "jj",
+ "rev": "041c4fecb77434dd6720e7d7f1ce48d9575ac5f7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "jj-vcs",
+ "ref": "v0.25.0",
+ "repo": "jj",
+ "type": "github"
+ }
+ },
"lix": {
"flake": false,
"locked": {
@@ -172,7 +211,7 @@
},
"lix-module": {
"inputs": {
- "flake-utils": "flake-utils_2",
+ "flake-utils": "flake-utils_3",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
@@ -256,6 +295,22 @@
}
},
"nixpkgs_3": {
+ "locked": {
+ "lastModified": 1731890469,
+ "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "5083ec887760adfe12af64830a66807423a859a7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
"locked": {
"lastModified": 1737404927,
"narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=",
@@ -277,12 +332,34 @@
"disko": "disko",
"flake-utils": "flake-utils",
"home-manager": "home-manager_2",
+ "jujutsu": "jujutsu",
"lix-module": "lix-module",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_4",
"nixpkgs-unstable-small": "nixpkgs-unstable-small"
}
},
+ "rust-overlay": {
+ "inputs": {
+ "nixpkgs": [
+ "jujutsu",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1732242723,
+ "narHash": "sha256-NWI8csIK0ujFlFuEXKnoc+7hWoCiEtINK9r48LUUMeU=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "a229311fcb45b88a95fdfa5cecd8349c809a272a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
"systems": {
"locked": {
"lastModified": 1681028828,
@@ -327,6 +404,21 @@
"repo": "default",
"type": "github"
}
+ },
+ "systems_4": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 622da02..b729103 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,6 +54,13 @@
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
+
+ jujutsu = {
+ type = "github";
+ owner = "jj-vcs";
+ repo = "jj";
+ ref = "v0.25.0";
+ };
};
outputs = {
@@ -97,6 +104,7 @@
})
agenix.overlays.default
+ inputs.jujutsu.overlays.default
]
++ builtins.attrValues self.overlays;
sharedModules =