diff --git a/flake.lock b/flake.lock index 36b2bd5..6c5b94a 100644 --- a/flake.lock +++ b/flake.lock @@ -610,11 +610,11 @@ ] }, "locked": { - "lastModified": 1746193516, - "narHash": "sha256-7KqthzbP7LbJpo6DtxlTg2Fqcs7HL1iV1vd1mM8q/u0=", + "lastModified": 1746981801, + "narHash": "sha256-+Bfr0KqZV6gZdA7e2kupeoawozaLIHLuiPtC54uxbFc=", "owner": "nix-community", "repo": "home-manager", - "rev": "355a6b937d07a95cb0b753ef513bcaad09128dea", + "rev": "ff915842e4a2e63c4c8c5c08c6870b9d5b3c3ee9", "type": "github" }, "original": { @@ -966,11 +966,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746152631, - "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", + "lastModified": 1746576598, + "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", + "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55", "type": "github" }, "original": { diff --git a/overlay.nix b/overlay.nix index f43e9a9..45654e3 100644 --- a/overlay.nix +++ b/overlay.nix @@ -99,7 +99,7 @@ let rofi-wayland-unwrapped = assert final.lib.assertMsg - (builtins.compareVersions prev.rofi-wayland-unwrapped.version "1.7.8+wayland1" == -1) + (builtins.compareVersions prev.rofi-wayland-unwrapped.version "1.7.8+wayland1" <= 0) "We only need this for https://github.com/lbonn/rofi/commit/f2f22e7edc635f7e4022afcf81a411776268c1c3. Use upstream package instead"; if prev.rofi-wayland-unwrapped.version == "1.7.8+wayland1" then prev.rofi-wayland-unwrapped.overrideAttrs (prev: { @@ -114,23 +114,25 @@ let else prev.rofi-wayland-unwrapped; - ollama = - assert final.lib.assertMsg ( - builtins.compareVersions prev.ollama-cuda.version "0.6.7" < 0 - ) "Remove `ollama` overlay to use upstream version"; - (prev.ollama.override { rocmGpuTargets = [ "gfx1030" ]; }).overrideAttrs ( - finalAttrs: prevAttrs: { - version = "0.6.7"; - src = final.fetchFromGitHub { - owner = "ollama"; - repo = "ollama"; - tag = "v${finalAttrs.version}"; - hash = "sha256-GRqvaD/tAPI9cVlVu+HmRTv5zr7oCHdSlKoFfSLJ4r4="; - fetchSubmodules = true; - }; - vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA="; - } - ); + python312 = prev.python312.override { + packageOverrides = pfinal: pprev: { + langchain = + assert final.lib.assertMsg ( + pprev.langchain.version != "0.3.24" + ) "Revert to 0.3.24 has been applied, remove overlay"; + pprev.langchain.overrideAttrs ( + afinal: aprev: { + version = "0.3.24-fix"; + src = final.fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + tag = "langchain==${afinal.version}"; + hash = "sha256-Up/pH2TxLPiPO49oIa2ZlNeH3TyN9sZSlNsqOIRmlxc="; + }; + } + ); + }; + }; }; overlay-libs = final: prev: {