diff --git a/lib/extended.nix b/lib/extended.nix index 4a1e4da..2c031d1 100644 --- a/lib/extended.nix +++ b/lib/extended.nix @@ -63,6 +63,11 @@ let (substring 6 2 longDate) ]); + flakeVer = + flake: + "${flake.shortRev or flake.dirtyShortRev}-${mkDate (toString flake.lastModifiedDate)}"; + + isNixFile = p: hasSuffix ".nix" p; isDefaultNixFile = p: hasSuffix "default.nix" p; filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths; @@ -81,5 +86,6 @@ in mkIfIn isNixFile listNixFilesRecursive + flakeVer ; } diff --git a/modules/languages/roc.nix b/modules/languages/roc.nix index b0a3b09..d298920 100644 --- a/modules/languages/roc.nix +++ b/modules/languages/roc.nix @@ -6,14 +6,23 @@ ... }: let - inherit (lib) mkIfIn; + inherit (lib) mkIfIn flakeVer; + + version = flakeVer inputs.roc; cfg = config.oizys.languages; rocPkgs = inputs.roc.packages.${pkgs.system}; + # I'm setting the versions so the changes are more apparent as flake is updated + roc = rocPkgs.cli.overrideAttrs { + inherit version; + + }; + lang-server = rocPkgs.lang-server.overrideAttrs { + inherit version; + }; + in { config = mkIfIn "roc" cfg { - environment.systemPackages = with rocPkgs; [ - full # cli + lang_server - ]; + environment.systemPackages = [roc lang-server]; }; }