From 561586d1a6d09fd2f89d1236479687985afcda4f Mon Sep 17 00:00:00 2001 From: Jasper Woudenberg Date: Sat, 26 Oct 2024 23:17:22 +0200 Subject: [PATCH] jujutsu: pull from branch with openssh support I can't get the mainline version to work with my yubikey-based ssh setup. This branch uses openssh, which should be fine. Here's a PR against the main repo: https://github.com/martinvonz/jj/pull/3191 --- flake.lock | 100 +++++++++++++++++++++++++++++++++++++++++++++++------ flake.nix | 4 ++- 2 files changed, 92 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 44645d6..a742f37 100644 --- a/flake.lock +++ b/flake.lock @@ -48,7 +48,7 @@ "update-systemd-resolved", "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1688380630, @@ -122,6 +122,24 @@ "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -136,7 +154,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1622445595, "narHash": "sha256-m+JRe6Wc5OZ/mKw2bB3+Tl0ZbtyxxxfnAWln8Q5qs+Y=", @@ -151,7 +169,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1634851050, "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", @@ -166,7 +184,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { "locked": { "lastModified": 1649676176, "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", @@ -181,9 +199,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_8": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1694529238, @@ -199,9 +217,32 @@ "type": "github" } }, - "launch": { + "jujutsu": { "inputs": { "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1729681370, + "narHash": "sha256-jDi9bYBzlyJcrjKGEPs17djiQaNnKZjHo9IFRnuvj4E=", + "owner": "bnjmnt4n", + "repo": "jj", + "rev": "0332e18932d040effd9704433070f122adc0ed40", + "type": "github" + }, + "original": { + "owner": "bnjmnt4n", + "ref": "ssh-openssh", + "repo": "jj", + "type": "github" + } + }, + "launch": { + "inputs": { + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -341,7 +382,7 @@ }, "random-colors": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -364,6 +405,7 @@ "inputs": { "agenda-txt": "agenda-txt", "cooklang": "cooklang", + "jujutsu": "jujutsu", "launch": "launch", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -380,9 +422,30 @@ "vim-spell-nl": "vim-spell-nl" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "jujutsu", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729304879, + "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "similar-sort": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "naersk": "naersk", "nixpkgs": "nixpkgs_3" }, @@ -475,9 +538,24 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "todo-txt-web": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] @@ -498,7 +576,7 @@ }, "tree-sitter-roc": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 3d94b69..d722248 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,8 @@ agenda-txt.inputs.nixpkgs.follows = "nixpkgs"; cooklang.url = "github:jwoudenberg/cooklang"; cooklang.inputs.nixpkgs.follows = "nixpkgs"; + jujutsu.url = "github:bnjmnt4n/jj/ssh-openssh"; + jujutsu.inputs.nixpkgs.follows = "nixpkgs-unstable"; launch.url = "github:jwoudenberg/launch"; launch.inputs.nixpkgs.follows = "nixpkgs"; random-colors.url = "github:jwoudenberg/random-colors"; @@ -85,7 +87,7 @@ ]; nvim-treesitter-roc = inputs.tree-sitter-roc.neovimPlugin."${system}"; vim-spell-nl = "${inputs.vim-spell-nl}"; - jujutsu = inputs.nixpkgs-unstable.legacyPackages."x86_64-linux".jujutsu; + jujutsu = inputs.jujutsu.packages."${system}".jujutsu; }; };