Merge pull request #39 from lassulus/update/flake-lock · lass.pds.lassul.us/superconfig@6195812

+21 -21

flake.lock

··· 67 67 "treefmt-nix": "treefmt-nix" 68 68 }, 69 69 "locked": { 70 - "lastModified": 1791922661, 71 - "narHash": "sha256-hHtm+OYobiuvKxB81F1oVDAFv5eKEx2xlTCdcYKerO0=", 70 + "lastModified": 1792011985, 71 + "narHash": "sha256-TEMPnqxXeNCuDaSUxlE5PgFjwcMetLP6dojJL0SJ4kM=", 72 72 "owner": "clan-lol", 73 73 "repo": "clan-core", 74 - "rev": "7ac938fe5ce4f96015955964fc447ca55ddd8935", 74 + "rev": "ab789aa769fad70ecc1dfe0f68a9a8ff9e05b74e", 75 75 "type": "github" 76 76 }, 77 77 "original": { ··· 275 275 "uv2nix": "uv2nix" 276 276 }, 277 277 "locked": { 278 - "lastModified": 1791959867, 279 - "narHash": "sha256-DrF6cEPx14ThnAA2wf6cCQBweWJ8oum8ZeEP8VoPQwk=", 278 + "lastModified": 1792051073, 279 + "narHash": "sha256-i6h0xnr+HSZGpaBWuSsACx7uUpYHg5rkCS5NSal8CJo=", 280 280 "owner": "nousresearch", 281 281 "repo": "hermes-agent", 282 - "rev": "0e427d788d253630d38a3a51cd76849e73cd6925", 282 + "rev": "db44c46208f1b421b4ecb7e56bf9d68b0423906f", 283 283 "type": "github" 284 284 }, 285 285 "original": { ··· 328 328 "treefmt-nix": "treefmt-nix_2" 329 329 }, 330 330 "locked": { 331 - "lastModified": 1791996698, 332 - "narHash": "sha256-9UCkQgTbjkSzMlpJHz/2fs93QXSZL4Q+ByASGw6P41M=", 331 + "lastModified": 1792049575, 332 + "narHash": "sha256-0bVIF+LJ1Wdq/6wtcV/TmVDBdcITVu/YcebJ+emvSRA=", 333 333 "owner": "krebs", 334 334 "repo": "kartei", 335 - "rev": "6ea16b8068562dba3aa0746b7b7ec4411bbdcba6", 335 + "rev": "1bac4c52d476d3560523fdf3ed842257183cee98", 336 336 "type": "github" 337 337 }, 338 338 "original": { ··· 352 352 "treefmt-nix": "treefmt-nix_3" 353 353 }, 354 354 "locked": { 355 - "lastModified": 1791976318, 356 - "narHash": "sha256-w7gcrqJmQ7jBezXvudA5GpZGh7ELzz0j/oolYUuSzT8=", 355 + "lastModified": 1792055596, 356 + "narHash": "sha256-N3oVVMiUnOBGEV5XlqJw9leJ9nY0WQHZUFyPQxG81CE=", 357 357 "owner": "numtide", 358 358 "repo": "llm-agents.nix", 359 - "rev": "42e40703df50a5357841310209d9023e8c321458", 359 + "rev": "45f10a17ddd1cae0b2651f0bb13ea13e53d71872", 360 360 "type": "github" 361 361 }, 362 362 "original": { ··· 375 375 ] 376 376 }, 377 377 "locked": { 378 - "lastModified": 1791782818, 379 - "narHash": "sha256-a9ps1IFkL2ynoUnKb1t/9VvfMYFMd4oLxq7JlqqotK4=", 378 + "lastModified": 1792038625, 379 + "narHash": "sha256-TQytwv3tWHSa3fThNph+NlWC1+dqpDRigErtwJeXU/U=", 380 380 "owner": "lassulus", 381 381 "repo": "niks3", 382 - "rev": "96bb25d227672be9a1fc46da43baf0d0cc2bebd0", 382 + "rev": "e4fee1ab67d1e57dcac5b96fee6fb62ae4712b83", 383 383 "type": "github" 384 384 }, 385 385 "original": { ··· 564 564 }, 565 565 "nixpkgs_2": { 566 566 "locked": { 567 - "lastModified": 1791734076, 568 - "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=", 567 + "lastModified": 1791956154, 568 + "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=", 569 569 "owner": "nixos", 570 570 "repo": "nixpkgs", 571 - "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0", 571 + "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044", 572 572 "type": "github" 573 573 }, 574 574 "original": { ··· 587 587 "systems": "systems_3" 588 588 }, 589 589 "locked": { 590 - "lastModified": 1791953364, 591 - "narHash": "sha256-aXrq+WQeUBbDqtqXxfsaCvEPTENBnAKMZ5zgRvmiywM=", 590 + "lastModified": 1792012326, 591 + "narHash": "sha256-DApZIjaKdU4XzglZ56yrPYLhG/ajoyuQ4g4s8tkHqxU=", 592 592 "owner": "nix-community", 593 593 "repo": "nixvim", 594 - "rev": "5b912bd8374a21a3d4f878ac6fae7828401c7bd7", 594 + "rev": "8485794923eb406ce3728af320392226608f724b", 595 595 "type": "github" 596 596 }, 597 597 "original": {

+7 -14

pkgs/flake-module.nix

View file

··· 14 14 # its agents (pkgs.orca is the GNOME screen reader, not this one). 15 15 callPackage = pkgs.newScope { llm-agents = inputs'.llm-agents.packages; }; 16 16 17 - # Wrapper that handles platform-incompatible packages by: 18 - # 1. Catching eval errors during callPackage 19 - # 2. Filtering based on meta.platforms 20 - platformAwareCallPackage = 21 - path: args: 22 - let 23 - result = builtins.tryEval (callPackage path args); 24 - pkg = result.value; 25 - isSupported = result.success && lib.meta.availableOn pkgs.stdenv.hostPlatform pkg; 26 - in 27 - if isSupported then pkg else null; 28 - 29 17 allPackages = lib.packagesFromDirectoryRecursive { 30 - callPackage = platformAwareCallPackage; 18 + inherit callPackage; 31 19 directory = ./.; 32 20 }; 33 21 in 34 - lib.filterAttrs (name: pkg: name != "flake-module" && pkg != null) allPackages; 22 + # Packages for other platforms are left out via meta.platforms, so a 23 + # package's meta must evaluate on every system, also on the ones it 24 + # does not support; a package that throws breaks the evaluation. 25 + lib.filterAttrs ( 26 + name: pkg: name != "flake-module" && lib.meta.availableOn pkgs.stdenv.hostPlatform pkg 27 + ) allPackages; 35 28 }; 36 29 }

+3 -3

configs/orca/server.nix

View file

··· 10 10 ... 11 11 }: 12 12 let 13 - llm = self.inputs.llm-agents.packages.${pkgs.system}; 13 + inherit (self.packages.${pkgs.system}) orca; 14 14 port = 6768; 15 15 in 16 16 { ··· 32 32 self.keys.ssh.massulus.public 33 33 ]; 34 34 packages = [ 35 - llm.orca 35 + orca 36 36 pkgs.omp 37 37 # GitHub issues/PRs in the work item lists. 38 38 pkgs.gh ··· 52 52 "/run/current-system/sw" 53 53 ]; 54 54 serviceConfig = { 55 - ExecStart = "${llm.orca}/bin/orca serve --port ${toString port} --pairing-address ${config.networking.hostName}.r"; 55 + ExecStart = "${orca}/bin/orca serve --port ${toString port} --pairing-address ${config.networking.hostName}.r"; 56 56 Restart = "on-failure"; 57 57 RestartSec = 10; 58 58 User = "orca";

+22 -14

pkgs/nm-dmenu/package.nix

View file

··· 1 1 { pkgs, lib, ... }: 2 2 3 - (pkgs.writers.writeDashBin "nm-dmenu" '' 4 - export PATH=$PATH:${ 5 - lib.makeBinPath [ 6 - (pkgs.writers.writeDashBin "dmenu" '' 7 - exec ${lib.getExe pkgs.rofi} -dmenu "$@" 8 - '') 9 - pkgs.networkmanagerapplet 10 - pkgs.procps 11 - ] 12 - } 13 - exec ${pkgs.networkmanager_dmenu}/bin/networkmanager_dmenu "$@" 14 - '') 15 - // { 3 + let 16 4 meta.platforms = lib.platforms.linux; 17 - } 5 + in 6 + # The writer forces the script at eval time and rofi & co. refuse to evaluate 7 + # off Linux, so reference them only there and keep meta readable elsewhere. 8 + if pkgs.stdenv.hostPlatform.isLinux then 9 + (pkgs.writers.writeDashBin "nm-dmenu" '' 10 + export PATH=$PATH:${ 11 + lib.makeBinPath [ 12 + (pkgs.writers.writeDashBin "dmenu" '' 13 + exec ${lib.getExe pkgs.rofi} -dmenu "$@" 14 + '') 15 + pkgs.networkmanagerapplet 16 + pkgs.procps 17 + ] 18 + } 19 + exec ${pkgs.networkmanager_dmenu}/bin/networkmanager_dmenu "$@" 20 + '') 21 + // { 22 + inherit meta; 23 + } 24 + else 25 + pkgs.runCommand "nm-dmenu" { inherit meta; } ""

+34 -2

pkgs/orca/package.nix

View file

··· 3 3 # for its helper apps relative to the symlink and dies with "Unable to find 4 4 # helper app". Executing the binary by its real path inside the bundle works. 5 5 { 6 + lib, 6 7 stdenvNoCC, 7 8 runtimeShell, 9 + fetchurl, 8 10 llm-agents, 9 11 }: 12 + # stablyai deleted the v1.4.225 and v1.4.226 releases, so llm-agents' src 404s. 13 + # Fails the evaluation once llm-agents moves past them, so the pin gets dropped. 14 + assert lib.assertMsg ( 15 + llm-agents.orca.version == "1.4.226" 16 + ) "llm-agents now ships orca ${llm-agents.orca.version}; remove the 1.4.224 pin in pkgs/orca"; 17 + let 18 + version = "1.4.224"; 19 + platforms = { 20 + x86_64-linux = { 21 + file = "orca-ide_${version}_amd64.deb"; 22 + hash = "sha256-8Dolyl9dHc5Nl5uCOGXevEC0ikGYsbqAbR9KtXYHbAo="; 23 + }; 24 + aarch64-linux = { 25 + file = "orca-ide_${version}_arm64.deb"; 26 + hash = "sha256-89BqCDSQaJzTymaIHtJwfHj2MTTSptk5KEruAFov/NE="; 27 + }; 28 + aarch64-darwin = { 29 + file = "Orca-${version}-arm64-mac.zip"; 30 + hash = "sha256-3tqvPVAipAYnHA0JpL6l2jsXwu32DpGcfkqxKDrXqBQ="; 31 + }; 32 + }; 33 + platform = platforms.${stdenvNoCC.hostPlatform.system}; 34 + pinned = llm-agents.orca.overrideAttrs { 35 + inherit version; 36 + src = fetchurl { 37 + url = "https://github.com/stablyai/orca/releases/download/v${version}/${platform.file}"; 38 + inherit (platform) hash; 39 + }; 40 + }; 41 + in 10 42 if stdenvNoCC.hostPlatform.isDarwin then 11 - llm-agents.orca.overrideAttrs (old: { 43 + pinned.overrideAttrs (old: { 12 44 postInstall = (old.postInstall or "") + '' 13 45 rm $out/bin/orca-ide 14 46 cat >$out/bin/orca-ide <<EOF ··· 19 51 ''; 20 52 }) 21 53 else 22 - llm-agents.orca 54 + pinned

Configure Feed

Configure Feed