Unverified Commit 5ac634e4 authored by Ryan Burns's avatar Ryan Burns Committed by GitHub
Browse files

treewide: prefer standard name for old and final Attrs (#470081)

parents 83d9f516 f60a6c51

doc/languages-frameworks/lua.section.md

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ final: prev: { 
  lua = prev.lua.override {

    packageOverrides = luaself: luaprev: {



      luarocks-nix = luaprev.luarocks-nix.overrideAttrs (oa: {

      luarocks-nix = luaprev.luarocks-nix.overrideAttrs (old: {

        pname = "luarocks-nix";

        src = /home/my_luarocks/repository;

      });

nixos/tests/lomiri-music-app.nix

+2 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ in 
            lomiri-thumbnailer

            # To check if playback actually works, or is broken due to missing codecs, we need to make the app's icons more OCR-able

            (lib.meta.hiPrio (

              suru-icon-theme.overrideAttrs (oa: {

              suru-icon-theme.overrideAttrs (old: {

                # Colour the background in special colours, which we can OCR for

                postPatch = (oa.postPatch or "") + ''

                postPatch = (old.postPatch or "") + ''

                  substituteInPlace suru/actions/scalable/media-playback-pause.svg \

                    --replace-fail 'fill:none' 'fill:${ocrPauseColor}'

pkgs/applications/editors/neovim/build-neovim-plugin.nix

+6 −6
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ let 
    else

      luaAttr;



  luaDrv = originalLuaDrv.overrideAttrs (oa: {

    version = attrs.version or oa.version;

  luaDrv = originalLuaDrv.overrideAttrs (old: {

    version = attrs.version or old.version;

    __intentionallyOverridingVersion = true;

    rockspecVersion = oa.rockspecVersion;

    rockspecVersion = old.rockspecVersion;



    extraConfig = ''

      -- to create a flat hierarchy
@@ -37,13 +37,13 @@ let 


  finalDrv = toVimPlugin (

    luaDrv.overrideAttrs (

      oa:

      old:

      attrs

      // {

        nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [

        nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [

          lua.pkgs.luarocksMoveDataFolder

        ];

        version = "${originalLuaDrv.version}-unstable-${oa.version}";

        version = "${originalLuaDrv.version}-unstable-${old.version}";

        __intentionallyOverridingVersion = true;

      }

    )

pkgs/applications/editors/neovim/tests/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ pkgs.lib.recurseIntoAttrs rec { 
    ${nvim_with_plug}/bin/nvim -V3log.txt -i NONE -c 'color base16-tomorrow-night'  +quit! -e

  '';



  nvim_with_autoconfigure = pkgs.neovim.overrideAttrs (oa: {

  nvim_with_autoconfigure = pkgs.neovim.overrideAttrs {

    plugins = [

      vimPlugins.unicode-vim

      vimPlugins.fzf-hoogle-vim
@@ -211,7 +211,7 @@ pkgs.lib.recurseIntoAttrs rec { 
    autoconfigure = true;

    # legacy wrapper sets it to false

    wrapRc = true;

  });

  };



  nvim_with_runtimeDeps = pkgs.neovim.overrideAttrs {

    plugins = [

pkgs/applications/editors/vim/plugins/overrides.nix

+8 −9
Original line number Diff line number Diff line
@@ -1292,7 +1292,7 @@ assertNoAdditions { 
    '';

  };



  fzf-hoogle-vim = super.fzf-hoogle-vim.overrideAttrs (oa: {

  fzf-hoogle-vim = super.fzf-hoogle-vim.overrideAttrs (old: {

    # add this to your lua config to prevent the plugin from trying to write in the

    # nix store:

    # vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json'
@@ -1301,7 +1301,7 @@ assertNoAdditions { 
      gawk

    ];

    dependencies = [ self.fzf-vim ];

    passthru = oa.passthru // {

    passthru = old.passthru // {



      initLua = "vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json";

    };
@@ -3140,8 +3140,8 @@ assertNoAdditions { 
    dependencies = [ self.plenary-nvim ];

  };



  rocks-nvim = super.rocks-nvim.overrideAttrs (oa: {

    passthru = oa.passthru // {

  rocks-nvim = super.rocks-nvim.overrideAttrs (old: {

    passthru = old.passthru // {

      initLua = ''

        vim.g.rocks_nvim = {

          luarocks_binary = "${neovim-unwrapped.lua.pkgs.luarocks_bootstrap}/bin/luarocks"
@@ -3291,7 +3291,7 @@ assertNoAdditions { 
  };



  sqlite-lua = super.sqlite-lua.overrideAttrs (

    oa:

    old:

    let

      libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";

    in
@@ -3301,7 +3301,7 @@ assertNoAdditions { 
          --replace-fail "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or '${lib.escapeShellArg libsqlite}'"

      '';



      passthru = oa.passthru // {

      passthru = old.passthru // {

        initLua = ''vim.g.sqlite_clib_path = "${libsqlite}"'';

      };
@@ -3692,7 +3692,7 @@ assertNoAdditions { 
        sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9";

      };

    in

    super.unicode-vim.overrideAttrs (oa: {

    super.unicode-vim.overrideAttrs (old: {

      # redirect to /dev/null else changes terminal color

      buildPhase = ''

        cp "${unicode-data}" autoload/unicode/UnicodeData.txt
@@ -3700,8 +3700,7 @@ assertNoAdditions { 
        ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null

      '';



      passthru = oa.passthru // {



      passthru = old.passthru // {

        initLua = ''vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"'';

      };

    });