diff --git a/flake.lock b/flake.lock index 20310dd..653cdc7 100644 --- a/flake.lock +++ b/flake.lock @@ -589,11 +589,11 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { diff --git a/overlay.nix b/overlay.nix index 7277402..f43e9a9 100644 --- a/overlay.nix +++ b/overlay.nix @@ -98,17 +98,21 @@ let }); 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"; - prev.rofi-wayland-unwrapped.overrideAttrs (prev: { - src = final.fetchFromGitHub { - owner = "lbonn"; - repo = "rofi"; - rev = "3bec3fac59394a475d162e72d5be2fb042115274"; - fetchSubmodules = true; - hash = "sha256-xkf5HWXvzanT9tCDHbVpgUAmQlqmrPMlnv6MbcN0k9E="; - }; - }); + if prev.rofi-wayland-unwrapped.version == "1.7.8+wayland1" then + prev.rofi-wayland-unwrapped.overrideAttrs (prev: { + src = final.fetchFromGitHub { + owner = "lbonn"; + repo = "rofi"; + rev = "3bec3fac59394a475d162e72d5be2fb042115274"; + fetchSubmodules = true; + hash = "sha256-xkf5HWXvzanT9tCDHbVpgUAmQlqmrPMlnv6MbcN0k9E="; + }; + }) + else + prev.rofi-wayland-unwrapped; ollama = assert final.lib.assertMsg (