Merge branch 'master' into closure-size

Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
parent 50fccad582 2463e09173
commit 30f14243c3
344 changed files with 58220 additions and 29215 deletions
@@ -59,6 +59,9 @@ stdenv.mkDerivation rec {
  '' + ''
    sed -i "s|/sbin /usr/sbin||" \
           "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
+
+    # make fish pick up completions from nix profile
+    echo "set fish_complete_path (echo \$NIX_PROFILES | tr ' ' '\n')\"/share/fish/vendor_completions.d\" \$fish_complete_path" >> $out/share/fish/config.fish
  '';

  meta = with stdenv.lib; {