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.

Sign up for GitHub

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

vimPlugins.coc-prettier: Add override #72506

Merged
merged 4 commits into from
Mar 15, 2020
Merged

vimPlugins.coc-prettier: Add override #72506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47069c0
nodePackages.coc-prettier: init
ersinakinci Feb 21, 2020
347479b
vimPlugins.overrides: add coc-prettier
ersinakinci Nov 2, 2019
588ca6e
neovim: use TMPDIR as home during initilizaiton
ersinakinci Feb 21, 2020
79ca23b
nodePackages: regenerate set
adisbladis Mar 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkgs/applications/editors/neovim/wrapper.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@ let
'' + optionalString (configure != {}) ''
echo "Generating remote plugin manifest"
export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim
# Some plugins assume that the home directory is accessible for
# initializing caches, temporary files, etc. Even if the plugin isn't
# actively used, it may throw an error as soon as Neovim is launched
# (e.g., inside an autoload script), causing manifest generation to
# fail. Therefore, let's create a fake home directory before generating
# the manifest, just to satisfy the needs of these plugins.
#
# See https://github.com/Yggdroot/LeaderF/blob/v1.21/autoload/lfMru.vim#L10
# for an example of this behavior.
export HOME="$(mktemp -d)"
# Launch neovim with a vimrc file containing only the generated plugin
# code. Pass various flags to disable temp file generation
# (swap/viminfo) and redirect errors to stderr.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/node-packages/composition-v10.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ in
import ./node-packages-v10.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}
2 changes: 1 addition & 1 deletion pkgs/development/node-packages/composition-v12.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ in
import ./node-packages-v12.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}
4 changes: 2 additions & 2 deletions pkgs/development/node-packages/composition-v13.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-13_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:

let
nodeEnv = import ./node-env.nix {
Expand All @@ -14,4 +14,4 @@ in
import ./node-packages-v13.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}
1 change: 1 addition & 0 deletions pkgs/development/node-packages/node-packages-v10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
, "browserify"
, "castnow"
, "clean-css"
, "coc-prettier"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't that cause a change in pkgs/development/node-packages/node-packages-v10.nix, instead it generates a new file, which seems weird to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just as a reminder from November, I agree that this is weird, but apparently regenerating the entire node-packages-v10.nix and updating a ton of NPM packages in the process is the blessed path. I'm basing this off of 1) a conversation I had in the #nixos IRC channel and 2) the documentation.

, "coffee-script"
, "coinmon"
, "configurable-http-proxy"
Expand Down
6,646 changes: 4,115 additions & 2,531 deletions pkgs/development/node-packages/node-packages-v10.nix
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions pkgs/development/node-packages/node-packages-v12.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,13 +850,13 @@ let
sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
};
};
"hosted-git-info-2.8.5" = {
"hosted-git-info-2.8.8" = {
name = "hosted-git-info";
packageName = "hosted-git-info";
version = "2.8.5";
version = "2.8.8";
src = fetchurl {
url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz";
sha512 = "kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==";
url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
};
};
"http-signature-1.2.0" = {
Expand Down Expand Up @@ -1309,13 +1309,13 @@ let
sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
};
};
"minimist-1.2.0" = {
"minimist-1.2.5" = {
name = "minimist";
packageName = "minimist";
version = "1.2.0";
version = "1.2.5";
src = fetchurl {
url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
};
};
"minipass-2.9.0" = {
Expand Down Expand Up @@ -1426,13 +1426,13 @@ let
sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
};
};
"nopt-4.0.1" = {
"nopt-4.0.3" = {
name = "nopt";
packageName = "nopt";
version = "4.0.1";
version = "4.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
};
};
"normalize-package-data-2.5.0" = {
Expand Down Expand Up @@ -2578,7 +2578,7 @@ in
})
sources."ms-2.0.0"
sources."nanomatch-1.2.13"
sources."nopt-4.0.1"
sources."nopt-4.0.3"
(sources."object-copy-0.1.0" // {
dependencies = [
sources."define-property-0.2.5"
Expand Down Expand Up @@ -2791,7 +2791,7 @@ in
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
sources."hosted-git-info-2.8.5"
sources."hosted-git-info-2.8.8"
sources."http-signature-1.2.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
Expand Down Expand Up @@ -2980,7 +2980,7 @@ in
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mkdirp-0.5.1"
sources."nopt-4.0.1"
sources."nopt-4.0.3"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
sources."oauth-sign-0.9.0"
Expand Down Expand Up @@ -3033,10 +3033,10 @@ in
node-gyp-build = nodeEnv.buildNodePackage {
name = "node-gyp-build";
packageName = "node-gyp-build";
version = "4.2.0";
version = "4.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.0.tgz";
sha512 = "4oiumOLhCDU9Rronz8PZ5S4IvT39H5+JEv/hps9V8s7RSLhsac0TCP78ulnHXOo8X1wdpPiTayGlM1jr4IbnaQ==";
url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz";
sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw==";
};
buildInputs = globalBuildInputs;
meta = {
Expand Down Expand Up @@ -3091,7 +3091,7 @@ in
sources."mkdirp-0.5.1"
sources."ms-2.1.2"
sources."needle-2.4.0"
sources."nopt-4.0.1"
sources."nopt-4.0.3"
sources."npm-bundled-1.1.1"
sources."npm-normalize-package-bin-1.0.1"
sources."npm-packlist-1.4.8"
Expand All @@ -3106,7 +3106,7 @@ in
sources."process-nextick-args-2.0.1"
(sources."rc-1.2.8" // {
dependencies = [
sources."minimist-1.2.0"
sources."minimist-1.2.5"
];
})
sources."readable-stream-2.3.7"
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/node-packages/node-packages-v13.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,13 +436,13 @@ let
sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
};
};
"hosted-git-info-2.8.5" = {
"hosted-git-info-2.8.8" = {
name = "hosted-git-info";
packageName = "hosted-git-info";
version = "2.8.5";
version = "2.8.8";
src = fetchurl {
url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz";
sha512 = "kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==";
url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
};
};
"http-signature-1.2.0" = {
Expand Down Expand Up @@ -1315,7 +1315,7 @@ in
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
sources."hosted-git-info-2.8.5"
sources."hosted-git-info-2.8.8"
sources."http-signature-1.2.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/node-packages/shell-generate.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ mkShell {
buildInputs = [
bash nodePackages.node2nix
];
NODE_NIXPKGS_PATH = toString ./.;
NODE_NIXPKGS_PATH = ./.;
}

7 changes: 7 additions & 0 deletions pkgs/misc/vim-plugins/overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
, languagetool
, Cocoa, CoreFoundation, CoreServices
, buildVimPluginFrom2Nix
, nodePackages
ersinakinci marked this conversation as resolved.
Show resolved Hide resolved

# coc-go dependency
, go
Expand Down Expand Up @@ -138,6 +139,12 @@ self: super: {
};
};

coc-prettier = buildVimPluginFrom2Nix {
pname = "coc-prettier";
version = nodePackages.coc-prettier.version;
src = "${nodePackages.coc-prettier}/lib/node_modules/coc-prettier";
};

command-t = super.command-t.overrideAttrs(old: {
buildInputs = [ ruby rake ];
buildPhase = ''
Expand Down