Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2e5c30c3b6ce
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 34aa254f9ebf
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 22, 2019

  1. Restrict vim update.py to generated.nix

    @tobim
    tobim committed Feb 22, 2019
    Copy the full SHA
    134a061 View commit details

Commits on Mar 3, 2019

  1. Merge pull request #56191 from tobim/restrict-vim-update 

    Restrict vim update.py to generated.nix
    @Mic92
    Mic92 authored Mar 3, 2019
    Copy the full SHA
    34aa254 View commit details
Showing with 8 additions and 4 deletions.
  1. +8 −4 pkgs/misc/vim-plugins/update.py
12 changes: 8 additions & 4 deletions pkgs/misc/vim-plugins/update.py
View file
Original file line number Diff line number Diff line change
@@ -111,16 +111,20 @@ def as_json(self) -> Dict[str, str]:
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)"""