Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.03] vimUtils.vimrcFile: Backport fix packpath order #87543

Merged
merged 1 commit into from May 11, 2020

Conversation

@maralorn
Copy link
Contributor

maralorn commented May 10, 2020

Motivation for this change

This is the backport of #78385. The comments of that PR said it should be backported. Sadly that never happened.

This broke e.g. haskell-vim syntax-highlighting when people upgraded from 19.09 to 20.03.
See: neovimhaskell/haskell-vim#111

My guess is that the problem was introduced into master around 8dccb59 from january. I could be wrong about that, but it definitely worked on 19.09.

So this was broken only for a few weeks. Sadly exactly when the branch-off happened.

@Mic92 @megheaiulian @jonringer

cc: @emptyflask

@bjornfor
Copy link
Contributor

bjornfor commented May 11, 2020

@maralorn : backport commits should be made with "git cherry-pick -x ..."

(cherry picked from commit 5d2ea07)
@maralorn maralorn force-pushed the maralorn:fix-vim-plugin-order branch from 51e2fcc to db204e7 May 11, 2020
@maralorn
Copy link
Contributor Author

maralorn commented May 11, 2020

Didn‘t know. Fixed.

@Mic92 Mic92 merged commit 5adf2a6 into NixOS:release-20.03 May 11, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="db204e7"; rev="db204e759bd0fe80e6e69f7c6c0c8cde6bddf724"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="db204e7"; rev="db204e759bd0fe80e6e69f7c6c0c8cde6bddf724"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="db204e7"; rev="db204e759bd0fe80e6e69f7c6c0c8cde6bddf724"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="db204e7"; rev="db204e759bd0fe80e6e69f7c6c0c8cde6bddf724"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="db204e7"; rev="db204e759bd0fe80e6e69f7c6c0c8cde6bddf724"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="db204e7"; rev="db204e759bd0fe80e6e69f7c6c0c8cde6bddf724"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="db204e7"; rev="db204e759bd0fe80e6e69f7c6c0c8cde6bddf724"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@maralorn maralorn deleted the maralorn:fix-vim-plugin-order branch May 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.