Commit 307b1253 authored by Janne Heß's avatar Janne Heß Committed by Matthieu Coudron
Browse files

nixos/neovim: Fix neovim runtime path generation

parent 5e1e2914
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -632,6 +632,13 @@
          wherever possible.
        </para>
      </listitem>
      <listitem>
        <para>
          <literal>programs.neovim.runtime</literal> switched to a
          <literal>linkFarm</literal> internally, making it impossible
          to use wildcards in the <literal>source</literal> argument.
        </para>
      </listitem>
    </itemizedlist>
  </section>
  <section xml:id="sec-release-21.11-notable-changes">
+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ pt-services.clipcat.enable).

- Deprecated package aliases in `emacs.pkgs.*` have been removed. These aliases were remnants of the old Emacs package infrastructure. We now use exact upstream names wherever possible.

- `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument.

## Other Notable Changes {#sec-release-21.11-notable-changes}

- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
+1 −12
Original line number Diff line number Diff line
@@ -7,18 +7,7 @@ let

  runtime' = filter (f: f.enable) (attrValues cfg.runtime);

  # taken from the etc module
  runtime = pkgs.stdenvNoCC.mkDerivation {
    name = "runtime";

    builder = ../system/etc/make-etc.sh;

    preferLocalBuild = true;
    allowSubstitutes = false;

    sources = map (x: x.source) runtime';
    targets = map (x: x.target) runtime';
  };
  runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = x.target; path = x.source; }) runtime');

in {
  options.programs.neovim = {