Merge e7cdd3c8a4 into 8febf44422

flake/packages.nix

@@ -6,7 +6,7 @@
     ...
   }: let
     docs = import ../docs {inherit pkgs inputs lib;};
-    pluginVersion = src: src.shortRev or src.shortDirtyRev or "dirty";
+    pluginVersion = input: input.shortRev or input.shortDirtyRev or "dirty";
   in {
     packages = {
       inherit (docs.manual) htmlOpenTool;
@@ -68,7 +68,7 @@
           };
         };
 
-      # Plugins that need compiling
+      # Plugins that need a compile step
       blink-cmp = pkgs.callPackage ./packages/blink-cmp.nix {
         src = inputs.plugin-blink-cmp;
         version = pluginVersion inputs.plugin-blink-cmp;

flake/packages/blink-cmp.nix

@@ -1,10 +1,12 @@
 {
   rustPlatform,
   hostPlatform,
-  vimUtils,
   src,
   version,
-}: let
+  vimUtils,
+}: {
+  blink-cmp = let
+    inherit version src;
     blink-fuzzy-lib = rustPlatform.buildRustPackage {
       pname = "blink-fuzzy-lib";
       inherit version src;
@@ -32,4 +34,5 @@ in
         mkdir -p target/release
         ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}
       '';
+    };
 }

modules/wrapper/build/config.nix

@@ -45,11 +45,6 @@
       pname = "flutter-tools";
       patches = [../patches/flutter-tools.patch];
     };
-    blink-cmp = pkgs.callPackage ../../../flake/packages/blink-cmp.nix {
-      src = inputs.plugin-blink-cmp;
-      # TODO: extract into helper func
-      version = inputs.plugin-blink-cmp.shortRev or inputs.plugin-blink-cmp.shortDirtyRev or "dirty";
-    };
   };
 
   buildConfigPlugins = plugins: