Merge master into staging-next
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
, "bower2nix"
|
||||
, "browserify"
|
||||
, "castnow"
|
||||
, { "texlab-citeproc-build-deps": "../tools/misc/texlab/citeproc" }
|
||||
, "clean-css"
|
||||
, "coffee-script"
|
||||
, "coinmon"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -697,13 +697,13 @@ let
|
||||
sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
|
||||
};
|
||||
};
|
||||
"glob-7.1.5" = {
|
||||
"glob-7.1.6" = {
|
||||
name = "glob";
|
||||
packageName = "glob";
|
||||
version = "7.1.5";
|
||||
version = "7.1.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz";
|
||||
sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==";
|
||||
url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
|
||||
sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
|
||||
};
|
||||
};
|
||||
"global-modules-1.0.0" = {
|
||||
@@ -2651,7 +2651,7 @@ in
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."gauge-2.7.4"
|
||||
sources."getpass-0.1.7"
|
||||
sources."glob-7.1.5"
|
||||
sources."glob-7.1.6"
|
||||
sources."graceful-fs-4.2.3"
|
||||
sources."har-schema-2.0.0"
|
||||
sources."har-validator-5.1.3"
|
||||
|
||||
@@ -391,13 +391,13 @@ let
|
||||
sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
|
||||
};
|
||||
};
|
||||
"glob-7.1.5" = {
|
||||
"glob-7.1.6" = {
|
||||
name = "glob";
|
||||
packageName = "glob";
|
||||
version = "7.1.5";
|
||||
version = "7.1.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz";
|
||||
sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==";
|
||||
url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
|
||||
sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
|
||||
};
|
||||
};
|
||||
"graceful-fs-4.2.3" = {
|
||||
@@ -1319,7 +1319,7 @@ in
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."gauge-2.7.4"
|
||||
sources."getpass-0.1.7"
|
||||
sources."glob-7.1.5"
|
||||
sources."glob-7.1.6"
|
||||
sources."graceful-fs-4.2.3"
|
||||
sources."har-schema-2.0.0"
|
||||
sources."har-validator-5.1.3"
|
||||
|
||||
Reference in New Issue
Block a user