nki/nix-home
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Update nixpkgs-unstable

Browse source
This commit is contained in:
Natsu Kagami 2025-05-11 19:47:17 +02:00
parent 1d260a1a9a
commit 94b4de3149
Signed by: nki
GPG key ID: 55A032EB38B49ADB
2 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -610,11 +610,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746193516, "lastModified": 1746981801,
"narHash": "sha256-7KqthzbP7LbJpo6DtxlTg2Fqcs7HL1iV1vd1mM8q/u0=", "narHash": "sha256-+Bfr0KqZV6gZdA7e2kupeoawozaLIHLuiPtC54uxbFc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "355a6b937d07a95cb0b753ef513bcaad09128dea", "rev": "ff915842e4a2e63c4c8c5c08c6870b9d5b3c3ee9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -966,11 +966,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1746152631, "lastModified": 1746576598,
"narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55",
"type": "github" "type": "github"
}, },
"original": { "original": {

28
overlay.nix
View file

@ -99,7 +99,7 @@ let
rofi-wayland-unwrapped = rofi-wayland-unwrapped =
assert final.lib.assertMsg 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"; "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 if prev.rofi-wayland-unwrapped.version == "1.7.8+wayland1" then
prev.rofi-wayland-unwrapped.overrideAttrs (prev: { prev.rofi-wayland-unwrapped.overrideAttrs (prev: {
@ -114,24 +114,26 @@ let
else else
prev.rofi-wayland-unwrapped; prev.rofi-wayland-unwrapped;
ollama = python312 = prev.python312.override {
packageOverrides = pfinal: pprev: {
langchain =
assert final.lib.assertMsg ( assert final.lib.assertMsg (
builtins.compareVersions prev.ollama-cuda.version "0.6.7" < 0 pprev.langchain.version != "0.3.24"
) "Remove `ollama` overlay to use upstream version"; ) "Revert to 0.3.24 has been applied, remove overlay";
(prev.ollama.override { rocmGpuTargets = [ "gfx1030" ]; }).overrideAttrs ( pprev.langchain.overrideAttrs (
finalAttrs: prevAttrs: { afinal: aprev: {
version = "0.6.7"; version = "0.3.24-fix";
src = final.fetchFromGitHub { src = final.fetchFromGitHub {
owner = "ollama"; owner = "langchain-ai";
repo = "ollama"; repo = "langchain";
tag = "v${finalAttrs.version}"; tag = "langchain==${afinal.version}";
hash = "sha256-GRqvaD/tAPI9cVlVu+HmRTv5zr7oCHdSlKoFfSLJ4r4="; hash = "sha256-Up/pH2TxLPiPO49oIa2ZlNeH3TyN9sZSlNsqOIRmlxc=";
fetchSubmodules = true;
}; };
vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA=";
} }
); );
}; };
};
};
overlay-libs = final: prev: { overlay-libs = final: prev: {
libs.crane = inputs.crane.mkLib final; libs.crane = inputs.crane.mkLib final;