diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers')
37 files changed, 868 insertions, 1664 deletions
diff --git a/nixpkgs/pkgs/development/compilers/chez/default.nix b/nixpkgs/pkgs/development/compilers/chez/default.nix index 1bac7eb9b95e..a0fc30c85868 100644 --- a/nixpkgs/pkgs/development/compilers/chez/default.nix +++ b/nixpkgs/pkgs/development/compilers/chez/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-error=format-truncation"; + /* ** We patch out a very annoying 'feature' in ./configure, which ** tries to use 'git' to update submodules. diff --git a/nixpkgs/pkgs/development/compilers/dtc/default.nix b/nixpkgs/pkgs/development/compilers/dtc/default.nix index ea305cc5c84c..d92d712a3ff7 100644 --- a/nixpkgs/pkgs/development/compilers/dtc/default.nix +++ b/nixpkgs/pkgs/development/compilers/dtc/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchgit, flex, bison, pkgconfig, python2, swig, which }: +{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which +, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python2, swig +}: stdenv.mkDerivation rec { pname = "dtc"; - version = "1.5.0"; + version = "1.5.1"; src = fetchgit { url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; rev = "refs/tags/v${version}"; - sha256 = "075gj8bbahfdb8dlif3d2dpzjrkyf3bwbcmx96zpwhlgs0da8jxh"; + sha256 = "1jhhfrg22h53lvm2lqhd66pyk20pil08ry03wcwyx1c3ln27k73z"; }; - nativeBuildInputs = [ flex bison pkgconfig swig which ]; - buildInputs = [ python2 ]; + nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python2 swig ]; + buildInputs = lib.optionals pythonSupport [ python2 ]; postPatch = '' patchShebangs pylibfdt/ ''; + makeFlags = lib.optionals (!pythonSupport) [ "NO_PYTHON=1" ]; installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Device Tree Compiler"; homepage = https://git.kernel.org/cgit/utils/dtc/dtc.git; license = licenses.gpl2; # dtc itself is GPLv2, libfdt is dual GPL/BSD diff --git a/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix b/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix index c27f2a226705..bede9fa4aa68 100644 --- a/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix +++ b/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation { description = "Lisp implementation aiming to be small, fast and easy to embed"; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/compilers/edk2/default.nix b/nixpkgs/pkgs/development/compilers/edk2/default.nix index 2a90902df1e7..97af433d6067 100644 --- a/nixpkgs/pkgs/development/compilers/edk2/default.nix +++ b/nixpkgs/pkgs/development/compilers/edk2/default.nix @@ -26,6 +26,7 @@ edk2 = stdenv.mkDerivation { buildInputs = [ libuuid pythonEnv ]; makeFlags = [ "-C BaseTools" ]; + NIX_CFLAGS_COMPILE = "-Wno-return-type -Wno-error=stringop-truncation"; hardeningDisable = [ "format" "fortify" ]; diff --git a/nixpkgs/pkgs/development/compilers/elm/default.nix b/nixpkgs/pkgs/development/compilers/elm/default.nix index c8bef546b6d9..676fa19d9e85 100644 --- a/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; }; - hsPkgs = haskell.packages.ghc864.override { + hsPkgs = haskell.packages.ghc865.override { overrides = self: super: with haskell.lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { @@ -56,6 +56,8 @@ let */ elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test; elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples; + elm-language-server = elmNodePackages."@elm-tooling/elm-language-server"; + # elm-analyse@0.16.4 build is not working elm-analyse = elmNodePackages."elm-analyse-0.16.3"; inherit (elmNodePackages) elm-doc-preview elm-live elm-upgrade elm-xref; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix index 870ad900210a..1ffd758ac82e 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json index 5ba7e49bfa62..9faaaced709e 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json @@ -5,5 +5,6 @@ "elm-upgrade", { "elm-analyse": "0.16.3" }, "elm-live", - "elm-xref" + "elm-xref", + "@elm-tooling/elm-language-server" ] diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix index 7605c377057f..45fb96ed6934 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix @@ -13,6 +13,33 @@ let sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA=="; }; }; + "@nodelib/fs.scandir-2.1.2" = { + name = "_at_nodelib_slash_fs.scandir"; + packageName = "@nodelib/fs.scandir"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz"; + sha512 = "wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w=="; + }; + }; + "@nodelib/fs.stat-2.0.2" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz"; + sha512 = "z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw=="; + }; + }; + "@nodelib/fs.walk-1.2.3" = { + name = "_at_nodelib_slash_fs.walk"; + packageName = "@nodelib/fs.walk"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz"; + sha512 = "l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA=="; + }; + }; "@sindresorhus/is-0.7.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -22,6 +49,42 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; + "@types/events-3.0.0" = { + name = "_at_types_slash_events"; + packageName = "@types/events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; + }; + }; + "@types/glob-7.1.1" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; + sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; + }; + }; + "@types/minimatch-3.0.3" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + }; + }; + "@types/node-12.7.5" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "12.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz"; + sha512 = "9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w=="; + }; + }; "accepts-1.3.7" = { name = "accepts"; packageName = "accepts"; @@ -85,13 +148,13 @@ let sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; - "anymatch-3.0.3" = { + "anymatch-3.1.0" = { name = "anymatch"; packageName = "anymatch"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz"; - sha512 = "c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz"; + sha512 = "Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA=="; }; }; "arr-diff-4.0.0" = { @@ -130,6 +193,15 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; + "array-union-2.1.0" = { + name = "array-union"; + packageName = "array-union"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; + }; + }; "array-unique-0.3.2" = { name = "array-unique"; packageName = "array-unique"; @@ -517,13 +589,13 @@ let sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg=="; }; }; - "chokidar-3.0.0" = { + "chokidar-3.0.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.0.tgz"; - sha512 = "ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz"; + sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; "chownr-1.1.2" = { @@ -544,15 +616,6 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; - "cli-color-1.2.0" = { - name = "cli-color"; - packageName = "cli-color"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-color/-/cli-color-1.2.0.tgz"; - sha1 = "3a5ae74fd76b6267af666e69e2afbbd01def34d1"; - }; - }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; @@ -616,22 +679,13 @@ let sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; }; }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; - }; - }; - "commander-3.0.0" = { + "commander-3.0.1" = { name = "commander"; packageName = "commander"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-3.0.0.tgz"; - sha512 = "pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow=="; + url = "https://registry.npmjs.org/commander/-/commander-3.0.1.tgz"; + sha512 = "UNgvDd+csKdc9GD4zjtkHKQbT8Aspt2jCBqNSPp53vAS0L1tS9sXB2TCEOPHJ7kt9bN/niWkYj8T3RQSoMXdSQ=="; }; }; "component-emitter-1.3.0" = { @@ -670,15 +724,6 @@ let sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; - "connect-pushstate-1.1.0" = { - name = "connect-pushstate"; - packageName = "connect-pushstate"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-pushstate/-/connect-pushstate-1.1.0.tgz"; - sha1 = "bcab224271c439604a0fb0f614c0a5f563e88e24"; - }; - }; "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; @@ -778,6 +823,15 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; + "crocks-0.12.1" = { + name = "crocks"; + packageName = "crocks"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/crocks/-/crocks-0.12.1.tgz"; + sha512 = "2qCRJwBmPlRQXzd50k9gt9PaItultOP8lj/cKSH2Eai9aeBuNqAnDuyolAm9TGn6Pw/4BgbxtPJLU1S+tQ4WMQ=="; + }; + }; "cross-spawn-4.0.0" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -814,15 +868,6 @@ let sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; - "d-1.0.1" = { - name = "d"; - packageName = "d"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; - sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -886,13 +931,13 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; - "default-gateway-2.7.2" = { + "default-gateway-4.2.0" = { name = "default-gateway"; packageName = "default-gateway"; - version = "2.7.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz"; - sha512 = "lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ=="; + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; "define-properties-1.1.3" = { @@ -967,6 +1012,15 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "dir-glob-3.0.1" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + }; "duplexer3-0.1.4" = { name = "duplexer3"; packageName = "duplexer3"; @@ -994,13 +1048,23 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "elm-serve-0.4.0" = { - name = "elm-serve"; - packageName = "elm-serve"; - version = "0.4.0"; + "elm-analyse-git://github.com/elm-tooling/elm-analyse#f2a983fc7bab262a3e44b46732735d8510d18876" = { + name = "elm-analyse"; + packageName = "elm-analyse"; + version = "0.16.4"; + src = fetchgit { + url = "git://github.com/elm-tooling/elm-analyse"; + rev = "f2a983fc7bab262a3e44b46732735d8510d18876"; + sha256 = "ce2770330503a0b8fe56eb369a95e9bad13b46676ff76f5303570d731cea4de2"; + }; + }; + "elm-hot-1.1.1" = { + name = "elm-hot"; + packageName = "elm-hot"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-serve/-/elm-serve-0.4.0.tgz"; - sha512 = "NYXzzaJT/zw8v7jzDWGXuvX3/soj+5NTLHxX0n/T6DICbmyDj8kO7rlI2wSKs9UTNjXhZ7quFQEKcgcf/SZksw=="; + url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.1.tgz"; + sha512 = "ZHjoHd2Ev6riNXNQirj3J+GKKXXwedAUikfFBYzlVL/+3CdGs96cpZ7nhAk4c5l//Qa9ymltrqX36mOlr0pPFA=="; }; }; "elm-test-0.19.0-rev6" = { @@ -1048,13 +1112,13 @@ let sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; }; }; - "es-abstract-1.13.0" = { + "es-abstract-1.14.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.13.0"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz"; - sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz"; + sha512 = "DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg=="; }; }; "es-to-primitive-1.2.0" = { @@ -1066,24 +1130,6 @@ let sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.50" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.50"; - src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz"; - sha512 = "KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw=="; - }; - }; - "es6-iterator-2.0.3" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; - }; - }; "es6-promisify-6.0.2" = { name = "es6-promisify"; packageName = "es6-promisify"; @@ -1093,24 +1139,6 @@ let sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg=="; }; }; - "es6-symbol-3.1.1" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; - }; - }; - "es6-weak-map-2.0.3" = { - name = "es6-weak-map"; - packageName = "es6-weak-map"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; - sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; - }; - }; "escape-html-1.0.3" = { name = "escape-html"; packageName = "escape-html"; @@ -1138,15 +1166,6 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; - }; - }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -1165,22 +1184,22 @@ let sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="; }; }; - "execa-0.10.0" = { + "execa-1.0.0" = { name = "execa"; packageName = "execa"; - version = "0.10.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz"; - sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw=="; + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-1.0.0" = { + "execa-2.0.4" = { name = "execa"; packageName = "execa"; - version = "1.0.0"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + url = "https://registry.npmjs.org/execa/-/execa-2.0.4.tgz"; + sha512 = "VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ=="; }; }; "expand-brackets-2.1.4" = { @@ -1282,6 +1301,24 @@ let sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; + "fast-diff-1.2.0" = { + name = "fast-diff"; + packageName = "fast-diff"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; + }; + }; + "fast-glob-3.0.4" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz"; + sha512 = "wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg=="; + }; + }; "fast-json-stable-stringify-2.0.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; @@ -1291,6 +1328,15 @@ let sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; + "fastq-1.6.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz"; + sha512 = "jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA=="; + }; + }; "fb-watchman-2.0.0" = { name = "fb-watchman"; packageName = "fb-watchman"; @@ -1399,13 +1445,13 @@ let sha1 = "b88673c42009f8821fac2926e99720acee924fae"; }; }; - "follow-redirects-1.8.1" = { + "follow-redirects-1.9.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.8.1.tgz"; - sha512 = "micCIbldHioIegeKs41DoH0KS3AXfFzgS30qVkM6z/XOE/GJgvmsoc839NUqa1B9udYe9dQxgv7KFwng6+p/dw=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz"; + sha512 = "CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A=="; }; }; "for-in-1.0.2" = { @@ -1597,6 +1643,15 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; + "get-stream-5.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; + sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; + }; + }; "get-value-2.0.6" = { name = "get-value"; packageName = "get-value"; @@ -1651,6 +1706,15 @@ let sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg=="; }; }; + "globby-10.0.1" = { + name = "globby"; + packageName = "globby"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz"; + sha512 = "sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A=="; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -1678,15 +1742,6 @@ let sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; }; }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - }; "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; @@ -1840,6 +1895,15 @@ let sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; + "http-errors-1.7.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; + }; + }; "http-proxy-1.17.0" = { name = "http-proxy"; packageName = "http-proxy"; @@ -1876,6 +1940,15 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "ignore-5.1.4" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz"; + sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A=="; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -1912,13 +1985,13 @@ let sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; }; }; - "internal-ip-3.0.1" = { + "internal-ip-4.3.0" = { name = "internal-ip"; packageName = "internal-ip"; - version = "3.0.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz"; - sha512 = "NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q=="; + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; "into-stream-3.1.0" = { @@ -2155,15 +2228,6 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - }; "is-redirect-1.0.0" = { name = "is-redirect"; packageName = "is-redirect"; @@ -2182,13 +2246,13 @@ let sha1 = "5517489b547091b0930e095654ced25ee97e9491"; }; }; - "is-retry-allowed-1.1.0" = { + "is-retry-allowed-1.2.0" = { name = "is-retry-allowed"; packageName = "is-retry-allowed"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; - sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; + sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; }; }; "is-stream-1.1.0" = { @@ -2200,6 +2264,15 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; "is-symbol-1.0.2" = { name = "is-symbol"; packageName = "is-symbol"; @@ -2452,6 +2525,15 @@ let sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; + "lodash-4.17.15" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.15"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; + }; + }; "lowercase-keys-1.0.0" = { name = "lowercase-keys"; packageName = "lowercase-keys"; @@ -2479,15 +2561,6 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; - "lru-queue-0.1.0" = { - name = "lru-queue"; - packageName = "lru-queue"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz"; - sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; - }; - }; "makeerror-1.0.11" = { name = "makeerror"; packageName = "makeerror"; @@ -2533,15 +2606,6 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "memoizee-0.4.14" = { - name = "memoizee"; - packageName = "memoizee"; - version = "0.4.14"; - src = fetchurl { - url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz"; - sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg=="; - }; - }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -2551,6 +2615,24 @@ let sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; }; }; + "merge-stream-2.0.0" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; + }; + }; + "merge2-1.3.0" = { + name = "merge2"; + packageName = "merge2"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz"; + sha512 = "2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw=="; + }; + }; "methods-1.1.2" = { name = "methods"; packageName = "methods"; @@ -2569,6 +2651,15 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; + "micromatch-4.0.2" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + }; + }; "mime-1.4.1" = { name = "mime"; packageName = "mime"; @@ -2587,6 +2678,15 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; + "mime-2.4.3" = { + name = "mime"; + packageName = "mime"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz"; + sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; + }; + }; "mime-db-1.40.0" = { name = "mime-db"; packageName = "mime-db"; @@ -2605,6 +2705,15 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; "mimic-response-1.0.1" = { name = "mimic-response"; packageName = "mimic-response"; @@ -2641,22 +2750,22 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.4.0" = { + "minipass-2.5.1" = { name = "minipass"; packageName = "minipass"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.4.0.tgz"; - sha512 = "6PmOuSP4NnZXzs2z6rbwzLJu/c5gdzYg1mRI/WIYdx45iiX7T+a4esOzavD6V/KmBzAaopFSTZPZcUx73bqKWA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-2.5.1.tgz"; + sha512 = "dmpSnLJtNQioZFI5HfQ55Ad0DzzsMAb+HfokwRTNXwEQjepbTkl5mtIlSVxGIkOkxlpX7wIn5ET/oAd9fZ/Y/Q=="; }; }; - "minizlib-1.2.1" = { + "minizlib-1.2.2" = { name = "minizlib"; packageName = "minizlib"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz"; - sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz"; + sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ=="; }; }; "mixin-deep-1.3.2" = { @@ -2713,13 +2822,13 @@ let sha1 = "5041049269c96633c866386960b2f4289e75e5b0"; }; }; - "mustache-3.0.3" = { + "mustache-3.1.0" = { name = "mustache"; packageName = "mustache"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-3.0.3.tgz"; - sha512 = "vM5FkMHamTYmVYeAujypihuPrJQDtaUIlKeeVb1AMJ73OZLtWiF7GprqrjxD0gJWT53W9JfqXxf97nXQjMQkqA=="; + url = "https://registry.npmjs.org/mustache/-/mustache-3.1.0.tgz"; + sha512 = "3Bxq1R5LBZp7fbFPZzFe5WN4s0q3+gxZaZuZVY+QctYJiCiVgXHOTIC0/HgZuOPFt/6BQcx5u0H2CUOxT/RoGQ=="; }; }; "nan-2.14.0" = { @@ -2749,15 +2858,6 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "next-tick-1.0.0" = { - name = "next-tick"; - packageName = "next-tick"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; - }; - }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -2839,6 +2939,15 @@ let sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; }; + "npm-run-path-3.1.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz"; + sha512 = "Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg=="; + }; + }; "npx-10.2.0" = { name = "npx"; packageName = "npx"; @@ -2875,6 +2984,15 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; + "object-inspect-1.6.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz"; + sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; + }; + }; "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; @@ -2929,13 +3047,22 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "opn-5.3.0" = { - name = "opn"; - packageName = "opn"; - version = "5.3.0"; + "onetime-5.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; - sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g=="; + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; + sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + }; + }; + "open-6.4.0" = { + name = "open"; + packageName = "open"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz"; + sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; }; }; "opn-5.4.0" = { @@ -3001,6 +3128,15 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; + "p-finally-2.0.1" = { + name = "p-finally"; + packageName = "p-finally"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz"; + sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="; + }; + }; "p-is-promise-1.1.0" = { name = "p-is-promise"; packageName = "p-is-promise"; @@ -3109,6 +3245,15 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; + "path-key-3.1.0" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz"; + sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg=="; + }; + }; "path-to-regexp-0.1.7" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -3118,13 +3263,22 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "pem-1.13.2" = { + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + }; + "pem-1.14.2" = { name = "pem"; packageName = "pem"; - version = "1.13.2"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/pem/-/pem-1.13.2.tgz"; - sha512 = "MPJWuEb/r6AG+GpZi2JnfNtGAZDeL/8+ERKwXEWRuST5i+4lq/Uy36B352OWIUSPQGH+HR1HEDcIDi+8cKxXNg=="; + url = "https://registry.npmjs.org/pem/-/pem-1.14.2.tgz"; + sha512 = "TOnPtq3ZFnCniOZ+rka4pk8UIze9xG1qI+wNE7EmkiR/cg+53uVvk5QbkWZ7M6RsuOxzz62FW1hlAobJr/lTOA=="; }; }; "performance-now-2.1.0" = { @@ -3226,13 +3380,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.3.0" = { + "psl-1.4.0" = { name = "psl"; packageName = "psl"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz"; - sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="; + url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; + sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; }; }; "pump-3.0.0" = { @@ -3298,15 +3452,6 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; - "querystringify-2.1.1" = { - name = "querystringify"; - packageName = "querystringify"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; - sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; - }; - }; "range-parser-1.2.1" = { name = "range-parser"; packageName = "range-parser"; @@ -3523,6 +3668,15 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; + "reusify-1.0.4" = { + name = "reusify"; + packageName = "reusify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + }; "rimraf-2.2.8" = { name = "rimraf"; packageName = "rimraf"; @@ -3550,6 +3704,24 @@ let sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; }; }; + "run-parallel-1.1.9" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; + sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + }; + }; + "rxjs-6.5.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz"; + sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA=="; + }; + }; "safe-buffer-5.1.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -3757,6 +3929,15 @@ let sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; + "slash-3.0.0" = { + name = "slash"; + packageName = "slash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; + }; + }; "snapdragon-0.8.2" = { name = "snapdragon"; packageName = "snapdragon"; @@ -3901,6 +4082,24 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; + "string.prototype.trimleft-2.1.0" = { + name = "string.prototype.trimleft"; + packageName = "string.prototype.trimleft"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; + sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw=="; + }; + }; + "string.prototype.trimright-2.1.0" = { + name = "string.prototype.trimright"; + packageName = "string.prototype.trimright"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; + sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg=="; + }; + }; "string_decoder-0.10.31" = { name = "string_decoder"; packageName = "string_decoder"; @@ -3946,6 +4145,15 @@ let sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; }; }; + "strip-final-newline-2.0.0" = { + name = "strip-final-newline"; + packageName = "strip-final-newline"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; + }; + }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -3964,15 +4172,6 @@ let sha1 = "d78c14398297d604fe6588dc3b03deca7b91ba93"; }; }; - "supervisor-0.12.0" = { - name = "supervisor"; - packageName = "supervisor"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supervisor/-/supervisor-0.12.0.tgz"; - sha1 = "de7e6337015b291851c10f3538c4a7f04917ecc1"; - }; - }; "supports-color-2.0.0" = { name = "supports-color"; packageName = "supports-color"; @@ -4063,15 +4262,6 @@ let sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; }; }; - "timers-ext-0.1.7" = { - name = "timers-ext"; - packageName = "timers-ext"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz"; - sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; - }; - }; "tmp-0.0.31" = { name = "tmp"; packageName = "tmp"; @@ -4171,6 +4361,15 @@ let sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; }; }; + "tslib-1.10.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz"; + sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="; + }; + }; "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; @@ -4189,15 +4388,6 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "type-1.0.3" = { - name = "type"; - packageName = "type"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz"; - sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg=="; - }; - }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -4288,13 +4478,13 @@ let sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A=="; }; }; - "upath-1.1.2" = { + "upath-1.2.0" = { name = "upath"; packageName = "upath"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz"; - sha512 = "kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="; + url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; }; "uri-js-4.2.2" = { @@ -4315,15 +4505,6 @@ let sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; - "url-parse-1.4.3" = { - name = "url-parse"; - packageName = "url-parse"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz"; - sha512 = "rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw=="; - }; - }; "url-parse-lax-1.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -4414,6 +4595,60 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; + "vscode-jsonrpc-4.0.0" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz"; + sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="; + }; + }; + "vscode-languageserver-5.2.1" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz"; + sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A=="; + }; + }; + "vscode-languageserver-protocol-3.14.1" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz"; + sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; + }; + }; + "vscode-languageserver-types-3.14.0" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz"; + sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="; + }; + }; + "vscode-uri-1.0.8" = { + name = "vscode-uri"; + packageName = "vscode-uri"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz"; + sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ=="; + }; + }; + "vscode-uri-2.0.3" = { + name = "vscode-uri"; + packageName = "vscode-uri"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.0.3.tgz"; + sha512 = "4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw=="; + }; + }; "walker-1.0.7" = { name = "walker"; packageName = "walker"; @@ -4423,6 +4658,15 @@ let sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; }; }; + "web-tree-sitter-0.15.9" = { + name = "web-tree-sitter"; + packageName = "web-tree-sitter"; + version = "0.15.9"; + src = fetchurl { + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.9.tgz"; + sha512 = "1lf4lnmi8oxuEzI6gpUok2FQlHXOmV1iipltkQvmR785JWnUbjhw1sZnwSCkisQP+/g/aezpMGcW3mjz0uVhMw=="; + }; + }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -4477,15 +4721,6 @@ let sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A=="; }; }; - "ws-5.2.0" = { - name = "ws"; - packageName = "ws"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz"; - sha512 = "c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w=="; - }; - }; "ws-5.2.2" = { name = "ws"; packageName = "ws"; @@ -4504,6 +4739,24 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; + "ws-7.1.1" = { + name = "ws"; + packageName = "ws"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.1.1.tgz"; + sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; + }; + }; + "ws-7.1.2" = { + name = "ws"; + packageName = "ws"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz"; + sha512 = "gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg=="; + }; + }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -4780,12 +5033,12 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.4.0" // { + (sources."minipass-2.5.1" // { dependencies = [ sources."yallist-3.0.3" ]; }) - sources."minizlib-1.2.1" + sources."minizlib-1.2.2" sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -4794,7 +5047,7 @@ in }) sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" - sources."mustache-3.0.3" + sources."mustache-3.1.0" sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."node-elm-compiler-5.0.3" @@ -4824,7 +5077,7 @@ in sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -4949,7 +5202,7 @@ in ]; }) sources."unzip-stream-0.3.0" - sources."upath-1.1.2" + sources."upath-1.2.0" sources."uri-js-4.2.2" sources."urix-0.1.0" sources."use-3.1.1" @@ -5193,12 +5446,12 @@ in sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.4.0" // { + (sources."minipass-2.5.1" // { dependencies = [ sources."yallist-3.0.3" ]; }) - sources."minizlib-1.2.1" + sources."minizlib-1.2.2" sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -5207,7 +5460,7 @@ in }) sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" - sources."mustache-3.0.3" + sources."mustache-3.1.0" sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."node-elm-compiler-5.0.3" @@ -5241,7 +5494,7 @@ in sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -5372,7 +5625,7 @@ in ]; }) sources."unzip-stream-0.3.0" - sources."upath-1.1.2" + sources."upath-1.2.0" sources."uri-js-4.2.2" sources."urix-0.1.0" sources."use-3.1.1" @@ -5465,7 +5718,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-3.0.0" + sources."commander-3.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" @@ -5488,7 +5741,7 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" - sources."es-abstract-1.13.0" + sources."es-abstract-1.14.2" sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -5587,7 +5840,7 @@ in sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-regex-1.0.4" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-symbol-1.0.2" sources."is-windows-1.0.2" @@ -5642,6 +5895,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.6.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.getownpropertydescriptors-2.0.3" @@ -5760,6 +6014,8 @@ in }) sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -5844,7 +6100,7 @@ in sources."ini-1.3.5" sources."is-object-1.0.1" sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" + sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."isexe-2.0.0" sources."isurl-1.0.0" @@ -5983,7 +6239,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.5" - sources."psl-1.3.0" + sources."psl-1.4.0" sources."punycode-2.1.1" sources."qs-6.5.1" sources."range-parser-1.2.1" @@ -6050,57 +6306,46 @@ in elm-live = nodeEnv.buildNodePackage { name = "elm-live"; packageName = "elm-live"; - version = "3.4.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-live/-/elm-live-3.4.1.tgz"; - sha512 = "7J4MCV0uyzfnGznSdVzz9o2vgHQwHSVKgEW/NG7dG7nsDWWxqPudQ/FkHYJFWjkylnRtBZUAtB27ZwnLIsgRUw=="; + url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.0.tgz"; + sha512 = "Yf6afXvBnghRZkefxgXCf/KjCm3DlwT6lfTrjLSc5v0I0VXE2Rc5T9iqXihjg3alh9t8NwDVLL+/py8PkkdC9Q=="; }; dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."anymatch-3.0.3" - sources."async-each-1.0.3" + sources."anymatch-3.1.0" sources."async-limiter-1.0.1" sources."binary-extensions-2.0.0" sources."braces-3.0.2" sources."chalk-1.1.3" sources."charenc-0.0.2" - sources."chokidar-3.0.0" - sources."cli-color-1.2.0" + sources."chokidar-3.0.2" sources."commander-2.17.1" - sources."connect-pushstate-1.1.0" + sources."crocks-0.12.1" sources."cross-spawn-5.0.1" sources."crypt-0.0.2" - sources."d-1.0.1" sources."debug-2.6.9" - sources."default-gateway-2.7.2" + sources."default-gateway-4.2.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."ee-first-1.1.1" - (sources."elm-serve-0.4.0" // { - dependencies = [ - sources."commander-2.9.0" - ]; - }) + sources."elm-hot-1.1.1" sources."encodeurl-1.0.2" - sources."es5-ext-0.10.50" - sources."es6-iterator-2.0.3" + sources."end-of-stream-1.4.1" sources."es6-promisify-6.0.2" - sources."es6-symbol-3.1.1" - sources."es6-weak-map-2.0.3" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."event-emitter-0.3.5" sources."eventemitter3-3.1.2" - (sources."execa-0.10.0" // { + (sources."execa-1.0.0" // { dependencies = [ sources."cross-spawn-6.0.5" ]; }) sources."fill-range-7.0.1" - sources."finalhandler-1.1.1" - (sources."follow-redirects-1.8.1" // { + sources."finalhandler-1.1.2" + (sources."follow-redirects-1.9.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -6108,14 +6353,13 @@ in }) sources."fresh-0.5.2" sources."fsevents-2.0.7" - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" sources."glob-parent-5.0.0" - sources."graceful-readlink-1.0.1" sources."has-ansi-2.0.0" - sources."http-errors-1.6.3" + sources."http-errors-1.7.3" sources."http-proxy-1.17.0" - sources."inherits-2.0.3" - sources."internal-ip-3.0.1" + sources."inherits-2.0.4" + sources."internal-ip-4.3.0" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" @@ -6123,53 +6367,52 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."is-promise-2.1.0" sources."is-stream-1.1.0" sources."is-wsl-1.1.0" sources."isexe-2.0.0" sources."lru-cache-4.1.5" - sources."lru-queue-0.1.0" sources."md5-2.2.1" - sources."memoizee-0.4.14" - sources."mime-1.4.1" - sources."minimist-1.2.0" + sources."mime-2.4.3" sources."ms-2.0.0" - sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" sources."on-finished-2.3.0" - sources."opn-5.3.0" + sources."once-1.4.0" + sources."open-6.4.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."parseurl-1.3.3" sources."path-key-2.0.1" - sources."pem-1.13.2" + sources."pem-1.14.2" sources."picomatch-2.0.7" sources."pseudomap-1.0.2" - sources."querystringify-2.1.1" + sources."pump-3.0.0" sources."range-parser-1.2.1" sources."readdirp-3.1.2" sources."requires-port-1.0.0" sources."semver-5.7.1" - sources."send-0.16.2" - sources."serve-static-1.13.2" - sources."setprototypeof-1.1.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."mime-1.6.0" + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" - sources."supervisor-0.12.0" sources."supports-color-2.0.0" - sources."timers-ext-0.1.7" sources."to-regex-range-5.0.1" - sources."type-1.0.3" + sources."toidentifier-1.0.0" sources."unpipe-1.0.0" - sources."url-parse-1.4.3" sources."which-1.3.1" - sources."ws-5.2.0" + sources."wrappy-1.0.2" + sources."ws-7.1.1" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -6222,4 +6465,248 @@ in bypassCache = true; reconstructLock = true; }; + "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { + name = "_at_elm-tooling_slash_elm-language-server"; + packageName = "@elm-tooling/elm-language-server"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.1.tgz"; + sha512 = "gzN/ee5JfQmg/+2xFq49zRN62ZFeMTu5A0unwQpOf3qLZa8Rz7no6OIaCnl6nEkNsaoAjvZxv1aFJOd2TtNtFw=="; + }; + dependencies = [ + sources."@nodelib/fs.scandir-2.1.2" + sources."@nodelib/fs.stat-2.0.2" + sources."@nodelib/fs.walk-1.2.3" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-12.7.5" + sources."accepts-1.3.7" + sources."ajv-6.10.2" + sources."array-flatten-1.1.1" + sources."array-union-2.1.0" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."babel-runtime-6.18.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."body-parser-1.18.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."bytes-3.0.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."concat-stream-1.5.2" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."core-js-2.6.9" + sources."core-util-is-1.0.2" + sources."cross-spawn-6.0.5" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dir-glob-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + (sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#f2a983fc7bab262a3e44b46732735d8510d18876" // { + dependencies = [ + sources."ultron-1.1.1" + sources."ws-3.3.1" + ]; + }) + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.1" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + (sources."execa-2.0.4" // { + dependencies = [ + sources."is-stream-2.0.0" + ]; + }) + sources."express-4.16.3" + (sources."express-ws-2.0.0" // { + dependencies = [ + sources."ws-1.1.5" + ]; + }) + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-diff-1.2.0" + sources."fast-glob-3.0.4" + sources."fast-json-stable-stringify-2.0.0" + sources."fastq-1.6.0" + sources."fill-range-7.0.1" + sources."finalhandler-1.1.1" + sources."find-0.2.7" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-extra-2.0.0" + sources."fs.realpath-1.0.0" + sources."get-stream-5.1.0" + sources."getpass-0.1.7" + sources."glob-7.1.4" + sources."glob-parent-5.0.0" + sources."globby-10.0.1" + sources."graceful-fs-4.2.2" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."http-errors-1.6.3" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."ignore-5.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ipaddr.js-1.9.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."lodash-4.17.15" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.3.0" + sources."methods-1.1.2" + sources."micromatch-4.0.2" + sources."mime-1.4.1" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."negotiator-0.6.2" + sources."nice-try-1.0.5" + sources."node-watch-0.5.5" + (sources."npm-run-path-3.1.0" // { + dependencies = [ + sources."path-key-3.1.0" + ]; + }) + sources."oauth-sign-0.9.0" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."onetime-5.1.0" + sources."opn-5.4.0" + sources."options-0.0.6" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."p-finally-2.0.1" + sources."parseurl-1.3.3" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."performance-now-2.1.0" + sources."picomatch-2.0.7" + sources."process-nextick-args-1.0.7" + sources."proxy-addr-2.0.5" + sources."psl-1.4.0" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qs-6.5.1" + sources."range-parser-1.2.1" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + sources."setprototypeof-1.0.3" + ]; + }) + sources."readable-stream-2.0.6" + sources."regenerator-runtime-0.9.6" + (sources."request-2.88.0" // { + dependencies = [ + sources."qs-6.5.2" + sources."safe-buffer-5.2.0" + ]; + }) + sources."reusify-1.0.4" + sources."run-parallel-1.1.9" + sources."rxjs-6.5.3" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."semver-5.7.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slash-3.0.0" + sources."sshpk-1.16.1" + sources."statuses-1.4.0" + sources."string_decoder-0.10.31" + sources."strip-final-newline-2.0.0" + sources."sums-0.2.4" + sources."through2-2.0.1" + sources."tmp-0.0.31" + sources."to-regex-range-5.0.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."traverse-chain-0.1.0" + sources."tslib-1.10.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."ultron-1.0.2" + sources."unpipe-1.0.0" + sources."uri-js-4.2.2" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.3.3" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."vscode-jsonrpc-4.0.0" + (sources."vscode-languageserver-5.2.1" // { + dependencies = [ + sources."vscode-uri-1.0.8" + ]; + }) + sources."vscode-languageserver-protocol-3.14.1" + sources."vscode-languageserver-types-3.14.0" + sources."vscode-uri-2.0.3" + sources."web-tree-sitter-0.15.9" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."ws-7.1.2" + sources."xtend-4.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Implementation of an elm language server in node."; + homepage = "https://github.com/elm-tooling/elm-language-server#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index f5572c077f31..129ca72251fc 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -373,6 +373,9 @@ stdenv.mkDerivation ({ stdenv.lib.platforms.freebsd ++ stdenv.lib.platforms.illumos ++ stdenv.lib.platforms.darwin; + + # See #40038 + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.2.2.nix b/nixpkgs/pkgs/development/compilers/ghc/8.2.2.nix deleted file mode 100644 index a034e4ec8dd8..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghc/8.2.2.nix +++ /dev/null @@ -1,276 +0,0 @@ -{ stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx -, bash -, runCommand - -, libiconv ? null, ncurses - -, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.useiOSPrebuilt - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" -, # Whether to backport https://phabricator.haskell.org/D4388 for - # deterministic profiling symbol names, at the cost of a slightly - # non-standard GHC API - deterministicProfiling ? false -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: [ ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation (rec { - version = "8.2.2"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - (fetchpatch { # Fix STRIP to be substituted from configure - url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; - sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; - }) - (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) - ] ++ stdenv.lib.optionals (hostPlatform != targetPlatform) [ - # Cherry-pick a few commits from newer hsc2hs so that proper binary is - # installed -- stage 2 normally but stage 1 with cross. - # - # TODO make unconditional next mass rebuild. - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/ecdac062b5cf1d284906487849c56f4e149b3c8e"; - sha256 = "1gagswi26j50z44sdx0mk1sb3wr0nrqyaph9j724zp6iwqslxyzm"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/598303cbffcd230635fbce28ce4105d177fdf76a"; - sha256 = "0hqcg434qbh1bz1pk85cap2q4v9i8bs6x65yzq4spz6xk3zq6af7"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/9483ad10064fbbb97ab525280623826b1ef63959"; - sha256 = "1cpfdhfc0cz9xkjzkcgwx4fbyj96dkmd04wpwi1vji7fahw8kmf3"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - (fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf"; - sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; - extraPrefix = "utils/hsc2hs/"; - stripLen = 1; - }) - ] ++ stdenv.lib.optionals (hostPlatform != targetPlatform && targetPlatform.system == hostPlatform.system) [ - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch"; - sha256 = "1hxj80bjx0x3w0f35cj3k2wipppr1ald03jwfy5q0xlxygdha17w"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch"; - sha256 = "12xsln3zyfpvml8bwdpbc003h6zl1qh2qcq1rhdrw02n45dz8lvc"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch"; - sha256 = "03dcqf5af3vjhrky3f2z26j4d9h8qd9nkv76xp0l97h4cqk7vfqb"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch"; - sha256 = "0pi2m85wjxaaablq6n4q5vyn9qxvry5d7nmja4b28i68yb4ly9g1"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/08a41d2dff99645af6ac5a7bb4774f5f193b6f20/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch"; - sha256 = "1fszfavf1cvrf02x500mi7jykcpvpl2i7i4qzr2qz9sbmyq063f0"; - }) - ] ++ stdenv.lib.optional deterministicProfiling - (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism - url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; - sha256 = "1lyysz6hfd1njcigpm8xppbnkadqfs0kvrp7s8vqgb38pjswj5hg"; - }) - ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform) [ - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - "--disable-large-address-space" - ]; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - # Make sure we never relax`$PATH` and hooks support for compatability. - strictDeps = true; - - nativeBuildInputs = [ - autoconf autoreconfHook automake perl python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - # See #63511 - the only unstripped file is the debug rts which isn't meant to - # be stripped. - dontStrip = true; - - checkTarget = "test"; - doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop." - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.2.2"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix deleted file mode 100644 index 18b2407a90ba..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix +++ /dev/null @@ -1,251 +0,0 @@ -{ stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whetherto build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] - ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation (rec { - version = "8.6.4"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "0fihs1sr0hpk67dn9cmrsav13kkcp9hz8ggdqcrs80rj8vj0fpav"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - (fetchpatch rec { # https://phabricator.haskell.org/D5123 - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D5123.diff"; - sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; - }) - (fetchpatch { # https://github.com/haskell/haddock/issues/900 - url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; - name = "loadpluginsinmodules.diff"; - sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; - extraPrefix = "utils/haddock/"; - stripLen = 1; - }) - ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatability. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - # See #63511 - the only unstripped file is the debug rts which isn't meant to - # be stripped. - dontStrip = true; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.6.4"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/nixpkgs/pkgs/development/compilers/ghc/abi-depends-determinism.nix b/nixpkgs/pkgs/development/compilers/ghc/abi-depends-determinism.nix deleted file mode 100644 index bc803b74617f..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghc/abi-depends-determinism.nix +++ /dev/null @@ -1,12 +0,0 @@ -# https://phabricator.haskell.org/D4159 to fix non-determinism in -# cached abi-depends fields in package databases, modified to only -# contain hunks that exist in distribution tarballs. -{ fetchpatch, runCommand }: let - base = fetchpatch rec { # Non-determinism in cached abi-depends fields - # Originally https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D4159.diff"; - sha256 = "0b8a08sisf1swmarm6nh9rgw7cpzi2rwdzvrd6ny49c7wk0f7x4b"; - }; -in runCommand base.name {} - "sed -n '/utils\\/ghc-pkg/,$p' ${base} >$out" diff --git a/nixpkgs/pkgs/development/compilers/go/1.11.nix b/nixpkgs/pkgs/development/compilers/go/1.11.nix deleted file mode 100644 index 32847a2671c5..000000000000 --- a/nixpkgs/pkgs/development/compilers/go/1.11.nix +++ /dev/null @@ -1,232 +0,0 @@ -{ stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation -, mailcap, runtimeShell -, buildPackages, pkgsTargetTarget -}: - -let - - inherit (stdenv.lib) optionals optionalString; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - i686 = "386"; - x86_64 = "amd64"; - aarch64 = "arm64"; - arm = "arm"; - armv5tel = "arm"; - armv6l = "arm"; - armv7l = "arm"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.11.13"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0xj0pbviikdf8g0sfz5hwxf7hwz8b8g5akqnrvyclhgnsdghjcjh"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; - buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - substituteInPlace src/mime/type_unix.go \ - --replace '/etc/mime.types' '${mailcap}/etc/mime.types' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/areturn' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/areturn' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - '' + optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.12.1.patch - ./remove-test-pie.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./remove-fhs-test-references.patch - ./skip-external-network-tests.patch - ./skip-nohup-tests.patch - # breaks under load: https://github.com/golang/go/issues/25628 - ./skip-test-extra-files-on-386.patch - ]; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" - else - null; - - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - # Independent from host/target, CC should produce code for the building system. - export CC=${buildPackages.stdenv.cc}/bin/cc - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/{bootstrap,obj} - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ goBootstrap ]; - - meta = with stdenv.lib; { - branch = "1.11"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/nixpkgs/pkgs/development/compilers/iasl/default.nix b/nixpkgs/pkgs/development/compilers/iasl/default.nix index b1b31aecae13..fccdf7a978d4 100644 --- a/nixpkgs/pkgs/development/compilers/iasl/default.nix +++ b/nixpkgs/pkgs/development/compilers/iasl/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl, bison, flex}: +{stdenv, fetchurl, fetchpatch, bison, flex}: stdenv.mkDerivation rec { pname = "iasl"; - version = "20181213"; + version = "20190108"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1vgqlv9pvxc52faxixpgz7hi1awqmj88bw5vqn3bldf6fmkh147w"; + sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; }; - NIX_CFLAGS_COMPILE = "-O3"; + NIX_CFLAGS_COMPILE = [ + "-O3" + ]; buildFlags = "iasl"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/D17533-1.patch b/nixpkgs/pkgs/development/compilers/llvm/3.8/D17533-1.patch deleted file mode 100644 index 79ca953d6e5b..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/D17533-1.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit eb92f5a745014532b83abfba04602fce87ca8393 -Author: Chuang-Yu Cheng <cycheng@multicorewareinc.com> -Date: Fri Apr 8 12:04:32 2016 +0000 - - CXX_FAST_TLS calling convention: performance improvement for PPC64 - - This is the same change on PPC64 as r255821 on AArch64. I have even borrowed - his commit message. - - The access function has a short entry and a short exit, the initialization - block is only run the first time. To improve the performance, we want to - have a short frame at the entry and exit. - - We explicitly handle most of the CSRs via copies. Only the CSRs that are not - handled via copies will be in CSR_SaveList. - - Frame lowering and prologue/epilogue insertion will generate a short frame - in the entry and exit according to CSR_SaveList. The majority of the CSRs will - be handled by register allcoator. Register allocator will try to spill and - reload them in the initialization block. - - We add CSRsViaCopy, it will be explicitly handled during lowering. - - 1> we first set FunctionLoweringInfo->SplitCSR if conditions are met (the target - supports it for the given machine function and the function has only return - exits). We also call TLI->initializeSplitCSR to perform initialization. - 2> we call TLI->insertCopiesSplitCSR to insert copies from CSRsViaCopy to - virtual registers at beginning of the entry block and copies from virtual - registers to CSRsViaCopy at beginning of the exit blocks. - 3> we also need to make sure the explicit copies will not be eliminated. - - Author: Tom Jablin (tjablin) - Reviewers: hfinkel kbarton cycheng - - http://reviews.llvm.org/D17533 - - git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265781 91177308-0d34-0410-b5e6-96231b3b80d8 - -diff --git a/lib/CodeGen/TargetFrameLoweringImpl.cpp b/lib/CodeGen/TargetFrameLoweringImpl.cpp -index 679ade1..0a0e079 100644 ---- a/lib/CodeGen/TargetFrameLoweringImpl.cpp -+++ b/lib/CodeGen/TargetFrameLoweringImpl.cpp -@@ -63,12 +63,15 @@ void TargetFrameLowering::determineCalleeSaves(MachineFunction &MF, - const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo(); - const MCPhysReg *CSRegs = TRI.getCalleeSavedRegs(&MF); - -+ // Resize before the early returns. Some backends expect that -+ // SavedRegs.size() == TRI.getNumRegs() after this call even if there are no -+ // saved registers. -+ SavedRegs.resize(TRI.getNumRegs()); -+ - // Early exit if there are no callee saved registers. - if (!CSRegs || CSRegs[0] == 0) - return; - -- SavedRegs.resize(TRI.getNumRegs()); -- - // In Naked functions we aren't going to save any registers. - if (MF.getFunction()->hasFnAttribute(Attribute::Naked)) - return; diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/default.nix deleted file mode 100644 index 0276393d840c..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }: - -let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { - pname = "clang"; - inherit version; - - src = fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"; - - unpackPhase = '' - unpackFile $src - mv cfe-${version}.src clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libxml2 llvm python ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ - # Maybe with compiler-rt this won't be needed? - (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ - (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); - - patches = [ ./purity.patch ]; - - postPatch = '' - sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp - ''; - - outputs = [ "out" "lib" "python" ]; - - # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix - postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - fi - - ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ - ln -sv $out/bin/clang $out/bin/cpp - - # Move libclang to 'lib' output - moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/share/clang/cmake/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - - mkdir -p $python/bin $python/share/clang/ - mv $out/bin/{git-clang-format,scan-view} $python/bin - if [ -e $out/bin/set-xcode-analyzer ]; then - mv $out/bin/set-xcode-analyzer $python/bin - fi - mv $out/share/clang/*.py $python/share/clang - - rm $out/bin/c-index-test - ''; - - enableParallelBuilding = true; - - passthru = { - isClang = true; - inherit llvm; - } // stdenv.lib.optionalAttrs stdenv.isLinux { - inherit gcc; - }; - - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; - }; -in self diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/purity.patch deleted file mode 100644 index 2d1c68d865e6..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/clang/purity.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/lib/Driver/Tools.cpp 2016-02-12 15:51:41.000000000 -0700 -+++ b/lib/Driver/Tools.cpp 2016-03-08 15:39:06.790111122 -0700 -@@ -8833,15 +8833,6 @@ - CmdArgs.push_back("-shared"); - } - -- if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb || -- Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb || -- (!Args.hasArg(options::OPT_static) && -- !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString( -- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain))); -- } -- - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/default.nix deleted file mode 100644 index a848c8b9252b..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -}: - -let - version = "3.8.1"; - - fetch = fetch_v version; - fetch_v = ver: name: sha256: fetchurl { - url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz"; - inherit sha256; - }; - - compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d"; - clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6"; - - tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv isl version fetch; }); - in { - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src; - }; - - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src; - }; - - libclang = tools.clang-unwrapped.lib; - - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; - - libstdcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ libstdcxxHook ]; - }; - - libcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; - }; - - lldb = callPackage ./lldb.nix {}; - }); - - libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); - in { - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libc++ {}; - - libcxxabi = callPackage ./libc++abi.nix {}; - }); - -in { inherit tools libraries; } // libraries // tools diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch b/nixpkgs/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch deleted file mode 100644 index 6e56c67c8977..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- llvm.org/utils/llvm-build/llvmbuild/main.py 2015-10-07 00:24:35.000000000 +0100 -+++ llvm/utils/llvm-build/llvmbuild/main.py 2017-06-16 17:08:39.866586578 +0100 -@@ -413,7 +413,7 @@ - if library_name is None: - library_name_as_cstr = 'nullptr' - else: -- library_name_as_cstr = '"lib%s.a"' % library_name -+ library_name_as_cstr = '"lib%s.so"' % library_name - if is_installed: - is_installed_as_cstr = 'true' - else: diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch deleted file mode 100644 index 6dd756f01cc2..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/darwin.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- libcxx-3.8.0.src.org/lib/CMakeLists.txt 2015-12-16 15:41:05.000000000 -0800 -+++ libcxx-3.8.0.src/lib/CMakeLists.txt 2016-06-17 19:40:00.293394500 -0700 -@@ -94,30 +94,30 @@ - add_definitions(-D__STRICT_ANSI__) - add_link_flags( - "-compatibility_version 1" - "-current_version 1" -- "-install_name /usr/lib/libc++.1.dylib" -- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" -+ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib" -+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" - "/usr/lib/libSystem.B.dylib") - else() - if ( ${CMAKE_OSX_SYSROOT} ) - list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) - if (OSX_HAS_ARMV7) - set(OSX_RE_EXPORT_LINE -- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" -+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") - else() - set(OSX_RE_EXPORT_LINE -- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") -+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") - endif() - else() -- set(OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") -+ set(OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") - endif() - - add_link_flags( - "-compatibility_version 1" -- "-install_name /usr/lib/libc++.1.dylib" -+ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib" - "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" - "${OSX_RE_EXPORT_LINE}" - "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp" - "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/weak.exp") diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix deleted file mode 100644 index 7c965926f2ee..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: - -stdenv.mkDerivation { - pname = "libc++"; - inherit version; - - src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include") - ''; - - patches = [ - # glibc 2.26 fix - ../../3.9/libc++/xlocale-glibc-2.26.patch - ] - ++ lib.optional stdenv.isDarwin ./darwin.patch - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch - ../../libcxx-max_align_t.patch - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; - - enableParallelBuilding = true; - - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; - - meta = { - homepage = http://libcxx.llvm.org/; - description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh deleted file mode 100644 index 6611259165ae..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++abi.nix deleted file mode 100644 index 80b069fff75a..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: - -stdenv.mkDerivation { - pname = "libc++abi"; - inherit version; - - src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1"; - - nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - export NIX_CFLAGS_COMPILE+=" -I$PWD/include" - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} - ''; - - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib - install -m 644 ../include/cxxabi.h $out/include - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; - - meta = { - homepage = http://libcxxabi.llvm.org/; - description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/lldb.nix deleted file mode 100644 index 985cd6663857..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/lldb.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, llvm -, clang-unwrapped -, python -, version -}: - -stdenv.mkDerivation { - pname = "lldb"; - inherit version; - - src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l"; - - postUnpack = '' - # Hack around broken standalone builf as of 3.8 - unpackFile ${llvm.src} - srcDir="$(ls -d lldb-*.src)" - mkdir -p "$srcDir/tools/lib/Support" - cp "$(ls -d llvm-*.src)/lib/Support/regex_impl.h" "$srcDir/tools/lib/Support/" - ''; - - buildInputs = [ cmake python which swig ncurses zlib libedit llvm ]; - - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" - "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" - "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" - "-DCLANG_MAIN_INCLUDE_DIR=${clang-unwrapped}/include" - "-DPYTHON_VERSION_MAJOR=2" - "-DPYTHON_VERSION_MINOR=7" - "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 - ]; - - enableParallelBuilding = true; - - meta = { - description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix deleted file mode 100644 index bca8e7877aca..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/3.8/llvm.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ stdenv -, fetch -, fetchpatch -, perl -, groff -, cmake -, python -, libffi -, libbfd -, libxml2 -, ncurses -, version -, zlib -, compiler-rt_src -, debugVersion ? false -, enableSharedLibraries ? true -}: - -stdenv.mkDerivation { - pname = "llvm"; - inherit version; - - src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"; - - unpackPhase = '' - unpackFile $src - mv llvm-${version}.src llvm - sourceRoot=$PWD/llvm - unpackFile ${compiler-rt_src} - mv compiler-rt-* $sourceRoot/projects/compiler-rt - ''; - - buildInputs = [ perl groff cmake libxml2 python libffi ]; - - propagatedBuildInputs = [ ncurses zlib ]; - - # Fix a segfault in llc - # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html - patches = [ ./D17533-1.patch ] - ++ stdenv.lib.optional (!stdenv.isDarwin) ./fix-llvm-config.patch - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - ../TLI-musl.patch - ../dynamiclibrary-musl.patch - ]; - - # hacky fix: New LLVM releases require a newer macOS SDK than - # 10.9. This is a temporary measure until nixpkgs darwin support is - # updated. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc - - substituteInPlace CMakeLists.txt \ - --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \ - --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" - '' - + '' - ( - cd projects/compiler-rt - patch -p1 < ${ - fetchpatch { - name = "sigaltstack.patch"; # for glibc-2.26 - url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; - sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; - } - } - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=ON" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_ENABLE_RTTI=ON" - - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optional enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ stdenv.lib.optionals ( isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - # Not yet supported - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" - - ]; - - postBuild = '' - rm -fR $out - ''; - - postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ln -s $out/lib/libLLVM.dylib $out/lib/libLLVM-${version}.dylib - ''; - - enableParallelBuilding = true; - - meta = { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/compilers/llvm/4/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/4/llvm.nix index 392ef4279096..7e8559953524 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/4/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/4/llvm.nix @@ -46,6 +46,14 @@ stdenv.mkDerivation ({ propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + (fetchpatch { + name = "0001-Fix-return-type-in-ORC-readMem-client-interface.patch"; + url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687"; + sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; + }) + ]; + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix index efe2022bedba..02db395db571 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , python , libffi @@ -42,6 +43,13 @@ stdenv.mkDerivation ({ propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + (fetchpatch { + url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687"; + name = "llvm-gcc8-type-mismatch.patch"; + sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; + }) + ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ diff --git a/nixpkgs/pkgs/development/compilers/nasm/default.nix b/nixpkgs/pkgs/development/compilers/nasm/default.nix index 8d92bc4eba2f..f5645ae02192 100644 --- a/nixpkgs/pkgs/development/compilers/nasm/default.nix +++ b/nixpkgs/pkgs/development/compilers/nasm/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { make golden && make test ''; + NIX_CFLAGS_COMPILE="-Wno-error=attributes"; + meta = with stdenv.lib; { homepage = https://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/8.nix b/nixpkgs/pkgs/development/compilers/openjdk/8.nix index e764e9c62cb8..1d356945a4f1 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/8.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/8.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib +{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip +, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , openjdk8-bootstrap @@ -85,7 +85,7 @@ let outputs = [ "out" "jre" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig lndir ]; buildInputs = [ cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst @@ -190,7 +190,8 @@ let # Move the JRE to a separate output mkdir -p $jre/lib/openjdk mv $out/lib/openjdk/jre $jre/lib/openjdk/jre - ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre + mkdir $out/lib/openjdk/jre + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre # Setup fallback fonts ${lib.optionalString (!headless) '' diff --git a/nixpkgs/pkgs/development/compilers/scala/2.12.nix b/nixpkgs/pkgs/development/compilers/scala/2.12.nix index 0e4207dccac6..9e11daced4a9 100644 --- a/nixpkgs/pkgs/development/compilers/scala/2.12.nix +++ b/nixpkgs/pkgs/development/compilers/scala/2.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.9"; + name = "scala-2.12.10"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0wpnxrhnhhscfk0k8yxk86akpvxbr5w1i8jb2igj2q4vax7h97sy"; + sha256 = "0sk5n3ir5zkgr8jayq5pn4l87ia5zmjr2zzwchgxkv8g62ivs4iv"; }; propagatedBuildInputs = [ jre ] ; diff --git a/nixpkgs/pkgs/development/compilers/scala/2.13.nix b/nixpkgs/pkgs/development/compilers/scala/2.13.nix index ab27d93a7cf9..6bba11af9d46 100644 --- a/nixpkgs/pkgs/development/compilers/scala/2.13.nix +++ b/nixpkgs/pkgs/development/compilers/scala/2.13.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.13.0"; + name = "scala-2.13.1"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p"; + sha256 = "1nq49acx3j6vnw0lhyrfqa23f671y3kc9lja4nki0j73jk2cq639"; }; propagatedBuildInputs = [ jre ] ; diff --git a/nixpkgs/pkgs/development/compilers/swift/default.nix b/nixpkgs/pkgs/development/compilers/swift/default.nix index c9698fcad9b4..817f81f9257b 100644 --- a/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -35,7 +35,7 @@ let v_base = "5.0.2"; version = "${v_base}-RELEASE"; - version_friendly = "${v_base}"; + version_friendly = v_base; tag = "refs/tags/swift-${version}"; fetch = { repo, sha256, fetchSubmodules ? false }: diff --git a/nixpkgs/pkgs/development/compilers/unison/default.nix b/nixpkgs/pkgs/development/compilers/unison/default.nix index 3bdf234f9159..d4e536484c46 100644 --- a/nixpkgs/pkgs/development/compilers/unison/default.nix +++ b/nixpkgs/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1c"; + milestone_id = "M1d"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "03q02r7qc7ybqz16kmpk2d8l9vx28kaj9x59mlxzi8a4mr0j3vzb"; + sha256 = "0cgkqwniw2fclsxgx6b1kgjmylqnn67kjs61iygzbpip8nvcm7pv"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "1iwynqnp1i39pyq9wc01x7y22y1qa0rrjlx40jjdgnj23y1r6jk4"; + sha256 = "0rpz40d23daad16r2s4appiay3brbk0awp38yamavlr6dh23c9ws"; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/nixpkgs/pkgs/development/compilers/vlang/default.nix b/nixpkgs/pkgs/development/compilers/vlang/default.nix index ad01fb4be290..f72ec0890543 100644 --- a/nixpkgs/pkgs/development/compilers/vlang/default.nix +++ b/nixpkgs/pkgs/development/compilers/vlang/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vlang"; repo = "v"; - rev = "${version}"; + rev = version; sha256 = "0js92v2r1h4vaaha3z1spgi7qynlmr9vls41gxp284w4yhnjzv15"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { vc = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "${version}"; + rev = version; sha256 = "0qx1drs1hr94w7vaaq5w8mkq7j1d3biffnmxkyz63yv8573k03bj"; }; diff --git a/nixpkgs/pkgs/development/compilers/z88dk/default.nix b/nixpkgs/pkgs/development/compilers/z88dk/default.nix index 19056ec2b6fd..433b6e6b32cb 100644 --- a/nixpkgs/pkgs/development/compilers/z88dk/default.nix +++ b/nixpkgs/pkgs/development/compilers/z88dk/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { #_FORTIFY_SOURCE requires compiling with optimization (-O) NIX_CFLAGS_COMPILE = "-O"; - short_rev = "${builtins.substring 0 7 src.rev}"; + short_rev = builtins.substring 0 7 src.rev; makeFlags = [ "git_rev=${short_rev}" "version=${version}" diff --git a/nixpkgs/pkgs/development/compilers/zulu/8.nix b/nixpkgs/pkgs/development/compilers/zulu/8.nix index 15ee5f403bc3..d4caabc6cb83 100644 --- a/nixpkgs/pkgs/development/compilers/zulu/8.nix +++ b/nixpkgs/pkgs/development/compilers/zulu/8.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation { rpath = stdenv.lib.strings.makeLibraryPath libraries; passthru = { - home = "${zulu}"; + home = zulu; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/compilers/zulu/default.nix b/nixpkgs/pkgs/development/compilers/zulu/default.nix index 90b28d318316..5f345c87355f 100644 --- a/nixpkgs/pkgs/development/compilers/zulu/default.nix +++ b/nixpkgs/pkgs/development/compilers/zulu/default.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation { rpath = stdenv.lib.strings.makeLibraryPath libraries; passthru = { - home = "${zulu}"; + home = zulu; }; meta = with stdenv.lib; { |