From 302b2e8a5a944c8045dee277beee877128797ccc Mon Sep 17 00:00:00 2001 From: amusingimpala75 <69653100+amusingimpala75@users.noreply.github.com> Date: Wed, 18 Mar 2026 10:38:45 -0400 Subject: [PATCH] jj-spr: switch to my fork in the meantime to fix jj-spr with jj 0.38+ --- flake.lock | 28 ++++++---------------------- flake.nix | 3 +-- modules/home/vcs/jujutsu.nix | 8 +------- 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 3c69dcf..124c228 100644 --- a/flake.lock +++ b/flake.lock @@ -698,15 +698,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1768954826, - "narHash": "sha256-H2aNW6brQ3gIX83gEc8PwgzuscZISFhvQeqr0wVJ17A=", - "owner": "LucioFranco", + "lastModified": 1774295354, + "narHash": "sha256-FaCsr+NSW5wzBLu9vpZxq4tyHV4fMViRuVbm5P3k53Y=", + "owner": "amusingimpala75", "repo": "jj-spr", - "rev": "982602e92542b53639679b3ce9cd71e43237a18d", + "rev": "d03c0d55db97e68427635eb13bb7d638d1dc028a", "type": "github" }, "original": { - "owner": "LucioFranco", + "owner": "amusingimpala75", + "ref": "fix-nix-jj-38", "repo": "jj-spr", "type": "github" } @@ -866,22 +867,6 @@ "type": "github" } }, - "nixpkgs-jj37": { - "locked": { - "lastModified": 1770169770, - "narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1743296961, @@ -1139,7 +1124,6 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_2", "nixpkgs-bleeding": "nixpkgs-bleeding", - "nixpkgs-jj37": "nixpkgs-jj37", "nixpkgs-stable-darwin": "nixpkgs-stable-darwin", "nixpkgs-stable-nixos": "nixpkgs-stable-nixos", "nixvim": "nixvim", diff --git a/flake.nix b/flake.nix index 8a132cf..84d4757 100644 --- a/flake.nix +++ b/flake.nix @@ -73,9 +73,8 @@ nixpkgs.follows = "nixpkgs"; }; - jj-spr.url = "github:LucioFranco/jj-spr"; + jj-spr.url = "github:amusingimpala75/jj-spr/fix-nix-jj-38"; jj-spr.inputs.nixpkgs.follows = "nixpkgs"; - nixpkgs-jj37.url = "github:NixOS/nixpkgs?rev=aa290c9891fa4ebe88f8889e59633d20cc06a5f2"; pi-extensions.url = "github:badlogic/pi-mono?shallow=1&dir=packages/coding-agent/examples/extensions"; pi-extensions.flake = false; diff --git a/modules/home/vcs/jujutsu.nix b/modules/home/vcs/jujutsu.nix index 064d264..af7dfb0 100644 --- a/modules/home/vcs/jujutsu.nix +++ b/modules/home/vcs/jujutsu.nix @@ -7,7 +7,6 @@ }: let cfg = config.my.vcs; - package = inputs.nixpkgs-jj37.legacyPackages.${pkgs.stdenv.hostPlatform.system}.jujutsu; in { options.my.vcs.jujutsu = lib.mkEnableOption "jujutsu configuration"; @@ -15,16 +14,11 @@ in config = lib.mkIf cfg.jujutsu { nixpkgs.overlays = [ (final: prev: { - # Thanks for not having a proper overlay smh - jj-spr = inputs.jj-spr.packages.${final.stdenv.hostPlatform.system}.default.overrideAttrs (old: { - nativeBuildInputs = - old.nativeBuildInputs |> lib.filter (pkg: pkg != prev.jujutsu) |> (list: list ++ [ package ]); - }); + jj-spr = inputs.jj-spr.packages.${final.stdenv.hostPlatform.system}.default; }) ]; programs.jujutsu = { enable = true; - inherit package; settings = { aliases = { features = [ -- knotmirror 0.0.1