diff options
Diffstat (limited to 'pkgs')
117 files changed, 2870 insertions, 2463 deletions
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index a9f56cca001..75990d593df 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -16,10 +16,10 @@ assert vorbisSupport -> vorbisTools != null; let zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; - -in pythonPackages.buildPythonApplication { +in +pythonPackages.buildPythonApplication { pname = "pulseaudio-dlna"; - version = "2017-11-01"; + version = "unstable-2017-11-01"; src = fetchFromGitHub { owner = "masmu"; @@ -28,12 +28,9 @@ in pythonPackages.buildPythonApplication { sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk"; }; - # pulseaudio-dlna has no tests - doCheck = false; - propagatedBuildInputs = with pythonPackages; [ dbus-python docopt requests setproctitle protobuf psutil futures - chardet notify2 netifaces pyroute2 pygobject2 lxml ] + chardet notify2 netifaces pyroute2 pygobject2 lxml setuptools ] ++ [ zeroconf ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional opusSupport opusTools @@ -42,12 +39,15 @@ in pythonPackages.buildPythonApplication { ++ stdenv.lib.optional soxSupport sox ++ stdenv.lib.optional vorbisSupport vorbisTools; + # upstream has no tests + checkPhase = '' + $out/bin/pulseaudio-dlna --help > /dev/null + ''; + meta = with stdenv.lib; { description = "A lightweight streaming server which brings DLNA / UPNP and Chromecast support to PulseAudio and Linux"; - homepage = https://github.com/masmu/pulseaudio-dlna; - + homepage = "https://github.com/masmu/pulseaudio-dlna"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ mog ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index 7544a3520c7..a4f48aa0c21 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "spectmorph"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; - sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn"; + sha256 = "06jrfx5g9c56swxn78lix0gyrjkhi21l9wqs56knp8iqcgfi3m0s"; }; buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index d3950c06c33..e9223b1453e 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -50,13 +50,13 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.14"; + version = "2.10.16"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz"; + sha256 = "1sybf1yilw272lr8qbyx3zbvysf5rc89gk80gd4aj4xr6jazxyfb"; }; nativeBuildInputs = [ @@ -155,6 +155,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--without-webkit" # old version is required + "--disable-check-update" "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" "--with-icc-directory=/run/current-system/sw/share/color/icc" # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch index 0d6a87000cc..e37351cfd46 100644 --- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch +++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch @@ -1,13 +1,15 @@ diff --git a/app/gimp-version.c b/app/gimp-version.c -index 12605c6..a9083da 100644 +index 0f7bfb9bf9..1679624b8e 100644 --- a/app/gimp-version.c +++ b/app/gimp-version.c -@@ -203,7 +203,7 @@ gimp_version (gboolean be_verbose, - lib_versions = gimp_library_versions (localized); - verbose_info = g_strdup_printf ("git-describe: %s\n" - "C compiler:\n%s\n%s", -- GIMP_GIT_VERSION, CC_VERSION, -+ GIMP_GIT_VERSION, "@cc_version@", +@@ -228,9 +228,9 @@ + "# Libraries #\n%s", + GIMP_GIT_VERSION, + GIMP_BUILD_ID, + gimp_version_get_revision (), + GIMP_BUILD_PLATFORM, +- CC_VERSION, ++ "@cc_version@", lib_versions); g_free (lib_versions); diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index a4d77715199..78e7249a087 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -78,6 +78,10 @@ in buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ]; outputs = [ "out" "terminfo" ]; + postPatch = '' + substituteInPlace alacritty/src/config/mouse.rs \ + --replace xdg-open ${xdg_utils}/bin/xdg-open + ''; postBuild = lib.optionalString stdenv.isDarwin "make app"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index df95b26b9c5..924d4dc9e0b 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -90,6 +90,7 @@ python3Packages.buildPythonApplication { '' + (if enableQt then '' substituteInPlace ./electrum/qrscanner.py \ --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} + sed -i 's/qdarkstyle<2.7/qdarkstyle<3.0/' contrib/requirements/requirements.txt '' else '' sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 18f7153b1eb..4b099270df5 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.64.1"; + version = "0.65.1"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1h5n5d7g3l2lp25sjrcmavbkqqm1csgv2q5z7afwbb57j0m1nkn8"; + sha256 = "09kaa5zvi0kmmhms9n162fmrxacidga9241in0vrnn8lwl3rbgam"; }; - modSha256 = "18wfsp3ypfxj5qljmb19kzyc5byf413nkabz5mfvq8srjhcq1ifl"; + modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na"; buildFlags = [ "-tags" "extended" ]; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 675f0adfc7f..f9d8599e329 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: mkDerivation rec { - version = "2.3.4"; + version = "2.3.4.3"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "0qgvc19flnf6ny3ffyj8civwaxrnwcdlw2v708hg49cbmg6f8igh"; + sha256 = "1rpp6wq0dc0bxwc0pipajv98vi7cpg391nq10d3c4pmpq38m08wx"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix index 753a0d24d0a..b1118cfc597 100644 --- a/pkgs/development/python-modules/mps-youtube/default.nix +++ b/pkgs/applications/misc/mps-youtube/default.nix @@ -1,17 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k -, pafy -}: +{ lib, python3Packages, fetchFromGitHub }: -buildPythonPackage rec { +with python3Packages; + +buildPythonApplication rec { pname = "mps-youtube"; - version = "0.2.8"; - disabled = (!isPy3k); + version = "unstable-2020-01-28"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "mps-youtube"; - rev = "v${version}"; - sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y"; + rev = "b808697133ec2ad7654953232d1e841b20aa7cc3"; + sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv"; }; propagatedBuildInputs = [ pafy ]; @@ -30,6 +29,6 @@ buildPythonPackage rec { description = "Terminal based YouTube player and downloader"; homepage = "https://github.com/mps-youtube/mps-youtube"; license = licenses.gpl3; - maintainers = with maintainers; [ odi ]; + maintainers = with maintainers; [ koral odi ]; }; } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index caaecd0ab9f..53d58334b86 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.3.115"; + version = "1.3.118"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1k9g1zjnn0bhyw133padpyym73x8v1i3nm65a040bgkwh6a5jaj8"; + sha256 = "1pmz10h35fm54453h7m0qiynyfpfmwaicmwzs41c4h8xavqgr6mb"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index c25e41de5db..20ecbebd6d8 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "1y0n1p14kg24qnybi201181q7j6vm20ka4xwmgggjll9v6qflvaz"; + sha256 = "182kzk68l6rr878aaaqx31c6npb65x77qzhbc5rbqlrrdrb69zsg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 2b44263096b..8256487b751 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,6 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native +, fx_cast_bridge , udev , kerberos }: @@ -71,6 +72,7 @@ let ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration + ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); libs = lib.optional stdenv.isLinux udev diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 6ceee567592..92ce038afa1 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1gdrm3zz7524c8v3g128drfzdyalxlipbzxmwhalm7px4p5z4n0j"; + sha256 = "0byc3si0ysjzbgb91vlbvbmawy8wprs1ajk5xzsb66c5hlhq1il9"; }; - modSha256 = "1kmm6yb03g9lsz380rvf32j4icp3rcq7ixxcgsxfgpwqvq08zkn6"; + modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8"; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5c131948649..da943c2aa7e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -112,8 +112,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.20"; - sha256 = "1k94iwhdvp1ifg9w7y26cl89ihki2w9kxv8mz06pp9bnfwfw67x5"; + version = "0.12.21"; + sha256 = "128mrqib8rigy6kk6fby0pjh4jh2qm2qwkrlbn0wgfln0637d9ff"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix deleted file mode 100644 index 1a11e8c0443..00000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-10_x, ruby, sencha -, auth0ClientID, auth0Domain }: - -stdenv.mkDerivation rec { - pname = "rambox-bare"; - version = "0.7.3"; - - src = fetchFromGitHub { - owner = "ramboxapp"; - repo = "community-edition"; - rev = version; - sha256 = "03pwzyij2i5m23qzhyqdcipixmqj46qbjmq626swwqy03a0p91qv"; - }; - - nativeBuildInputs = [ nodejs-10_x ruby sencha ]; - - node_modules = fetchNodeModules { - inherit src; - - nodejs = nodejs-10_x; - sha256 = "05vb0r0q3ckg2g87fsm22j0cbfvk81q5z43zwmrzh3pb3zh54xj1"; - }; - - patches = [ ./isDev.patch ]; - - configurePhase = '' - echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js - ln -s ${node_modules} node_modules - ''; - - buildPhase = '' - mkdir ../rambox-build - npm run sencha:compile:build - ''; - - installPhase = '' - mv ../rambox-build/ $out - - # https://github.com/saenzramiro/rambox/issues/1281 - echo '{"name": "rambox", "version": "${version}", "main": "electron/main.js"}' > $out/package.json - - # https://github.com/saenzramiro/rambox/issues/1282 - cp --parents ext/packages/ext-locale/build/ext-locale-*.js $out - - # Symbolic link causes `Uncaught Error: Cannot find module 'immutable'` - cp -r ${node_modules} $out/node_modules - ''; - - meta = with stdenv.lib; { - description = "Messaging and emailing app that combines common web applications into one"; - homepage = http://rambox.pro; - license = licenses.gpl3; - maintainers = with maintainers; [ gnidorah ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index f588c31c183..488da12c18c 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,52 +1,50 @@ -{ stdenv, newScope, makeWrapper -, electron, xdg_utils, makeDesktopItem -, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" -, auth0Domain ? "nixpkgs.auth0.com" }: +{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook +, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify +}: let - callPackage = newScope self; - self = { - fetchNodeModules = callPackage ./fetchNodeModules.nix {}; - rambox-bare = callPackage ./bare.nix { - inherit auth0ClientID auth0Domain; + version = "0.7.3"; +in stdenv.mkDerivation rec { + pname = "rambox"; + inherit version; + src = { + x86_64-linux = fetchurl { + url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb"; + sha256 = "09v8zlayas906zhqy2aw4wkvyl87ykr09sjf0nmgmf69piwmjgg6"; }; - sencha = callPackage ./sencha {}; - }; - desktopItem = makeDesktopItem rec { - name = "Rambox"; - exec = "rambox"; - icon = "${self.rambox-bare}/resources/Icon.png"; - desktopName = name; - genericName = "Rambox messenger"; - categories = "Network;"; - }; -in - -with self; - -stdenv.mkDerivation { - name = "rambox-${rambox-bare.version}"; - - nativeBuildInputs = [ makeWrapper ]; + i686-linux = fetchurl { + url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb"; + sha256 = "0gv4pf3vhrw4xyccm24ivv92d9qy4zpwsh0m82ib1w764lyxmyrz"; + }; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - dontUnpack = true; + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; + buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ]; + runtimeDependencies = [ udev.lib libnotify ]; - dontWrapGApps = true; # we only want $gappsWrapperArgs here + unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - runHook preInstall - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications - runHook postInstall + mkdir -p $out/bin + cp -r opt $out + ln -s $out/opt/Rambox/rambox $out/bin + + # provide resources + cp -r usr/share $out + substituteInPlace $out/share/applications/rambox.desktop \ + --replace Exec=/opt/Rambox/rambox Exec=rambox ''; postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/rambox \ - --add-flags "${rambox-bare} --without-update" \ - --prefix PATH : ${xdg_utils}/bin + wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin ''; - meta = rambox-bare.meta // { - platforms = [ "i686-linux" "x86_64-linux" ]; + meta = with stdenv.lib; { + description = "Free and Open Source messaging and emailing app that combines common web applications into one"; + homepage = http://rambox.pro; + license = licenses.mit; + maintainers = [ maintainers.gnidorah ]; + platforms = ["i686-linux" "x86_64-linux"]; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch deleted file mode 100644 index b918144c766..00000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://github.com/saenzramiro/rambox/issues/1280 - -diff -urNZ a/electron/main.js b/electron/main.js ---- a/electron/main.js 2017-11-02 14:58:06.085127616 +0000 -+++ b/electron/main.js 2017-11-02 14:58:18.316887679 +0000 -@@ -8,7 +8,7 @@ - // Configuration - const Config = require('electron-config'); - // Development --const isDev = require('electron-is-dev'); -+const isDev = false; - // Updater - const updater = require('./updater'); - // File System diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix deleted file mode 100644 index 30b12963b33..00000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, gzip, which, unzip, jdk }: - -let - version = "6.6.0.13"; - srcs = { - i686-linux = fetchurl { - url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; - sha256 = "15b197108b49mf0afpihkh3p68lxm7580zz2w0xsbahglnvhwyfz"; - }; - x86_64-linux = fetchurl { - url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip"; - sha256 = "1cxhckmx1802p9qiw09cgb1v5f30wcvnrwkshmia8p8n0q47lpp4"; - }; - }; -in - -stdenv.mkDerivation { - inherit version; - - pname = "sencha-bare"; - src = srcs.${stdenv.hostPlatform.system}; - - nativeBuildInputs = [ gzip which unzip ]; - buildInputs = [ jdk ]; - - sourceRoot = "."; - - configurePhase = '' - substituteAll ${./response.varfile} response.varfile - ''; - - installPhase = '' - ./SenchaCmd*.sh -q -dir $out -varfile response.varfile - # disallow sencha writing into /nix/store/repo - echo "repo.local.dir=$TMP/repo" >> $out/sencha.cfg - rm $out/shell-wrapper.sh $out/Uninstaller - ''; - - meta = with stdenv.lib; { - license = licenses.unfree; - platforms = attrNames srcs; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix deleted file mode 100644 index 4be8edaf9b8..00000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, callPackage, makeWrapper }: - -let - sencha-bare = callPackage ./bare.nix {}; -in - -stdenv.mkDerivation { - name = "sencha-${sencha-bare.version}"; - - nativeBuildInputs = [ makeWrapper ]; - - dontUnpack = true; - - installPhase = '' - makeWrapper ${sencha-bare}/sencha $out/bin/sencha - ''; -} diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile deleted file mode 100644 index 0ff6f0a30d5..00000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile +++ /dev/null @@ -1,13 +0,0 @@ -addToPath$Integer=1 -parentDir=. -sys.adminRights$Boolean=false -sys.component.148$Boolean=true -sys.component.157$Boolean=true -sys.component.26$Boolean=true -sys.component.30$Boolean=true -sys.component.90$Boolean=true -sys.component.91$Boolean=true -sys.component.92$Boolean=true -sys.component.94$Boolean=true -sys.installationDir=@out@ -sys.languageId=en \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index e501d3bcdbf..32f50b6fd63 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -8,120 +8,146 @@ let version = "4.2.0"; - rpath = stdenv.lib.makeLibraryPath [ - alsaLib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curl - dbus - expat - fontconfig - freetype - glib - gnome2.GConf - gdk-pixbuf - gtk3 - pango - libnotify - libxcb - libappindicator-gtk3 - nspr - nss - stdenv.cc.cc - systemd - libuuid - libpulseaudio + inherit (stdenv.hostPlatform) system; - xorg.libxkbfile - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libXScrnSaver - ] + ":${stdenv.cc.cc.lib}/lib64"; + throwSystem = throw "Unsupported system: ${system}"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "01b2klhky04fijdqcpfafgdqx2c5nh2fpnzvzgvz10hv7h16cinv"; - } - else - throw "Slack is not supported on ${stdenv.hostPlatform.system}"; - -in stdenv.mkDerivation { pname = "slack"; - inherit version; - - inherit src; - - buildInputs = [ - gtk3 # needed for GSETTINGS_SCHEMAS_PATH - ]; - - nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ]; - - dontUnpack = true; - dontBuild = true; - dontPatchELF = true; - installPhase = '' - # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here - dpkg --fsys-tarfile $src | tar --extract - rm -rf usr/share/lintian + sha256 = { + x86_64-darwin = "0947a98m7yz4hldjvcqnv9s17dpvlsk9sflc1zc99hf500zck0w1"; + x86_64-linux = "01b2klhky04fijdqcpfafgdqx2c5nh2fpnzvzgvz10hv7h16cinv"; + }.${system} or throwSystem; - mkdir -p $out - mv usr/* $out - - # Otherwise it looks "suspicious" - chmod -R g-w $out - - for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/lib/slack $file || true - done - - # Replace the broken bin/slack symlink with a startup wrapper - rm $out/bin/slack - makeWrapper $out/lib/slack/slack $out/bin/slack \ - --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --prefix PATH : ${xdg_utils}/bin - - # Fix the desktop link - substituteInPlace $out/share/applications/slack.desktop \ - --replace /usr/bin/ $out/bin/ \ - --replace /usr/share/ $out/share/ - '' + stdenv.lib.optionalString (theme != null) '' - asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked - cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js - - var fs = require('fs'); - document.addEventListener('DOMContentLoaded', function() { - fs.readFile('${theme}/theme.css', 'utf8', function(err, css) { - let s = document.createElement('style'); - s.type = 'text/css'; - s.innerHTML = css; - document.head.appendChild(s); - }); - }); - EOF - asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar - ''; meta = with stdenv.lib; { description = "Desktop client for Slack"; homepage = https://slack.com; license = licenses.unfree; maintainers = [ maintainers.mmahut ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + }; + + linux = stdenv.mkDerivation rec { + inherit pname version meta; + src = fetchurl { + url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; + inherit sha256; + }; + + rpath = stdenv.lib.makeLibraryPath [ + alsaLib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + fontconfig + freetype + glib + gnome2.GConf + gdk-pixbuf + gtk3 + pango + libnotify + libxcb + libappindicator-gtk3 + nspr + nss + stdenv.cc.cc + systemd + libuuid + libpulseaudio + + xorg.libxkbfile + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXScrnSaver + ] + ":${stdenv.cc.cc.lib}/lib64"; + + buildInputs = [ + gtk3 # needed for GSETTINGS_SCHEMAS_PATH + ]; + + nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ]; + + dontUnpack = true; + dontBuild = true; + dontPatchELF = true; + + installPhase = '' + # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here + dpkg --fsys-tarfile $src | tar --extract + rm -rf usr/share/lintian + + mkdir -p $out + mv usr/* $out + + # Otherwise it looks "suspicious" + chmod -R g-w $out + + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-rpath ${rpath}:$out/lib/slack $file || true + done + + # Replace the broken bin/slack symlink with a startup wrapper + rm $out/bin/slack + makeWrapper $out/lib/slack/slack $out/bin/slack \ + --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ + --prefix PATH : ${xdg_utils}/bin + + # Fix the desktop link + substituteInPlace $out/share/applications/slack.desktop \ + --replace /usr/bin/ $out/bin/ \ + --replace /usr/share/ $out/share/ + '' + stdenv.lib.optionalString (theme != null) '' + asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked + cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js + + var fs = require('fs'); + document.addEventListener('DOMContentLoaded', function() { + fs.readFile('${theme}/theme.css', 'utf8', function(err, css) { + let s = document.createElement('style'); + s.type = 'text/css'; + s.innerHTML = css; + document.head.appendChild(s); + }); + }); + EOF + asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version meta; + + phases = [ "installPhase" ]; + + src = fetchurl { + url = "https://downloads.slack-edge.com/mac_releases/Slack-${version}-macOS.dmg"; + inherit sha256; + }; + + installPhase = '' + /usr/bin/hdiutil mount -nobrowse -mountpoint slack-mnt $src + mkdir -p $out/Applications + cp -r ./slack-mnt/Slack.app $out/Applications + /usr/bin/hdiutil unmount slack-mnt + defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES + ''; }; -} +in if stdenv.isDarwin + then darwin + else linux diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index ec7e4e68312..9cd181c591d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.9.13"; + version = "1.9.14"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1cd1vy5f0hin01jp7agdr56axwd8539rkngb7c16x17bhj5r7rm7"; + sha256 = "0jsss4b51ylf4qk58frvh2yap1s3cjf3isnlc273cc0fh5g1skc6"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 780dab79e99..27977dae15f 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -15,6 +15,8 @@ buildPythonPackage rec { checkInputs = [ mock pytest coverage tox ]; propagatedBuildInputs = [ urwid tweepy future ]; + LC_ALL = "en_US.UTF-8"; + patches = [ (fetchpatch { url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 13ac80677ee..96d7b3faaed 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -27,12 +27,12 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.7"; + version = "2.7.1"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "00hzchzw1w2181kczcrrnj8ngml3bwk7qciha3higxq3qynf0h8c"; + sha256 = "0acz41jg7lmipni9z2agfqw4dhmx5hf6k9w4pvr4zih1fhkldva2"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 845dd928766..038611ca289 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -64,7 +64,7 @@ in buildPythonPackage { --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' substituteInPlace $out/bin/matrix_decrypt \ --replace '/usr/bin/env python3' '${scriptPython}/bin/python' - + mkdir -p $out/${python.sitePackages} cp -r $src/matrix $out/${python.sitePackages}/matrix ''; @@ -75,7 +75,7 @@ in buildPythonPackage { description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol"; homepage = "https://github.com/poljar/weechat-matrix"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ tilpner emily ]; }; } diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 72003f41721..05268bdaead 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.66"; + version = "2.67"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "1qwmxfkgc5q7v6ickxr29khil6mh9crv5mwdm72bp6k64w0akbs7"; + sha256 = "0510wkwmwrlv61958zd5nsc4lr0l0lka3jf4pq3dyiyfsf4k20rq"; }; installPhase = '' diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 573752b5b53..8b194e53b44 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,7 +5,7 @@ let sha256 = { - x86_64-linux = "1ysd8fwzm0360qs6ijr6l0y2agqb3njz20h7am1x4kxmhy8ravq9"; + x86_64-linux = "0az7n4lhmd4pz0spjvyiwd4w1gnqbh8f1fvr1jinsssyq0j26ldj"; i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "5.5.1"; + version = "5.5.2"; src = fetchurl { urls = [ diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix index cf1159b83f8..3d3f60c7f62 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.17.2"; + version = "3.17.4"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "1pmy01jwdr461vsl4fsxi3jaqnjx9yl5dw4987y5g73qx21qc5d5"; + sha256 = "0mjyrd0d9wfsfd9ajg1xf7ijg4k8jp76swjsiydxpgfk1sdljswv"; }; binary = appimageTools.wrapType2 { @@ -23,7 +23,7 @@ let name = "ssb-patchwork"; exec = "${binary}/bin/ssb-patchwork"; icon = "ssb-patchwork.png"; - comment = "Decentralized messaging and sharing app"; + comment = "Client for the decentralized social network Secure Scuttlebutt"; desktopName = "Patchwork"; genericName = "Patchwork"; categories = "Network;"; @@ -45,9 +45,9 @@ in longDescription = '' sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. ''; - homepage = https://www.scuttlebutt.nz/; + homepage = "https://www.scuttlebutt.nz/"; license = licenses.agpl3; - maintainers = with maintainers; [ thedavidmeister ninjatrappeur flokli ]; + maintainers = with maintainers; [ asymmetric ninjatrappeur thedavidmeister ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 2ac7c208a5f..b77f5110521 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,14 +1,9 @@ -{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: +{ lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "elan"; version = "0.7.5"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v"; - src = fetchFromGitHub { owner = "kha"; repo = "elan"; @@ -16,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1"; }; + cargoSha256 = "0vja1cq6z7jlr4nzfdzn4gl8l31yld82zmgzwihnalif13q3fcps"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl zlib openssl ]; @@ -38,7 +35,7 @@ rustPlatform.buildRustPackage rec { $out/bin/elan completions zsh > "$out/share/zsh/site-functions/_elan" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Small tool to manage your installations of the Lean theorem prover"; homepage = "https://github.com/Kha/elan"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index be15bba979f..988ea8c855c 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, ccache, cmake, ctags, swig +{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig # data, compression , bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy # maths -, openblasCompat, eigen, nlopt, lp_solve, colpack +, openblasCompat, eigen, nlopt, lp_solve, colpack, liblapack, glpk # libraries , libarchive, libxml2 # extra support @@ -13,47 +13,79 @@ assert pythonSupport -> pythonPackages != null; assert opencvSupport -> opencv != null; -stdenv.mkDerivation rec { +let pname = "shogun"; - version = "6.0.0"; - - src = fetchFromGitHub { - owner = pname + "-toolbox"; - repo = pname; - rev = pname + "_" + version; - sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf"; - fetchSubmodules = true; + version = "6.1.4"; + rxcppVersion = "4.0.0"; + gtestVersion = "1.8.0"; + srcs = { + toolbox = fetchFromGitHub { + owner = pname + "-toolbox"; + repo = pname; + rev = pname + "_" + version; + sha256 = "38aULxK50wQ2+/ERosSpRyBmssmYSGv5aaWfWSlrSRc="; + fetchSubmodules = true; + }; + # we need the packed archive + rxcpp = fetchurl { + url = "https://github.com/Reactive-Extensions/RxCpp/archive/v${rxcppVersion}.tar.gz"; + sha256 = "0y2isr8dy2n1yjr9c5570kpc9lvdlch6jv0jvw000amwn5d3krsh"; + }; + gtest = fetchurl { + url = "https://github.com/google/googletest/archive/release-${gtestVersion}.tar.gz"; + sha256 = "1n5p1m2m3fjrjdj752lf92f9wq3pl5cbsfrb49jqbg52ghkz99jq"; + }; }; +in + +stdenv.mkDerivation rec { + + inherit pname version; + + src = srcs.toolbox; + + postUnpack = '' + mkdir -p $sourceRoot/third_party/{rxcpp,gtest} + ln -s ${srcs.rxcpp} $sourceRoot/third_party/rxcpp/v${rxcppVersion}.tar.gz + ln -s ${srcs.gtest} $sourceRoot/third_party/gtest/release-${gtestVersion}.tar.gz + ''; + + # broken + doCheck = false; patches = [ (fetchpatch { - name = "Fix-meta-example-parser-bug-in-parallel-builds.patch"; - url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch"; - sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n"; - }) - (fetchpatch { url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s"; }) ]; + CCACHE_DISABLE="1"; CCACHE_DIR=".ccache"; buildInputs = with lib; [ - openblasCompat bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo - protobuf nlopt snappy swig (libarchive.dev) libxml2 + openblasCompat bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + protobuf nlopt snappy swig (libarchive.dev) libxml2 liblapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) ++ optional (opencvSupport) opencv; - cmakeFlags = with lib; [] - ++ (optional (pythonSupport) "-DPythonModular=ON") - ++ (optional (opencvSupport) "-DOpenCV=ON") - ; + NIX_CFLAGS_COMPILE="-faligned-new"; + + cmakeFlags = + let + onOff = b: if b then "ON" else "OFF"; + flag = n: b: "-D"+n+"="+onOff b; + in + with lib; [ + (flag "ENABLE_TESTING" doCheck) + (flag "BUILD_META_EXAMPLES" doCheck) + (flag "CMAKE_VERBOSE_MAKEFILE:BOOL" doCheck) + (flag "PythonModular" pythonSupport) + (flag "OpenCV" opencvSupport) + ]; - # Previous attempts to fix parallel builds (see patch above) were not entirely successful. - # Sporadic build failures still exist. Dislable parallel builds for now. - enableParallelBuilding = false; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index a08c0ee3403..de84d35c2e8 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "geogebra"; - version = "5-0-570-0"; + version = "5-0-573-0"; preferLocalBuild = true; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "0q6brg5rkl2gyyg9vhiilvb8zy23zlp4a1xcwnv501xzcccv0p37"; + sha256 = "0lj0k49sjsjqs716n74xbq6a4gids5903f5s6fhqyahrwyldhzrj"; }; srcIcon = fetchurl { diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 19f97e8994c..594d2a3abae 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "0.5.5"; + version = "0.5.7"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0jmkcx95kngzylqhllg33s094rggpsrgky704z8v6j4969xgrfnc"; + sha256 = "14j8210c1dndnhb8l2ifxcljzhajjhil86lvk9y7ndjkq09805q1"; }; - modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h"; + modSha256 = "1qwcl74sg5az9vaivnvn7f40p72ilmkms5rp52sp5imfrql81lxf"; buildFlagsArray = [ "-ldflags=-X github.com/cli/cli/command.Version=${version}" diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index a7f13905e7c..9396c6cd99c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.25.0"; + version = "2.25.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60"; + sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; outputs = [ "out" ]; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 3fa5399c2b5..f6de0036afe 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -6,7 +6,7 @@ # https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781 let - fetchNodeModules = callPackage ../../networking/instant-messengers/rambox/fetchNodeModules.nix { }; + fetchNodeModules = callPackage ./fetchNodeModules.nix { }; python = python37.override { packageOverrides = self: super: { diff --git a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix index 047890a932c..047890a932c 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix +++ b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 6926f7e8eae..f0959284d66 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.18.0"; mkDerivation rec { pname = "shotcut"; - version = "19.12.31"; + version = "20.02.17"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9"; + sha256 = "0nsqlbapqgxccb7mnvxqw4hdddj944d4z5jxafpv0cwj7s3z8wj0"; }; patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ]; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index cd6600387cd..d56318555e5 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { # Fix a /usr/bin/env reference in here that breaks sandboxed builds prePatch = "patchShebangs arch/lkl/scripts"; + # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 + postPatch = "sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c"; installPhase = '' mkdir -p $out/bin $lib/lib $dev diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 403d9939e13..fd964215d45 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.17.1"; + version = "4.18"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0iazv2i2rgmakzh95pgj6iapyzn7bdpcbcd35a79mhlml4ry33qy"; + sha256 = "0dv5g8ycfmijxfjyw8hzsxaf80v09lb73zh7x2vszy78h3amifqz"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 7fb5e413a26..6a66f94597f 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -144,6 +144,10 @@ if [[ -n "$sri" ]]; then tempHash="$(nix to-sri --type "$oldHashAlgo" "$tempHash")" fi +# Escape regex metacharacter that are allowed in hashes (+) +oldHashEscaped=$(echo "$oldHash" | sed -re 's|[+]|\\&|g') +tempHashEscaped=$(echo "$tempHash" | sed -re 's|[+]|\\&|g') + # Replace new version sed -i.bak "$nixFile" -re "$pattern" if cmp -s "$nixFile" "$nixFile.bak"; then @@ -159,7 +163,7 @@ if [[ -n "$newUrl" ]]; then fi fi -sed -i "$nixFile" -re "s|\"$oldHash\"|\"$tempHash\"|" +sed -i "$nixFile" -re "s|\"$oldHashEscaped\"|\"$tempHash\"|" if cmp -s "$nixFile" "$nixFile.bak"; then die "Failed to replace source hash of '$attr' to a temporary hash!" fi @@ -168,12 +172,12 @@ fi if [[ -z "$newHash" ]]; then nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed - newHash=$(grep --extended-regexp --invert-match "killing process|dependencies couldn't be built|wanted: " "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'\| got: .*:\(.*\)~\1\2\3~" | head -n1) -fi + newHash=$(sed '1,/hash mismatch in fixed-output derivation/d' "$attr.fetchlog" | grep --perl-regexp --only-matching 'got: +.+[:-]\K.+') -if [[ -n "$sri" ]]; then - # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type - newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")" + if [[ -n "$sri" ]]; then + # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type + newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")" + fi fi if [[ -z "$newHash" ]]; then @@ -186,7 +190,7 @@ if [[ -z "${ignoreSameHash}" && "$oldVersion" != "$newVersion" && "$oldHash" = " die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" fi -sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|" +sed -i "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|" if cmp -s "$nixFile" "$nixFile.bak"; then die "Failed to replace temporary source hash of '$attr' to the final source hash!" fi diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index c85f01d2718..96ad0e2c2b8 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0za44h7f4vk37yl30xlaa6w76maiipb6p63gl9hl1rshdn9nxq0y"; }; - nativeBuildInputs = [ gtk3 numix-icon-theme ]; + nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + buildInputs = [ numix-icon-theme ]; + + propagatedBuildInputs = [ hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 620ef02fde7..644d20cccfd 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "19.09.20"; + version = "19.12.27"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0q3d4d4wndknz3043bh8ardjvdpds2hkzk73kyyh1848wg4ff0ly"; + sha256 = "0pjbi2g7wk8gyr4lvp8fvcb8z29kc3l6v19a45axgadnc609hqw7"; }; - nativeBuildInputs = [ gtk3 numix-icon-theme ]; + nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + buildInputs = [ numix-icon-theme ]; + + propagatedBuildInputs = [ hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix index 046ea84a0d8..234b2c44631 100644 --- a/pkgs/development/compilers/ocaml/4.10.nix +++ b/pkgs/development/compilers/ocaml/4.10.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "10"; - patch_version = "0+rc1"; - sha256 = "1nzmn9wszixsyzz4bhpwqw8dx0m1iy83xmanp4g9f5dfywgcss2c"; + patch_version = "0+rc2"; + sha256 = "1iv8x9xr4k2s1x1p4rj4fqdh2iwzhgi56lyshvh6gg224i14rkbz"; } diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 942e23c6170..4cf507fbf5c 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ openssh openssl curl zlib libiconv ] + buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ] ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { meta = with stdenv.lib; { description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; - homepage = https://github.com/rust-lang/rls/; + homepage = "https://github.com/rust-lang/rls/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ symphorien ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 77bc3cc5b73..25accf8c949 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -26,6 +26,7 @@ , git , libgit2 , fetchFromGitHub +, fetchpatch , findutils , makeWrapper , gnumake @@ -224,6 +225,15 @@ stdenv.mkDerivation { # uuid.h is not part of glibc, but of libuuid sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' swift/stdlib/public/Platform/glibc.modulemap.gyb + # Compatibility with glibc 2.30 + # Adapted from https://github.com/apple/swift-package-manager/pull/2408 + patch -p1 -d swiftpm -i ${./patches/swift-package-manager-glibc-2.30.patch} + # https://github.com/apple/swift/pull/27288 + patch -p1 -d swift -i ${fetchpatch { + url = "https://github.com/apple/swift/commit/f968f4282d53f487b29cf456415df46f9adf8748.patch"; + sha256 = "1aa7l66wlgip63i4r0zvi9072392bnj03s4cn12p706hbpq0k37c"; + }} + PREFIX=''${out/#\/} substituteInPlace indexstore-db/Utilities/build-script-helper.py \ --replace usr "$PREFIX" diff --git a/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch b/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch new file mode 100644 index 00000000000..14ef3849764 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch @@ -0,0 +1,25 @@ +diff --git a/Sources/Basic/Process.swift b/Sources/Basic/Process.swift +index f388c769..8f208691 100644 +--- a/Sources/Basic/Process.swift ++++ b/Sources/Basic/Process.swift +@@ -322,7 +322,10 @@ public final class Process: ObjectIdentifierProtocol { + defer { posix_spawn_file_actions_destroy(&fileActions) } + + // Workaround for https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=89e435f3559c53084498e9baad22172b64429362 +- let devNull = strdup("/dev/null") ++ // Change allowing for newer version of glibc ++ guard let devNull = strdup("/dev/null") else { ++ throw SystemError.posix_spawn(0, arguments) ++ } + defer { free(devNull) } + // Open /dev/null as stdin. + posix_spawn_file_actions_addopen(&fileActions, 0, devNull, O_RDONLY, 0) +@@ -348,7 +351,7 @@ public final class Process: ObjectIdentifierProtocol { + + let argv = CStringArray(arguments) + let env = CStringArray(environment.map({ "\($0.0)=\($0.1)" })) +- let rv = posix_spawnp(&processID, argv.cArray[0], &fileActions, &attributes, argv.cArray, env.cArray) ++ let rv = posix_spawnp(&processID, argv.cArray[0]!, &fileActions, &attributes, argv.cArray, env.cArray) + + guard rv == 0 else { + throw SystemError.posix_spawn(rv, arguments) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 97703922395..8bbf74b6078 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -2,11 +2,13 @@ let params = { - "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; - "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; - "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; - "8.8" = { version = "0.10.3"; sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; }; - "8.9" = { version = "0.10.3"; sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; }; + "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; + "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; + "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; + "8.8" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; + "8.9" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; + "8.10" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; + "8.11" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; }; param = params.${coq.coq-version}; in diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 0e9d81d5e95..d6252a7506a 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -1,18 +1,30 @@ -{ stdenv, lib, fetchurl, clojure, - nodejs, jre, unzip, nodePackages, - python, openssl, pkgs }: - -let # packageJSON=./package.json; - version = "1.9.0"; - nodeVersion = "10.9.0"; - nodeSources = fetchurl { - url="https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz"; - sha256="0wgawq3wzw07pir73bxz13dggcc1fj0538y7y69n3cc0a2kiplqy"; - }; - lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH"; +{ stdenv +, lib +, fetchurl +, clojure +, gnutar +, nodejs +, jre +, unzip +, nodePackages +, xcbuild +, python +, openssl +, pkgs +, fetchgit +, darwin +}: +let + version = "1.10.1"; + nodeVersion = "11.13.0"; + nodeSources = fetchurl { + url = "https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz"; + sha256 = "1cjzjbshxnysxkvbf41p3m8298cnhs9kfvdczgvvvlp6w16x4aac"; + }; + lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH"; - # as found in cljs/snapshot/lumo/repl.cljs - requireDeps = '' \ + # as found in cljs/snapshot/lumo/repl.cljs + requireDeps = '' \ cljs.analyzer \ cljs.compiler \ cljs.env \ @@ -50,104 +62,125 @@ let # packageJSON=./package.json; lumo.js-deps \ lumo.common ''; - compileClojurescript = (simple: '' - (require '[cljs.build.api :as cljs]) - (cljs/build \"src/cljs/snapshot\" - {:optimizations ${if simple then ":simple" else ":none"} - :main 'lumo.core - :cache-analysis true - :source-map false - :dump-core false - :static-fns true - :optimize-constants false - :npm-deps false - :verbose true - :closure-defines {'cljs.core/*target* \"nodejs\" - 'lumo.core/*lumo-version* \"${version}\"} - :compiler-stats true - :process-shim false - :fn-invoke-direct true - :parallel-build false - :browser-repl false - :target :nodejs - :hashbang false - ;; :libs [ \"src/cljs/bundled\" \"src/js\" ] - :output-dir ${if simple - then ''\"cljstmp\"'' - else ''\"target\"''} - :output-to ${if simple - then ''\"cljstmp/main.js\"'' - else ''\"target/deleteme.js\"'' }}) - ''); + compileClojurescript = (simple: '' + (require '[cljs.build.api :as cljs]) + (cljs/build \"src/cljs/snapshot\" + {:optimizations ${if simple then ":simple" else ":none"} + :main 'lumo.core + :cache-analysis true + :source-map false + :dump-core false + :static-fns true + :optimize-constants false + :npm-deps false + :verbose true + :closure-defines {'cljs.core/*target* \"nodejs\" + 'lumo.core/*lumo-version* \"${version}\"} + :compiler-stats true + :process-shim false + :fn-invoke-direct true + :parallel-build false + :browser-repl false + :target :nodejs + :hashbang false + ;; :libs [ \"src/cljs/bundled\" \"src/js\" ] + :output-dir ${if simple + then ''\"cljstmp\"'' + else ''\"target\"''} + :output-to ${if simple + then ''\"cljstmp/main.js\"'' + else ''\"target/deleteme.js\"'' }}) + '' + ); - cacheToJsons = '' - (import [java.io ByteArrayOutputStream FileInputStream]) - (require '[cognitect.transit :as transit] - '[clojure.edn :as edn] - '[clojure.string :as str]) + cacheToJsons = '' + (import [java.io ByteArrayOutputStream FileInputStream]) + (require '[cognitect.transit :as transit] + '[clojure.edn :as edn] + '[clojure.string :as str]) - (defn write-transit-json [cache] - (let [out (ByteArrayOutputStream. 1000000) - writer (transit/writer out :json)] - (transit/write writer cache) - (.toString out))) + (defn write-transit-json [cache] + (let [out (ByteArrayOutputStream. 1000000) + writer (transit/writer out :json)] + (transit/write writer cache) + (.toString out))) - (defn process-caches [] - (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\" - cache-aot-edn (edn/read-string (slurp cache-aot-path)) - cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\" - cache-macros-stream (FileInputStream. cache-macros-path) - cache-macros-edn (transit/read (transit/reader cache-macros-stream :json)) - caches [[cache-aot-path cache-aot-edn] - [cache-macros-path cache-macros-edn]]] - (doseq [[path cache-edn] caches] - (doseq [key (keys cache-edn)] - (let [out-path (str/replace path #\"(\.json|\.edn)\$\" - (str \".\" (munge key) \".json\")) - tr-json (write-transit-json (key cache-edn))] - (spit out-path tr-json)))))) + (defn process-caches [] + (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\" + cache-aot-edn (edn/read-string (slurp cache-aot-path)) + cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\" + cache-macros-stream (FileInputStream. cache-macros-path) + cache-macros-edn (transit/read (transit/reader cache-macros-stream :json)) + caches [[cache-aot-path cache-aot-edn] + [cache-macros-path cache-macros-edn]]] + (doseq [[path cache-edn] caches] + (doseq [key (keys cache-edn)] + (let [out-path (str/replace path #\"(\.json|\.edn)\$\" + (str \".\" (munge key) \".json\")) + tr-json (write-transit-json (key cache-edn))] + (spit out-path tr-json)))))) - (process-caches) - ''; + (process-caches) + ''; - trimMainJsEnd = '' - (let [string (slurp \"target/main.js\")] - (spit \"target/main.js\" - (subs string 0 (.indexOf string \"cljs.nodejs={};\")))) - ''; + trimMainJsEnd = '' + (let [string (slurp \"target/main.js\")] + (spit \"target/main.js\" + (subs string 0 (.indexOf string \"cljs.nodejs={};\")))) + ''; - cljdeps = import ./deps.nix { inherit pkgs; }; - classp = cljdeps.makeClasspaths { - extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"]; - }; - + cljdeps = import ./deps.nix { inherit pkgs; }; + classp = cljdeps.makeClasspaths { + extraClasspaths = [ "src/js" "src/cljs/bundled" "src/cljs/snapshot" ]; + }; - getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; -in stdenv.mkDerivation { + getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; +in +stdenv.mkDerivation { inherit version; pname = "lumo"; - src = fetchurl { - url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz"; - sha256 = "1mr3zjslznhv7y3mzvg1pmmvzn10d6di26izz4x8p4nfnshacwgw"; + src = fetchgit { + url = "https://github.com/anmonteiro/lumo.git"; + rev = "${version}"; + sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p"; }; + buildInputs = [ + nodejs + clojure + jre + unzip + python + openssl + gnutar + nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" + ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices + xcbuild + ] + ); - buildInputs = [ nodejs clojure jre unzip python openssl - nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" ]; + patches = [ ./no_mangle.patch ./mkdir_promise.patch ]; + + postPatch = '' + substituteInPlace $NIX_BUILD_TOP/lumo/vendor/nexe/exe.js \ + --replace 'glob.sync(dir + "/*")' 'glob.sync(dir + "/../*")' + ''; buildPhase = '' - # Copy over lumo-build-deps environment + # Copy over lumo-build-deps environment rm yarn.lock cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./ # configure clojure-cli mkdir ./.cpcache export CLJ_CONFIG=`pwd` - export CLJ_CACHE=`pwd`/.cpcache + export CLJ_CACHE=`pwd`/.cpcache # require more namespaces for cljs-bundle sed -i "s!ns lumo.core! \ @@ -155,7 +188,7 @@ in stdenv.mkDerivation { (:require ${requireDeps}) \ (:require-macros [clojure.template :as temp] \ [cljs.test :as test])!g" \ - ./src/cljs/snapshot/lumo/core.cljs + ./src/cljs/snapshot/lumo/core.cljs # Step 1: compile clojurescript with :none and :simple ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}" @@ -204,7 +237,7 @@ in stdenv.mkDerivation { # Step 3: generate munged cache jsons ${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}" rm ./target/cljs/core\$macros\.cljc\.cache\.json - + # Step 4: Bunde javascript NODE_ENV=production node scripts/bundle.js @@ -215,21 +248,20 @@ in stdenv.mkDerivation { # Step 6: Package executeable 1st time # fetch node sources and copy to palce that nexe will find - mkdir -p tmp/${nodeVersion} - cp ${nodeSources} tmp/${nodeVersion}/node-${nodeVersion}.tar.gz - tar -C ./tmp/${nodeVersion} -xf ${nodeSources} - mv ./tmp/${nodeVersion}/node-v${nodeVersion}/* ./tmp/${nodeVersion}/ + mkdir -p tmp/node/${nodeVersion} + cp ${nodeSources} tmp/node/${nodeVersion}/node-${nodeVersion}.tar.gz + tar -C ./tmp/node/${nodeVersion} -xf ${nodeSources} --warning=no-unknown-keyword + mv ./tmp/node/${nodeVersion}/node-v${nodeVersion}/* ./tmp/node/${nodeVersion}/ rm -rf ${lumo-internal-classpath} - mv target ${lumo-internal-classpath} + cp -rf target ${lumo-internal-classpath} node scripts/package.js ${nodeVersion} - rm -rf ${lumo-internal-classpath} + rm -rf target + mv ${lumo-internal-classpath} target # Step 7: AOT Macros sh scripts/aot-bundle-macros.sh # Step 8: Package executeable 2nd time - rm -rf ${lumo-internal-classpath} - mv target ${lumo-internal-classpath} node scripts/package.js ${nodeVersion} ''; @@ -250,7 +282,6 @@ in stdenv.mkDerivation { homepage = https://github.com/anmonteiro/lumo; license = stdenv.lib.licenses.epl10; maintainers = [ stdenv.lib.maintainers.hlolli ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } - diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.edn b/pkgs/development/interpreters/clojurescript/lumo/deps.edn index e1563599a8c..7a2faee1d7a 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/deps.edn +++ b/pkgs/development/interpreters/clojurescript/lumo/deps.edn @@ -1,12 +1,12 @@ {:deps - {org.clojure/clojure {:mvn/version "1.10.0-beta5"} - org.clojure/clojurescript {:mvn/version "1.10.439"} - org.clojure/test.check {:mvn/version "0.10.0-alpha3"} + {org.clojure/clojure {:mvn/version "1.10.1"} + org.clojure/clojurescript {:mvn/version "1.10.520"} + org.clojure/test.check {:mvn/version "0.10.0-alpha4"} org.clojure/tools.reader {:mvn/version "1.3.2" :exclusions [org.clojure/clojure org.clojure/clojurescript]} com.cognitect/transit-cljs {:mvn/version "0.8.256" :exclusions [org.clojure/clojure org.clojure/clojurescript]} malabarba/lazy-map {:mvn/version "1.3" :exclusions [org.clojure/clojure org.clojure/clojurescript]} - fipp {:mvn/version "0.6.14" + fipp {:mvn/version "0.6.17" :exclusions [org.clojure/clojure org.clojure/clojurescript]}}} diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/pkgs/development/interpreters/clojurescript/lumo/deps.nix index 3e53c7f98dd..4f3beff3b81 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/deps.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/deps.nix @@ -1,241 +1,240 @@ -# generated by clj2nix-1.0.3 +# generated by clj2nix-1.0.4 { pkgs }: - let repos = [ - "https://repo.clojars.org/" - "https://repo1.maven.org/" - "http://central.maven.org/maven2/" - "http://oss.sonatype.org/content/repositories/releases/" - "http://oss.sonatype.org/content/repositories/public/" - "http://repo.typesafe.com/typesafe/releases/" - ]; - - in rec { - makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; - makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); - - packages = [ - { - name = "com.cognitect/transit-java"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-java"; - groupId = "com.cognitect"; - sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708"; - version = "0.8.332"; - }; - } - - { - name = "org.clojure/data.json"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "data.json"; - groupId = "org.clojure"; - sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; - version = "0.2.6"; - }; - } - - { - name = "org.clojure/clojure"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "clojure"; - groupId = "org.clojure"; - sha512 = "f7a6b207b1bcbb6523d32ecfdd3c8c25d4d0b0a59c78baf06cdc69ba3c21c5e96b5dac8e9efcb331efd94e10bccbb9b54fca62a4312309db65a1f9d89d9da3f4"; - version = "1.10.0-beta5"; - }; - } - - { - name = "commons-codec/commons-codec"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "commons-codec"; - groupId = "commons-codec"; - sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3"; - version = "1.10"; - }; - } - - { - name = "com.google.errorprone/error_prone_annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "error_prone_annotations"; - groupId = "com.google.errorprone"; - sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b"; - version = "2.1.3"; - }; - } - - { - name = "org.clojure/core.specs.alpha"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "core.specs.alpha"; - groupId = "org.clojure"; - sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; - version = "0.2.44"; - }; - } - - { - name = "org.clojure/spec.alpha"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "spec.alpha"; - groupId = "org.clojure"; - sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; - version = "0.2.176"; - }; - } - - { - name = "org.codehaus.mojo/animal-sniffer-annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "animal-sniffer-annotations"; - groupId = "org.codehaus.mojo"; - sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136"; - version = "1.14"; - }; - } - - { - name = "com.googlecode.json-simple/json-simple"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "json-simple"; - groupId = "com.googlecode.json-simple"; - sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742"; - version = "1.1.1"; - }; - } - - { - name = "com.cognitect/transit-cljs"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-cljs"; - groupId = "com.cognitect"; - sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd"; - version = "0.8.256"; - }; - } - - { - name = "org.clojure/google-closure-library"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "google-closure-library"; - groupId = "org.clojure"; - sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a"; - version = "0.0-20170809-b9c14c6b"; - }; - } - - { - name = "fipp"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "fipp"; - groupId = "fipp"; - sha512 = "155b5bb7045ac7c3a75c638e65464ca1fc90e5b4692328fc2da73b26792178fdbce5ab01ba0397e1986b6162b06b8904712d2c366f32ea43ea5fa2b454a526a5"; - version = "0.6.14"; - }; - } - - { - name = "org.clojure/clojurescript"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "clojurescript"; - groupId = "org.clojure"; - sha512 = "4aec5abdd48aaf95f7a729e11d225a99d02caa3a4ddff3e9e4f8db80dea83ab70a4440691cb372562c8c16e73c2850b22806a2851df3849c852fddd49b57fc58"; - version = "1.10.439"; - }; - } - - { - name = "com.google.jsinterop/jsinterop-annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "jsinterop-annotations"; - groupId = "com.google.jsinterop"; - sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d"; - version = "1.0.0"; - }; - } - - { - name = "com.fasterxml.jackson.core/jackson-core"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "jackson-core"; - groupId = "com.fasterxml.jackson.core"; - sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64"; - version = "2.8.7"; - }; - } - - { - name = "malabarba/lazy-map"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "lazy-map"; - groupId = "malabarba"; - sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f"; - version = "1.3"; - }; - } - - { - name = "com.cognitect/transit-js"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-js"; - groupId = "com.cognitect"; - sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623"; - version = "0.8.846"; - }; - } - - { - name = "org.mozilla/rhino"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "rhino"; - groupId = "org.mozilla"; - sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc"; - version = "1.7R5"; - }; - } - - { - name = "org.clojure/google-closure-library-third-party"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "google-closure-library-third-party"; - groupId = "org.clojure"; - sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35"; - version = "0.0-20170809-b9c14c6b"; - }; - } - - { - name = "com.google.javascript/closure-compiler-externs"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "closure-compiler-externs"; - groupId = "com.google.javascript"; - sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82"; - version = "v20180805"; - }; - } - - { +let repos = [ + "https://repo.clojars.org/" + "https://repo1.maven.org/" + "http://oss.sonatype.org/content/repositories/releases/" + "http://oss.sonatype.org/content/repositories/public/" + "http://repo.typesafe.com/typesafe/releases/" + ]; + +in rec { + makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; + makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); + + packages = [ + { + name = "com.cognitect/transit-java"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-java"; + groupId = "com.cognitect"; + sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708"; + version = "0.8.332"; + }; + } + + { + name = "org.clojure/data.json"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "data.json"; + groupId = "org.clojure"; + sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; + version = "0.2.6"; + }; + } + + { + name = "org.clojure/clojure"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojure"; + groupId = "org.clojure"; + sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b"; + version = "1.10.1"; + }; + } + + { + name = "commons-codec/commons-codec"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "commons-codec"; + groupId = "commons-codec"; + sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3"; + version = "1.10"; + }; + } + + { + name = "com.google.errorprone/error_prone_annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "error_prone_annotations"; + groupId = "com.google.errorprone"; + sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b"; + version = "2.1.3"; + }; + } + + { + name = "org.clojure/core.specs.alpha"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.specs.alpha"; + groupId = "org.clojure"; + sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; + version = "0.2.44"; + }; + } + + { + name = "org.clojure/spec.alpha"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "spec.alpha"; + groupId = "org.clojure"; + sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; + version = "0.2.176"; + }; + } + + { + name = "org.codehaus.mojo/animal-sniffer-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "animal-sniffer-annotations"; + groupId = "org.codehaus.mojo"; + sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136"; + version = "1.14"; + }; + } + + { + name = "com.googlecode.json-simple/json-simple"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "json-simple"; + groupId = "com.googlecode.json-simple"; + sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742"; + version = "1.1.1"; + }; + } + + { + name = "com.cognitect/transit-cljs"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-cljs"; + groupId = "com.cognitect"; + sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd"; + version = "0.8.256"; + }; + } + + { + name = "org.clojure/google-closure-library"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "google-closure-library"; + groupId = "org.clojure"; + sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a"; + version = "0.0-20170809-b9c14c6b"; + }; + } + + { + name = "fipp"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "fipp"; + groupId = "fipp"; + sha512 = "d844ab63d28cb5e31657cc38e574bbc7072a78419c997f25445ac6ea4a719904a4f4844b37e3f664a8d2e49bd38ff1006a9e8c6e63fb4e2f0a2322d6c2638275"; + version = "0.6.17"; + }; + } + + { + name = "org.clojure/clojurescript"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojurescript"; + groupId = "org.clojure"; + sha512 = "b241959d6bd2ab659920965d301508226e26b3edcee469e4cd516cd4ed014b1a6b132c17ee7d96a8e66fe27fd01a74813ac8b85958d260f9fdbbeb4348d57ff1"; + version = "1.10.520"; + }; + } + + { + name = "com.google.jsinterop/jsinterop-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jsinterop-annotations"; + groupId = "com.google.jsinterop"; + sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d"; + version = "1.0.0"; + }; + } + + { + name = "com.fasterxml.jackson.core/jackson-core"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jackson-core"; + groupId = "com.fasterxml.jackson.core"; + sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64"; + version = "2.8.7"; + }; + } + + { + name = "malabarba/lazy-map"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "lazy-map"; + groupId = "malabarba"; + sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f"; + version = "1.3"; + }; + } + + { + name = "com.cognitect/transit-js"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-js"; + groupId = "com.cognitect"; + sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623"; + version = "0.8.846"; + }; + } + + { + name = "org.mozilla/rhino"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "rhino"; + groupId = "org.mozilla"; + sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc"; + version = "1.7R5"; + }; + } + + { + name = "org.clojure/google-closure-library-third-party"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "google-closure-library-third-party"; + groupId = "org.clojure"; + sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35"; + version = "0.0-20170809-b9c14c6b"; + }; + } + + { + name = "com.google.javascript/closure-compiler-externs"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "closure-compiler-externs"; + groupId = "com.google.javascript"; + sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82"; + version = "v20180805"; + }; + } + + { name = "org.javassist/javassist"; path = pkgs.fetchMavenArtifact { inherit repos; @@ -307,8 +306,8 @@ inherit repos; artifactId = "core.rrb-vector"; groupId = "org.clojure"; - sha512 = "5f737bf3ca3acf567b2b5c14b5761c8c38e94e1f6168f8cba9f46d2ae41334ae3d68d2c00663827a6214094d96b9767f6803f66ab44b0012c6f2e3c2997b1796"; - version = "0.0.13"; + sha512 = "4e410c4a90a869e98d5d69a8a6dd6427e9d77b70e1a2b54cf24baf23389f22e7a208375783c2fdc5c1a5acfb8511a5c5ed57ad1a946d5bffd203f453d90a6155"; + version = "0.0.14"; }; } @@ -351,8 +350,8 @@ inherit repos; artifactId = "test.check"; groupId = "org.clojure"; - sha512 = "bf57571a9d31d50cf15b38134f4d7c34d03eb458bc62b30c7a1dbf233e300c67f1fda6673dbd1584a0497cf8875f972e6697e7f13d0c3e70e4254697b1b75cc6"; - version = "0.10.0-alpha3"; + sha512 = "60fa3bd38c32cf193c573f1bd47c6abd7e7a5bb2fc7f7f9f97aa9dcd54d5e2eab9e351f5f83b01bb96b32811a9f2f5ab384c6b7b7ebbb6c86d1ad4f2789351bf"; + version = "0.10.0-alpha4"; }; } diff --git a/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch b/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch new file mode 100644 index 00000000000..e9504bb5c1a --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch @@ -0,0 +1,20 @@ +diff --git a/vendor/nexe/exe.js b/vendor/nexe/exe.js +index 21e78bb..ecbfca4 100644 +--- a/vendor/nexe/exe.js ++++ b/vendor/nexe/exe.js +@@ -254,9 +254,7 @@ return initModule._compile(${JSON.stringify(source)}, process.execPath); + */ + + function makeOutputDirectory(next) { +- mkdirp(path.dirname(options.output), function() { +- next(); +- }); ++ mkdirp(path.dirname(options.output)).then(() => next()); + }, + + /** +@@ -1107,4 +1105,3 @@ exports.package = function(path, options) { + + return obj; + } +- diff --git a/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch b/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch new file mode 100644 index 00000000000..9af22341195 --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/bundle.js b/scripts/bundle.js +index 16425a4..0d510fc 100644 +--- a/scripts/bundle.js ++++ b/scripts/bundle.js +@@ -73,6 +73,8 @@ const plugins = [ + if (!isDevBuild) { + plugins.push( + babelMinify({ ++ evaluate: false, ++ mangle: false, + comments: false, + removeConsole: true, + removeDebugger: true, diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json index cfffdc890d1..6ab3f9616c7 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/package.json +++ b/pkgs/development/interpreters/clojurescript/lumo/package.json @@ -1,40 +1,49 @@ { "name": "lumo-build-deps", - "version": "1.9.0", + "version": "1.10.1", "dependencies": { "@babel/core": "^7.1.5", - "@babel/plugin-external-helpers": "7.0.0", + "@babel/plugin-external-helpers": "7.8.3", "@babel/plugin-proposal-class-properties": "^7.1.0", "@babel/plugin-proposal-object-rest-spread": "^7.0.0", "@babel/plugin-transform-runtime": "^7.1.0", "@babel/preset-env": "^7.1.5", - "@babel/preset-stage-2": "7.0.0", + "@babel/preset-stage-2": "7.8.3", "@babel/runtime": "^7.1.5", + "async": "^3.1.1", "async-retry": "^1.2.3", "babel-core": "^7.0.0-bridge.0", - "babel-eslint": "10.0.1", - "babel-jest": "^23.6.0", + "babel-eslint": "10.0.3", + "babel-jest": "^25.1.0", "babel-loader": "^8.0.4", "babel-plugin-transform-flow-strip-types": "6.22.0", - "chalk": "^2.4.1", - "cross-env": "5.2.0", + "browserify": "^16.2.3", + "chalk": "^3.0.0", + "colors": "^1.3.3", + "cross-env": "7.0.0", "death": "^1.1.0", - "flow-bin": "0.85.0", + "flow-bin": "0.118.0", "google-closure-compiler-js": "20170910.0.1", + "glob": "^7.1.3", + "gunzip-maybe": "^1.4.1", + "insert-module-globals": "^7.2.0", "jszip": "github:anmonteiro/jszip#patch-1", - "nexe": "3.0.0-beta.7", + "mkdirp": "^1.0.3", + "ncp": "^2.0.0", "node-fetch": "^2.2.1", - "paredit.js": "0.3.4", + "paredit.js": "0.3.6", "posix-getopt": "github:anmonteiro/node-getopt#master", - "prettier": "1.15.1", + "prettier": "1.19.1", "progress": "^2.0.0", - "read-pkg": "^4.0.1", - "rollup": "0.67.0", - "rollup-plugin-babel": "4.0.3", - "rollup-plugin-babel-minify": "6.1.1", - "rollup-plugin-commonjs": "9.2.0", - "rollup-plugin-node-resolve": "3.4.0", - "rollup-plugin-replace": "2.1.0", + "read-pkg": "^5.2.0", + "request": "^2.88.0", + "rollup": "^1.9.0", + "rollup-plugin-babel": "^4.3.2", + "rollup-plugin-babel-minify": "^9.1.1", + "rollup-plugin-commonjs": "^10.0.0", + "rollup-plugin-node-resolve": "^5.0.0", + "rollup-plugin-replace": "^2.1.1", + "tar-stream": "^2.0.1", "webpack": "^4.25.1", "webpack-cli": "^3.2.3", "which-promise": "^1.0.0" diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 639ad8d0e51..803cf853be1 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -18,6 +18,7 @@ , netsurf , pango , poly2tri-c +, poppler , bzip2 , json-glib , gettext @@ -34,14 +35,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.20"; + version = "0.4.22"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93"; + sha256 = "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q"; }; patches = [ @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { netsurf.libnsgif pango poly2tri-c + poppler bzip2 libraw libwebp diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index a0f44a33220..32d19283974 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libcbor libressl udev ]; + buildInputs = [ libcbor libressl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/Yubico/libfido2; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; - + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix index 115d818d936..c66329fa633 100644 --- a/pkgs/development/libraries/mypaint-brushes/1.0.nix +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -1,5 +1,4 @@ { stdenv -, fetchpatch , autoconf , automake , fetchFromGitHub @@ -8,23 +7,15 @@ stdenv.mkDerivation rec { pname = "mypaint-brushes"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mypaint"; repo = pname; rev = "v${version}"; - sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"; + sha256 = "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j"; }; - patches = [ - # build with automake 1.16 - (fetchpatch { - url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch; - sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9"; - }) - ]; - nativeBuildInputs = [ autoconf automake diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index 8f693a32e35..2309e6671f8 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -6,7 +6,7 @@ let inherit name; src = fetchurl { - url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/${name}.tar.gz"; + url = "http://lhapdfsets.web.cern.ch/lhapdfsets/current/${name}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/sundials/3.x.nix b/pkgs/development/libraries/sundials/3.x.nix deleted file mode 100644 index 879f13e8bf5..00000000000 --- a/pkgs/development/libraries/sundials/3.x.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, cmake -, fetchurl -, python -, liblapack -, gfortran -, lapackSupport ? true }: - -let liblapackShared = liblapack.override { - shared = true; -}; - -in stdenv.mkDerivation rec { - pname = "sundials"; - version = "3.2.1"; - - buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ]; - nativeBuildInputs = [ cmake ]; - - src = fetchurl { - url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7"; - }; - - patches = [ - (fetchurl { - # https://github.com/LLNL/sundials/pull/19 - url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; - sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; - }) - ]; - - cmakeFlags = [ - "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" - ] ++ stdenv.lib.optionals (lapackSupport) [ - "-DSUNDIALS_INDEX_TYPE=int32_t" - "-DLAPACK_ENABLE=ON" - "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" - ]; - - # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3 - doCheck = false; - checkPhase = "make test"; - - meta = with stdenv.lib; { - description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = https://computation.llnl.gov/projects/sundials; - platforms = platforms.all; - maintainers = with maintainers; [ flokli idontgetoutmuch ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix new file mode 100644 index 00000000000..d1e3934d882 --- /dev/null +++ b/pkgs/development/libraries/ucx/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, doxygen +, numactl, rdma-core, libbfd, libiberty, perl, zlib +}: + +let + version = "1.7.0"; + +in stdenv.mkDerivation { + name = "ucx-${version}"; + + src = fetchFromGitHub { + owner = "openucx"; + repo = "ucx"; + rev = "v${version}"; + sha256 = "149p8s7jrg7pbbq0hw0qm8va119bsl19q4scgk94vjqliyc1s33h"; + }; + + nativeBuildInputs = [ autoreconfHook doxygen ]; + + buildInputs = [ numactl rdma-core libbfd libiberty perl zlib ]; + + configureFlags = [ + "--with-rdmacm=${rdma-core}" + "--with-dc" + "--with-rc" + "--with-dm" + "--with-verbs=${rdma-core}" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Unified Communication X library"; + homepage = http://www.openucx.org; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 71bd608e93a..5c508f133e1 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa }: - +{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3 +, libGLU, epoxy, libX11, libdrm, mesa +}: stdenv.mkDerivation rec { - pname = "virglrenderer"; - version = "0.7.0"; + version = "0.8.1"; src = fetchurl { - url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2"; - sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m"; + url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; + sha256 = "0ac39mplmy6lmcd6cljmfsrfby7m6ac3dzvmnn5pv200drl415l4"; }; buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ]; - # Fix use of fd_set without proper include - prePatch = '' - sed -e '1i#include <sys/select.h>' -i vtest/util.c - ''; + dontUseCmakeConfigure = true; meta = with stdenv.lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; @@ -27,5 +24,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.xeji ]; }; - } diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 5497679f4f6..7cfa4719891 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -535,13 +535,13 @@ let sha512 = "0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw=="; }; }; - "@babel/plugin-external-helpers-7.0.0" = { + "@babel/plugin-external-helpers-7.8.3" = { name = "_at_babel_slash_plugin-external-helpers"; packageName = "@babel/plugin-external-helpers"; - version = "7.0.0"; + version = "7.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.0.0.tgz"; - sha512 = "tZKTMdhZvTy0KCEX5EGQQm1RHr7jUa36q/yax1baEA0yZapVYmu10yW7LTqijITgSq416gPVjrcexiA6y4pJlA=="; + url = "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.8.3.tgz"; + sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.8.3" = { @@ -634,6 +634,15 @@ let sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; }; }; + "@babel/plugin-syntax-bigint-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-bigint"; + packageName = "@babel/plugin-syntax-bigint"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; + sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; + }; + }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { name = "_at_babel_slash_plugin-syntax-dynamic-import"; packageName = "@babel/plugin-syntax-dynamic-import"; @@ -1066,13 +1075,13 @@ let sha512 = "iCXFk+T4demnq+dNLLvlGOgvYF6sPZ/hS1EmswugOqh1Ysp2vuiqJzpgsnp5rW8+6dLJT/0CXDzye28ZH6BAfQ=="; }; }; - "@babel/preset-stage-2-7.0.0" = { + "@babel/preset-stage-2-7.8.3" = { name = "_at_babel_slash_preset-stage-2"; packageName = "@babel/preset-stage-2"; - version = "7.0.0"; + version = "7.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-stage-2/-/preset-stage-2-7.0.0.tgz"; - sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA=="; + url = "https://registry.npmjs.org/@babel/preset-stage-2/-/preset-stage-2-7.8.3.tgz"; + sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; "@babel/preset-typescript-7.8.3" = { @@ -1156,15 +1165,6 @@ let sha512 = "jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg=="; }; }; - "@calebboyd/semaphore-1.3.1" = { - name = "_at_calebboyd_slash_semaphore"; - packageName = "@calebboyd/semaphore"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@calebboyd/semaphore/-/semaphore-1.3.1.tgz"; - sha512 = "17z9me12RgAEcMhIgR7f+BiXKbzwF9p1VraI69OxrUUSWGuSMOyOTEHQNVtMKuVrkEDVD0/Av5uiGZPBMYZljw=="; - }; - }; "@cliqz-oss/firefox-client-0.3.1" = { name = "_at_cliqz-oss_slash_firefox-client"; packageName = "@cliqz-oss/firefox-client"; @@ -1183,13 +1183,22 @@ let sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA=="; }; }; - "@comandeer/babel-plugin-banner-4.1.0" = { + "@cnakazawa/watch-1.0.4" = { + name = "_at_cnakazawa_slash_watch"; + packageName = "@cnakazawa/watch"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz"; + sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ=="; + }; + }; + "@comandeer/babel-plugin-banner-5.0.0" = { name = "_at_comandeer_slash_babel-plugin-banner"; packageName = "@comandeer/babel-plugin-banner"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@comandeer/babel-plugin-banner/-/babel-plugin-banner-4.1.0.tgz"; - sha512 = "9hKVIN2+maygxkngnXDsZXRZqCYDY4pxIRljJqqJ5A+eJZzW3k/NZj5lixEmStjWFjlPlOHGYBytBehpf0l+hA=="; + url = "https://registry.npmjs.org/@comandeer/babel-plugin-banner/-/babel-plugin-banner-5.0.0.tgz"; + sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ=="; }; }; "@cronvel/get-pixels-3.3.1" = { @@ -1480,6 +1489,42 @@ let sha512 = "ODXbta2kvFNkMIEGwl7KX5gJTcZZHkzSLoBh3wND2H+EsG0KpIqOZKWMtkj+suuPut85wyLZ7fGfARnrNf7dtA=="; }; }; + "@istanbuljs/load-nyc-config-1.0.0" = { + name = "_at_istanbuljs_slash_load-nyc-config"; + packageName = "@istanbuljs/load-nyc-config"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz"; + sha512 = "ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg=="; + }; + }; + "@istanbuljs/schema-0.1.2" = { + name = "_at_istanbuljs_slash_schema"; + packageName = "@istanbuljs/schema"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz"; + sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; + }; + }; + "@jest/transform-25.1.0" = { + name = "_at_jest_slash_transform"; + packageName = "@jest/transform"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/transform/-/transform-25.1.0.tgz"; + sha512 = "4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ=="; + }; + }; + "@jest/types-25.1.0" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz"; + sha512 = "VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA=="; + }; + }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { name = "_at_kbrandwijk_slash_swagger-to-graphql"; packageName = "@kbrandwijk/swagger-to-graphql"; @@ -2965,6 +3010,42 @@ let sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ=="; }; }; + "@types/babel__core-7.1.4" = { + name = "_at_types_slash_babel__core"; + packageName = "@types/babel__core"; + version = "7.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.4.tgz"; + sha512 = "c/5MuRz5HM4aizqL5ViYfW4iEnmfPcfbH4Xa6GgLT21dMc1NGeNnuS6egHheOmP+kCJ9CAzC4pv4SDCWTnRkbg=="; + }; + }; + "@types/babel__generator-7.6.1" = { + name = "_at_types_slash_babel__generator"; + packageName = "@types/babel__generator"; + version = "7.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz"; + sha512 = "bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew=="; + }; + }; + "@types/babel__template-7.0.2" = { + name = "_at_types_slash_babel__template"; + packageName = "@types/babel__template"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz"; + sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; + }; + }; + "@types/babel__traverse-7.0.8" = { + name = "_at_types_slash_babel__traverse"; + packageName = "@types/babel__traverse"; + version = "7.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.8.tgz"; + sha512 = "yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw=="; + }; + }; "@types/babylon-6.16.5" = { name = "_at_types_slash_babylon"; packageName = "@types/babylon"; @@ -3064,6 +3145,15 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; + "@types/estree-0.0.42" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.42"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz"; + sha512 = "K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ=="; + }; + }; "@types/events-3.0.0" = { name = "_at_types_slash_events"; packageName = "@types/events"; @@ -3136,6 +3226,33 @@ let sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; }; }; + "@types/istanbul-lib-coverage-2.0.1" = { + name = "_at_types_slash_istanbul-lib-coverage"; + packageName = "@types/istanbul-lib-coverage"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz"; + sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg=="; + }; + }; + "@types/istanbul-lib-report-3.0.0" = { + name = "_at_types_slash_istanbul-lib-report"; + packageName = "@types/istanbul-lib-report"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; + }; + }; + "@types/istanbul-reports-1.1.1" = { + name = "_at_types_slash_istanbul-reports"; + packageName = "@types/istanbul-reports"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz"; + sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA=="; + }; + }; "@types/js-yaml-3.12.2" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; @@ -3226,22 +3343,22 @@ let sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; }; }; - "@types/node-10.17.15" = { + "@types/node-10.17.16" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.15"; + version = "10.17.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.15.tgz"; - sha512 = "daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.16.tgz"; + sha512 = "A4283YSA1OmnIivcpy/4nN86YlnKRiQp8PYwI2KdPCONEBN093QTb0gCtERtkLyVNGKKIGazTZ2nAmVzQU51zA=="; }; }; - "@types/node-13.7.1" = { + "@types/node-13.7.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.7.1"; + version = "13.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz"; - sha512 = "Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz"; + sha512 = "oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw=="; }; }; "@types/node-6.14.9" = { @@ -3289,6 +3406,15 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; + "@types/resolve-0.0.8" = { + name = "_at_types_slash_resolve"; + packageName = "@types/resolve"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz"; + sha512 = "auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ=="; + }; + }; "@types/responselike-1.0.0" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; @@ -3379,6 +3505,24 @@ let sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g=="; }; }; + "@types/yargs-15.0.3" = { + name = "_at_types_slash_yargs"; + packageName = "@types/yargs"; + version = "15.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.3.tgz"; + sha512 = "XCMQRK6kfpNBixHLyHUsGmXrpEmFFxzMrcnSXFMziHd8CoNJo8l16FkHyQq4x+xbM7E2XL83/O78OD8u+iZTdQ=="; + }; + }; + "@types/yargs-parser-15.0.0" = { + name = "_at_types_slash_yargs-parser"; + packageName = "@types/yargs-parser"; + version = "15.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; + }; + }; "@types/zen-observable-0.8.0" = { name = "_at_types_slash_zen-observable"; packageName = "@types/zen-observable"; @@ -5368,15 +5512,6 @@ let sha512 = "F14aX2R/fKNYMvhuP2t9GD9fggID7zp5I96MF5QeKYWDWTrkRdHRp4+SVfXUVN+cXOaB/IebfvRtzPf25CM0zw=="; }; }; - "app-builder-5.2.0" = { - name = "app-builder"; - packageName = "app-builder"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/app-builder/-/app-builder-5.2.0.tgz"; - sha512 = "RRj/vu8WhmMM71G9BxMLRvcwpr1QUJZ9NXURGGo1v3fPiauzkQfNi31kM7irRNqR87NV+lJ/qI62iTzcAc+V0Q=="; - }; - }; "app-module-path-2.2.0" = { name = "app-module-path"; packageName = "app-module-path"; @@ -6457,13 +6592,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.620.0" = { + "aws-sdk-2.622.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.620.0"; + version = "2.622.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.620.0.tgz"; - sha512 = "j+PGKbYwk5OjzbCFbxzRkcJVEvfdn9YFkrU8dJdjleYf9AzUSUpTjMyZsyUPOKxJxdNdA9FYTs43WdtSKHZa0A=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.622.0.tgz"; + sha512 = "CV5RZjoh2PZ/wALQXx932dTYukPTZXZmfjlRTJqNibRhyN36/E1KwkX1va1CROii2AnfnxjzV7OqymH0TgKlUg=="; }; }; "aws-sign2-0.6.0" = { @@ -6529,13 +6664,13 @@ let sha512 = "poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg=="; }; }; - "babel-eslint-10.0.1" = { + "babel-eslint-10.0.3" = { name = "babel-eslint"; packageName = "babel-eslint"; - version = "10.0.1"; + version = "10.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz"; - sha512 = "z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ=="; + url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz"; + sha512 = "z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA=="; }; }; "babel-generator-6.26.1" = { @@ -6628,13 +6763,13 @@ let sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; }; }; - "babel-jest-23.6.0" = { + "babel-jest-25.1.0" = { name = "babel-jest"; packageName = "babel-jest"; - version = "23.6.0"; + version = "25.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz"; - sha512 = "lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.1.0.tgz"; + sha512 = "tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg=="; }; }; "babel-loader-8.0.6" = { @@ -6664,22 +6799,22 @@ let sha512 = "o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ=="; }; }; - "babel-plugin-istanbul-4.1.6" = { + "babel-plugin-istanbul-6.0.0" = { name = "babel-plugin-istanbul"; packageName = "babel-plugin-istanbul"; - version = "4.1.6"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz"; - sha512 = "PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ=="; + url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"; + sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-23.2.0" = { + "babel-plugin-jest-hoist-25.1.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "23.2.0"; + version = "25.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz"; - sha1 = "e61fae05a1ca8801aadee57a6d66b8cefaf44167"; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz"; + sha512 = "oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw=="; }; }; "babel-plugin-minify-builtins-0.5.0" = { @@ -6952,13 +7087,13 @@ let sha1 = "379937abc67d7895970adc621f284cd966cf2153"; }; }; - "babel-preset-jest-23.2.0" = { + "babel-preset-jest-25.1.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "23.2.0"; + version = "25.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz"; - sha1 = "8ec7a03a138f001a1a8fb1e8113652bf1a55da46"; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz"; + sha512 = "eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ=="; }; }; "babel-preset-minify-0.5.1" = { @@ -8203,6 +8338,15 @@ let sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; }; }; + "browserify-zlib-0.1.4" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; + sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + }; + }; "browserify-zlib-0.2.0" = { name = "browserify-zlib"; packageName = "browserify-zlib"; @@ -8221,6 +8365,15 @@ let sha512 = "gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA=="; }; }; + "bser-2.1.1" = { + name = "bser"; + packageName = "bser"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"; + sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; + }; + }; "btoa-lite-1.0.0" = { name = "btoa-lite"; packageName = "btoa-lite"; @@ -8482,15 +8635,6 @@ let sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "builtin-modules-2.0.0" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-2.0.0.tgz"; - sha512 = "3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg=="; - }; - }; "builtin-modules-3.1.0" = { name = "builtin-modules"; packageName = "builtin-modules"; @@ -8932,13 +9076,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001027" = { + "caniuse-lite-1.0.30001028" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001027"; + version = "1.0.30001028"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz"; - sha512 = "7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz"; + sha512 = "Vnrq+XMSHpT7E+LWoIYhs3Sne8h9lx9YJV3acH3THNCwU/9zV93/ta4xVfzTtnqd3rvnuVpVjE3DFqf56tr3aQ=="; + }; + }; + "capture-exit-2.0.0" = { + name = "capture-exit"; + packageName = "capture-exit"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz"; + sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g=="; }; }; "capture-stack-trace-1.0.1" = { @@ -9310,15 +9463,6 @@ let sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA=="; }; }; - "cherow-1.6.9" = { - name = "cherow"; - packageName = "cherow"; - version = "1.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/cherow/-/cherow-1.6.9.tgz"; - sha512 = "pmmkpIQRcnDA7EawKcg9+ncSZNTYfXqDx+K3oqqYvpZlqVBChjTomTfw+hePnkqYR3Y013818c0R1Q5P/7PGrQ=="; - }; - }; "child-process-ext-2.1.0" = { name = "child-process-ext"; packageName = "child-process-ext"; @@ -11722,22 +11866,22 @@ let sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; }; }; - "cross-env-5.2.0" = { + "cross-env-6.0.3" = { name = "cross-env"; packageName = "cross-env"; - version = "5.2.0"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz"; - sha512 = "jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg=="; + url = "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz"; + sha512 = "+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag=="; }; }; - "cross-env-6.0.3" = { + "cross-env-7.0.0" = { name = "cross-env"; packageName = "cross-env"; - version = "6.0.3"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz"; - sha512 = "+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag=="; + url = "https://registry.npmjs.org/cross-env/-/cross-env-7.0.0.tgz"; + sha512 = "rV6M9ldNgmwP7bx5u6rZsTbYidzwvrwIYZnT08hSGLcQCcggofgFW+sNe7IhA1SRauPS0QuLbbX+wdNtpqE5CQ=="; }; }; "cross-fetch-2.2.2" = { @@ -11965,15 +12109,6 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; - "css-unit-converter-1.1.1" = { - name = "css-unit-converter"; - packageName = "css-unit-converter"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz"; - sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996"; - }; - }; "css-what-2.1.3" = { name = "css-what"; packageName = "css-what"; @@ -12010,15 +12145,6 @@ let sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4"; }; }; - "cssesc-2.0.0" = { - name = "cssesc"; - packageName = "cssesc"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz"; - sha512 = "MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="; - }; - }; "cssesc-3.0.0" = { name = "cssesc"; packageName = "cssesc"; @@ -14368,13 +14494,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.353" = { + "electron-to-chromium-1.3.355" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.353"; + version = "1.3.355"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.353.tgz"; - sha512 = "CkG24biyy9qQTQs8U2vGQaiyWSFDxAXP/UGHBveXZ1TGoWOAw+eYZXryrX0UeIMKnQjcaHx33hzYuydv98kqGQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.355.tgz"; + sha512 = "zKO/wS+2ChI/jz9WAo647xSW8t2RmgRLFdbUb/77cORkUTargO+SCj4ctTHjBn2VeNFrsLgDT7IuDVrd3F8mLQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -14495,6 +14621,15 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; + "emojis-list-3.0.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; + sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; + }; + }; "emphasize-1.5.0" = { name = "emphasize"; packageName = "emphasize"; @@ -15242,15 +15377,6 @@ let sha512 = "MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw=="; }; }; - "eslint-scope-3.7.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "3.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; - }; - }; "eslint-scope-3.7.3" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -15476,15 +15602,6 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estree-walker-0.5.2" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz"; - sha512 = "XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig=="; - }; - }; "estree-walker-0.6.1" = { name = "estree-walker"; packageName = "estree-walker"; @@ -15755,6 +15872,15 @@ let sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw=="; }; }; + "exec-sh-0.3.4" = { + name = "exec-sh"; + packageName = "exec-sh"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz"; + sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A=="; + }; + }; "execa-0.1.1" = { name = "execa"; packageName = "execa"; @@ -16466,6 +16592,15 @@ let sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; }; }; + "fb-watchman-2.0.1" = { + name = "fb-watchman"; + packageName = "fb-watchman"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; + }; + }; "fd-lock-1.0.2" = { name = "fd-lock"; packageName = "fd-lock"; @@ -17060,13 +17195,13 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; - "flow-bin-0.85.0" = { + "flow-bin-0.118.0" = { name = "flow-bin"; packageName = "flow-bin"; - version = "0.85.0"; + version = "0.118.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-bin/-/flow-bin-0.85.0.tgz"; - sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ=="; + url = "https://registry.npmjs.org/flow-bin/-/flow-bin-0.118.0.tgz"; + sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; "flow-parser-0.118.0" = { @@ -19086,13 +19221,13 @@ let sha512 = "4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA=="; }; }; - "graphql-tools-4.0.6" = { + "graphql-tools-4.0.7" = { name = "graphql-tools"; packageName = "graphql-tools"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.6.tgz"; - sha512 = "jHLQw8x3xmSNRBCsaZqelXXsFfUSUSktSCUP8KYHiX1Z9qEuwcMpAf+FkdBzk8aTAFqOlPdNZ3OI4DKKqGKUqg=="; + url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.7.tgz"; + sha512 = "rApl8sT8t/W1uQRcwzxMYyUBiCl/XicluApiDkNze5TX/GR0BSTQMjM2UcRGdTmkbsb1Eqq6afkyyeG/zMxZYQ=="; }; }; "graphql-type-json-0.3.1" = { @@ -19266,6 +19401,15 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; + "gunzip-maybe-1.4.1" = { + name = "gunzip-maybe"; + packageName = "gunzip-maybe"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; + sha512 = "qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g=="; + }; + }; "handle-thing-2.0.0" = { name = "handle-thing"; packageName = "handle-thing"; @@ -21589,6 +21733,15 @@ let sha512 = "RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw=="; }; }; + "is-deflate-1.0.0" = { + name = "is-deflate"; + packageName = "is-deflate"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz"; + sha1 = "c862901c3c161fb09dac7cdc7e784f80e98f2f14"; + }; + }; "is-descriptor-0.1.6" = { name = "is-descriptor"; packageName = "is-descriptor"; @@ -21796,6 +21949,15 @@ let sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; + "is-gzip-1.0.0" = { + name = "is-gzip"; + packageName = "is-gzip"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz"; + sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83"; + }; + }; "is-hexadecimal-1.0.4" = { name = "is-hexadecimal"; packageName = "is-hexadecimal"; @@ -22174,6 +22336,15 @@ let sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; + "is-reference-1.1.4" = { + name = "is-reference"; + packageName = "is-reference"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz"; + sha512 = "uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw=="; + }; + }; "is-regex-1.0.5" = { name = "is-regex"; packageName = "is-regex"; @@ -22678,22 +22849,22 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "istanbul-lib-coverage-1.2.1" = { + "istanbul-lib-coverage-3.0.0" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; - version = "1.2.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz"; - sha512 = "PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ=="; + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; + sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="; }; }; - "istanbul-lib-instrument-1.10.2" = { + "istanbul-lib-instrument-4.0.1" = { name = "istanbul-lib-instrument"; packageName = "istanbul-lib-instrument"; - version = "1.10.2"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz"; - sha512 = "aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A=="; + url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz"; + sha512 = "imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg=="; }; }; "isurl-1.0.0" = { @@ -22795,6 +22966,51 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; + "jest-haste-map-25.1.0" = { + name = "jest-haste-map"; + packageName = "jest-haste-map"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.1.0.tgz"; + sha512 = "/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw=="; + }; + }; + "jest-regex-util-25.1.0" = { + name = "jest-regex-util"; + packageName = "jest-regex-util"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.1.0.tgz"; + sha512 = "9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w=="; + }; + }; + "jest-serializer-25.1.0" = { + name = "jest-serializer"; + packageName = "jest-serializer"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.1.0.tgz"; + sha512 = "20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA=="; + }; + }; + "jest-util-25.1.0" = { + name = "jest-util"; + packageName = "jest-util"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-util/-/jest-util-25.1.0.tgz"; + sha512 = "7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw=="; + }; + }; + "jest-worker-25.1.0" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "25.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz"; + sha512 = "ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg=="; + }; + }; "jetpack-id-1.0.0" = { name = "jetpack-id"; packageName = "jetpack-id"; @@ -24533,6 +24749,15 @@ let sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; }; }; + "loader-utils-1.4.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; + sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; + }; + }; "locate-path-2.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -26207,13 +26432,13 @@ let sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w=="; }; }; - "make-error-1.3.5" = { + "make-error-1.3.6" = { name = "make-error"; packageName = "make-error"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz"; - sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; + sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; "make-error-cause-1.2.2" = { @@ -26252,6 +26477,15 @@ let sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw=="; }; }; + "makeerror-1.0.11" = { + name = "makeerror"; + packageName = "makeerror"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz"; + sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; + }; + }; "mamacro-0.0.3" = { name = "mamacro"; packageName = "mamacro"; @@ -27161,6 +27395,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=="; + }; + }; "middleware-handler-0.2.0" = { name = "middleware-handler"; packageName = "middleware-handler"; @@ -28767,15 +29010,6 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; - "nexe-3.0.0-beta.7" = { - name = "nexe"; - packageName = "nexe"; - version = "3.0.0-beta.7"; - src = fetchurl { - url = "https://registry.npmjs.org/nexe/-/nexe-3.0.0-beta.7.tgz"; - sha512 = "Vnvd/rHCDyvc3ZxEX/sSw6lCMsBLHqkhGQS627MtetIiFBj1G7oRw9y1All8a7Tzi560o+SGIkAbnjFR60wNlQ=="; - }; - }; "next-event-1.0.0" = { name = "next-event"; packageName = "next-event"; @@ -28839,22 +29073,22 @@ let sha1 = "04b035cb530d46859d1018839a518c029133f676"; }; }; - "nlcst-is-literal-1.2.0" = { + "nlcst-is-literal-1.2.1" = { name = "nlcst-is-literal"; packageName = "nlcst-is-literal"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.0.tgz"; - sha512 = "0f7SKVXHdQvXvibPzLL90Lp8KXbhO0ktZGvythpwyoc7mmXKGe2VtDjnPRailPWBO8TgzHRzvQzkPIz81PSyBA=="; + url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.1.tgz"; + sha512 = "abNv1XY7TUoyLn5kSSorMIYHfRvVfXbgftNFNvEMiQQkyKteLdjrGuDqEMMyK70sMbn7uPA6oUbRvykM6pg+pg=="; }; }; - "nlcst-normalize-2.1.3" = { + "nlcst-normalize-2.1.4" = { name = "nlcst-normalize"; packageName = "nlcst-normalize"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.3.tgz"; - sha512 = "TtAmaUsjZPU6zH+yksmLwTezMti5Db8R+kdViCmWv44pWGxNr4C90p7X33YbiULxDfA7i7J7gUutDX4fT9pn7g=="; + url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.4.tgz"; + sha512 = "dWJ3XUoAoWoau24xOM59Y1FPozv7DyYWy+rdUaXj9Ow0hBCVuwqDQbXzTF7H+HskyTVpTkRPXYPu4YsMEScmRw=="; }; }; "nlcst-search-1.5.1" = { @@ -28866,13 +29100,13 @@ let sha512 = "G3ws0fgNlVsUvHvA2G1PTjyxzGOJ0caI0+WOvlZzev5iSUTX+R1q4lnlL4Y7E+he4ZMUW/0FMn9rYwdYon/13g=="; }; }; - "nlcst-to-string-2.0.3" = { + "nlcst-to-string-2.0.4" = { name = "nlcst-to-string"; packageName = "nlcst-to-string"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.3.tgz"; - sha512 = "OY2QhGdf6jpYfHqS4vJwqF7aIBZkaMjMUkcHcskMPitvXLuYNGdQvgVWI/5yKwkmIdmhft3ounSJv+Re2yydng=="; + url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.4.tgz"; + sha512 = "3x3jwTd6UPG7vi5k4GEzvxJ5rDA7hVUIRNHPblKuMVP9Z3xmlsd9cgLcpAMkc5uPOBna82EeshROFhsPkbnTZg=="; }; }; "no-case-2.3.2" = { @@ -31217,13 +31451,13 @@ let sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; }; }; - "paredit.js-0.3.4" = { + "paredit.js-0.3.6" = { name = "paredit.js"; packageName = "paredit.js"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/paredit.js/-/paredit.js-0.3.4.tgz"; - sha512 = "b6t7ORo/MwT6xvRiuu1c1do3+CAUd7/0rgc1d3qNHUeP64zxy4ttLIvK7SEHzyfyDLvD9pPuV9mYKHf6MgUkmg=="; + url = "https://registry.npmjs.org/paredit.js/-/paredit.js-0.3.6.tgz"; + sha512 = "Z97Go1ucly6XzJDWsX8g6aXKIapx610JElNEgAvOQ8DA3A5uTAzEIaPZyn3r/WskHS+HpaO17oALcy2dUsKlQA=="; }; }; "parent-module-1.0.1" = { @@ -31973,6 +32207,15 @@ let sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA=="; }; }; + "peek-stream-1.1.3" = { + name = "peek-stream"; + packageName = "peek-stream"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz"; + sha512 = "FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA=="; + }; + }; "peer-wire-protocol-0.7.1" = { name = "peer-wire-protocol"; packageName = "peer-wire-protocol"; @@ -32460,13 +32703,22 @@ let sha512 = "IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA=="; }; }; - "postcss-calc-7.0.1" = { + "postcss-7.0.27" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.27"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz"; + sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ=="; + }; + }; + "postcss-calc-7.0.2" = { name = "postcss-calc"; packageName = "postcss-calc"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz"; - sha512 = "oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ=="; + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz"; + sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ=="; }; }; "postcss-colormin-4.0.3" = { @@ -32730,15 +32982,6 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-5.0.0" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz"; - sha512 = "w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ=="; - }; - }; "postcss-selector-parser-6.0.2" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; @@ -32775,6 +33018,15 @@ let sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; + "postcss-value-parser-4.0.3" = { + name = "postcss-value-parser"; + packageName = "postcss-value-parser"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz"; + sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg=="; + }; + }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -32865,15 +33117,6 @@ let sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; }; }; - "prettier-1.15.1" = { - name = "prettier"; - packageName = "prettier"; - version = "1.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.15.1.tgz"; - sha512 = "4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA=="; - }; - }; "prettier-1.19.1" = { name = "prettier"; packageName = "prettier"; @@ -34890,15 +35133,6 @@ let sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; }; }; - "read-pkg-4.0.1" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz"; - sha1 = "963625378f3e1c4d48c85872b5a6ec7d5d093237"; - }; - }; "read-pkg-5.2.0" = { name = "read-pkg"; packageName = "read-pkg"; @@ -35070,6 +35304,15 @@ let sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; }; }; + "realpath-native-1.1.0" = { + name = "realpath-native"; + packageName = "realpath-native"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz"; + sha512 = "wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA=="; + }; + }; "recast-0.11.23" = { name = "recast"; packageName = "recast"; @@ -35889,15 +36132,6 @@ let sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; }; }; - "resolve-dependencies-2.2.3" = { - name = "resolve-dependencies"; - packageName = "resolve-dependencies"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-2.2.3.tgz"; - sha512 = "EIZcqEE3q+fWNapzpQ2iiCPal+J7TsLfLnoeGq4h5L4GYjnf4xKzVHN7VBjLGgOJwUs/Z+a6nqA80AhwP7IPlQ=="; - }; - }; "resolve-dir-1.0.1" = { name = "resolve-dir"; packageName = "resolve-dir"; @@ -36330,58 +36564,58 @@ let sha512 = "jmaDhK9CO4YbQAV8zzCnq9vjAqeO489MS5ehZ+rXmFiPFFE6B+S9KYO6prjmLJ5A0zY3QxVlQdrIya7E/azz/Q=="; }; }; - "rollup-0.67.0" = { + "rollup-1.31.1" = { name = "rollup"; packageName = "rollup"; - version = "0.67.0"; + version = "1.31.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-0.67.0.tgz"; - sha512 = "p34buXxArhwv9ieTdHvdhdo65Cbig68s/Z8llbZuiX5e+3zCqnBF02Ck9IH0tECrmvvrJVMws32Ry84hTnS1Tw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-1.31.1.tgz"; + sha512 = "2JREN1YdrS/kpPzEd33ZjtuNbOuBC3ePfuZBdKEybvqcEcszW1ckyVqzcEiEe0nE8sqHK+pbJg+PsAgRJ8+1dg=="; }; }; - "rollup-plugin-babel-4.0.3" = { + "rollup-plugin-babel-4.3.3" = { name = "rollup-plugin-babel"; packageName = "rollup-plugin-babel"; - version = "4.0.3"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.0.3.tgz"; - sha512 = "/PP0MgbPQyRywI4zRIJim6ySjTcOLo4kQbEbROqp9kOR3kHC3FeU++QpBDZhS2BcHtJTVZMVbBV46flbBN5zxQ=="; + url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz"; + sha512 = "tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw=="; }; }; - "rollup-plugin-babel-minify-6.1.1" = { + "rollup-plugin-babel-minify-9.1.1" = { name = "rollup-plugin-babel-minify"; packageName = "rollup-plugin-babel-minify"; - version = "6.1.1"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-6.1.1.tgz"; - sha512 = "MX0lqOHp1vHd7WbHTK5OG679msgPxzGzYf4VBEg6kKptO05fgheCbN51i3EoFYSa+8/VtNDjPc23iDdZfhO2uw=="; + url = "https://registry.npmjs.org/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-9.1.1.tgz"; + sha512 = "/Jph4PungzuB4h8uPSNKJQ16GjxVTfaRT6f4EwZW5NfD7RU7niFSEMMCZAlM6ezf11MBo1ttQcei+FisyCxicg=="; }; }; - "rollup-plugin-commonjs-9.2.0" = { + "rollup-plugin-commonjs-10.1.0" = { name = "rollup-plugin-commonjs"; packageName = "rollup-plugin-commonjs"; - version = "9.2.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz"; - sha512 = "0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA=="; + url = "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz"; + sha512 = "jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q=="; }; }; - "rollup-plugin-node-resolve-3.4.0" = { + "rollup-plugin-node-resolve-5.2.0" = { name = "rollup-plugin-node-resolve"; packageName = "rollup-plugin-node-resolve"; - version = "3.4.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz"; - sha512 = "PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg=="; + url = "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz"; + sha512 = "jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw=="; }; }; - "rollup-plugin-replace-2.1.0" = { + "rollup-plugin-replace-2.2.0" = { name = "rollup-plugin-replace"; packageName = "rollup-plugin-replace"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.1.0.tgz"; - sha512 = "SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ=="; + url = "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz"; + sha512 = "/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA=="; }; }; "rollup-pluginutils-2.8.2" = { @@ -36438,6 +36672,15 @@ let sha512 = "OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="; }; }; + "rsvp-4.8.5" = { + name = "rsvp"; + packageName = "rsvp"; + version = "4.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz"; + sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; + }; + }; "rttc-4.5.2" = { name = "rttc"; packageName = "rttc"; @@ -36708,6 +36951,15 @@ let sha512 = "jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ=="; }; }; + "sane-4.1.0" = { + name = "sane"; + packageName = "sane"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz"; + sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA=="; + }; + }; "sanitize-filename-1.6.3" = { name = "sanitize-filename"; packageName = "sanitize-filename"; @@ -38004,22 +38256,22 @@ let sha512 = "43HbJj6QatuL2BNG+Uq2Taa73wdfSQSID8FJWW4q5/LYgd9D+RtdiE4lAMwxqYYbvThU9uuza4epuF/B1CAlYw=="; }; }; - "snyk-go-parser-1.3.1" = { + "snyk-go-parser-1.3.3" = { name = "snyk-go-parser"; packageName = "snyk-go-parser"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.1.tgz"; - sha512 = "jrFRfIk6yGHFeipGD66WV9ei/A/w/lIiGqI80w1ndMbg6D6M5pVNbK7ngDTmo4GdHrZDYqx/VBGBsUm2bol3Rg=="; + url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.3.tgz"; + sha512 = "h65vi4UDH3ier7+r/E1GTZhruBSbGv3z4dGmzB+pc+g8ljOJd0BfqN6pUPIHB7hjrIbLh6KxT/XtJcV4X7LdeQ=="; }; }; - "snyk-go-plugin-1.11.1" = { + "snyk-go-plugin-1.12.0" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.11.1.tgz"; - sha512 = "IsNi7TmpHoRHzONOWJTT8+VYozQJnaJpKgnYNQjzNm2JlV8bDGbdGQ1a8LcEoChxnJ8v8aMZy7GTiQyGGABtEQ=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.12.0.tgz"; + sha512 = "8rba/qn/hrUtPL0tDgdhJvp5HoN/3OMOUTmrtPiI0JHfVW6fqBTM9UnCFXJdK7UCUt9ITKIWIL0UBAzTc4hgKg=="; }; }; "snyk-gradle-plugin-3.2.4" = { @@ -40686,13 +40938,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.22.0" = { + "systeminformation-4.22.1" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.22.0"; + version = "4.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.0.tgz"; - sha512 = "Sq6H99xxvBeN54kUdM9DCdbesSLb+S5MZnUD2qy7gutyfS0REYZ4QN6tfsWbYhcsaocrvcpCwoOHblbO+caN4A=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.1.tgz"; + sha512 = "TjUA91kxGOcwWCic/OLc+zI0twe+GyHFp4mpjZcpG9LpXh0EVMD4zMeIVaEqsmxCWVOM+/FA3V6OB3W/IpLypA=="; }; }; "syswide-cas-5.3.0" = { @@ -41074,13 +41326,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.33.10" = { + "terminal-kit-1.33.15" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.33.10"; + version = "1.33.15"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.10.tgz"; - sha512 = "xKJAeyfm9EIkHWWz0C/GXbYW5LytAMzuVT9xZdI9kgLnm9Z7lNkly0WdBCH8WOPD4inZpKjNzBKr0StEOJXBNA=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.15.tgz"; + sha512 = "zGZpZRXXAKJw/fyWxY7k8rOzo56OBzzhfPQGloPBP4irhQs6cv4VWMOoVFHze8o7L4YzwtijBotfI479xA4QxQ=="; }; }; "terser-3.17.0" = { @@ -41110,13 +41362,13 @@ let sha512 = "QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA=="; }; }; - "test-exclude-4.2.3" = { + "test-exclude-6.0.0" = { name = "test-exclude"; packageName = "test-exclude"; - version = "4.2.3"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.3.tgz"; - sha512 = "SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA=="; + url = "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz"; + sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="; }; }; "text-extensions-1.9.0" = { @@ -41569,6 +41821,15 @@ let sha512 = "8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw=="; }; }; + "tmpl-1.0.4" = { + name = "tmpl"; + packageName = "tmpl"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz"; + sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + }; + }; "to-absolute-glob-2.0.2" = { name = "to-absolute-glob"; packageName = "to-absolute-glob"; @@ -42631,13 +42892,13 @@ let sha512 = "pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw=="; }; }; - "uglify-js-3.7.7" = { + "uglify-js-3.8.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.7.7"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz"; - sha512 = "FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz"; + sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -44899,6 +45160,15 @@ let sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532"; }; }; + "walker-1.0.7" = { + name = "walker"; + packageName = "walker"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz"; + sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; + }; + }; "ware-1.3.0" = { name = "ware"; packageName = "ware"; @@ -47338,7 +47608,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.7.7" + sources."uglify-js-3.8.0" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -47554,7 +47824,7 @@ in sources."@apollo/federation-0.12.0" (sources."@apollo/protobufjs-1.0.3" // { dependencies = [ - sources."@types/node-10.17.15" + sources."@types/node-10.17.16" ]; }) sources."@apollographql/apollo-tools-0.4.3" @@ -47767,7 +48037,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@types/node-fetch-2.5.4" sources."@types/normalize-package-data-2.4.0" sources."@types/range-parser-1.2.3" @@ -47945,7 +48215,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001027" + sources."caniuse-lite-1.0.30001028" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -48110,7 +48380,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.353" + sources."electron-to-chromium-1.3.355" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -48263,7 +48533,7 @@ in sources."graphql-extensions-0.10.10" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.3" - sources."graphql-tools-4.0.6" + sources."graphql-tools-4.0.7" sources."graphql-type-json-0.3.1" sources."graphql-upload-8.1.0" sources."growly-1.3.0" @@ -48454,7 +48724,7 @@ in ]; }) sources."make-dir-1.3.0" - sources."make-error-1.3.5" + sources."make-error-1.3.6" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" @@ -49351,12 +49621,16 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-2.0.3.tgz"; - sha512 = "QdHKO+HOYVtE4B/M3up3i4LSJeJgsa2CTVBrjBf9GgLUPGGUFZowcdJ5yE4gOJuRAHNdqB9JFeRfFfaOu5x8Rw=="; + url = "https://registry.npmjs.org/asar/-/asar-2.1.0.tgz"; + sha512 = "d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA=="; }; dependencies = [ + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.7.4" sources."balanced-match-1.0.0" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" @@ -49881,7 +50155,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.15" + sources."@types/node-10.17.16" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.11.0" @@ -50454,7 +50728,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.11.0" @@ -51089,7 +51363,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -51430,7 +51704,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -52653,7 +52927,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.620.0" + sources."aws-sdk-2.622.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -53214,10 +53488,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.0.0.tgz"; - sha512 = "9I+AC6Y7WTX4J1O3GGg1LqGiDxOUedLxzIxtKSWnD1FP3z2MPQbnWNNycg9Pq/L5B0NlszdaBlajUexZ8qzuag=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.0.tgz"; + sha512 = "cNZFOYG+Quphqj+GPoTNe9nsDCRJo2AjHVpu4RkvAxH8+vR2ckvm7ksr+Lwi+kkKuMf4h+QifTAXJ0HuBkJ7FA=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" @@ -55724,10 +55998,10 @@ in gtop = nodeEnv.buildNodePackage { name = "gtop"; packageName = "gtop"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gtop/-/gtop-1.0.1.tgz"; - sha512 = "rDONVL6bOSKi9H2PuZ+nItRvFML39EeLgV65JRkGPdLri5saUAMVISZV/4jW8LylZBRHysVmaI1nCu5S/0Iilg=="; + url = "https://registry.npmjs.org/gtop/-/gtop-1.0.2.tgz"; + sha512 = "Dn/8Kt57CsFLHd9vJIqWuhzXETpm+J86tD444rOz04uUu0kQBUTEBXmwu7zOVntb+TRr4EuyRxBo2tecJAPFmA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -55779,7 +56053,7 @@ in sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."systeminformation-4.22.0" + sources."systeminformation-4.22.1" sources."term-canvas-0.0.5" sources."wordwrap-0.0.3" sources."x256-0.0.2" @@ -56619,7 +56893,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.7.7" + sources."uglify-js-3.8.0" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -58311,7 +58585,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.33.10" + sources."terminal-kit-1.33.15" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -59616,7 +59890,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -60381,7 +60655,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - (sources."uglify-js-3.7.7" // { + (sources."uglify-js-3.8.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61406,7 +61680,7 @@ in "lumo-build-deps-../interpreters/clojurescript/lumo" = nodeEnv.buildNodePackage { name = "lumo-build-deps"; packageName = "lumo-build-deps"; - version = "1.9.0"; + version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.8.3" @@ -61436,9 +61710,13 @@ in sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-wrap-function-7.8.3" sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" + (sources."@babel/highlight-7.8.3" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) sources."@babel/parser-7.8.4" - sources."@babel/plugin-external-helpers-7.0.0" + sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" @@ -61449,6 +61727,7 @@ in sources."@babel/plugin-proposal-optional-chaining-7.8.3" sources."@babel/plugin-proposal-unicode-property-regex-7.8.3" sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -61489,22 +61768,35 @@ in sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" sources."@babel/preset-env-7.8.4" - sources."@babel/preset-stage-2-7.0.0" + sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.8.4" sources."@babel/template-7.8.3" sources."@babel/traverse-7.8.4" sources."@babel/types-7.8.3" - sources."@calebboyd/semaphore-1.3.1" - sources."@comandeer/babel-plugin-banner-4.1.0" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@sindresorhus/is-0.7.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@types/estree-0.0.39" - sources."@types/events-3.0.0" - sources."@types/glob-7.1.1" - sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@cnakazawa/watch-1.0.4" + sources."@comandeer/babel-plugin-banner-5.0.0" + sources."@istanbuljs/load-nyc-config-1.0.0" + sources."@istanbuljs/schema-0.1.2" + (sources."@jest/transform-25.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."@jest/types-25.1.0" + sources."@types/babel__core-7.1.4" + sources."@types/babel__generator-7.6.1" + sources."@types/babel__template-7.0.2" + sources."@types/babel__traverse-7.0.8" + sources."@types/color-name-1.1.1" + sources."@types/estree-0.0.42" + sources."@types/istanbul-lib-coverage-2.0.1" + sources."@types/istanbul-lib-report-3.0.0" + sources."@types/istanbul-reports-1.1.1" + sources."@types/node-13.7.4" + sources."@types/normalize-package-data-2.4.0" + sources."@types/resolve-0.0.8" + sources."@types/yargs-15.0.3" + sources."@types/yargs-parser-15.0.0" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -61525,69 +61817,25 @@ in sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" + sources."JSONStream-1.3.5" sources."ace.improved-0.2.1" - sources."acorn-6.4.0" + sources."acorn-7.1.0" + sources."acorn-node-1.8.2" + sources."acorn-walk-7.1.1" sources."ajv-6.11.0" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."amdefine-1.0.1" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - (sources."anymatch-2.0.0" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."debug-2.6.9" - sources."define-property-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."extend-shallow-2.0.1" - sources."extglob-2.0.4" - sources."fill-range-4.0.0" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" - sources."micromatch-3.1.10" - sources."ms-2.0.0" - ]; - }) - sources."app-builder-5.2.0" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" sources."aproba-1.2.0" - (sources."archive-type-4.0.0" // { - dependencies = [ - sources."file-type-4.4.0" - ]; - }) - sources."arr-diff-2.0.0" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.2.1" - sources."arrify-1.0.1" + sources."array-unique-0.3.2" + sources."asn1-0.2.4" sources."asn1.js-4.10.1" (sources."assert-1.5.0" // { dependencies = [ @@ -61595,23 +61843,17 @@ in sources."util-0.10.3" ]; }) + sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" + sources."async-3.1.1" sources."async-each-1.0.3" sources."async-retry-1.3.1" + sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."chalk-1.1.3" - sources."js-tokens-3.0.2" - ]; - }) + sources."aws-sign2-0.7.0" + sources."aws4-1.9.1" sources."babel-core-7.0.0-bridge.0" - sources."babel-eslint-10.0.1" - (sources."babel-generator-6.26.1" // { - dependencies = [ - sources."jsesc-1.3.0" - ]; - }) + sources."babel-eslint-10.0.3" sources."babel-helper-evaluate-path-0.5.0" sources."babel-helper-flip-expressions-0.4.3" sources."babel-helper-is-nodes-equiv-0.0.1" @@ -61619,16 +61861,16 @@ in sources."babel-helper-mark-eval-scopes-0.4.3" sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" - sources."babel-jest-23.6.0" + sources."babel-jest-25.1.0" (sources."babel-loader-8.0.6" // { dependencies = [ - sources."pify-4.0.1" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" ]; }) - sources."babel-messages-6.23.0" sources."babel-plugin-dynamic-import-node-2.3.0" - sources."babel-plugin-istanbul-4.1.6" - sources."babel-plugin-jest-hoist-23.2.0" + sources."babel-plugin-istanbul-6.0.0" + sources."babel-plugin-jest-hoist-25.1.0" sources."babel-plugin-minify-builtins-0.5.0" sources."babel-plugin-minify-constant-folding-0.5.0" sources."babel-plugin-minify-dead-code-elimination-0.5.1" @@ -61641,7 +61883,6 @@ in sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" sources."babel-plugin-syntax-flow-6.18.0" - sources."babel-plugin-syntax-object-rest-spread-6.13.0" sources."babel-plugin-transform-flow-strip-types-6.22.0" sources."babel-plugin-transform-inline-consecutive-adds-0.4.3" sources."babel-plugin-transform-member-expression-literals-6.9.4" @@ -61654,44 +61895,50 @@ in sources."babel-plugin-transform-remove-undefined-0.5.0" sources."babel-plugin-transform-simplify-comparison-operators-6.9.4" sources."babel-plugin-transform-undefined-to-void-6.9.4" - sources."babel-preset-jest-23.2.0" + sources."babel-preset-jest-25.1.0" sources."babel-preset-minify-0.5.1" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" ]; }) - sources."babel-template-6.26.0" - (sources."babel-traverse-6.26.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."globals-9.18.0" - sources."ms-2.0.0" - ]; - }) - (sources."babel-types-6.26.0" // { - dependencies = [ - sources."to-fast-properties-1.0.3" - ]; - }) - sources."babylon-6.18.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) sources."base64-js-1.3.1" + sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."bl-1.2.2" + (sources."bl-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."bluebird-3.7.2" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."brorand-1.1.0" + sources."browser-pack-6.1.0" + (sources."browser-resolve-1.11.3" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + (sources."browserify-16.5.0" // { + dependencies = [ + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + ]; + }) sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" @@ -61699,57 +61946,47 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."browserslist-4.8.7" + sources."bser-2.1.1" sources."buffer-5.4.3" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" - sources."builtin-modules-2.0.0" + sources."builtin-modules-3.1.0" sources."builtin-status-codes-3.0.0" - sources."cacache-12.0.3" - (sources."cache-base-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."cacheable-request-2.1.4" // { + (sources."cacache-12.0.3" // { dependencies = [ - sources."lowercase-keys-1.0.0" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" ]; }) - sources."call-me-maybe-1.0.1" + sources."cache-base-1.0.1" + sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001027" - sources."caw-2.0.1" - (sources."chalk-2.4.2" // { + sources."caniuse-lite-1.0.30001028" + sources."capture-exit-2.0.0" + sources."caseless-0.12.0" + (sources."chalk-3.0.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."supports-color-5.5.0" + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" ]; }) - sources."cherow-1.6.9" (sources."chokidar-2.1.8" // { dependencies = [ - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - (sources."glob-parent-3.1.0" // { + (sources."anymatch-2.0.0" // { dependencies = [ - sources."is-glob-3.1.0" + sources."normalize-path-2.1.1" ]; }) - sources."is-extglob-2.1.1" - sources."is-glob-4.0.1" - sources."is-number-3.0.0" - sources."isobject-3.0.1" - sources."normalize-path-3.0.0" + sources."fsevents-1.2.11" + sources."micromatch-3.1.10" ]; }) sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" + sources."ci-info-2.0.0" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -61765,37 +62002,38 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) - sources."cli-cursor-2.1.0" - sources."cli-spinners-2.2.0" - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."cliui-5.0.0" sources."clone-2.1.2" sources."clone-buffer-1.0.0" - sources."clone-response-1.0.2" sources."clone-stats-1.0.0" sources."cloneable-readable-1.1.3" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.8.1" + sources."colors-1.4.0" + (sources."combine-source-map-0.8.0" // { + dependencies = [ + sources."convert-source-map-1.1.3" + ]; + }) + sources."combined-stream-1.0.8" + sources."commander-2.20.3" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."config-chain-1.1.12" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."content-disposition-0.5.3" sources."convert-source-map-1.7.0" - sources."copy-concurrently-1.0.5" + (sources."copy-concurrently-1.0.5" // { + dependencies = [ + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + ]; + }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.11" (sources."core-js-compat-3.6.4" // { @@ -61807,143 +62045,68 @@ in sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cross-env-5.2.0" + (sources."cross-env-7.0.0" // { + dependencies = [ + sources."cross-spawn-7.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" sources."cyclist-1.0.1" + sources."dash-ast-1.0.0" + sources."dashdash-1.14.1" sources."death-1.1.0" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - (sources."decompress-4.2.0" // { - dependencies = [ - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - ]; - }) - sources."decompress-response-3.3.0" - (sources."decompress-tar-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - (sources."decompress-targz-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-unzip-4.0.1" // { - dependencies = [ - sources."file-type-3.9.0" - sources."get-stream-2.3.1" - ]; - }) - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) - sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" - (sources."define-property-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."define-property-2.0.2" + sources."defined-1.0.0" + sources."delayed-stream-1.0.0" + sources."deps-sort-2.0.1" sources."des.js-1.0.1" sources."detect-file-1.0.0" - sources."detect-indent-4.0.0" + sources."detective-5.2.0" sources."diffie-hellman-5.0.3" - (sources."dir-glob-2.0.0" // { - dependencies = [ - sources."path-type-3.0.0" - sources."pify-3.0.0" - ]; - }) sources."domain-browser-1.2.0" - (sources."download-7.1.0" // { - dependencies = [ - sources."got-8.3.2" - sources."make-dir-1.3.0" - sources."pify-3.0.0" - ]; - }) - sources."duplexer3-0.1.4" + sources."duplexer2-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.353" + sources."ecc-jsbn-0.1.2" + sources."electron-to-chromium-1.3.355" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" - sources."emojis-list-2.1.0" + sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-4.1.1" + (sources."enhanced-resolve-4.1.1" // { + dependencies = [ + sources."memory-fs-0.5.0" + ]; + }) sources."errno-0.1.7" sources."error-ex-1.3.2" + sources."es-abstract-1.17.4" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-3.7.1" + sources."eslint-scope-4.0.3" sources."eslint-visitor-keys-1.1.0" + sources."esprima-4.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."estree-walker-0.6.1" sources."esutils-2.0.3" - sources."events-3.1.0" + sources."events-2.1.0" sources."evp_bytestokey-1.0.3" - (sources."execa-1.0.0" // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - }) - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - sources."expand-tilde-2.0.2" - sources."ext-list-2.2.2" - sources."ext-name-5.0.0" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."extglob-0.3.2" - sources."fast-deep-equal-3.1.1" - (sources."fast-glob-2.2.7" // { + sources."exec-sh-0.3.4" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."debug-2.6.9" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ sources."kind-of-3.2.2" @@ -61954,146 +62117,90 @@ in sources."kind-of-3.2.2" ]; }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."is-extglob-2.1.1" - sources."is-glob-4.0.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" - sources."micromatch-3.1.10" + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" sources."ms-2.0.0" ]; }) + sources."expand-tilde-2.0.2" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."fd-slicer-1.1.0" + sources."fast-safe-stringify-2.0.7" + sources."fb-watchman-2.0.1" sources."figgy-pudding-3.5.1" - sources."file-type-8.1.0" sources."file-uri-to-path-1.0.0" - sources."filename-regex-2.0.1" - sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."fill-range-2.2.4" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."find-cache-dir-2.1.0" - sources."find-up-2.1.0" + sources."find-up-4.1.0" (sources."findup-sync-3.0.0" // { dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."debug-2.6.9" - sources."define-property-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."extend-shallow-2.0.1" - sources."extglob-2.0.4" - sources."fill-range-4.0.0" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."is-extglob-2.1.1" - sources."is-glob-4.0.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" sources."micromatch-3.1.10" - sources."ms-2.0.0" ]; }) - sources."flow-bin-0.85.0" + sources."flow-bin-0.118.0" sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" - sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-2.1.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.1" + sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" - sources."get-proxy-2.1.0" - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" sources."get-value-2.0.6" + sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" - sources."glob-to-regexp-0.3.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) (sources."global-modules-2.0.0" // { dependencies = [ sources."global-prefix-3.0.0" - sources."kind-of-6.0.3" ]; }) sources."global-prefix-1.0.2" sources."globals-11.12.0" - (sources."globby-8.0.2" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) sources."google-closure-compiler-js-20170910.0.1" - (sources."got-9.6.0" // { + sources."graceful-fs-4.2.3" + (sources."gunzip-maybe-1.4.1" // { dependencies = [ - sources."@sindresorhus/is-0.14.0" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.1.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."get-stream-4.1.0" - sources."http-cache-semantics-4.0.4" - sources."normalize-url-4.5.0" - sources."p-cancelable-1.1.0" + sources."browserify-zlib-0.1.4" + sources."pako-0.2.9" ]; }) - sources."graceful-fs-4.2.3" - sources."graceful-readlink-1.0.1" - sources."has-ansi-2.0.0" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.1" - sources."has-to-string-tag-x-1.4.1" - (sources."has-value-1.0.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."kind-of-4.0.0" ]; }) @@ -62102,119 +62209,134 @@ in sources."hmac-drbg-1.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.5" - sources."http-cache-semantics-3.8.1" + sources."htmlescape-1.1.1" + sources."http-signature-1.2.0" sources."https-browserify-1.0.0" sources."ieee754-1.1.13" sources."iferr-0.1.5" - sources."ignore-3.3.10" sources."import-local-2.0.0" sources."imurmurhash-0.1.4" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" + sources."inline-source-map-0.6.2" + sources."insert-module-globals-7.2.0" sources."interpret-1.2.0" - sources."into-stream-3.1.0" sources."invariant-2.2.4" sources."invert-kv-2.0.0" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" + sources."is-callable-1.1.5" + sources."is-ci-2.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-deflate-1.0.0" + sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" - sources."is-finite-1.1.0" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-2.0.1" + sources."is-glob-4.0.1" + sources."is-gzip-1.0.0" sources."is-module-1.0.0" - sources."is-natural-number-4.0.1" - sources."is-number-2.1.0" - sources."is-object-1.0.1" - sources."is-plain-obj-1.1.0" - (sources."is-plain-object-2.0.4" // { + (sources."is-number-3.0.0" // { dependencies = [ - sources."isobject-3.0.1" + sources."kind-of-3.2.2" ]; }) - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" - sources."is-retry-allowed-1.2.0" + sources."is-plain-object-2.0.4" + (sources."is-reference-1.1.4" // { + dependencies = [ + sources."@types/estree-0.0.39" + ]; + }) + sources."is-regex-1.0.5" sources."is-stream-1.1.0" - sources."is-utf8-0.2.1" + sources."is-symbol-1.0.3" + sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" - sources."istanbul-lib-coverage-1.2.1" - sources."istanbul-lib-instrument-1.10.2" - sources."isurl-1.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."istanbul-lib-coverage-3.0.0" + (sources."istanbul-lib-instrument-4.0.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."jest-haste-map-25.1.0" + sources."jest-regex-util-25.1.0" + sources."jest-serializer-25.1.0" + (sources."jest-util-25.1.0" // { + dependencies = [ + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + ]; + }) + (sources."jest-worker-25.1.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + ]; + }) sources."js-tokens-4.0.0" + sources."js-yaml-3.13.1" + sources."jsbn-0.1.1" sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-0.0.1" + sources."json-stringify-safe-5.0.1" sources."json5-2.1.1" + sources."jsonify-0.0.0" + sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" sources."jszip-git://github.com/anmonteiro/jszip#patch-1" - sources."keyv-3.0.0" - sources."kind-of-3.2.2" + sources."kind-of-6.0.3" + sources."labeled-stream-splicer-2.0.2" sources."lcid-2.0.0" sources."leven-3.1.0" sources."levenary-1.1.1" - sources."load-json-file-1.1.0" + sources."lines-and-columns-1.1.6" sources."loader-runner-2.4.0" - (sources."loader-utils-1.2.3" // { + (sources."loader-utils-1.4.0" // { dependencies = [ sources."json5-1.0.1" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" - sources."log-symbols-2.2.0" + sources."lodash.memoize-3.0.4" sources."loose-envify-1.4.0" - sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" sources."magic-string-0.25.6" - (sources."make-dir-2.1.0" // { - dependencies = [ - sources."pify-4.0.1" - ]; - }) + sources."make-dir-2.1.0" + sources."makeerror-1.0.11" sources."mamacro-0.0.3" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."math-random-1.0.4" sources."md5.js-1.3.5" - (sources."mem-4.3.0" // { + sources."mem-4.3.0" + sources."memory-fs-0.4.1" + sources."merge-stream-2.0.0" + (sources."micromatch-4.0.2" // { dependencies = [ - sources."mimic-fn-2.1.0" - sources."p-is-promise-2.1.0" + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."to-regex-range-5.0.1" ]; }) - sources."memory-fs-0.5.0" - sources."merge2-1.3.0" - sources."micromatch-2.3.11" sources."miller-rabin-4.0.1" sources."mime-db-1.43.0" - sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.1" + sources."mime-types-2.1.26" + sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -62225,54 +62347,43 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { + sources."mkdirp-1.0.3" + sources."module-deps-6.2.2" + (sources."move-concurrently-1.0.1" // { dependencies = [ sources."minimist-0.0.8" + sources."mkdirp-0.5.1" ]; }) - sources."move-concurrently-1.0.1" sources."ms-2.1.2" - sources."multistream-2.1.1" sources."nan-2.14.0" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."kind-of-6.0.3" - ]; - }) + sources."nanomatch-1.2.13" + sources."ncp-2.0.0" sources."neo-async-2.6.1" - (sources."nexe-3.0.0-beta.7" // { - dependencies = [ - sources."pify-4.0.1" - ]; - }) sources."nice-try-1.0.5" sources."node-fetch-2.6.0" + sources."node-int64-0.4.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."buffer-4.9.2" - sources."punycode-1.4.1" + sources."events-3.1.0" + sources."inherits-2.0.3" + sources."stream-http-2.8.3" + sources."timers-browserify-2.0.11" + sources."tty-browserify-0.0.0" + sources."util-0.11.1" ]; }) + sources."node-modules-regexp-1.0.0" (sources."node-releases-1.1.49" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."normalize-package-data-2.5.0" - sources."normalize-path-2.1.1" - (sources."normalize-url-2.0.1" // { - dependencies = [ - sources."sort-keys-2.0.0" - ]; - }) - (sources."npm-conf-1.1.3" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" + sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -62284,81 +62395,65 @@ in sources."kind-of-5.1.0" ]; }) + sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" - (sources."object-visit-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."object-visit-1.0.1" sources."object.assign-4.1.0" - sources."object.omit-2.0.1" - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."object.getownpropertydescriptors-2.1.0" + sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-2.0.1" - (sources."ora-3.4.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."os-browserify-0.3.0" sources."os-locale-3.1.0" - sources."p-cancelable-0.4.1" sources."p-defer-1.0.0" - sources."p-event-2.3.1" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-timeout-2.0.1" - sources."p-try-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.2.2" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" sources."pako-1.0.11" sources."parallel-transform-1.2.0" - sources."paredit.js-0.3.4" + sources."paredit.js-0.3.6" + sources."parents-1.0.1" sources."parse-asn1-5.1.5" - sources."parse-glob-3.0.4" - sources."parse-json-2.2.0" + sources."parse-json-5.0.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" - sources."path-type-1.1.0" + sources."path-platform-0.11.15" sources."pbkdf2-3.0.17" - sources."pend-1.2.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" + sources."peek-stream-1.1.3" + sources."performance-now-2.1.0" + sources."picomatch-2.2.1" + sources."pify-4.0.1" + sources."pinkie-1.0.0" + sources."pinkie-promise-1.0.0" + sources."pirates-4.0.1" (sources."pkg-dir-3.0.0" // { dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.2" sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."path-exists-3.0.0" ]; }) sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" - sources."prepend-http-2.0.0" - sources."preserve-0.2.0" - sources."prettier-1.15.1" + sources."prettier-1.19.1" sources."private-0.1.8" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" - sources."proto-list-1.2.4" sources."prr-1.0.1" + sources."psl-1.7.0" sources."public-encrypt-4.0.3" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { @@ -62366,78 +62461,29 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.1.1" - sources."query-string-5.1.1" + sources."punycode-1.4.1" + sources."qs-6.5.2" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - (sources."randomatic-3.1.1" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.3" - ]; - }) sources."randombytes-2.1.0" sources."randomfill-1.0.4" - (sources."read-pkg-4.0.1" // { - dependencies = [ - sources."parse-json-4.0.0" - sources."pify-3.0.0" - ]; - }) - (sources."read-pkg-up-1.0.1" // { + sources."read-only-stream-2.0.0" + sources."read-pkg-5.2.0" + (sources."readable-stream-2.3.7" // { dependencies = [ - sources."find-up-1.1.2" - sources."path-exists-2.1.0" - sources."read-pkg-1.1.0" + sources."string_decoder-1.1.1" ]; }) - sources."readable-stream-2.3.7" (sources."readdirp-2.2.1" // { dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."debug-2.6.9" - sources."define-property-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."extend-shallow-2.0.1" - sources."extglob-2.0.4" - sources."fill-range-4.0.0" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" sources."micromatch-3.1.10" - sources."ms-2.0.0" ]; }) + sources."realpath-native-1.1.0" sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.1.0" sources."regenerator-runtime-0.13.3" sources."regenerator-transform-0.14.1" - sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."regexpu-core-4.6.0" sources."regjsgen-0.5.1" @@ -62449,24 +62495,14 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."repeating-2.0.1" sources."replace-ext-1.0.0" + sources."request-2.88.2" sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" + sources."require-main-filename-2.0.0" sources."resolve-1.15.1" - sources."resolve-cwd-2.0.0" - (sources."resolve-dependencies-2.2.3" // { + (sources."resolve-cwd-2.0.0" // { dependencies = [ - sources."dir-glob-2.2.2" - sources."globby-9.2.0" - sources."ignore-4.0.6" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-4.0.1" - sources."slash-2.0.0" + sources."resolve-from-3.0.0" ]; }) (sources."resolve-dir-1.0.1" // { @@ -62474,30 +62510,32 @@ in sources."global-modules-1.0.0" ]; }) - sources."resolve-from-3.0.0" + sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" - sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.12.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" - sources."rollup-0.67.0" - sources."rollup-plugin-babel-4.0.3" - sources."rollup-plugin-babel-minify-6.1.1" - (sources."rollup-plugin-commonjs-9.2.0" // { - dependencies = [ - sources."estree-walker-0.5.2" - ]; - }) - sources."rollup-plugin-node-resolve-3.4.0" - sources."rollup-plugin-replace-2.1.0" + sources."rollup-1.31.1" + sources."rollup-plugin-babel-4.3.3" + sources."rollup-plugin-babel-minify-9.1.1" + sources."rollup-plugin-commonjs-10.1.0" + sources."rollup-plugin-node-resolve-5.2.0" + sources."rollup-plugin-replace-2.2.0" sources."rollup-pluginutils-2.8.2" + sources."rsvp-4.8.5" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + (sources."sane-4.1.0" // { + dependencies = [ + sources."anymatch-2.0.0" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + ]; + }) sources."schema-utils-1.0.0" - sources."seek-bzip-1.0.5" sources."semver-5.7.1" sources."serialize-javascript-2.1.2" sources."set-blocking-2.0.0" @@ -62508,10 +62546,14 @@ in }) sources."setimmediate-1.0.5" sources."sha.js-2.4.11" + sources."shasum-1.0.2" + sources."shasum-object-1.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."shell-quote-1.7.2" sources."signal-exit-3.0.2" - sources."slash-1.0.0" + sources."simple-concat-1.0.0" + sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -62535,12 +62577,13 @@ in (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) - sources."snapdragon-util-3.0.1" - sources."sort-keys-1.1.2" - sources."sort-keys-length-1.0.1" + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."source-list-map-0.1.8" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" @@ -62556,6 +62599,8 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" sources."ssri-6.0.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -62575,28 +62620,36 @@ in ]; }) sources."stream-browserify-2.0.2" + sources."stream-combiner2-1.1.1" sources."stream-each-1.2.3" - sources."stream-http-2.8.3" + (sources."stream-http-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."stream-shift-1.0.1" - sources."strict-uri-encode-1.1.0" - (sources."string-width-3.1.0" // { + sources."stream-splicer-2.0.1" + sources."string-width-3.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" + (sources."string_decoder-1.3.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."safe-buffer-5.2.0" ]; }) - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" - sources."strip-dirs-2.1.0" + sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" - sources."strip-outer-1.0.1" - sources."supports-color-2.0.0" + sources."subarg-1.0.0" + sources."supports-color-5.5.0" + sources."syntax-error-1.4.0" sources."tapable-1.1.3" - sources."tar-stream-1.6.2" + (sources."tar-stream-2.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) (sources."terser-4.6.3" // { dependencies = [ - sources."commander-2.20.3" sources."source-map-0.6.1" ]; }) @@ -62605,29 +62658,34 @@ in sources."source-map-0.6.1" ]; }) - sources."test-exclude-4.2.3" + sources."test-exclude-6.0.0" sources."through-2.3.8" sources."through2-2.0.5" - sources."timed-out-4.0.1" - sources."timers-browserify-2.0.11" + sources."timers-browserify-1.4.2" + sources."tmpl-1.0.4" sources."to-arraybuffer-1.0.1" - sources."to-buffer-1.1.1" sources."to-fast-properties-2.0.0" - sources."to-object-path-0.3.0" - sources."to-readable-stream-1.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."to-regex-3.0.2" - (sources."to-regex-range-2.1.1" // { + sources."to-regex-range-2.1.1" + (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."is-number-3.0.0" + sources."punycode-2.1.1" ]; }) - sources."trim-repeated-1.0.0" - sources."trim-right-1.0.1" sources."tslib-1.10.0" - sources."tty-browserify-0.0.0" + sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-fest-0.6.0" sources."typedarray-0.0.6" - sources."unbzip2-stream-1.3.3" + sources."typedarray-to-buffer-3.1.5" + sources."umd-3.0.3" + sources."undeclared-identifiers-1.1.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.1.0" @@ -62643,79 +62701,55 @@ in ]; }) sources."has-values-0.1.4" - sources."isobject-3.0.1" ]; }) sources."upath-1.2.0" - sources."uri-js-4.2.2" + (sources."uri-js-4.2.2" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) - sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" sources."use-3.1.1" - (sources."util-0.11.1" // { + (sources."util-0.10.4" // { dependencies = [ sources."inherits-2.0.3" ]; }) sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.1" + sources."uuid-3.4.0" sources."v8-compile-cache-2.0.3" sources."validate-npm-package-license-3.0.4" + sources."verror-1.10.0" sources."vinyl-2.2.0" sources."vm-browserify-1.1.2" + sources."walker-1.0.7" sources."watchpack-1.6.0" - sources."wcwidth-1.0.1" (sources."webpack-4.41.6" // { dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."braces-2.3.2" - sources."debug-2.6.9" - sources."define-property-1.0.0" - sources."eslint-scope-4.0.3" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."extend-shallow-2.0.1" - sources."extglob-2.0.4" - sources."fill-range-4.0.0" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" - sources."memory-fs-0.4.1" + sources."acorn-6.4.0" sources."micromatch-3.1.10" - sources."ms-2.0.0" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" ]; }) (sources."webpack-cli-3.3.11" // { dependencies = [ + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."emojis-list-2.1.0" sources."enhanced-resolve-4.1.0" - sources."memory-fs-0.4.1" + sources."json5-1.0.1" + sources."loader-utils-1.2.3" sources."supports-color-6.1.0" ]; }) @@ -62734,19 +62768,13 @@ in sources."which-module-2.0.0" (sources."which-promise-1.0.0" // { dependencies = [ - sources."pinkie-1.0.0" - sources."pinkie-promise-1.0.0" + sources."pify-2.3.0" ]; }) sources."worker-farm-1.7.0" - (sources."wrap-ansi-5.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" - sources."strip-ansi-5.2.0" - ]; - }) + sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.1" sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.1.1" @@ -62754,14 +62782,11 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.2.2" sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."require-main-filename-2.0.0" + sources."path-exists-3.0.0" ]; }) sources."yargs-parser-13.1.1" - sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -63381,7 +63406,7 @@ in sources."longest-1.0.1" sources."lru-cache-2.7.3" sources."lru-queue-0.1.0" - sources."make-error-1.3.5" + sources."make-error-1.3.6" sources."make-error-cause-1.2.2" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" @@ -63595,7 +63620,7 @@ in sources."tweetnacl-0.14.5" sources."type-1.2.0" sources."typescript-3.7.5" - (sources."uglify-js-3.7.7" // { + (sources."uglify-js-3.8.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -66076,7 +66101,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001027" + sources."caniuse-lite-1.0.30001028" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -66149,7 +66174,6 @@ in ]; }) sources."css-tree-1.0.0-alpha.37" - sources."css-unit-converter-1.1.1" sources."css-what-3.2.1" sources."cssesc-0.1.0" sources."cssnano-4.1.10" @@ -66212,7 +66236,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.353" + sources."electron-to-chromium-1.3.355" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -66509,12 +66533,16 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.26" // { + (sources."postcss-7.0.27" // { dependencies = [ sources."supports-color-6.1.0" ]; }) - sources."postcss-calc-7.0.1" + (sources."postcss-calc-7.0.2" // { + dependencies = [ + sources."postcss-value-parser-4.0.3" + ]; + }) sources."postcss-colormin-4.0.3" sources."postcss-convert-values-4.0.1" sources."postcss-discard-comments-4.0.2" @@ -66567,9 +66595,9 @@ in sources."postcss-ordered-values-4.1.2" sources."postcss-reduce-initial-4.0.3" sources."postcss-reduce-transforms-4.0.2" - (sources."postcss-selector-parser-5.0.0" // { + (sources."postcss-selector-parser-6.0.2" // { dependencies = [ - sources."cssesc-2.0.0" + sources."cssesc-3.0.0" ]; }) sources."postcss-svgo-4.0.2" @@ -66585,12 +66613,7 @@ in sources."psl-1.7.0" sources."public-encrypt-4.0.3" sources."punycode-2.1.1" - (sources."purgecss-1.4.2" // { - dependencies = [ - sources."cssesc-3.0.0" - sources."postcss-selector-parser-6.0.2" - ]; - }) + sources."purgecss-1.4.2" sources."q-1.5.1" sources."qs-6.5.2" sources."querystring-0.2.0" @@ -66753,9 +66776,7 @@ in sources."typedarray-0.0.6" (sources."uncss-0.17.3" // { dependencies = [ - sources."cssesc-3.0.0" sources."is-absolute-url-3.0.3" - sources."postcss-selector-parser-6.0.2" ]; }) sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -68288,10 +68309,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.63.0"; + version = "1.64.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.63.0.tgz"; - sha512 = "dMwUiAsVoE+25R2jmD0+DfRf9VpvjBN8mgqweXtvm3k6TP536a9Wug8Ue6pc0KpEPc++zg5lIyd1zlTlrSHnPg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.64.0.tgz"; + sha512 = "N1Ls4ecV1++ZYqZ6RRVUOqMrHZrwBW/nvy/P1N7FCfJX1k9LQMtUe6wa4X5+q0kiFdhIHYYCteHcpSGJbyOwTw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -68358,7 +68379,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.620.0" // { + (sources."aws-sdk-2.622.0" // { dependencies = [ sources."buffer-4.9.1" sources."uuid-3.3.2" @@ -68469,32 +68490,19 @@ in sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - (sources."decompress-4.2.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."decompress-4.2.0" sources."decompress-response-3.3.0" - (sources."decompress-tar-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) + sources."decompress-tar-4.1.1" (sources."decompress-tarbz2-4.1.1" // { dependencies = [ sources."file-type-6.2.0" ]; }) - (sources."decompress-targz-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) + sources."decompress-targz-4.1.1" (sources."decompress-unzip-4.0.1" // { dependencies = [ sources."file-type-3.9.0" sources."get-stream-2.3.1" - sources."pify-2.3.0" ]; }) sources."deep-extend-0.6.0" @@ -68508,6 +68516,7 @@ in dependencies = [ sources."@sindresorhus/is-0.7.0" sources."cacheable-request-2.1.4" + sources."file-type-8.1.0" sources."get-stream-3.0.0" sources."got-8.3.2" sources."http-cache-semantics-3.8.1" @@ -68515,6 +68524,7 @@ in sources."lowercase-keys-1.0.0" sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" + sources."pify-3.0.0" sources."sort-keys-2.0.0" ]; }) @@ -68553,7 +68563,7 @@ in sources."fast-levenshtein-2.0.6" sources."fd-slicer-1.1.0" sources."figures-3.2.0" - sources."file-type-8.1.0" + sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."filesize-3.6.1" @@ -68585,11 +68595,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.0" sources."global-dirs-0.1.1" - (sources."globby-6.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."globby-6.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.3" sources."graceful-readlink-1.0.1" @@ -68701,7 +68707,11 @@ in sources."lru-cache-4.1.5" sources."lru-queue-0.1.0" sources."lsmod-1.0.0" - sources."make-dir-1.3.0" + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."memoizee-0.4.14" @@ -68732,7 +68742,11 @@ in sources."node-fetch-1.7.3" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" - sources."npm-conf-1.1.3" + (sources."npm-conf-1.1.3" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -68780,7 +68794,7 @@ in sources."path-loader-1.0.10" sources."pend-1.2.0" sources."picomatch-2.2.1" - sources."pify-3.0.0" + sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" @@ -69639,10 +69653,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.292.0"; + version = "1.294.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.292.0.tgz"; - sha512 = "ga4ouBqRc897Ts80yzdZG25zqGgbU3ah8VKtLyRjK1ZmApHy+PRi2zBVJcwMspyfhyaCh47vr1siIqHler4rxg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.294.0.tgz"; + sha512 = "F+kDV9GvZUPtkAnssUae1bxoh471fNR2vNDUXsvgdAiZuqHw+N6i/ZTTWuCf3T7GWSuNb5OlGray/5uvS7WJAw=="; }; dependencies = [ sources."@snyk/cli-interface-2.3.0" @@ -69663,7 +69677,7 @@ in sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.2" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@types/restify-4.3.6" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.3" @@ -69921,8 +69935,8 @@ in sources."debug-4.1.1" ]; }) - sources."snyk-go-parser-1.3.1" - (sources."snyk-go-plugin-1.11.1" // { + sources."snyk-go-parser-1.3.3" + (sources."snyk-go-plugin-1.12.0" // { dependencies = [ sources."debug-4.1.1" ]; @@ -71194,7 +71208,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.620.0" // { + (sources."aws-sdk-2.622.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -72614,7 +72628,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - (sources."uglify-js-3.7.7" // { + (sources."uglify-js-3.8.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -72685,7 +72699,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."ajv-6.11.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -73286,10 +73300,10 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.1.2" - sources."nlcst-is-literal-1.2.0" - sources."nlcst-normalize-2.1.3" + sources."nlcst-is-literal-1.2.1" + sources."nlcst-normalize-2.1.4" sources."nlcst-search-1.5.1" - sources."nlcst-to-string-2.0.3" + sources."nlcst-to-string-2.0.4" sources."normalize-package-data-2.5.0" sources."npm-prefix-1.2.0" sources."npm-run-path-2.0.2" @@ -73824,7 +73838,7 @@ in sources."@types/color-name-1.1.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -74714,10 +74728,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.7.7"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz"; - sha512 = "FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz"; + sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ=="; }; dependencies = [ sources."commander-2.20.3" @@ -75489,7 +75503,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.7.7" + sources."uglify-js-3.8.0" sources."uid-0.0.2" sources."unbzip2-stream-1.3.3" sources."unyield-0.0.1" @@ -75547,7 +75561,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -76544,7 +76558,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."JSONSelect-0.2.1" sources."acorn-6.4.0" sources."acorn-jsx-5.1.0" @@ -77731,7 +77745,7 @@ in sources."domain-browser-1.2.0" sources."duplexify-3.7.1" sources."elliptic-6.5.2" - sources."emojis-list-2.1.0" + sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-4.1.1" // { dependencies = [ @@ -77838,7 +77852,7 @@ in sources."json5-1.0.1" sources."kind-of-6.0.3" sources."loader-runner-2.4.0" - sources."loader-utils-1.2.3" + sources."loader-utils-1.4.0" sources."locate-path-3.0.0" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" @@ -78424,7 +78438,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.7.1" + sources."@types/node-13.7.4" sources."accepts-1.3.7" sources."ajv-6.11.0" sources."ajv-errors-1.0.1" @@ -79043,7 +79057,7 @@ in sources."cyclist-1.0.1" sources."dir-glob-2.2.2" sources."duplexify-3.7.1" - sources."emojis-list-2.1.0" + sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" @@ -79081,7 +79095,7 @@ in sources."minimist-1.2.0" ]; }) - sources."loader-utils-1.2.3" + sources."loader-utils-1.4.0" sources."locate-path-3.0.0" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" @@ -79170,7 +79184,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.15" + sources."@types/node-10.17.16" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 737d1eec3c2..304a2a362e9 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { }; checkInputs = [ - pytestrunner pytest gunicorn pytest-timeout async_generator pytest_xdist + pytestrunner pytest gunicorn async_generator pytest_xdist pytest-mock pytestcov trustme brotlipy freezegun ]; diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 446bb9e6379..01c37275fc3 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.6.2"; + version = "0.6.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0srqbxxxffi3idqd161n5b90xyqy9gibigxxmvqag3nxab5vw1j6"; + sha256 = "06w15iyr07s861hkzqfdclzxkpvgg83sx8f235mz8k2490hnyqvv"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index aa7462ba831..16a8a167fbb 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2020.1.3"; + version = "2020.2.1"; format = "flit"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cjrh"; repo = pname; rev = "v${version}"; - sha256 = "0ka0pj6xr47j7rw6kd5mkrr5jyhn631pfpd95ig7vbln4434qnb4"; + sha256 = "0wcj8prkijb889ic8n6varms7xkwy028hhw0imgkd1i0p64lm3m4"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index aab979f3a8f..24675200b5b 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -11,14 +11,14 @@ }: buildPythonPackage rec { - version = "1.2.1"; + version = "1.2.2"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1fff6g5lszn97qz1h4l1n255r9538yybb329ilb2rwdfq3q9kkg2"; + sha256 = "0bz4m6kmqymxlxf9qk6jw8v895d13rsggbgsjpsbvi9px6w15nwb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index b96e0b7874a..db5ed5410e3 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.58.0"; + version = "3.59.0"; src = fetchPypi { inherit pname version; - sha256 = "0n8k9m3kifj34rzi2a3jgjsik91w8z32xaaxcmvqs7x8m5m3kjj4"; + sha256 = "08g8qlnsp9wd2zbf6x3npp1425g7ih4lyljzvybd3vazsbqlw4yq"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index a286249ea0f..7a541a47952 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "bsddb3"; - version = "6.2.6"; + version = "6.2.7"; src = fetchPypi { inherit pname version; - sha256 = "42d621f4037425afcb16b67d5600c4556271a071a9a7f7f2c2b1ba65bc582d05"; + sha256 = "17yw0by4lycwpvnx06cnzbbchz4zvzbx3j89b20xa314xdizmxxh"; }; buildInputs = [ pkgs.db ]; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index b9d2b4b7751..8aa80a75067 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -24,12 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; - checkInputs = [ nose mock pytest pytest-timeout hypothesis future ]; - - # Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in - # that case. This clause can be removed once hypothesis has been upgraded in - # nixpkgs. - doCheck = !(isPy27 && (hypothesis.version == "4.7.3")); + checkInputs = [ nose mock pytest hypothesis future ]; # Add the scripts to PATH checkPhase = '' diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index 599f91f2d07..f1136851f8a 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "0.8.0"; + version = "1.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1mbs9l8qycy50j5lq6az7l5d8i40nb0vmlyhcyax298qp6c1r1gh"; + sha256 = "1glws7z7kk9qyl1j4446hb6vv3l4s5xca40zb4fzhsh6chm76h11"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix new file mode 100644 index 00000000000..2a77f45217a --- /dev/null +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -0,0 +1,49 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchPypi +, cvxopt +, ecos +, multiprocess +, numpy +, osqp +, scipy +, scs +, six + # Check inputs +, nose +}: + +buildPythonPackage rec { + pname = "cvxpy"; + version = "1.0.25"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "04zalvc8lckjfzm3i2ir32ib5pd6v7hxqqcnsnq6fw40vffm4dc5"; + }; + + propagatedBuildInputs = [ + cvxopt + ecos + multiprocess + osqp + scs + six + ]; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + + meta = { + description = "A domain-specific language for modeling convex optimization problems in Python."; + homepage = "https://www.cvxpy.org/"; + downloadPage = "https://github.com/cvxgrp/cvxpy/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index 2856eeeab1b..93502a296dc 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "face_recognition"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { repo = pname; owner = "ageitgey"; - rev = "634db2e4309a365cee2503cb65d6f2e88f519d1e"; - sha256 = "06zw5hq417d5yp17zynhxhb73074lx2qy64fqfzf711rw5vrn2mx"; + rev = "d34c622bf42e2c619505a4884017051ecf61ac77"; + sha256 = "052878vnh3vbrsvmpgr0bx78k524dlxn47b2xakzbxk7dyjrgcli"; }; postPatch = '' diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 7091799deca..551f5f4c3dd 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fuzzywuzzy"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "6f49de47db00e1c71d40ad16da42284ac357936fa9b66bea1df63fed07122d62"; + sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5"; }; propagatedBuildInputs = [ python-Levenshtein ]; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 788a8f73ab8..4557d665650 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "03g0mqbgk143cq3l3r42js2iy5l6iyvpckpqip4p468rlzrddyhn"; + sha256 = "0kh0d83xavpffdp4xp4hq8xy43l6lyv3d1a25rnc15jcbdf1nghw"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index ff9d6f134e0..020fab8f888 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "nbval"; - version = "0.9.4"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "5273c2d958335e24b170fe59b689b13e4b1855b569626e18b1c7e420f5110cc6"; + sha256 = "1xh2p7g5s5g06caaraf3dsz69bpj7dgw2h3ss67kci789aspnwp8"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index bef4969d7d2..7451b1102ed 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.28"; + version = "4.0.30"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "510643354c4c687ed96bf7e7cec4d02d6c626ecf3e18696f5a0228dd6d11b769"; + sha256 = "0skjpraar6hcwsy82612bpj8nw016ncyvvq88j5syrikxgp5saw5"; }; buildInputs = [ unixODBC ]; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 3563edce792..e13472dafb4 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.7"; + version = "0.5.9"; src = fetchPypi { inherit pname version; - sha256 = "963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98"; + sha256 = "1dymaa3rif05k42sh4c3g2m057v2dsc2f3f49hl2rw5yz8bd23i4"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 46dd54c62e2..38b55c4563d 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.15.3"; + version = "0.15.4"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -23,26 +23,35 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "v${version}"; - sha256 = "0g6md20gsr24pdr9b8nj403w31ixfjv8bjhdvg3x476kjiq1kvyb"; + sha256 = "04w6h6mv6lsr74hj9gy4r2laifcbhgl2bjcr4r1l9r73xdd45mdy"; }; + nativeBuildInputs = [ samtools ]; buildInputs = [ bzip2 curl cython lzma zlib ]; - checkInputs = [ pytest bcftools htslib samtools ]; - + checkInputs = [ pytest bcftools htslib ]; checkPhase = "py.test"; - preInstall = '' + # tests require samtools<=1.9 + doCheck = false; + preCheck = '' export HOME=$(mktemp -d) make -C tests/pysam_data make -C tests/cbcf_data ''; - meta = { - homepage = https://pysam.readthedocs.io/; + pythonImportsCheck = [ + "pysam" + "pysam.bcftools" + "pysam.libcutils" + "pysam.libcvcf" + ]; + + meta = with lib; { description = "A python module for reading, manipulating and writing genome data sets"; - maintainers = with lib.maintainers; [ unode ]; - license = lib.licenses.mit; + homepage = "https://pysam.readthedocs.io/"; + maintainers = with maintainers; [ unode ]; + license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index b58b934dadc..0ad85844440 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-flask"; - version = "0.15.0"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "0jdzrib94vwfpl8524h34aqzqndh3h4xn706v32xh412c8dphx6q"; + sha256 = "1ri3p3hibb1r2wcblpvs64s4jz40ci4jki4s2nf3xf7iz2wwbn6b"; }; doCheck = false; diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index 89ffe334e7f..ba3d5eaaff0 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , fetchurl , cython , enum34 @@ -11,19 +11,16 @@ , pytest , python , scipy -, sundials_3 +, sundials }: buildPythonPackage rec { pname = "scikits.odes"; - version = "2.4.0-9-g93075ae"; + version = "2.6.1"; - # we fetch github instead of Pypi, as we want #104 and #105, which don't apply cleanly on 2.4.0 - src = fetchFromGitHub { - owner = "bmcage"; - repo = "odes"; - rev = "93075ae25c409f572f13ca7207fada5706f73c73"; - sha256 = "161rab7hy6r1a9xw1zby9xhnnmxi0zwdpzxfpjkw9651xn2k5xyw"; + src = fetchPypi { + inherit pname version; + sha256 = "0kbf2n16h9s35x6pavlx6sff0pqr68i0x0609z92a4vadni32n6b"; }; nativeBuildInputs = [ @@ -33,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - sundials_3 + sundials scipy ] ++ lib.optionals (!isPy3k) [ enum34 ]; diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix new file mode 100644 index 00000000000..4e500d68535 --- /dev/null +++ b/pkgs/development/python-modules/scs/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, blas +, liblapack +, numpy +, scipy +, scs + # check inputs +, nose +}: + +buildPythonPackage rec { + inherit (scs) pname version; + + src = fetchFromGitHub { + owner = "bodono"; + repo = "scs-python"; + rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged + sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr"; + }; + + preConfigure = '' + rm -r scs + ln -s ${scs.src} scs + ''; + + buildInputs = [ + liblapack + blas + ]; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + pythonImportsCheck = [ "scs" ]; + + meta = with lib; { + description = "Python interface for SCS: Splitting Conic Solver"; + longDescription = '' + Solves convex cone programs via operator splitting. + Can solve: linear programs (LPs), second-order cone programs (SOCPs), semidefinite programs (SDPs), + exponential cone programs (ECPs), and power cone programs (PCPs), or problems with any combination of those cones. + ''; + homepage = "https://github.com/cvxgrp/scs"; # upstream C package + downloadPage = "https://github.com/bodono/scs-python"; + license = licenses.gpl3; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a1140dbab81..49c749b2123 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,17 +110,17 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "23710"; - gittap = "4.2.0"; - gittip = "57a60ba8c5e782ca0807e3c7b1d26a8b3923073d"; - rev = "4.2.0"; - version = "4.2.0"; - sha256 = "1xkvc9msbcvwgcasx9q10098ciw1zpnwgrciw397rq9ayrrvpngz"; + version_commit = "23781"; + gittap = "4.2.1"; + gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; + rev = "4.2.1"; + version = "4.2.1"; + sha256 = "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "23710"; + version_commit = "23781"; gittap = "4.2.1"; gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh index 8d06352b135..2760bb95fcf 100644 --- a/pkgs/development/tools/build-managers/apache-maven/builder.sh +++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh @@ -5,7 +5,7 @@ unpackPhase mkdir -p $out/maven cp -r $name/* $out/maven -makeWrapper $out/maven/bin/mvn $out/bin/mvn --set JAVA_HOME "$jdk" +makeWrapper $out/maven/bin/mvn $out/bin/mvn --set-default JAVA_HOME "$jdk" # Add the maven-axis and JIRA plugin by default when using maven 1.x if [ -e $out/maven/bin/maven ] diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index ac438080b9a..88ebc5ebfae 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { --replace '"-framework CoreServices"' '""' ''; - buildInputs = [ curl expat zlib bzip2 ] + buildInputs = [ setupHook curl expat zlib bzip2 ] ++ optional useNcurses ncurses ++ optional useQt4 qt4; @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; preConfigure = with stdenv; '' - source $setupHook fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ --subst-var-by libc_bin ${getBin cc.libc} \ @@ -82,7 +81,7 @@ stdenv.mkDerivation rec { homepage = https://cmake.org; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ xfix ]; license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 860602cb684..cec1aeab6c5 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1zswdp2gran8djk718q5g3ldbvw0qp34j9jj1n7m1xp870g3590l"; + sha256 = "166a6lncx0nlmn0kxgx9qkn1dnbphm30vy1wncxcpsqspxhkqfra"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index a230b0e7ce1..eb507857ca8 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -1,30 +1,21 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -# buildGoModule is not supported by the project -# See https://github.com/mikefarah/yq/issues/227 -buildGoPackage rec { +buildGoModule rec { pname = "yq-go"; - version = "3.1.0"; - - goPackagePath = "github.com/mikefarah/yq/v3"; + version = "3.1.2"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "0hsb9m0pq2agsg7392r6h9sv5vqa2r7fl0ff1q24vpx8jlpq1vc6"; + sha256 = "0gjxmnmphav8ms4zdkcjcsgrjs77ccwdfpc1qpxjp6fr2g4v5vmq"; }; - goDeps = ./deps.nix; - - postInstall = '' - mv $bin/bin/v3 $bin/bin/yq - ''; + modSha256 = "035w9bh96rr2x21w7bwwpngyng6839wglpgwf7gy8p6difvnn2v9"; meta = with stdenv.lib; { description = "Portable command-line YAML processor"; - homepage = http://mikefarah.github.io/yq/; + homepage = "https://mikefarah.gitbook.io/yq/"; license = [ licenses.mit ]; maintainers = [ maintainers.lewo ]; }; diff --git a/pkgs/development/tools/yq-go/deps.nix b/pkgs/development/tools/yq-go/deps.nix deleted file mode 100644 index 2ca5e0ffd1b..00000000000 --- a/pkgs/development/tools/yq-go/deps.nix +++ /dev/null @@ -1,363 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-etcd"; - rev = "v2.0.0"; - sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v1.0.10"; - sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/kylelemons/godebug"; - fetch = { - type = "git"; - url = "https://github.com/kylelemons/godebug"; - rev = "v1.1.0"; - sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.2"; - sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.3.0"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.5"; - sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.3.2"; - sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "c90efee705ee"; - sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "3b0461eec859"; - sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "97732733099d"; - sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "04c2e8eff935"; - sha256 = "0xfif9h5ssf5f7f65k35zr5n6z524zv65kv68zg2qybnmb3c008d"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "1b5146add898"; - sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/imdario/mergo.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/imdario/mergo.v0"; - rev = "v0.3.7"; - sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8"; - }; - } - { - goPackagePath = "gopkg.in/op/go-logging.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/op/go-logging.v1"; - rev = "b2cb9fa56473"; - sha256 = "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v3"; - rev = "4206685974f2"; - sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g"; - }; - } -] diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index ae4302b7429..d05fbff5e0c 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "7.0.6"; + version = "7.1.0"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "125g40micavq5js5l7lpv01yl8635dwg240vldz8i2riqj65inq8"; + sha256 = "1aqzg01dwgm1jidavwxichydxsz1c4ck8xhgvlgw24qddx5gwq1y"; }; nativeBuildInputs = diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 8832f3bbc18..d7a96210429 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -100,6 +100,9 @@ in buildFHSUserEnv rec { # friends options won't display "Launch Game" without it lsof + + # called by steam's setup.sh + file ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { inherit runtimeOnly; diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 16c14b32218..81cd77f3edb 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -330,9 +330,8 @@ let ); in '' - set packpath-=~/.vim/after - set packpath+=${packDir packages} - set packpath+=~/.vim/after + set packpath^=${packDir packages} + set runtimepath^=${packDir packages} filetype indent plugin on | syn on ''); diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 6e26ef4bbce..1451a4e96c0 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation { sha256 = "1ygzp8rjr8f1gs48mb1pz7psdgbfhlvr6kjdnmzbsqcml06zvrpr"; }; + # Fixup build with newer Linux headers. + postPatch = '' + sed '1i#include <linux/sockios.h>' -i \ + slcanpty.c cansniffer.c canlogserver.c isotpdump.c isotpsniffer.c isotpperf.c + ''; + preConfigure = ''makeFlagsArray+=(PREFIX="$out")''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 5f5005d8b97..b61d99cead1 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dbus-broker"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "14lgjv0gxvfa1h5hsarh9nwpxns6jb2861nd7mcanpkm2jlxh5vm"; + sha256 = "0vxr73afix5wjxy8g4cckwhl242rrlazm52673iwmdyfz5nskj2x"; fetchSubmodules = true; }; diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 248e5334d50..53c44bc5b72 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.104"; + version = "4.19.105"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1s3bsqcsjrpjiqlxwq89llb5pb37fkbr1pwircpnh1r6ijrgzsr3"; + sha256 = "04mz4amafbhia0lwyh7wc9mxiqg2kw4gz2y0wvfb7zh4nj57fb7q"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 4692ef7dc56..ef021fa211d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.20"; + version = "5.4.21"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1fv7bknwjyzh176rwn11dxvpymp97h5v94mhpdhxqx3hkb6nsgvr"; + sha256 = "1yjv8qg47kb4j4jkcpi9z7v07p0vz3gszpmhrfji5866j97748vd"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix index 375743dda15..806ba4d4f6c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5.4"; + version = "5.5.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1yx60d22c3x2qnwdhrwdr2nxir59gk33jh5d5334780bxc6zsh7a"; + sha256 = "11shmhalrj6k25alarsgyh9ml48sgpq9v9r59n99y59d7z07ph3s"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 917652ca6f7..f8c75b1913b 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz"; - sha256 = "01kr6l2c3bhbgdrmwgzh6jk0jjkw3pi9xrzzl9cpn0ibyf68p1aj"; + sha256 = "1v4jwbda25w07qhlx5xc5i0hwsv3pjy8hfy0r93vnmfjxq61grvw"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 427d3d1d42e..cbb13074afc 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.6.1"; + version = "6.6.2"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0yw7yq201f5c3dzy51jaa2mgn0bdh69341a7r9hz9bxpb21w0zq9"; + sha256 = "0zbc9jcr3w7rwsv96csqaifn5d0b435wyrrajr5wzsmhljygvrcy"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0xrkaiz3kl1avq040xyyal35rkf2mg6s2y0wggmndvsnwc3q5p0f"; + sha256 = "1plijm7cy92k79ypcnxjmdf2vhlxa4dzwjyl9lkf2npm7kswswsl"; }; postPatch = '' diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 2586171a7cf..24422842e35 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.18.6.2368-97add474d"; + version = "1.18.7.2438-f342a5a43"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0d2nnvw9qpmsra6g044bz192v67igcp1mfayy4sk0j2yqgiqvcgl"; + sha256 = "07lill29ck5h6lnrxj4k709afh36d6giy4jzv1jwcvcq1hdrvmzh"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/shells/zsh/bracketed-paste-magic.patch b/pkgs/shells/zsh/bracketed-paste-magic.patch deleted file mode 100644 index f22f6489ce7..00000000000 --- a/pkgs/shells/zsh/bracketed-paste-magic.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic -index 4baae82..840091b 100644 ---- a/Functions/Zle/bracketed-paste-magic -+++ b/Functions/Zle/bracketed-paste-magic -@@ -162,7 +162,7 @@ bracketed-paste-magic() { - - # There are active widgets. Reprocess $PASTED as keystrokes. - NUMERIC=1 -- zle -U - $PASTED -+ zle -U - "$PASTED" - - # Just in case there are active undo widgets - -@@ -212,7 +212,7 @@ bracketed-paste-magic() { - # Arrange to display highlighting if necessary - if [[ -z $zle_highlight || -n ${(M)zle_highlight:#paste:*} ]]; then - zle -R -- zle .read-command && zle -U - $KEYS -+ zle .read-command && zle -U - "$KEYS" - fi - } - diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 52bd3c71858..8e050acef1f 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre, buildPackages }: let - version = "5.7.1"; + version = "5.8"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh"; + sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; }; in @@ -15,16 +15,9 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j"; + sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; }; - patches = [ - # Bracketed-paste-magic error in Putty due to empty $PASTED variable - # http://www.zsh.org/mla/workers/2019/msg00808.html - # This patch included in the next version - ./bracketed-paste-magic.patch - ]; - buildInputs = [ ncurses pcre ]; configureFlags = [ diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 3b67d2a2280..39672a7608a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-02-11"; + version = "2020-02-19"; pname = "oh-my-zsh"; - rev = "17428f3c9a99c8d81e57bcf565d39011669e65ed"; + rev = "bc9fe7423f5d8c639b208ebb9a7dbfce078bfd9b"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1i2f5gvr8gdvwx4x135j949x4q1q721jq2936p33c1zk9wq4kzwc"; + sha256 = "0nhqnhgp6y70q2p70qi7n4qzhahcb9q6hyqij7wfcdsws0lbf6nn"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 9a6b512ce1f..69e0a2afe6e 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.0.81"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "1fpdc59qqkx9s5aip62jzcky92fhlbvc97hi1x047sldh9ibp02n"; + sha256 = "0f4wrqp9f4n4mk73ybx08ybvmxx88r6g5cvx8ld6ybhl2w8bbn9v"; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 4cf0a5d3554..2ac74a16edd 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -119,11 +119,14 @@ let azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.5.0" "zip" - "0jhq8fi3dn2cncyv2rrgr4kldd254f30zgwf6p85rdgvg2p9k4hl"; + azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" + "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "6.0.0" "zip" - "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "8.0.1" "zip" + "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7"; + + azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip" + "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "10.0.0" "zip" "1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg"; @@ -161,8 +164,8 @@ let azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "7.0.0" "zip" - "0ss5yc9k3dh78lb88nfh3z98yz1pcd8d7d7cfjlxmv4n3dlr1kij"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "9.0.0" "zip" + "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix"; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "1.1.1" "zip" "16wk0ksycrscsn3n14qk4vvf7i567vq6f96lwf5dwbc81wx6n32x"; @@ -194,11 +197,11 @@ let azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; - azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "2.6.0" "zip" - "1nnp2ki4iz4f4897psmwb0v5khrwh84fgxja7nl7g73g3ym20sz8"; + azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "3.0.0" "zip" + "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "1.1.0" "zip" - "16a0d3j5dilbp7pd7gbwf8jr46vzbjim1p9alcmisi12m4km7885"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.1.0" "zip" + "1ikv8b2h1r91fa0srz95ymn54qpqgb5a4faxwp4hf92r5h85c8j9"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.0.0" "zip" "0aphqh4mvrc1yiyis8zvks0d19d1m3lqylr9jc8fj73iw84rwgm5"; @@ -218,8 +221,8 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip" "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.1.0" "zip" - "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.2.0" "zip" + "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 326d15a9318..1d37f71f0a8 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -30,6 +30,8 @@ let }; }.${system}; + strip = if stdenv.isDarwin then "strip -x" else "strip"; + in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; version = "268.0.0"; @@ -93,7 +95,7 @@ in stdenv.mkDerivation rec { done # strip the Cython gRPC library - strip $out/google-cloud-sdk/lib/third_party/grpc/_cython/cygrpc.so + ${strip} $out/google-cloud-sdk/lib/third_party/grpc/_cython/cygrpc.so ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index c6c47ce4f16..90ce2d188d6 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "wal-g"; - version = "0.2.0"; + version = "0.2.14"; src = fetchFromGitHub { owner = "wal-g"; repo = "wal-g"; rev = "v${version}"; - sha256 = "08lk7by1anxpd9v97xbf9443kk4n1w63zaar2nz86w8i3k3b4id9"; + sha256 = "0rrn9kzcg3nw9qvzy58m4qacghv0pj7iyjh4yspc71n5nkamkfgm"; }; buildInputs = [ brotli ]; @@ -16,11 +16,21 @@ buildGoPackage rec { doCheck = true; goPackagePath = "github.com/wal-g/wal-g"; + + goDeps = ./deps.nix; + + subPackages = [ "main/pg" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/pg.WalgVersion=${version} -X ${goPackagePath}/cmd/pg.GitRevision=${src.rev}" ]; + + postInstall = '' + mv $bin/bin/pg $bin/bin/wal-g + ''; + meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/wal-g/wal-g"; license = stdenv.lib.licenses.asl20; - description = "An archival restoration tool for Postgres"; + description = "An archival restoration tool for PostgreSQL"; maintainers = [ stdenv.lib.maintainers.ocharles ]; - broken = true; }; } diff --git a/pkgs/tools/backup/wal-g/deps.nix b/pkgs/tools/backup/wal-g/deps.nix new file mode 100644 index 00000000000..13daf375c31 --- /dev/null +++ b/pkgs/tools/backup/wal-g/deps.nix @@ -0,0 +1,588 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "0ebda48a7f143b1cce9eb37a8c1106ac762a3430"; + sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; + }; + } + { + goPackagePath = "github.com/Azure/azure-pipeline-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-pipeline-go"; + rev = "232aee85e8e3a6223a11c0943f7df2ae0fac00e4"; + sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6"; + }; + } + { + goPackagePath = "github.com/Azure/azure-storage-blob-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-storage-blob-go"; + rev = "fc700035fe4a7020f50d49f420b3c088aed57e03"; + sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/DataDog/zstd"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/zstd"; + rev = "aebefd9fcb99f22cd691ef778a12ed68f0e6a1ab"; + sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8"; + }; + } + { + goPackagePath = "github.com/RoaringBitmap/roaring"; + fetch = { + type = "git"; + url = "https://github.com/RoaringBitmap/roaring"; + rev = "3d677d3262197ee558b85029301eb69b8239f91a"; + sha256 = "0v5jbqr7m4x7n8rxcyizhs21ndyinn8kil9hd6y2bifx9b9g6gv9"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "02973e4916ed10f78aff1257f45f01d23907a05d"; + sha256 = "0w5c06l0f8h77p74gmsp2wzl21pcn92yzsycd36746qqav83yyld"; + }; + } + { + goPackagePath = "github.com/cyberdelia/lzo"; + fetch = { + type = "git"; + url = "https://github.com/cyberdelia/lzo"; + rev = "feb520148d8940294afb1e242dc1d2a7c9c34432"; + sha256 = "0mk93b7vr9hp1xcvzaw5r01zs2blhk24m22pacf6sx5zwx8fd2ld"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/glycerine/go-unsnap-stream"; + fetch = { + type = "git"; + url = "https://github.com/glycerine/go-unsnap-stream"; + rev = "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126"; + sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n"; + }; + } + { + goPackagePath = "github.com/go-redis/redis"; + fetch = { + type = "git"; + url = "https://github.com/go-redis/redis"; + rev = "75795aa4236dc7341eefac3bbe945e68c99ef9df"; + sha256 = "1qf7zl5slnc4bcz0z0vn4fq1pwkphdrmqmjg3wv5q6pv2x29drli"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "72cd26f257d44c1114970e19afddcd812016007e"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "51421b967af1f557f93a59e0057aaf15ca02e29c"; + sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; + sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; + }; + } + { + goPackagePath = "github.com/google/brotli"; + fetch = { + type = "git"; + url = "https://github.com/google/brotli"; + rev = "d6d98957ca8ccb1ef45922e978bb10efca0ea541"; + sha256 = "0n0ia2sxsj3fnnzhjbigbadpsqxivjs3v78b1xzqvgd1nwalglaj"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2"; + sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d"; + sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "8cb6e5b959231cc1119e43259c4a608f9c51a241"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/jackc/pgx"; + fetch = { + type = "git"; + url = "https://github.com/jackc/pgx"; + rev = "c73e7d75061bb42b0282945710f344cfe1113d10"; + sha256 = "1am1iggch89mn4a99bxnawjhc5yrgd8fjlmzq0b9l9qy5w1gzr1f"; + }; + } + { + goPackagePath = "github.com/jedib0t/go-pretty"; + fetch = { + type = "git"; + url = "https://github.com/jedib0t/go-pretty"; + rev = "a37e1e030434d93557ca8a6a77b4cf9d31cc21ff"; + sha256 = "057xwrrqq0cvyq9f0wnfzjpx10807520vl92qq7l7a7s0r56jyrx"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c2353362d570a7bfa228149c62842019201cfb71"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/mattn/go-ieproxy"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-ieproxy"; + rev = "f9202b1cfdeb0c82ddd3dc1e8e9cd94b3c0c1b13"; + sha256 = "0r8c17znlv32750qy3p96fbyp8ys8xfdccpzv0z9lr2y88jnzhpz"; + }; + } + { + goPackagePath = "github.com/minio/sio"; + fetch = { + type = "git"; + url = "https://github.com/minio/sio"; + rev = "035b4ef8c449ba2ba21ec143c91964e76a1fb68c"; + sha256 = "007mh7a61qzgf8ga4pix6qhm6jbph3h71a8iif7l45mvqphabh0z"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } + { + goPackagePath = "github.com/mschoch/smat"; + fetch = { + type = "git"; + url = "https://github.com/mschoch/smat"; + rev = "90eadee771aeab36e8bf796039b8c261bebebe4f"; + sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3"; + }; + } + { + goPackagePath = "github.com/ncw/swift"; + fetch = { + type = "git"; + url = "https://github.com/ncw/swift"; + rev = "f737f4e00462f79ff2e0ddbcfb09331ce7ec4fa9"; + sha256 = "0c6vcn3dmhh339wilh71fmjb535kgfkf9dh2dh8ln43whq6mbjbs"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + { + goPackagePath = "github.com/philhofer/fwd"; + fetch = { + type = "git"; + url = "https://github.com/philhofer/fwd"; + rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136"; + sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/lz4"; + rev = "5a3d2245f97fc249850e7802e3c01fad02a1c316"; + sha256 = "1my03x0m72vc2xyy9h0naa1qrzcf0g531gh4cakcwpxrq0z39vmr"; + }; + } + { + goPackagePath = "github.com/pierrec/xxHash"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/xxHash"; + rev = "d17cb990ad2d219d5901415ceaeb50d17df59527"; + sha256 = "07rbr0apyq9m8m2knf1j7g9299r2v2ihvig1b7bq2srszcd9r221"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "f4711e4db9e9a1d3887343acb72b2bbfc2f686f5"; + sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8c9545af88b134710ab1cd196795e7f2388358d7"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1"; + sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "6d33b5a963d922d182c91e8a1c88d81fd150cfd4"; + sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "221dbe5ed46703ee255b1da0dec05086f5035f62"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + }; + } + { + goPackagePath = "github.com/tinsane/tracelog"; + fetch = { + type = "git"; + url = "https://github.com/tinsane/tracelog"; + rev = "05cb843fbac1d7693bbbbed8aa8f7b401438ee7f"; + sha256 = "1fry633qi4iih9za91m90c26p3qpd79d716dggk10cbc0bpvql51"; + }; + } + { + goPackagePath = "github.com/tinylib/msgp"; + fetch = { + type = "git"; + url = "https://github.com/tinylib/msgp"; + rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1"; + sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; + }; + } + { + goPackagePath = "github.com/ulikunitz/xz"; + fetch = { + type = "git"; + url = "https://github.com/ulikunitz/xz"; + rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d"; + sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy"; + }; + } + { + goPackagePath = "github.com/wal-g/storages"; + fetch = { + type = "git"; + url = "https://github.com/wal-g/storages"; + rev = "ecd376af8972cd9c3e355831c126a7862de6b2b9"; + sha256 = "1jmvin93811xxh9sqf6xrrys55dm12zszqf2l3arf92h0bysvniy"; + }; + } + { + goPackagePath = "github.com/willf/bitset"; + fetch = { + type = "git"; + url = "https://github.com/willf/bitset"; + rev = "e553b05586428962bf7058d1044519d87ca72d74"; + sha256 = "0davmxzv79qqg7lkj89diqinqx3xkr94d67yfnazqn3h1f7sjkd1"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "9c377598961b706d1542bd2d84d538b5094d596e"; + sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "e657309f52e71501f9934566ac06dc5c2f7f11a1"; + sha256 = "17jwkjrfj7kz25z8z492xlz88nmb42kpjcxl9dsv5jl28zvzq1bj"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "ec7cb31e5a562f5e9e31b300128d2f530f55d127"; + sha256 = "19b4kdwfahq9f809v4lmn9h47sq1y67nkl7csnracn5qd334hp06"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "959b441ac422379a43da2230f62be024250818b0"; + sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "74dc4d7220e7acc4e100824340f3e66577424772"; + sha256 = "0563yswwqknxx2gsvl0qikn0lmwalilbng8i12iw4d3v40n23s0l"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; + sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0fa942474b76e1b46a6060d720ae6e"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "4d1cda033e0619309c606fc686de3adcf599539e"; + sha256 = "1wgaldbnkmh568v8kkgvnmkskaj96fqrbzhx23yji2kh1432q6gh"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "85acf8d2951cb2a3bde7632f9ff273ef0379bcbd"; + sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "fc82fb2afd64396b05ea9aa0bccd6e8f2257b154"; + sha256 = "1rnpbhhcnv28k63m7biv2rxrmdxhz9q3p35qi0phcq2qhcf78032"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "feb0267beb8644f5088a03be4d5ec3f8c7020152"; + sha256 = "1lzdzkd2i41v6amxs9jah1q44qbvf1yvm8906jpfjiq6c3ffhqss"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "4a4468ece617fc8205e99368fa2200e9d1fad421"; + sha256 = "13cyhqwmvc2nia4ssdwwdzscq52aj3z9zjikx17wk4kb0j8vr370"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "24fa4b261c55da65468f2abfdae2b024eef27dfb"; + sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "6eaf6f47437a6b4e2153a190160ef39a92c7eceb"; + sha256 = "1cn33r2gclmq2v1ndpf1n5bmhf2qs8mms7ii5cnl6f9ch4r2c4k3"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "72554cb117ad340748b3093e7108983fd984c9f2"; + sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd"; + }; + } +] \ No newline at end of file diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix new file mode 100644 index 00000000000..5fa57e830d2 --- /dev/null +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl, dpkg }: + +stdenv.mkDerivation rec { + pname = "fx_cast_bridge"; + version = "0.0.5"; + + src = fetchurl { + url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb"; + sha256 = "1qmp1d7miq7c2q8i4bhfp5ywxdngvyi7rjl6i82is2g5nhr7gbvv"; + }; + + nativeBuildInputs = [ dpkg ]; + + unpackPhase = '' + runHook preUnpack + dpkg-deb -xv $src ./ + runHook postUnpack + ''; + + dontBuild = true; + dontPatchELF = true; + + installPhase = '' + install -DT {opt/fx_cast,$out/bin}/${pname} + install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/${pname}.json + + substituteInPlace $out/lib/mozilla/native-messaging-hosts/${pname}.json \ + --replace {/opt/fx_cast,$out/bin}/${pname} + ''; + + # See now-cli/default.nix + dontStrip = true; + preFixup = let + libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; + bin = "$out/bin/${pname}"; + in '' + + orig_size=$(stat --printf=%s ${bin}) + + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ${bin} + patchelf --set-rpath ${libPath} ${bin} + chmod +x ${bin} + + new_size=$(stat --printf=%s ${bin}) + + ###### zeit-pkg fixing starts here. + # we're replacing plaintext js code that looks like + # PAYLOAD_POSITION = '1234 ' | 0 + # [...] + # PRELUDE_POSITION = '1234 ' | 0 + # ^-----20-chars-----^^------22-chars------^ + # ^-- grep points here + # + # var_* are as described above + # shift_by seems to be safe so long as all patchelf adjustments occur + # before any locations pointed to by hardcoded offsets + + var_skip=20 + var_select=22 + shift_by=$(expr $new_size - $orig_size) + + function fix_offset { + # $1 = name of variable to adjust + location=$(grep -obUam1 "$1" ${bin} | cut -d: -f1) + location=$(expr $location + $var_skip) + + value=$(dd if=${bin} iflag=count_bytes,skip_bytes skip=$location \ + bs=1 count=$var_select status=none) + value=$(expr $shift_by + $value) + + echo -n $value | dd of=${bin} bs=1 seek=$location conv=notrunc + } + + fix_offset PAYLOAD_POSITION + fix_offset PRELUDE_POSITION + + ''; + + meta = with stdenv.lib; { + description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; + homepage = https://hensm.github.io/fx_cast/; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index e331e43956e..48b471e3b40 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "128hlk2m7dy1ajvxkkazbi2npx738jfrkkznvmhyxm0hllcw4r9z"; + sha256 = "1pilksik3bbd4sgmnpns9gg9sddybzxzxkn9sknn40dav08k1x6h"; }; dontBuild = true; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index b42be5b548c..34a6cb03d8b 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.0"; + version = "1.2020.1"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1ibhyj51wib2d8q7zyjbzp65hqm0a1jczqwqdw3834zdmrb2v7bs"; + sha256 = "02a55na86561fnxf6pk0cpg13mx8qr7pvigyp65rqks0f9ygj9ga"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 0c0820837f5..338452e213c 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.36.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0vkp6yfafzyhilkk5rfvgka91gmhm9nrrvy3m6gdza4ayslmcpam"; + sha256 = "1ip6jfnlw0maabvihzbmmka453njnw1yf7hq3fd89l6dx57315m5"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -19,10 +19,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "05q527bd5q6a7kd03hwic4bynyc4sipyvi0bf2g2jqxzcsmswyyk"; + cargoSha256 = "16wsd8z4cfb5pplwfvwgi5qawwv8c0aa220wnvphplmgz8cpq35r"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 06eabec0618..a79540eaeca 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.4.2"; + version = "3.4.4"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0mia01cqmaa17696m73qazpbyrcng7wldca79g46xgc4z96q1i7i"; + sha256 = "1qr9cd22m6w5r32bsvg08bmvyvzz7agaklrghf8n1d23ijj1563p"; }; - modSha256 = "1zwm7skdhql6isffyhixqsgvcgxw2436iv8bj92cxs70ipk537v9"; + modSha256 = "00pd0xi0m3w4xqdqq7ldqcpirq9plln45nhpjrsp5r9bz7yc5wn9"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 8dd18df28c7..7ee959905ce 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "04jn0189vq5lc795izkxq1zdv9fnpxz2xchg2mm37armpz7n06id"; + sha256 = "0vhhiccyvp9pjdmmscwdwcynxfwd2kgv418z90blnir0yfkvsryq"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix deleted file mode 100644 index 969084582ae..00000000000 --- a/pkgs/tools/networking/netalyzr/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, jre, makeWrapper }: - -stdenv.mkDerivation { - pname = "netalyzr"; - version = "57861"; - - # unfortunately there is not a version specific download URL - src = fetchurl { - url = "http://netalyzr.icsi.berkeley.edu/NetalyzrCLI.jar"; - sha256 = "0fa3gvgp05p1nf1d711052wgvnp0xnvhj2h2bwk1mh1ih8qn50xb"; - }; - - phases = [ "installPhase" ]; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/{bin,share/netalyzr} - install -m644 $src $out/share/netalyzr/NetalyzrCLI.jar - makeWrapper ${stdenv.lib.getBin jre}/bin/java $out/bin/netalyzr \ - --add-flags "-jar $out/share/netalyzr/NetalyzrCLI.jar" - ''; - - meta = with stdenv.lib; { - description = "Network debugging and analysis tool"; - homepage = http://netalyzr.icsi.berkeley.edu; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index 4f52b5e0945..02ff7511382 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "throttled"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "erpalma"; repo = pname; rev = "v${version}"; - sha256 = "1icb2288pj25vbdnd16zvisw9c01hp8vkk25ilkc74gy76xhpcs4"; + sha256 = "1y1sczvj2qc8ml9i1rdzr8hklvci9bdphm3mmri2ncaqys8wdbh4"; }; nativeBuildInputs = [ python3Packages.wrapPython ]; - pythonPath = with python3Packages; [ + pythonPath = with python3Packages; [ configparser dbus-python pygobject3 ]; - # The upstream unit both assumes the install location, and tries to run in a virtualenv + # The upstream unit both assumes the install location, and tries to run in a virtualenv postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/lenovo_fix.py|' -i systemd/lenovo_fix.service''; installPhase = '' diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index cdc6878bb5a..6f7b4d487ef 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.5.0"; + version = "9.6.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0rvwxykyscpcvfgm8zzyvjgzl9x9ddi9cxmqyxrc031mxpc0lzyy"; + sha256 = "1cpj8fj1mzp6mbd1z9dj38fmlcg5q2gbya4vbag1ddd4vp7rvn2m"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 9d4f7b514a3..099a02e8f65 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.3.0"; + version = "0.3.1"; src = stdenv.mkDerivation rec { name = "${pname}-${version}-source"; @@ -11,11 +11,11 @@ rustPlatform.buildRustPackage rec { owner = "xiph"; repo = "rav1e"; rev = "v${version}"; - sha256 = "1z8wdwhmczd7qq61gpngnyhl9614csccm0vnavvzjmaqsljlm0qi"; + sha256 = "001v29baa77pkab13d7imi71llixyvffqax8kgjwhm1dhsqlm7bl"; }; cargoLock = fetchurl { url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock"; - sha256 = "0qhgiryb71qgil5nawy7n3mj5g9aiikl3hq3nlikg94rm9dl0dhv"; + sha256 = "06l8jj75ma5kvz1m14x58an2zvx12i6wcq70gzq5k47nvj5l0zax"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { # Delete this on next update; see #79975 for details legacyCargoFetcher = true; - cargoSha256 = "185jnmyirfhrv8bxvmwizf3lvq49sjj1696g3gflph31d8bfpb0c"; + cargoSha256 = "0jxc8qsp5fasnh5cbg6yl9d878n7dppay9gzjndlb65kj9j43h84"; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dabbfcd6d49..42478f38b84 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -423,6 +423,7 @@ mapAliases ({ smbclient = samba; # added 2018-04-25 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 + sundials_3 = throw "removed 2020-02. outdated and no longer needed"; net_snmp = net-snmp; # added 2019-12-21 spaceOrbit = space-orbit; # addewd 2016-05-23 speech_tools = speech-tools; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b70c6856301..025c6a4631c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1776,6 +1776,8 @@ in fwup = callPackage ../tools/misc/fwup { }; + fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; + fzf = callPackage ../tools/misc/fzf { }; fzf-zsh = callPackage ../shells/zsh/fzf-zsh { }; @@ -6009,6 +6011,8 @@ in openmpi = callPackage ../development/libraries/openmpi { }; + ucx = callPackage ../development/libraries/ucx {}; + openmodelica = callPackage ../applications/science/misc/openmodelica { }; qarte = libsForQt5.callPackage ../applications/video/qarte { }; @@ -6728,8 +6732,6 @@ in w3m = w3m-batch; }; - netalyzr = callPackage ../tools/networking/netalyzr { }; - swaks = callPackage ../tools/networking/swaks { }; swiften = callPackage ../development/libraries/swiften { }; @@ -9132,7 +9134,7 @@ in kanif = callPackage ../applications/networking/cluster/kanif { }; lumo = callPackage ../development/interpreters/clojurescript/lumo { - nodejs = nodejs-10_x; + nodejs = nodejs-13_x; }; lxappearance = callPackage ../desktops/lxde/core/lxappearance { @@ -14398,8 +14400,6 @@ in sundials = callPackage ../development/libraries/sundials { }; - sundials_3 = callPackage ../development/libraries/sundials/3.x.nix { }; - sutils = callPackage ../tools/misc/sutils { }; svrcore = callPackage ../development/libraries/svrcore { }; @@ -20448,6 +20448,8 @@ in mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; + mps-youtube = callPackage ../applications/misc/mps-youtube { }; + mplayer = callPackage ../applications/video/mplayer ({ libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); @@ -20604,6 +20606,15 @@ in shogun = callPackage ../applications/science/machine-learning/shogun { stdenv = gcc8Stdenv; + + # Workaround for the glibc abi version mismatch. + # Please note that opencv builds are by default disabled. + opencv = opencv3.override { + stdenv = gcc8Stdenv; + openexr = openexr.override { + stdenv = gcc8Stdenv; + }; + }; }; sky = callPackage ../applications/networking/instant-messengers/sky {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b9a8bb8c25..c00033b3a72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1496,7 +1496,7 @@ in { webapp2 = callPackage ../development/python-modules/webapp2 { }; wordcloud = callPackage ../development/python-modules/wordcloud { }; - + wrf-python = callPackage ../development/python-modules/wrf-python { }; pyunbound = callPackage ../tools/networking/unbound/python.nix { }; @@ -1690,7 +1690,7 @@ in { asn1ate = callPackage ../development/python-modules/asn1ate { }; - atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; + atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; atomiclong = callPackage ../development/python-modules/atomiclong { }; @@ -1904,6 +1904,8 @@ in { cvxopt = callPackage ../development/python-modules/cvxopt { }; + cvxpy = callPackage ../development/python-modules/cvxpy { }; + cycler = callPackage ../development/python-modules/cycler { }; cysignals = callPackage ../development/python-modules/cysignals { }; @@ -4406,7 +4408,7 @@ in { nbconvert = callPackage ../development/python-modules/nbconvert { }; - nbformat = if isPy3k then + nbformat = if isPy3k then callPackage ../development/python-modules/nbformat { } else callPackage ../development/python-modules/nbformat/2.nix { }; @@ -5080,6 +5082,8 @@ in { python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}; python_simple_hipchat = self.python-simple-hipchat; + scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; + python_keyczar = callPackage ../development/python-modules/python_keyczar { }; python-language-server = callPackage ../development/python-modules/python-language-server {}; @@ -6491,8 +6495,6 @@ in { maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; - mps-youtube = callPackage ../development/python-modules/mps-youtube { }; - d2to1 = callPackage ../development/python-modules/d2to1 { }; ovh = callPackage ../development/python-modules/ovh { }; |