From 134a061d935dff774293aa0ae1764a560200778a Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Fri, 22 Feb 2019 15:49:43 +0100
Subject: [PATCH] Restrict vim update.py to generated.nix
---
pkgs/misc/vim-plugins/update.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index d3412822fdf3..8a8e20da8d7e 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -111,16 +111,20 @@ class Plugin:
return copy
-GET_PLUGINS = """(with import <localpkgs> {};
+GET_PLUGINS = f"""(with import <localpkgs> {{}};
let
+ inherit (vimUtils.override {{inherit vim;}}) buildVimPluginFrom2Nix;
+ generated = callPackage {ROOT}/generated.nix {{
+ inherit buildVimPluginFrom2Nix;
+ }};
hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
getChecksum = name: value:
- if hasChecksum value then {
+ if hasChecksum value then {{
submodules = value.src.fetchSubmodules or false;
sha256 = value.src.outputHash;
rev = value.src.rev;
- } else null;
- checksums = lib.mapAttrs getChecksum vimPlugins;
+ }} else null;
+ checksums = lib.mapAttrs getChecksum generated;
in lib.filterAttrs (n: v: v != null) checksums)"""