diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2854949..0379012 120000 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1 +1 @@ -/nix/store/i0gadb1792q2qrj1m5fwvcxrd1cc8bkf-pre-commit-config.json \ No newline at end of file +/nix/store/i9wwy5p3qn5258yi6qw4v10m8i0w8cyb-pre-commit-config.json \ No newline at end of file diff --git a/flake.lock b/flake.lock index e84574e..2e71cbe 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1772460678, - "narHash": "sha256-NYaWs8fYJ38IgFld0hGSdT2LEVhrgO8SiRReBjIH7YY=", + "lastModified": 1786464219, + "narHash": "sha256-WKqWL8r7CyTDYueTr2ffJ9ya50dellv6IR1JX5PghDY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "5d2cb726b16ee349df443f84b64cff53221b6983", + "rev": "f3d1804205e8158c15595cdda1b566f93349ffae", "type": "github" }, "original": { @@ -130,16 +130,16 @@ ] }, "locked": { - "lastModified": 1784016262, - "narHash": "sha256-ADTLbHz4pCj5XEi0phjiN5vOLPiWH+P29rXvWXD4WRI=", + "lastModified": 1786695136, + "narHash": "sha256-7MqeyKcuBLVTHQHLKNKnoFVVYye+7NesBjNTuayeJ+c=", "owner": "patrickjaja", - "repo": "claude-desktop-bin", - "rev": "9364a60fb16bafa47bd9ca0e1380d33d669b8019", + "repo": "claude-desktop-extra", + "rev": "548854c1124a9c64d81e642859bb222c62e99d75", "type": "github" }, "original": { "owner": "patrickjaja", - "repo": "claude-desktop-bin", + "repo": "claude-desktop-extra", "type": "github" } }, @@ -189,12 +189,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1783537817, - "narHash": "sha256-1Xu/0aFdCij0oyB5/i5flZBfGXOVCYeDvVE2jSv08PM=", - "rev": "7adcb07f6a603447b1d6aa674ce5747a4a91f029", - "revCount": 426, + "lastModified": 1786121778, + "narHash": "sha256-KV12+FdIAecrnrS97IYhDUUotvnwYMrB+bXirUMPOdA=", + "rev": "c5a93225f633faee482cbd0670e5d6dca0edf9de", + "revCount": 431, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.5/019f4326-f1c4-7f13-b58b-98979a78c513/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.22.0/019fdd2b-320e-7cf1-8321-a350e90231d9/source.tar.gz" }, "original": { "type": "tarball", @@ -204,37 +204,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-oz9PLBISeJ+ipMoi4xmcVG41P/Q8IcptQ62xAJ9ZiZg=", + "narHash": "sha256-MJ6w+0xdY7SGBfk90WzNo9qJAINb7EqywoTUyJf+rbE=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-tvhnv4tS6GIX0DkngUOxWcZ1wW+G7BEOTszojDNDBeY=", + "narHash": "sha256-CL1jY3+NauKiMgH52YE1ZxJ2X78XiOcSaAkAQJa03ek=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-brJCRiMDagnf2TLZLAq7UVfKrgow7I/5uNIXfhZsEWA=", + "narHash": "sha256-n2/CLr4NrldpdfNnBzH3jQL3CdAfxDvya1KzM9Hh5Ec=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/x86_64-linux" } }, "dms": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1783529634, - "narHash": "sha256-zdHsPGPE5MVi/y+uIt548XScTfZjQzdF21dME7ISEJM=", + "lastModified": 1785111455, + "narHash": "sha256-aTNuC9NDBnYAeEtFsleeUwmGX3AZlKOutbl+LQRPkmQ=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "bdfd565b72cbb416441a9ab828efcac4fd516c70", + "rev": "069ddab041c738236a8910e4c39b65d9628d3018", "type": "github" }, "original": { @@ -284,11 +284,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1779670703, - "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", + "lastModified": 1783570805, + "narHash": "sha256-ptl5aRlCv9/uRSv2u8Hq8UFVFeZ6Q/bT049bpqNgc3w=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", + "rev": "5602ed62d638142c1ab31dccd01dfbfb28841225", "type": "github" }, "original": { @@ -300,15 +300,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -370,12 +370,12 @@ ] }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", - "revCount": 377, + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "revCount": 480, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.480%2Brev-17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e/019f2195-dee5-7233-9747-eca0c27f7406/source.tar.gz" }, "original": { "type": "tarball", @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -411,11 +411,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1783704517, - "narHash": "sha256-CKe1Vm0Q+oTO06bnHc9GozOwXJXQy9wXV/uJYPH8qZU=", + "lastModified": 1786145028, + "narHash": "sha256-5i+Pu6D+S3zLTfzjy34dPWMhbHTLnxEg8Tz0O7AAccQ=", "owner": "flox", "repo": "flox", - "rev": "66c183068bf3448caccf0a0d29df5ddf76d37f30", + "rev": "aad7ad29c151b061c2daa4ecb6162491ed834a86", "type": "github" }, "original": { @@ -488,11 +488,11 @@ ] }, "locked": { - "lastModified": 1783008725, - "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=", + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", "type": "github" }, "original": { @@ -504,10 +504,6 @@ "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat", - "gitignore": [ - "determinate", - "nix" - ], "nixpkgs": [ "determinate", "nix", @@ -515,12 +511,12 @@ ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", - "revCount": 1026, + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "revCount": 1231, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1231%2Brev-43b3c1ab9d40fb1dbb008f451988a91e375825e9/019f7135-8fdf-76f0-b1a1-d2c67e91af8d/source.tar.gz" }, "original": { "type": "tarball", @@ -576,11 +572,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1783624671, - "narHash": "sha256-Y+WyXIg6BCC7KqvllsI27q03LmAMqclG5uPJsDWVUn8=", + "lastModified": 1786887518, + "narHash": "sha256-vKQZoNk86Sp7tb2AAAECE38tXF0fmQT7nK4KcB+0WHE=", "owner": "NousResearch", "repo": "hermes-agent", - "rev": "111544d544d6cf6efed9875e116f2daeb76a1211", + "rev": "7095e23eb2066fe9a2f93b99cdbfe0e2b5ece397", "type": "github" }, "original": { @@ -617,11 +613,11 @@ ] }, "locked": { - "lastModified": 1783221248, - "narHash": "sha256-ESQnuNHEDChsB4IxoLRhscVahqkDWkTb+qdIz8euYt4=", + "lastModified": 1785119570, + "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", "owner": "nix-community", "repo": "home-manager", - "rev": "af2beae5f0fae0a4310cc0e6aef2572f56090353", + "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", "type": "github" }, "original": { @@ -647,11 +643,11 @@ ] }, "locked": { - "lastModified": 1772461523, - "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", + "lastModified": 1786464367, + "narHash": "sha256-k58p4wbzIXWyRWrW84pP8tD+iaZSSYiiM+fr0Auk4oU=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", + "rev": "7c895c44e3ca6d28ed68ddd80ec02b02b925e7fc", "type": "github" }, "original": { @@ -676,11 +672,11 @@ ] }, "locked": { - "lastModified": 1772459629, - "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", + "lastModified": 1786464129, + "narHash": "sha256-339AkTlpMYSIvFuG0rnR+8Yg4/AZKeJalshJavlnKfg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", + "rev": "9508458be316a0d70d37ebed1ab725ccd10411ff", "type": "github" }, "original": { @@ -708,11 +704,11 @@ ] }, "locked": { - "lastModified": 1772459629, - "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", + "lastModified": 1786464129, + "narHash": "sha256-339AkTlpMYSIvFuG0rnR+8Yg4/AZKeJalshJavlnKfg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", + "rev": "9508458be316a0d70d37ebed1ab725ccd10411ff", "type": "github" }, "original": { @@ -734,11 +730,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1783103145, - "narHash": "sha256-hSr3iX+Up1fN+om/uc1Np1zkxlXxCEE1hmfVu+ZbxLg=", + "lastModified": 1786644260, + "narHash": "sha256-whKdDsmN1xRgmafBzAth/Rq7nKHuZ1OAk+AuKes4ZM8=", "owner": "hyprwm", "repo": "hyprlauncher", - "rev": "ffea48203dc29a809b7da13a1353a52080b20261", + "rev": "bcb061197be7a01452acc69deddf9e2cb5dd6c4f", "type": "github" }, "original": { @@ -776,11 +772,11 @@ ] }, "locked": { - "lastModified": 1772462885, - "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", + "lastModified": 1786464731, + "narHash": "sha256-USQr9G+TZbHbBHXRwgqTNQ/rQZjDCVByngD/7HuZhmY=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", + "rev": "be487c470a1a10011fb8dccf9fc0f12f1e006cac", "type": "github" }, "original": { @@ -801,11 +797,11 @@ ] }, "locked": { - "lastModified": 1772459870, - "narHash": "sha256-xxkK2Cvqxpf/4UGcJ/TyCwrvmiNWsKsJfFzHMp2bxis=", + "lastModified": 1786642952, + "narHash": "sha256-WGAG9f7YnEjAu33WWxL6kkOyZGgcpiASwdNxpkwr2AQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e63f3a79334dec49f8eb1691f66f18115df04085", + "rev": "2db328fe2b3e8b6a2eee5d17a91ff1ca4177719f", "type": "github" }, "original": { @@ -826,11 +822,11 @@ ] }, "locked": { - "lastModified": 1772459835, - "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", + "lastModified": 1786464033, + "narHash": "sha256-QM8Qe4/L8lpdVN4bgwahmi+jyyc4fisseDMe4afcDxA=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", + "rev": "62e62c1ca23da17612c6890d4ad2064f575643db", "type": "github" }, "original": { @@ -855,11 +851,11 @@ ] }, "locked": { - "lastModified": 1772463520, - "narHash": "sha256-GIjASzYnV4fK19HnyJKmHyqyxHxIpjusK9foEA4Yo+4=", + "lastModified": 1786464294, + "narHash": "sha256-ZQsZ2WvBdkboCIyh8LStDPdAIARmxzn0XMNxxoOhjPE=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "4e1933ae5602b350c5b6633f5c932549c9b8aca2", + "rev": "4ce7cd6b6128c1ac41caf23c58a30a26b327f9dd", "type": "github" }, "original": { @@ -877,12 +873,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1783531012, - "narHash": "sha256-oR+h2cF6jderMyM+CMvGu/gbh8s3xceSY+oFqYOcrGg=", - "rev": "1318433ee92773c7c4ab7b3950c8c24d7a8bcc2b", - "revCount": 26214, + "lastModified": 1786114274, + "narHash": "sha256-Quqthts9sCdYDCelos6cVrlxgJgkGcJNtQmWwFwvPQw=", + "rev": "c9c272f5ab1a99fb149ab2b152bd8cd8d6fa1186", + "revCount": 27199, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.5/019f42f2-bfcf-72d3-ba62-dd63f71ea07e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.22.0/019fdd0b-8551-7d43-a627-08af9d70b415/source.tar.gz" }, "original": { "type": "tarball", @@ -896,11 +892,11 @@ ] }, "locked": { - "lastModified": 1783395956, - "narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=", + "lastModified": 1786845137, + "narHash": "sha256-oQFip+v0luP8NIxJzmiW4Wu8bILsbFWom5l0zonl8hQ=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15", + "rev": "4cff07de74b50e64bdd68cd4e722ab5b6b35ee48", "type": "github" }, "original": { @@ -932,11 +928,11 @@ ] }, "locked": { - "lastModified": 1783414108, - "narHash": "sha256-RY8e+gR2/DhXsYDxGDL6Hhe9+POD9u4+llwxMBqMQDs=", + "lastModified": 1786852476, + "narHash": "sha256-IM5CYtf86W4w8eUPpKcY/LpdHElmVBtJhaKnoTKxZEA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "96d6de10eb281b98f5cfcd1841394c03da5df77c", + "rev": "c7962dc97b45129df8d751bedaf37beb5a17706e", "type": "github" }, "original": { @@ -950,11 +946,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1783582157, - "narHash": "sha256-EteIu2AVVbxzkBnBKjrbdknbpjxBkWTMNg02rXj4mgU=", + "lastModified": 1786867632, + "narHash": "sha256-ez+ubZlA1RtdjCB18a6zJ9M4u8qoPDy08EcnsW5M3Xw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "968980fba2c290b5529025636474eae8457b854c", + "rev": "ff17823245ab9ff7bcae6acf950bd89cba82c38c", "type": "github" }, "original": { @@ -1014,12 +1010,12 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", - "revCount": 1027867, + "lastModified": 1786599213, + "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", + "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", + "revCount": 1053317, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1027867%2Brev-d407951447dcd00442e97087bf374aad70c04cea/019f32d6-f801-7201-b6cb-59773d7eec95/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1053317%2Brev-0e251e24a4f24e036a084b6b4b2d2491af4167f4/019ffab9-5757-7122-a14d-d75093644390/source.tar.gz" }, "original": { "type": "tarball", @@ -1028,26 +1024,26 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1782767157, - "narHash": "sha256-db/8NgfehQlPNt8rMY0J1gvwzTaURU/foM7y/AQimIM=", - "rev": "1d4e0f865d68258aada31e68e6d79c8c463f3b34", - "revCount": 914302, + "lastModified": 1784160687, + "narHash": "sha256-iYL/bixrb6FlHFu/gIuBYzq6c6lM5AAXsXNSWXtIgQc=", + "rev": "4382ed2b7a6839d4280a9b386db49cbc5907414d", + "revCount": 1009383, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.914302%2Brev-1d4e0f865d68258aada31e68e6d79c8c463f3b34/019f1c78-b5ab-7af2-8516-c0d5406b0646/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009383%2Brev-4382ed2b7a6839d4280a9b386db49cbc5907414d/019f6c11-ad78-7500-a194-d18a5bad0fbe/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2511" + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2605" } }, "nixpkgs_3": { "locked": { - "lastModified": 1782723713, - "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", - "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", - "revCount": 1024265, + "lastModified": 1785090369, + "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=", + "rev": "624af665418d3c65d544145b4d34ad696439570e", + "revCount": 1042126, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1024265%2Brev-b5aa0fbd538984f6e3d201be0005b4463d8b09f8/019f3b54-a452-7bf0-9017-aa0cf4ad1907/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1042126%2Brev-624af665418d3c65d544145b4d34ad696439570e/019fcb6c-e772-7cb3-baa0-211e12b79e38/source.tar.gz" }, "original": { "type": "tarball", @@ -1072,11 +1068,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1785318670, + "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5", "type": "github" }, "original": { @@ -1088,11 +1084,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1772433332, - "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", + "lastModified": 1786247143, + "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "rev": "279b4a8275f032c566576b3f181fa0f27197f588", "type": "github" }, "original": { @@ -1117,12 +1113,12 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1783389287, - "narHash": "sha256-0xIy4dVLqq47rA+mRy0hXDfjhQd4E5PoIns/RmB7nR4=", - "rev": "0ad6f47ea4fe188f4bc8f0380f93ae8523337c6c", - "revCount": 1008655, + "lastModified": 1786711500, + "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", + "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d", + "revCount": 1011966, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1008655%2Brev-0ad6f47ea4fe188f4bc8f0380f93ae8523337c6c/019f4063-e8c2-7113-9f39-e4425b111fb0/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1011966%2Brev-02e08985a27c65ffd33d434eeb2e660a2e4dc84d/01a003f1-59bd-7782-b0ed-5cbf8697f61e/source.tar.gz" }, "original": { "type": "tarball", @@ -1136,11 +1132,11 @@ ] }, "locked": { - "lastModified": 1783618499, - "narHash": "sha256-UwLxkIz9HDiARFVocKnGR6OAMs9XAuFRke+InNBmL1A=", + "lastModified": 1786892487, + "narHash": "sha256-zNSXD0iT4o9W99CJQvb02qUCuRGWMYz+RV1uFELt1qs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "313732302e6432d7ce41a9ce2334fdaca879dcd7", + "rev": "2fbc93e021d601c49f83366e6a99e78fd3ebcfef", "type": "github" }, "original": { @@ -1182,11 +1178,11 @@ ] }, "locked": { - "lastModified": 1779766384, - "narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=", + "lastModified": 1785549842, + "narHash": "sha256-DCwBZmGsySF7oKGTRgEv2HvpxVXkHT+38VhTM76k0B4=", "owner": "nix-community", "repo": "NUR", - "rev": "57800b7ab648725ccd33551d01484ee14952ad3f", + "rev": "a9f987b57594e845e3e5cdd423b9a70846d70308", "type": "github" }, "original": { @@ -1234,11 +1230,11 @@ ] }, "locked": { - "lastModified": 1772555609, - "narHash": "sha256-3BA3HnUvJSbHJAlJj6XSy0Jmu7RyP2gyB/0fL7XuEDo=", + "lastModified": 1785115949, + "narHash": "sha256-8AM37BfyGaL2v/SZyg4PupRxJ01Y4htvM+WrTjWrPpo=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "c37f66a953535c394244888598947679af231863", + "rev": "62c0d86027edb1c4f39a5facc09876348144f7c9", "type": "github" }, "original": { @@ -1255,11 +1251,11 @@ ] }, "locked": { - "lastModified": 1772865871, - "narHash": "sha256-/ZTSg97aouL0SlPHaokA4r3iuH9QzHVuWPACD2CUCFY=", + "lastModified": 1784591072, + "narHash": "sha256-zP/WaDxrRu8GANZM61+V2LT/7ycEEdoyLWn7M6WzU7M=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "e537db02e72d553cea470976b9733581bcf5b3ed", + "rev": "e3b599ca2e7fcf93d4edf65d7f19bbf6491724f3", "type": "github" }, "original": { @@ -1327,11 +1323,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1783359251, - "narHash": "sha256-HUiCnEVlJ4n+qJlZojiz/zv+P0cqM5zsg1dxpz2J7Mg=", + "lastModified": 1786383226, + "narHash": "sha256-SM00z+A0/ruFPGCRdoxDnApVGa3A1iLlhRmMvnGH7tU=", "owner": "nix-community", "repo": "stylix", - "rev": "e602ad042f00409f33c8ad2829cd8d59ba345c7e", + "rev": "a01dcef2f28b4106d6b3817ab89280194bf716d3", "type": "github" }, "original": { @@ -1435,11 +1431,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777806186, - "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", + "lastModified": 1785153830, + "narHash": "sha256-fNdfCTeCXU3tZG3TMincd+u68qBHQgCr2Ljr/M1mWP0=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", + "rev": "9bd28ed313560db3c5b605c63bc4e309e78e3fc8", "type": "github" }, "original": { @@ -1451,11 +1447,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1778379944, - "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", + "lastModified": 1785031658, + "narHash": "sha256-mZp9O2LjzdMzlqQF3l3fjqsuPBzXy+1qTfBEUGjTlpk=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", + "rev": "5d2c67f61ea7af36f16865ab6d541cdba41dc257", "type": "github" }, "original": { @@ -1467,11 +1463,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1778378178, - "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", + "lastModified": 1785030526, + "narHash": "sha256-klZf8UviewRkxuu74Bhbq6tqy7oxebQC7UVRWbbtQxU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "9cd816033ff969415b190722cddf134e78a5665f", + "rev": "16f5a8adf4a6b1310d0a61ab172de963e8f76a02", "type": "github" }, "original": { @@ -1492,11 +1488,11 @@ ] }, "locked": { - "lastModified": 1773039484, - "narHash": "sha256-+boo33KYkJDw9KItpeEXXv8+65f7hHv/earxpcyzQ0I=", + "lastModified": 1785277507, + "narHash": "sha256-9Tq3UDX2hD/aveW/HvkBlAmEwJTOlY5HQXJM+L5BGmE=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "b68be7cfeacbed9a3fa38a2b5adc0cfb81d9bb1f", + "rev": "5a836d395cbf5fc22670eb98dd4aa4fc4d406977", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 007e5a8..45685ec 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ agenix.url = "github:ryantm/agenix"; # Claude Desktop claude-desktop = { - url = "github:patrickjaja/claude-desktop-bin"; + url = "github:patrickjaja/claude-desktop-extra"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 891b6ff..c94f8fb 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -242,9 +242,6 @@ in claude-desktop grok-cli pi-coding-agent - hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.desktop - hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.default - # claude-desktop.packages.x86_64-linux.default claude-code buzz-desktop diff --git a/modules/core/default.nix b/modules/core/default.nix index b22fb24..0d4ac4f 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -27,6 +27,11 @@ niri-touchscreen-gestures = final.callPackage ../../pkgs/niri-touchscreen-gestures { }; # Buzz Desktop AppImage wrapper, see pkgs/buzz-desktop. buzz-desktop = final.callPackage ../../pkgs/buzz-desktop { }; + # ollama pinned ahead of nixpkgs (0.32.14 vs the 0.32.7 in stable/unstable). + # See pkgs/ollama for hashing instructions. + ollama = final.callPackage ../../pkgs/ollama { }; + ollama-rocm = final.callPackage ../../pkgs/ollama { acceleration = "rocm"; }; + ollama-vulkan = final.callPackage ../../pkgs/ollama { acceleration = "vulkan"; }; }) (final: prev: { pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ diff --git a/pkgs/ABOUTME.md b/pkgs/ABOUTME.md index 3c5330b..e1b34c2 100644 --- a/pkgs/ABOUTME.md +++ b/pkgs/ABOUTME.md @@ -11,6 +11,7 @@ Packages here are exposed via an overlay defined in `modules/core/default.nix`. | `ds4/` | DwarfStar (`antirez/ds4`) DeepSeek V4 local inference engine, built from source. Backend-parameterized (`backend = "cpu" \| "rocm" \| "cuda"`); tracks `main` and builds per-host. Exposed as `pkgs.ds4` (cpu, default), `pkgs.ds4-rocm` (Strix Halo / gfx1151), `pkgs.ds4-cuda`. Installs the `ds4`, `ds4-server`, `ds4-bench`, `ds4-eval`, `ds4-agent` binaries plus a `ds4-download-model` helper for fetching GGUF weights. Model weights are a runtime concern and not packaged. | | `colibri/` | colibrì (`JustVugg/colibri`) — GLM-5.2/OLMoE local inference engine, built from source, pinned to a tagged release. Backend-parameterized (`backend = "cpu" \| "rocm"`). Exposed as `pkgs.colibri` (cpu, default), `pkgs.colibri-rocm` (Strix Halo / gfx1151). Installs the `coli` CLI (wrapped with the Python env its converter/bench subcommands need) plus the bundled `colibri`/`olmoe` engine binaries. Model weights are a runtime concern and not packaged. | | `niri-touchscreen-gestures/` | Python daemon that reads multi-touch events from a touchscreen via `evdev`, detects 2/3/4-finger swipes (up/down/left/right), and dispatches configurable `niri msg action` commands. Configured via TOML; exposed as `pkgs.niri-touchscreen-gestures`. | +| `ollama/` | Ollama local LLM inference server, pinned ahead of nixpkgs (0.32.14 vs 0.32.7 in stable/unstable). Derived from nixpkgs master's 0.32.13 derivation (FetchContent-based llama.cpp, Vulkan/ROCm backends) bumped to 0.32.14. Exposed as `pkgs.ollama` (cpu), `pkgs.ollama-rocm` (Strix Halo / gfx1151), `pkgs.ollama-vulkan`. | | `buzz-desktop/` | Block Buzz desktop (Type-2 AppImage from `block/buzz`). Wrapped with `appimageTools.wrapType2` plus extra FHS libs (`elfutils`, `zstd`, WebKit/tray, GStreamer good/bad) so it runs on NixOS. Exposed as `pkgs.buzz-desktop` (`buzz-desktop` binary + desktop entry / icons). | ## Adding a New Package diff --git a/pkgs/ollama/default.nix b/pkgs/ollama/default.nix new file mode 100644 index 0000000..611350c --- /dev/null +++ b/pkgs/ollama/default.nix @@ -0,0 +1,339 @@ +# ollama — local LLM inference server, version-pinned ahead of nixpkgs. +# +# Derived from nixpkgs master's ollama package.nix at the 0.32.13 commit +# (which introduced the FetchContent-based llama.cpp build, Vulkan/ROCm/CUDA +# backends, and spirv-headers). Updated to 0.32.14. +# +# UPDATING THIS PACKAGE +# ===================== +# 1. Set `version` to the new tag (without "v"). +# 2. Set `src.hash` to `lib.fakeHash` and attempt a build. +# Copy the "got: sha256-..." value from the Nix error output. +# 3. Set `vendorHash` to `lib.fakeHash` and attempt a build again. +# Copy the "got: sha256-..." value from the Nix error output. +# 4. Check whether LLAMA_CPP_VERSION changed in the new release tag. +# If so, also update `llamaCppVersion` and `llamaCppSrc.hash`. + +{ lib +, buildGoModule +, fetchFromGitHub +, buildEnv +, makeBinaryWrapper +, stdenv +, addDriverRunpath +, cmake +, gitMinimal +, clblast +, libdrm +, rocmPackages +, rocmGpuTargets ? rocmPackages.clr.localGpuTargets or (rocmPackages.clr.gpuTargets or [ ]) +, cudaPackages +, cudaArches ? cudaPackages.flags.realArches or [ ] +, autoAddDriverRunpath +, apple-sdk_15 +, vulkan-tools +, vulkan-headers +, vulkan-loader +, spirv-headers +, shaderc +, ccache +, versionCheckHook +, writableTmpDirAsHomeHook +, config +, # one of `[ null false "rocm" "cuda" "vulkan" ]` + acceleration ? null +, +}: + +assert builtins.elem acceleration [ + null + false + "rocm" + "cuda" + "vulkan" +]; + +let + validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) + (lib.concatStrings [ + "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, " + "but they are mutually exclusive; falling back to cpu" + ]) + (!(config.rocmSupport && config.cudaSupport)); + shouldEnable = + mode: fallback: (acceleration == mode) || (fallback && acceleration == null && validateFallback); + + rocmRequested = shouldEnable "rocm" config.rocmSupport; + cudaRequested = shouldEnable "cuda" config.cudaSupport; + vulkanRequested = acceleration == "vulkan"; + + enableRocm = rocmRequested && stdenv.hostPlatform.isLinux; + enableCuda = cudaRequested && stdenv.hostPlatform.isLinux; + enableVulkan = vulkanRequested && stdenv.hostPlatform.isLinux; + + rocmLibs = [ + rocmPackages.clr + rocmPackages.hipblas-common + rocmPackages.hipblas + rocmPackages.rocblas + rocmPackages.rocsolver + rocmPackages.rocsparse + rocmPackages.rocm-device-libs + rocmPackages.rocm-smi + ]; + rocmPath = buildEnv { + name = "rocm-path"; + paths = rocmLibs; + }; + + cudaLibs = [ + cudaPackages.cuda_cudart + cudaPackages.libcublas + cudaPackages.cccl + ]; + + vulkanLibs = [ + vulkan-headers + vulkan-loader + ]; + + cudaMajorVersion = lib.versions.major cudaPackages.cuda_cudart.version; + + cudaToolkit = buildEnv { + name = "cuda-merged-${cudaMajorVersion}"; + paths = map lib.getLib cudaLibs ++ [ + (lib.getOutput "static" cudaPackages.cuda_cudart) + (lib.getBin (cudaPackages.cuda_nvcc.__spliced.buildHost or cudaPackages.cuda_nvcc)) + ]; + ignoreCollisions = true; + }; + + cudaPath = lib.removeSuffix "-${cudaMajorVersion}" cudaToolkit; + + # Since v0.30, llama.cpp is consumed via CMake FetchContent rather than + # vendored in-tree. Pre-stage the pin so the FetchContent step uses our + # copy instead of trying to clone over the network in the sandbox. + # Check LLAMA_CPP_VERSION in the ollama source tree when bumping. + llamaCppVersion = "b10434"; + llamaCppSrc = fetchFromGitHub { + owner = "ggml-org"; + repo = "llama.cpp"; + tag = llamaCppVersion; + hash = "sha256-Sz0kW1q91YzdrKbZUqMbFJ0DLZrzARSGheUrtCKcoQo="; + }; + + wrapperOptions = [ + "--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'" + ] + ++ lib.optionals enableRocm [ + "--suffix LD_LIBRARY_PATH : '${rocmPath}/lib'" + "--set-default HIP_PATH '${rocmPath}'" + ] + ++ lib.optionals enableCuda [ + "--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib cudaLibs)}'" + ] + ++ lib.optionals enableVulkan [ + "--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib vulkanLibs)}'" + "--set-default OLLAMA_VULKAN '1'" + ]; + wrapperArgs = builtins.concatStringsSep " " wrapperOptions; + + goBuild = + if enableCuda then + buildGoModule.override { stdenv = cudaPackages.backendStdenv; } + else if enableRocm then + buildGoModule.override { inherit (rocmPackages) stdenv; } + else if enableVulkan then + buildGoModule.override { inherit (vulkan-tools) stdenv; } + else + buildGoModule; + + inherit (lib) licenses platforms maintainers; +in +goBuild (finalAttrs: { + pname = "ollama"; + version = "0.32.14"; + + src = fetchFromGitHub { + owner = "ollama"; + repo = "ollama"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wvEG7L61gYI63pfHZ9UnTVQh8QMG3wHMfxEBeshtIKQ="; + }; + + vendorHash = "sha256-HMwoaFBMbpoy8f0I+O+i7kIa9BslLu3FcVWeaIOkpvs="; + proxyVendor = true; + + env = + lib.optionalAttrs enableRocm + { + ROCM_PATH = rocmPath; + CLBlast_DIR = "${clblast}/lib/cmake/CLBlast"; + HIP_PATH = rocmPath; + CFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include"; + CXXFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include"; + } + // lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; } + // lib.optionalAttrs enableVulkan { VULKAN_SDK = shaderc.bin; }; + + nativeBuildInputs = [ + cmake + gitMinimal + ] + ++ lib.optionals enableRocm ( + rocmLibs + ++ [ + rocmPackages.llvm.bintools + ] + ) + ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ] + ++ lib.optionals (enableRocm || enableCuda) [ + makeBinaryWrapper + autoAddDriverRunpath + ] + ++ lib.optionals enableVulkan [ + ccache + spirv-headers + ]; + + buildInputs = + lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) + ++ lib.optionals enableCuda cudaLibs + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ] + ++ lib.optionals enableVulkan vulkanLibs; + + postPatch = '' + substituteInPlace version/version.go \ + --replace-fail 0.0.0 '${finalAttrs.version}' + + rm cmd/launch/*_test.go + + rm -r app + + if [[ ${llamaCppVersion} != $(cat LLAMA_CPP_VERSION) ]]; then + echo "llama-cpp version mismatch, expected ${llamaCppVersion}, but found $(cat LLAMA_CPP_VERSION)" + exit 1 + fi + cp -r ${llamaCppSrc} $TMPDIR/llama-cpp-src + chmod -R +w $TMPDIR/llama-cpp-src + ( cd $TMPDIR/llama-cpp-src && \ + cmake -DPATCH_DIR=$NIX_BUILD_TOP/source/llama/compat \ + -P $NIX_BUILD_TOP/source/llama/compat/apply-patch.cmake ) + ''; + + overrideModAttrs = _: _: { + preBuild = ""; + }; + + preBuild = + let + removeSMPrefix = + str: + let + matched = builtins.match "sm_(.*)" str; + in + if matched == null then str else builtins.head matched; + + cudaArchitectures = builtins.concatStringsSep ";" (map removeSMPrefix cudaArches); + rocmTargets = builtins.concatStringsSep ";" rocmGpuTargets; + + rocmMajorVersion = lib.versions.major rocmPackages.clr.version; + rocmMinorVersion = lib.versions.minor rocmPackages.clr.version; + llamaBackend = + if enableCuda then + "cuda_v${cudaMajorVersion}" + else if enableRocm then + "rocm_v${rocmMajorVersion}_${rocmMinorVersion}" + else if enableVulkan then + "vulkan" + else + ""; + + cmakeFlagsCudaArchitectures = lib.optionalString enableCuda "-DCMAKE_CUDA_ARCHITECTURES='${cudaArchitectures}'"; + cmakeFlagsRocmTargets = lib.optionalString enableRocm "-DAMDGPU_TARGETS='${rocmTargets}'"; + cmakeFlagsBackend = lib.optionalString + ( + llamaBackend != "" + ) "-DOLLAMA_LLAMA_BACKENDS=${llamaBackend}"; + in + '' + ${lib.optionalString enableVulkan '' + export CMAKE_PREFIX_PATH="${spirv-headers}''${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}" + export NIX_CFLAGS_COMPILE="-isystem ${spirv-headers}/include $NIX_CFLAGS_COMPILE" + ''} + cmake -B build \ + -DCMAKE_SKIP_BUILD_RPATH=ON \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ + -DFETCHCONTENT_SOURCE_DIR_LLAMA_CPP="$TMPDIR/llama-cpp-src" \ + -DOLLAMA_MLX_BACKENDS="" \ + $cmakeFlags \ + ${cmakeFlagsCudaArchitectures} \ + ${cmakeFlagsRocmTargets} \ + ${cmakeFlagsBackend} + + cmake --build build -j $NIX_BUILD_CORES + ''; + + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + find $out/lib/ollama -type f \( -name '*.so' -o -name '*.so.*' \) \ + -exec patchelf --shrink-rpath --allowed-rpath-prefixes /nix/store {} + + ''; + + postInstall = '' + mkdir -p $out/lib + cp -r build/lib/ollama $out/lib/ + ''; + + postFixup = + lib.optionalString (enableRocm || enableCuda) '' + wrapProgram "$out/bin/ollama" ${wrapperArgs} + ''; + + ldflags = [ + "-X=github.com/ollama/ollama/version.Version=${finalAttrs.version}" + "-X=github.com/ollama/ollama/server.mode=release" + ]; + + __darwinAllowLocalNetworking = true; + + sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' + (allow file-read* (subpath "/System/Library/Extensions")) + (allow iokit-open (iokit-user-client-class "AGXDeviceUserClient")) + ''; + + checkFlags = + let + skippedTests = [ + "TestPushHandler/unauthorized_push" + "TestPiRun_InstallAndWebSearchLifecycle" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckKeepEnvironment = "HOME"; + + passthru = { + inherit llamaCppSrc llamaCppVersion; + }; + + meta = { + description = + "Get up and running with large language models locally" + + lib.optionalString rocmRequested ", using ROCm for AMD GPU acceleration" + + lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration" + + lib.optionalString vulkanRequested ", using Vulkan for generic GPU acceleration"; + homepage = "https://github.com/ollama/ollama"; + changelog = "https://github.com/ollama/ollama/releases/tag/v${finalAttrs.version}"; + license = licenses.mit; + platforms = + if (rocmRequested || cudaRequested || vulkanRequested) then platforms.linux else platforms.unix; + mainProgram = "ollama"; + maintainers = with maintainers; [ prusnak ]; + broken = stdenv.buildPlatform != stdenv.hostPlatform; + }; +})