From 5bd7726b1c42663f2fb6d97a1d8fb6db694970dd Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Mon, 12 Jan 2026 09:42:37 +0000 Subject: [PATCH] up --- flake.lock | 53 +++++++++++++++++++++++++++++--------------- flake.nix | 4 ++++ overlays/jj-ryu.nix | 18 +++++++++++++++ profiles/jujutsu.nix | 4 +++- 4 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 overlays/jj-ryu.nix diff --git a/flake.lock b/flake.lock index 32d2e75..0a3adf1 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1767718503, - "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", + "lastModified": 1768220509, + "narHash": "sha256-8wMrJP/Xk5Dkm0TxzaERLt3eGFEhHTWaJKUpK3AoL4o=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", + "rev": "7b1d394e7d9112d4060e12ef3271b38a7c43e83b", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1768206322, - "narHash": "sha256-8DEVB7Sd7sWLIEA6ztQem0cZIeEO6sHsih2k7M5wbHw=", + "lastModified": 1768228375, + "narHash": "sha256-0sG4C/dRt3UYOEPooDvObhdqTYrc5taSka7taMJujNs=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "ae040047f7ce666a5f74d5c59b3a72d2f68f0e7c", + "rev": "cf5bb4826aa9715f9909b58b790d428d6950a85d", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1768197147, - "narHash": "sha256-A9LSW/Ay1WqakvrYSl9jnnz5GQvyGoZ/Wcs82m1BMxE=", + "lastModified": 1768230092, + "narHash": "sha256-nOo98fueRmKbFjswkiBpOjZUZjgv3ZPkaC5y0rowFoc=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "314b11f50bbdc5fcc397a800ca9ec1fc01a86861", + "rev": "d650e5f90ab540f960316b368b4b32afa7d1904e", "type": "github" }, "original": { @@ -299,6 +299,22 @@ "type": "github" } }, + "jj-ryu": { + "flake": false, + "locked": { + "lastModified": 1768064162, + "narHash": "sha256-eV850bPWkqMFzHxqflKEA1ZgTajy49F3szh9pk9PH+4=", + "owner": "dmmulroy", + "repo": "jj-ryu", + "rev": "f32369a1ef36abe657d6907b352c6ccf3ca3fcdd", + "type": "github" + }, + "original": { + "owner": "dmmulroy", + "repo": "jj-ryu", + "type": "github" + } + }, "llm-agents": { "inputs": { "blueprint": "blueprint", @@ -306,11 +322,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1768187947, - "narHash": "sha256-AKKMXAzXRj9qc10H7yCwgbfifOK9sQPIJxY+RmnbEEQ=", + "lastModified": 1768227710, + "narHash": "sha256-m6GRI1hzt/jfKaPyyraxUCi0HAc6ROwasemyeWGulJA=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "aaf9b420caf594ebaabf8679c165d8b8793c09e4", + "rev": "321aab84a04492df7230090eabc61fa0b224a106", "type": "github" }, "original": { @@ -382,11 +398,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768149890, - "narHash": "sha256-iihg1oHkVkYHD1pFQifGEP+Rw1g+LZQyDNbtAqpXtNM=", + "lastModified": 1768178648, + "narHash": "sha256-kz/F6mhESPvU1diB7tOM3nLcBfQe7GU7GQCymRlTi/s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d113fe1f7bb454435a5cabae6cd283e64191bb7", + "rev": "3fbab70c6e69c87ea2b6e48aa6629da2aa6a23b0", "type": "github" }, "original": { @@ -413,11 +429,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1768207798, - "narHash": "sha256-suK/X3uTRWQtpP+b/7bymkDzoO2aQDI8sf1DrEwdhW0=", + "lastModified": 1768229562, + "narHash": "sha256-vqtS4NliKWgEG7sgUACsIew7Dy5TmGDY6lGk1ntJa7g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e19dc16ab3bb347394ba919c1b7f0b389010ddca", + "rev": "7d7fcf6c30cb14907cea3db09cf426463ef8ec3c", "type": "github" }, "original": { @@ -488,6 +504,7 @@ "home-manager": "home-manager", "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", + "jj-ryu": "jj-ryu", "llm-agents": "llm-agents", "lumen": "lumen", "nix-homebrew": "nix-homebrew", diff --git a/flake.nix b/flake.nix index c5d8602..55acbed 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,10 @@ url = "github:jnsahaj/lumen"; inputs.nixpkgs.follows = "nixpkgs"; }; + jj-ryu = { + url = "github:dmmulroy/jj-ryu"; + flake = false; + }; }; outputs = inputs @ {flake-parts, ...}: diff --git a/overlays/jj-ryu.nix b/overlays/jj-ryu.nix new file mode 100644 index 0000000..21c2d2d --- /dev/null +++ b/overlays/jj-ryu.nix @@ -0,0 +1,18 @@ +{inputs}: final: prev: let + manifest = (prev.lib.importTOML "${inputs.jj-ryu}/Cargo.toml").package; +in { + jj-ryu = prev.rustPlatform.buildRustPackage { + pname = manifest.name; + version = manifest.version; + + cargoLock.lockFile = "${inputs.jj-ryu}/Cargo.lock"; + + src = inputs.jj-ryu; + + nativeBuildInputs = [prev.pkg-config]; + buildInputs = [prev.openssl]; + OPENSSL_NO_VENDOR = 1; + + doCheck = false; + }; +} diff --git a/profiles/jujutsu.nix b/profiles/jujutsu.nix index 2dd6b28..1875f37 100644 --- a/profiles/jujutsu.nix +++ b/profiles/jujutsu.nix @@ -1,4 +1,6 @@ -{ +{pkgs, ...}: { + home.packages = [pkgs.jj-ryu]; + programs.jujutsu = { enable = true; settings = {