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

Update nixpkgs and skip rofi-wayland patch if version too old

Browse source
This commit is contained in:
Natsu Kagami 2025-05-04 17:39:28 +02:00
parent 0b5a108993
commit 83ca001fdc
Signed by: nki
GPG key ID: 55A032EB38B49ADB
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -589,11 +589,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744117652, "lastModified": 1745557122,
"narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
overlay.nix
View file

@ -98,8 +98,10 @@ let
}); });
rofi-wayland-unwrapped = rofi-wayland-unwrapped =
assert final.lib.assertMsg (prev.rofi-wayland-unwrapped.version == "1.7.8+wayland1") assert final.lib.assertMsg
(builtins.compareVersions prev.rofi-wayland-unwrapped.version "1.7.8+wayland1" == -1)
"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
prev.rofi-wayland-unwrapped.overrideAttrs (prev: { prev.rofi-wayland-unwrapped.overrideAttrs (prev: {
src = final.fetchFromGitHub { src = final.fetchFromGitHub {
owner = "lbonn"; owner = "lbonn";
@ -108,7 +110,9 @@ let
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-xkf5HWXvzanT9tCDHbVpgUAmQlqmrPMlnv6MbcN0k9E="; hash = "sha256-xkf5HWXvzanT9tCDHbVpgUAmQlqmrPMlnv6MbcN0k9E=";
}; };
}); })
else
prev.rofi-wayland-unwrapped;
ollama = ollama =
assert final.lib.assertMsg ( assert final.lib.assertMsg (