diff options
Diffstat (limited to 'pkgs')
472 files changed, 7708 insertions, 3587 deletions
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index c7a81b6b11f..b6a47b2828c 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost165, openssl_1_1, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }: +{ callPackage, boost155, boost165, openssl_1_1, haskellPackages, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }: rec { @@ -75,6 +75,9 @@ rec { namecoin = callPackage ./namecoin.nix { withGui = true; }; namecoind = callPackage ./namecoin.nix { withGui = false; }; + pivx = libsForQt59.callPackage ./pivx.nix { withGui = true; }; + pivxd = callPackage ./pivx.nix { withGui = false; }; + ethabi = callPackage ./ethabi.nix { }; stellar-core = callPackage ./stellar-core.nix { }; diff --git a/pkgs/applications/altcoins/pivx.nix b/pkgs/applications/altcoins/pivx.nix new file mode 100644 index 00000000000..995b8deccd9 --- /dev/null +++ b/pkgs/applications/altcoins/pivx.nix @@ -0,0 +1,54 @@ +{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook +, openssl, db48, boost, zlib, miniupnpc, gmp +, qrencode, glib, protobuf, yasm, libevent +, utillinux, qtbase ? null, qttools ? null +, enableUpnp ? false +, disableWallet ? false +, disableDaemon ? false +, withGui ? false }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "pivx-${version}"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "PIVX-Project"; + repo= "PIVX"; + rev = "v${version}"; + sha256 = "1sym6254vhq8qqpxq9qhy10m5167v7x93kqaj1gixc1vwwbxyazy"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] + ++ optionals withGui [ qtbase qttools qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] + ++ optional enableUpnp "--enable-upnp-default" + ++ optional disableWallet "--disable-wallet" + ++ optional disableDaemon "--disable-daemon" + ++ optionals withGui [ "--with-gui=yes" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; + + enableParallelBuilding = true; + doChecks = true; + postBuild = '' + mkdir -p $out/share/applications $out/share/icons + cp contrib/debian/pivx-qt.desktop $out/share/applications/ + cp share/pixmaps/*128.png $out/share/icons/ + ''; + + meta = with stdenv.lib; { + description = "An open source crypto-currency focused on fast private transactions"; + longDescription = '' + PIVX is an MIT licensed, open source, blockchain-based cryptocurrency with + ultra fast transactions, low fees, high network decentralization, and + Zero Knowledge cryptography proofs for industry-leading transaction anonymity. + ''; + license = licenses.mit; + homepage = https://www.dash.org; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 7a80fecab71..125c0f7a753 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { production, performance and DJing, with a focus on flexible editing tools and a super-fast workflow. ''; - homepage = http://www.bitwig.com/; + homepage = https://www.bitwig.com/; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus mrVanDalo ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 49ecf670f32..0bffa6a0755 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "1azzwqgrrr4zr509sib2jvigfvz5bkwnx82chdadxdwfarai8586"; + sha256 = "0d0kskr9pzdckw7sz4djjkkkgz1fa83zrq5my6qlxn68wqdj6800"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 1c5eaba78b2..a97b539e02a 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "18m077z1hqjg10chy5rgajd9q1wnrcxhiidivgjcdchc9q5d4b08"; + sha256 = "0vmbwpfjq66qv3zp7mss3hsxy6dxjybqfm7k2xyc0w181qclg1ya"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 465544e7c6a..9df4308131e 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.37.3"; + version = "0.38.1"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "1wfm8wrwrnqpb4ihy75n7l9i6vml536jlq9pdx2pblbc4ba3paac"; + sha256 = "0bw7xnrx062nwb1bfj9x660h7069ncmz77szcs8icpqxrvhs7z80"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 wafHook ]; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 2e70bebc88d..d798a2bed53 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { - Delay Compensator Stereo - Verzögerungsausgleicher Stereo - Delay Compensator x2 Stereo - Verzögerungsausgleicher x2 Stereo ''; - homepage = http://lsp-plug.in; + homepage = https://lsp-plug.in; maintainers = with maintainers; [ magnetophon ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 7089f4dba92..67fe983c26f 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.33"; + version = "0.34"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1ymnxb85v2pc0qpk0yz5gdxayc0ialk82ba521lgdw66li7fr4as"; + sha256 = "0ffby37qdg251c1w0vl6rmd13akbydnf12468z4vrl0ybwfd7fc4"; }; buildInputs = [ glib ncurses mpd_clientlib boost ]; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index b82dad05c31..8a0762d5176 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -7,6 +7,7 @@ , patchelf , fdk_aac , libtool +, ldacbt , cmake , bluez , dbus @@ -23,14 +24,13 @@ let in stdenv.mkDerivation rec { name = "pulseaudio-modules-bt-${version}"; - version = "unstable-2019-03-15"; + version = "1.1.99"; src = fetchFromGitHub { owner = "EHfive"; repo = "pulseaudio-modules-bt"; - rev = "0b397c26eb4fd5dc611bd3e2baa79776de646856"; - sha256 = "09q0xh9iz0crik6xpln9lijirf62aljxa1jrds1i1zgflyfidd0z"; - fetchSubmodules = true; + rev = "v${version}"; + sha256 = "0x670xbd62r3fs9a8pa5p4ppvxn6m64hvlrqa702gvikcvyrmwcg"; }; patches = [ @@ -48,6 +48,7 @@ in stdenv.mkDerivation rec { ffmpeg_4 fdk_aac libtool + ldacbt bluez dbus sbc @@ -67,7 +68,7 @@ in stdenv.mkDerivation rec { for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ + --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ "$so" done ''; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index ff38d4b16f5..0cbb022eb20 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -47,13 +47,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.5.5"; + version = "4.5.9"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0ll85c9xll2i42r1bdgbnxi5mc5jq2vxgp179jj2iq7wczq5psj1"; + sha256 = "19pqi9wix359hdrslzmi9sz0dzz03pdwqvdyzw3i5rdny01skdfw"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 603ca8b3640..b146513d735 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "08x7znvbwi9miavcarymi7dsv8njmxzwzma20dbmz8j2aswm53w5"; + sha256 = "0h4hhja8qbyzd6v24flw9wr4mwl03nplryx1gyrppn7sg13l1sx6"; }; nativeBuildInputs = [ autoconf pkgconfig ]; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 59bbceac705..703ce5c5cf9 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1zsikhqj5xzhw2x3b6pqlmcwz3hxx07lbbif8v3m3j41snzjic22"; + sha256 = "06sa4wl8zr0k8dnjiil0gjwnhrkq95h50xv56ih1y8jgyzxchaxp"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index cba85aacfbb..1a131539460 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "0402rdr46za21w34m7ajzbwiiqcd1h0da3b0ldsr2z5g2mrkzxv8"; + sha256 = "16a5xix9pn0gl3fr6bv6zl1l9vrzgvy1q7xd8yxzfr3vi5s8x4z9"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 0918cf42830..48579694699 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1b9w4cml3cmcg09kh852cahas6l9ks8wl3gzp1az8rzxz4229yg1"; + sha256 = "1hcngk7mxfrqf8v3r759x3wd0p02nc3q83j8m3k58p408y3mx7nr"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e5e5e179b89..80d84bcd2fd 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,21 +18,11 @@ let sha256Hash = "1v4apc73jdhavhzj8j46mzh15rw08w1hd9y9ykarj3b5q7i2vyq1"; }; latestVersion = { # canary & dev - version = "3.5.0.9"; # "Android Studio 3.5 Canary 10" - build = "191.5416148"; - sha256Hash = "03d2x6bqasw417dxc7b8y65rral73xm2ci512gprmsvwy42k3mqi"; + version = "3.5.0.10"; # "Android Studio 3.5 Canary 11" + build = "191.5455988"; + sha256Hash = "1g24a8fwnrfzdf093wdmqly3mzjddk5ndgi51qj98amn7kclsdpf"; }; in rec { - # Old alias (TODO @primeos: Remove after 19.03 is branched off): - preview = throw '' - The attributes "android-studio-preview" and "androidStudioPackages.preview" - are now deprecated and will be removed soon, please use - "androidStudioPackages.beta" instead. This attribute corresponds to the - beta channel, if you want the latest release you can use - "androidStudioPackages.dev" or "androidStudioPackages.canary" instead - (currently, there is no difference between both channels). - ''; - # Attributes are named by their corresponding release channels stable = mkStudio (stableVersion // { diff --git a/pkgs/applications/editors/emacs/clean-env-macport.patch b/pkgs/applications/editors/emacs/clean-env-macport.patch deleted file mode 100644 index 7b4cb9d5266..00000000000 --- a/pkgs/applications/editors/emacs/clean-env-macport.patch +++ /dev/null @@ -1,15 +0,0 @@ -Dump temacs in an empty environment to prevent -dev paths from ending -up in the dumped image. - -diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in ---- emacs-25.3/src/Makefile.in 2017-04-14 17:02:47.000000000 +0200 -+++ emacs-25.3-new/src/Makefile.in 2017-09-25 19:03:02.173861038 +0200 -@@ -532,7 +532,7 @@ - ifeq ($(CANNOT_DUMP),yes) - ln -f temacs$(EXEEXT) $@ - else -- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump -+ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump - ifneq ($(PAXCTL_dumped),) - $(PAXCTL_dumped) $@ - endif diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index fb7892aec99..33c5da8642c 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -4,19 +4,19 @@ }: stdenv.mkDerivation rec { - emacsVersion = "26.1"; + emacsVersion = "26.2"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "7.4"; + macportVersion = "7.6"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; + sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "1xl3rfqw1f3jil20xf6iy0f1hdk9adj8rnv7xhcjq4pymj4w8ka6"; + sha256 = "00szqb74ds89m34sx5mq0gxhsrz64j691sxyvqncj10hw17d0y61"; }; hiresSrc = fetchurl { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk"; }; - patches = [ ./clean-env-macport.patch ]; + patches = [ ./clean-env.patch ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 891fd32df70..52888c5f85d 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; - version = "2.1.5"; + version = "2.1.7"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "1h05b68ka1ka217f6svq8yxvnscwf9sl5cx46c0b6ygcbz1vr3ba"; + sha256 = "014c8xvb7shy00vjx0b1k8zr7iknxskqab1aqvz9md3bn5rwkxm5"; }; propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index f2068eb30df..ffa80bc68ca 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "okteta-${version}"; - version = "0.26.0"; + version = "0.26.1"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; - sha256 = "0rxvbllisz4zl687zgpb9jj2nbxgfhhf2bj8bnsfaab5jb6jpi2y"; + sha256 = "1bqq3ax47xym3ikwn6xsshs1b5gpfg5djrnkzszqnp127f1fxi54"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 189c49cde35..67c1ddf175f 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -108,6 +108,10 @@ in mkdir -p $out/share/pixmaps cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png + + # Override the previously determined VSCODE_PATH with the one we know to be correct + sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" $out/bin/code + grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/code # check if sed succeeded ''; preFixup = lib.optionalString (system == "i686-linux" || system == "x86_64-linux") '' @@ -129,7 +133,7 @@ in homepage = https://code.visualstudio.com/; downloadPage = https://code.visualstudio.com/Updates; license = licenses.unfree; - maintainers = with maintainers; [ eadwu ]; + maintainers = with maintainers; [ eadwu synthetica ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index e30f4a428a3..719491ac2b0 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,12 +10,12 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in stdenv.mkDerivation rec { - version = "3.4.5"; + version = "3.4.6"; name = "qgis-unwrapped-${version}"; src = fetchurl { url = "http://qgis.org/downloads/qgis-${version}.tar.bz2"; - sha256 = "0myw1jgz8v8wncmrjsszn9ixylx84hafn0281c4hqhz623n3lxgx"; + sha256 = "1skdimcbcv41hi4ii7iq8ka29k2zizzqv04fwidzfbxqclz7300h"; }; passthru = { diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index b15b57d8430..e16ef45fe1e 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "2.6.1"; + version = "2.6.2"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "09ihbj0602spgc5lfbskf9am38n03gam2r8v3kj4dyfgxqr37ib3"; + sha256 = "0igvgyd042j7hm4y8fcm6dc1qqjs4d1r7y6f0pzpa0x416xyzfcw"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 8c547359820..75cd9447b86 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -1,48 +1,89 @@ { stdenv , fetchurl , cmake +, extra-cmake-modules + +# common deps +, karchive + +# client deps , qtbase -, qtsvg , qtmultimedia +, qtsvg , qttools -, kdnssd -, karchive -, libsodium -, libmicrohttpd + +# optional client deps , giflib -, miniupnpc -, extra-cmake-modules +, kdnssd , libvpx +, miniupnpc +, qtx11extras # kis + +# optional server deps +, libmicrohttpd +, libsodium + +# options +, buildClient ? true +, buildServer ? true +, buildServerGui ? true # if false builds a headless server +, buildExtraTools ? false +, enableKisTablet ? false # enable improved graphics tablet support }: -stdenv.mkDerivation rec { +with stdenv.lib; + +let + commonDeps = [ + karchive + ]; + clientDeps = [ + qtbase + qtmultimedia + qtsvg + qttools + # optional: + giflib # gif animation export support + kdnssd # local server discovery with Zeroconf + libvpx # WebM video export + miniupnpc # automatic port forwarding + ]; + serverDeps = [ + # optional: + libmicrohttpd # HTTP admin api + libsodium # ext-auth support + ]; + kisDeps = [ + qtx11extras + ]; + +in stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.1.6"; + version = "2.1.7"; + src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "0vwsdvphigrq1daiazi411qflahlvgx8x8ssp581bng2lbq1vrbd"; + sha256 = "1nk1rb1syrlkxq7qs101ifaf012mq42nmq1dbkssnx6niydi3bbd"; }; + nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - # common deps: cmake - qtbase qtsvg qtmultimedia qttools - karchive - # optional deps: - # server-specific: - libsodium # ext-auth support - libmicrohttpd # HTTP admin api - # client-specific: - giflib # gif animation export support - miniupnpc # automatic port forwarding - kdnssd # local server discovery with Zeroconf - libvpx # WebM video export + extra-cmake-modules ]; - configurePhase = "cmake -DCMAKE_INSTALL_PREFIX=$out ."; + buildInputs = + commonDeps ++ + optionals buildClient clientDeps ++ + optionals buildServer serverDeps ++ + optionals enableKisTablet kisDeps ; + + cmakeFlags = + optional (!buildClient ) "-DCLIENT=off" ++ + optional (!buildServer ) "-DSERVER=off" ++ + optional (!buildServerGui ) "-DSERVERGUI=off" ++ + optional ( buildExtraTools) "-DTOOLS=on" ++ + optional ( enableKisTablet) "-DKIS_TABLET=on"; - meta = with stdenv.lib; { + meta = { description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; homepage = https://drawpile.net/; downloadPage = https://drawpile.net/download/; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index 9c81fe32b51..42ed667dee9 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -34,7 +34,7 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ]; meta = { - homepage = http://manatlan.com/jbrout/; + homepage = https://manatlan.com/jbrout/; description = "Photo manager"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index ba64aae6215..b24b14698e6 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimize JPEG files"; - homepage = http://www.kokkonen.net/tjko/projects.html ; + homepage = https://www.kokkonen.net/tjko/projects.html ; license = licenses.gpl2; maintainers = [ maintainers.aristid ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 36087aa84bb..0f19a296df3 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, python3Packages , file, intltool, gobject-introspection, libgudev -, udisks, glib, gnome3, gst_all_1, libnotify -, exiv2, exiftool, qt5, gdk_pixbuf +, udisks, gexiv2, gst_all_1, libnotify +, exiftool, gdk_pixbuf, libmediainfo }: python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1517w18sxil1gwd78jjbbixcd1b0sp05imnnd5h5lr8wl3f0szj0"; + sha256 = "1nywkkyxlpzq3s9anza9k67j5689pfclfha218frih36qdb0j258"; }; # Disable version check and fix install tests @@ -19,24 +19,34 @@ python3Packages.buildPythonApplication rec { --replace "disable_version_check = False" "disable_version_check = True" substituteInPlace raphodo/rescan.py \ --replace "from preferences" "from raphodo.preferences" - substituteInPlace raphodo/copyfiles.py \ - --replace "import problemnotification" "import raphodo.problemnotification" ''; - nativeBuildInputs = [ file intltool gobject-introspection ]; + nativeBuildInputs = [ + file + intltool + ]; + + # Package has no generally usable unit tests. + # The included doctests expect specific, hardcoded hardware to be present. + doCheck = false; + # NOTE: Without gobject-introspection in buildInputs, launching fails with + # "Namespace [Notify / GExiv2 / GUdev] not available" buildInputs = [ - libgudev - udisks - glib - gnome3.gexiv2 + gdk_pixbuf + gexiv2 + gobject-introspection + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gstreamer + gst_all_1.gstreamer.dev + libgudev libnotify - exiv2 - exiftool - qt5.qtimageformats - gdk_pixbuf - ] ++ (with python3Packages; [ + udisks + ]; + + propagatedBuildInputs = with python3Packages; [ pyqt5 pygobject3 gphoto2 @@ -54,11 +64,14 @@ python3Packages.buildPythonApplication rec { requests colorlog pyprind - ]); + ]; makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set PYTHONPATH \"$PYTHONPATH\"" + "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool ]}" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}" + "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix index 912f18890b5..3c18d70d6c2 100644 --- a/pkgs/applications/misc/asciiquarium/default.nix +++ b/pkgs/applications/misc/asciiquarium/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Enjoy the mysteries of the sea from the safety of your own terminal!"; - homepage = https://robobunny.com/projects/asciiquarium/html; + homepage = https://robobunny.com/projects/asciiquarium/html/; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.utdemir ]; diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/applications/misc/bicon/default.nix new file mode 100644 index 00000000000..22eb3e3d859 --- /dev/null +++ b/pkgs/applications/misc/bicon/default.nix @@ -0,0 +1,36 @@ +{ stdenv + , fetchFromGitHub + , autoreconfHook + , pkg-config + , perl + , fribidi + , kbd + , xkbutils +}: + +stdenv.mkDerivation rec { + pname = "bicon"; + version = "unstable-2018-09-10"; + + src = fetchFromGitHub { + owner = "behdad"; + repo = pname; + rev = "38725c062a83ab19c4e4b4bc20eb9535561aa76c"; + sha256 = "0hdslrci8pq300f3rrjsvl5psfrxdwyxf9g2m5g789sr049dksnq"; + }; + + buildInputs = [ fribidi kbd xkbutils perl ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + preConfigure = '' + patchShebangs . + ''; + + meta = with stdenv.lib; { + description = "A bidirectional console"; + homepage = https://github.com/behdad/bicon; + license = [ licenses.lgpl21 licenses.psfl licenses.bsd0 ]; + maintainers = [ maintainers.linarcx ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index f0dce54675c..3f13972de9b 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -1,26 +1,26 @@ -{ stdenv, pythonPackages, fetchurl }: +{ stdenv, pythonPackages, fetchurl, gettext }: pythonPackages.buildPythonApplication rec { - name = "bleachbit-${version}"; - version = "2.0"; + pname = "bleachbit"; + version = "2.2"; - namePrefix = ""; + format = "other"; src = fetchurl { - url = "mirror://sourceforge/bleachbit/${name}.tar.bz2"; - sha256 = "0ps98zx4n13q92bq7ykqi6hj3i7brdqgm87i9gk6ibvljp1vxdz9"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "1yj9bc3k6s1aib7znb79h5rybfv691zz4szxkwf9fm9nr0dws603"; }; - buildInputs = [ pythonPackages.wrapPython ]; + nativeBuildInputs = [ gettext ]; - doCheck = false; + # Patch the many hardcoded uses of /usr/share/ and /usr/bin + postPatch = '' + find -type f -exec sed -i -e 's@/usr/share@${placeholder "out"}/share@g' {} \; + find -type f -exec sed -i -e 's@/usr/bin@${placeholder "out"}/bin@g' {} \; + ''; - postInstall = '' - mkdir -p $out/bin - cp bleachbit.py $out/bin/bleachbit - chmod +x $out/bin/bleachbit + dontBuild = true; - substituteInPlace $out/bin/bleachbit --replace "#!/usr/bin/env python" "#!${pythonPackages.python.interpreter}" - ''; + installFlags = [ "prefix=${placeholder "out"}" ]; propagatedBuildInputs = with pythonPackages; [ pygtk ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 5609b6a8beb..c77e47df34c 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.7.3"; + version = "3.8.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1nxxxq0lfs4r673i70dh2xwdn3chcjl913bkz14kyna29i6n1nwm"; + sha256 = "0kbhgg0j6iqfrpixvwl1mk3m0bz5s8bd6npk5xqcgzp1giywdc4i"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 51683a0a720..626b62ed7d0 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper -, fontconfig, freetype, glib, gtk2 +, fontconfig, freetype, glib, gtk3 , jdk, libX11, libXrender, libXtst, zlib }: # The build process is almost like eclipse's. @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "6.0.0"; + version = "6.0.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fontconfig freetype glib gtk2 + fontconfig freetype glib gtk3 jdk libX11 libXrender libXtst zlib ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1v7zvvphkyw7x5ziysk4gs2rpgc4dr108fn4ja80kijs1jmj5dxr"; + sha256 = "12zqz9zi4jryvlk1rjxfl4jdj4a6n00018yyk95glfdrxda2xyib"; }; installPhase = '' @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ])} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" # Create desktop item. diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index b28e7673992..309d4d54ae5 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, makeWrapper , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver -, libXinerama, libnotify, libxdg_basedir, pango, xorgproto, librsvg, dunstify ? false +, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false }: stdenv.mkDerivation rec { name = "dunst-${version}"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "1kqlshaflp306yrjjmc28pghi1y5p24vdx4bxf8i4n9khdawb514"; + sha256 = "1rwbylygd88r61yrxc7ckg9svgq8b1i2falr0mk9sabqxzn9050s"; }; nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ]; buildInputs = [ cairo dbus gdk_pixbuf glib libX11 libXScrnSaver - libXinerama libnotify libxdg_basedir pango xorgproto librsvg libXrandr + libXinerama libnotify pango xorgproto librsvg libXrandr ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 255396a7950..6c802e683ce 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -3,11 +3,11 @@ librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWra stdenv.mkDerivation rec { name = "eaglemode-${version}"; - version = "0.94.0"; + version = "0.94.1"; src = fetchurl { url = "mirror://sourceforge/eaglemode/${name}.tar.bz2"; - sha256 = "1sr3bd9y9j2svqvdwhrak29yy9cxf92w9vq2cim7a8hzwi9qfy9k"; + sha256 = "0mpnk0fzy02jxbafipkdkj48m6k38h42j599gw4sdnag7ymlms89"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 946f3695f16..21fed2e28de 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "exercism-${version}"; - version = "3.0.9"; + version = "3.0.11"; goPackagePath = "github.com/exercism/cli"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "0nr3dzipylicrbplh25dw0w84qklr0xcyq442i9aswzibqrb2vc6"; + sha256 = "1wg23bvibsk6j4iqwyw35wl9plfwdqxiql81zci7r1x4d5cp26av"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 32d10712b76..22a1a4ba2ad 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "14760"; + version = "14945"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1ya05z3i37ynpaqrm99cirkbap03q7wgbbps2y95l7r2k9l4sxsi"; + sha256 = "0kdfdn0i7gjfkkllb93598ywf0qlllzsia5q14szc5b5assl8qpb"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 1dbc4f64088..ee99e21f6ec 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,26 +1,29 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, qttools , curl +, glibcLocales +, libXi +, libXtst , libargon2 , libgcrypt -, libsodium -, zlib -, libmicrohttpd -, libXtst -, qtbase , libgpgerror -, glibcLocales +, libmicrohttpd +, libsodium , libyubikey -, yubikey-personalization -, libXi -, qtx11extras +, pkg-config +, qrencode +, qtbase , qtmacextras , qtsvg -, qrencode +, qtx11extras +, quazip +, yubikey-personalization +, zlib , withKeePassBrowser ? true +, withKeePassKeeShare ? true +, withKeePassKeeShareSecure ? true , withKeePassSSHAgent ? true -, withKeePassHTTP ? false , withKeePassNetworking ? false }: @@ -28,13 +31,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1k8s56003gym2dv6c54gxwzs20i7lf6w5g5qnr449jfmf6wvbivr"; + sha256 = "1cbfsfdvb4qw6yb0zl6mymdbphnb7lxbfrc5a8cjmn9w8b09kv6m"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ @@ -52,17 +55,19 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + ./quazip5.patch ]; cmakeFlags = [ "-DKEEPASSXC_BUILD_TYPE=Release" "-DWITH_GUI_TESTS=ON" "-DWITH_XC_AUTOTYPE=ON" + "-DWITH_XC_UPDATECHECK=OFF" "-DWITH_XC_YUBIKEY=ON" - "-DWITH_XC_KEESHARE=ON" ] ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") - ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON") + ++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") + ++ (optional withKeePassKeeShareSecure "-DWITH_XC_KEESHARE_SECURE=ON") ++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") ++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); @@ -87,13 +92,16 @@ stdenv.mkDerivation rec { libmicrohttpd libsodium libyubikey + pkg-config + qrencode qtbase - qtx11extras qtsvg + qtx11extras yubikey-personalization zlib - qrencode - ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; + ] + ++ stdenv.lib.optional withKeePassKeeShareSecure quazip + ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; postInstall = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. @@ -103,7 +111,7 @@ stdenv.mkDerivation rec { meta = { description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; - longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI and via CLI. Includes optional http-interface to allow browser-integration with plugins like PassIFox (https://github.com/pfn/passifox)."; + longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)."; homepage = https://keepassxc.org/; license = licenses.gpl2; maintainers = with maintainers; [ s1lvester jonafato ]; diff --git a/pkgs/applications/misc/keepassx/qt511.patch b/pkgs/applications/misc/keepassx/qt511.patch deleted file mode 100644 index b4d312c8c26..00000000000 --- a/pkgs/applications/misc/keepassx/qt511.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp -index 6fd65c1a..e99275b0 100644 ---- a/src/gui/entry/EditEntryWidget.cpp -+++ b/src/gui/entry/EditEntryWidget.cpp -@@ -29,6 +29,7 @@ - #include <QMenu> - #include <QSortFilterProxyModel> - #include <QTemporaryFile> -+#include <QButtonGroup> - #include <QMimeData> - #include <QEvent> - #include <QColorDialog> --- -2.17.1 - diff --git a/pkgs/applications/misc/keepassx/quazip5.patch b/pkgs/applications/misc/keepassx/quazip5.patch new file mode 100644 index 00000000000..ccea841cac7 --- /dev/null +++ b/pkgs/applications/misc/keepassx/quazip5.patch @@ -0,0 +1,27 @@ +diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake +index 8d309181..92aa892c 100644 +--- a/cmake/FindQuaZip.cmake ++++ b/cmake/FindQuaZip.cmake +@@ -9,7 +9,6 @@ IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) + SET(QUAZIP_FOUND TRUE) + ELSE(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) + IF(Qt5Core_FOUND) +- set(QUAZIP_LIB_VERSION_SUFFIX 5) + ENDIF() + IF(WIN32) + FIND_PATH(QUAZIP_LIBRARY_DIR +diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp +index 33f5ed1f..5fcd9202 100644 +--- a/src/keeshare/ShareObserver.cpp ++++ b/src/keeshare/ShareObserver.cpp +@@ -46,8 +46,8 @@ + #include <QStringBuilder> + + #if defined(WITH_XC_KEESHARE_SECURE) +-#include <quazip5/quazip.h> +-#include <quazip5/quazipfile.h> ++#include <quazip/quazip.h> ++#include <quazip/quazipfile.h> + #endif + + namespace diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 9ea8210e67e..bc49e810d4e 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { meta = { description = "An offline reader for Web content"; - homepage = http://kiwix.org; + homepage = https://kiwix.org; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ robbinch ]; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index c27fda31a8f..e560fa30294 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.8.6"; + version = "0.8.8"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; - sha256 = "1qzf9fkfkbv8vnc9p6lm7ya9hzydwk2f7671by9ij26f77lmxfb3"; + sha256 = "137s7rx35a5qrfww3q8bllj4zyjfa7l709snvdfj34y7jbq7p6cd"; name = "${name}.tar.xz"; }; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index c872af68cef..2cfa6010853 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.8.7"; + version = "3.8.8"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "10j7q7rk6ck86xl1898maxhgkp1h7vy7nliv9sk5bqgs7rdwn4kl"; + sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 3e763f15798..8dc288c0162 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.navit-project.org; + homepage = https://www.navit-project.org; description = "Car navigation system with routing engine using OSM maps"; license = licenses.gpl2; maintainers = [ maintainers.genesis ]; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index da029a535a0..da09c123dcd 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -20,6 +20,8 @@ , which , curl , jq +, xorg +, libGL }: let @@ -50,7 +52,7 @@ let else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; - libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xorg.libX11 ]; + libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; in stdenv.mkDerivation { name = "playonlinux-${version}"; @@ -66,6 +68,8 @@ in stdenv.mkDerivation { [ python2Packages.python python2Packages.wxPython python2Packages.setuptools + xorg.libX11 + libGL ]; patchPhase = '' @@ -102,6 +106,5 @@ in stdenv.mkDerivation { license = licenses.gpl3; maintainers = [ maintainers.a1russell ]; platforms = [ "x86_64-linux" "i686-linux" ]; - broken = true; }; } diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 9e2beb5b07c..e6507845d4c 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -25,13 +25,14 @@ assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { - name = "polybar-${version}"; - version = "3.3.0"; + pname = "polybar"; + version = "3.3.1"; + src = fetchFromGitHub { owner = "jaagr"; - repo = "polybar"; + repo = pname; rev = version; - sha256 = "18hrsbq62na2i4rlwbs2ih7v9shnayg76nw14i6az28wpf8kx4rr"; + sha256 = "0qwi6q3qkrz2ip1jd4pxlnsrs2a9ywxyf8rgvbzyilr334rsiywh"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix new file mode 100644 index 00000000000..8f26ee99e22 --- /dev/null +++ b/pkgs/applications/misc/stretchly/default.nix @@ -0,0 +1,139 @@ +{ GConf +, alsaLib +, at-spi2-atk +, atk +, cairo +, cups +, dbus +, expat +, fetchurl +, fontconfig +, gdk_pixbuf +, glib +, gtk2 +, gtk3 +, lib +, libX11 +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libappindicator +, libdrm +, libnotify +, libpciaccess +, libpng12 +, libxcb +, nspr +, nss +, pango +, pciutils +, pulseaudio +, stdenv +, udev +, wrapGAppsHook +}: + +let + libs = [ + GConf + alsaLib + at-spi2-atk + atk + cairo + cups + dbus + expat + fontconfig + gdk_pixbuf + glib + gtk2 + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libappindicator + libdrm + libnotify + libpciaccess + libpng12 + libxcb + nspr + nss + pango + pciutils + pulseaudio + stdenv.cc.cc.lib + udev + ]; + + libPath = lib.makeLibraryPath libs; +in + +stdenv.mkDerivation rec { + pname = "stretchly"; + version = "0.19.1"; + + src = fetchurl { + url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz"; + sha256 = "1q2wxfqs8qv9b1rfh5lhmyp3rrgdl05m6ihsgkxlgp0yzi07afz8"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = libs; + + dontPatchELF = true; + dontBuild = true; + dontConfigure = true; + + installPhase = '' + mkdir -p $out/bin $out/lib/stretchly + cp -r ./* $out/lib/stretchly/ + ln -s $out/lib/stretchly/libffmpeg.so $out/lib/ + ln -s $out/lib/stretchly/libnode.so $out/lib/ + ln -s $out/lib/stretchly/stretchly $out/bin/ + ''; + + preFixup = '' + patchelf --set-rpath "${libPath}" $out/lib/stretchly/libffmpeg.so + patchelf --set-rpath "${libPath}" $out/lib/stretchly/libnode.so + + patchelf \ + --set-rpath "$out/lib/stretchly:${libPath}" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/lib/stretchly/stretchly + ''; + + meta = with stdenv.lib; { + description = "A break time reminder app"; + longDescription = '' + stretchly is a cross-platform electron app that reminds you to take + breaks when working on your computer. By default, it runs in your tray + and displays a reminder window containing an idea for a microbreak for 20 + seconds every 10 minutes. Every 30 minutes, it displays a window + containing an idea for a longer 5 minute break. + ''; + homepage = https://hovancik.net/stretchly; + downloadPage = https://hovancik.net/stretchly/downloads/; + license = licenses.bsd2; + maintainers = with maintainers; [ cdepillabout ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 62be8bbc1d6..59ba69c1c4d 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.18"; + version = "2.19"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "0mwhh61klicn2vwk39nc7y4cw4mygzdi2nljn4r0gjbw6jmw3337"; + sha256 = "02ls11c02p7xvsdjyb43rrzr850i1yly003r812z0w5vv5yqqxbh"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 07a389af8d6..599a0a20d7d 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -117,7 +117,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://www.opera.com; + homepage = https://www.opera.com; description = "Web browser"; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index 9a47e18fad1..b7118b49dae 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -1,5 +1,5 @@ { stdenv, cmake, fetchFromGitHub -, qtbase, qtmultimedia, qtwebengine +, qtbase, qtmultimedia, qtwebengine, qtxmlpatterns , version ? "1.0.01" , sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb" }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qtmultimedia qtwebengine ]; + buildInputs = [ qtbase qtmultimedia qtwebengine qtxmlpatterns ]; meta = with stdenv.lib; { homepage = https://otter-browser.org; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 283c63dcd6f..f37677b0521 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -302,10 +302,12 @@ stdenv.mkDerivation rec { # easily generated by firefox at startup. rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json} + # XDG + : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" + : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" + ${optionalString pulseaudioSupport '' # Figure out some envvars for pulseaudio - : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" - : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}" : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}" ''} @@ -336,9 +338,9 @@ stdenv.mkDerivation rec { \ TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ - XAUTHORITY="\''${XAUTHORITY:-}" \ + XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \ DISPLAY="\$DISPLAY" \ - DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ + DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\ \ XDG_DATA_HOME="\$HOME/.local/share" \ XDG_DATA_DIRS="$WRAPPER_XDG_DATA_DIRS" \ diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index f777696cdbf..85751e526fa 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "2.4.1488.38-1"; + version = "2.4.1488.40-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "1ycq4i19mcsbqrcvmxqkwwy991dsd9bg5sqr54s4z8gs0a9xj43q"; + sha256 = "0w084mamy72v1kkfgg8nn2q3hmfj7v216kkvqb52f1nyycqqzb37"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 98d4e25ef87..e8d732cf617 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -57,8 +57,8 @@ let in rec { charles4 = (generic { - version = "4.2.7"; - sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd"; + version = "4.2.8"; + sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080"; }); charles3 = (generic { version = "3.12.3"; diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index 9e991b25fc2..d1e24c56f8a 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kubetail-${version}"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = "${version}"; - sha256 = "159162dazcr0gsq9mkwb7sf4psqq5iqqgavy2mc8qnpswdlq3pfc"; + sha256 = "15f97bzw0vha4nrl9207l7w9mlnx58xlcnmpfjvbpm7x0ivb5l0q"; }; installPhase = '' diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 297703cde69..a43d52d7359 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "rssguard"; - version = "3.5.6"; + version = "3.5.7"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "1pdas7hg3nzykm3qi951fk25c9s6gjb7my82b9xzjn2yd7ks71by"; + sha256 = "1v0m2p6y7szdqbd2gl3972ah6cp6prfv2gp2a55ac1l8ba2dma4v"; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 9df43b690fd..cda455d9e56 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,16 +1,16 @@ { callPackage, stdenv }: let - stableVersion = "2.1.15"; - previewVersion = "2.2.0a4"; + stableVersion = "2.1.16"; + previewVersion = "2.2.0a5"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "116wigkh5kwna00q200yv2wm8dpi4kmsns96iglzwrrl19fk538p"; - serverSrcHash = "1mqwydxn58v5ddpnsxvf6vgqwhrfm3mwjwf030lv83zmcjhx237q"; + guiSrcHash = "03d7yjdnks568njkrgyh7g6c3vf6v7wkifshz2bcvry79pp2h4nl"; + serverSrcHash = "0p331aaqxw16kk5l2074qn9a7ih6fkivm05n8da3fwydzp9hjmcp"; in { guiStable = mkGui { stable = true; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "1a64c314v7mbaiipyap2skqgf69pyp1ld58cn2g3d89w2zrhf5q7"; + sha256Hash = "0p4g5hszys68ijzsi2rb89j1rpg04wlqlzzrl92npvqqf2i0jdf8"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "1jlz8a34q3s1sz9r6swh3jnlp96602axnvh1byywry5fb9ga8mfy"; + sha256Hash = "1yvdfczi8ah9m7b49l7larfs678hh7c424i1f73kivfds6211bj5"; }; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index cb3c9092374..ee6a40e5860 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.0.4", + "version": "1.0.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 0d10d1ae8be..3db537938da 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -4,12 +4,12 @@ with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.0.4"; + version = "1.0.7"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "152mi81miams5a7l9rd12bnf6wkd1r0lyicgr35r5fq0p6z7a4dk"; + sha256 = "1sq6vnyas2ab3phaiyby4fkpp0nwvl67xwxnr2pzfm0dkjxl9r58"; }; in mkYarnPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 7ce41d9e27e..9f8818efd98 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "09sm1k3iypqn93iazfx10y4bqz06d2h8f0902sgrj5qbnaq4jcxr"; + sha256 = "1zg9hwvbanmv2yymjcxjzk2bwvv8707i30vrs0gr213iz6i4abg5"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 116e4917354..5127e9ca827 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.23.2"; + version = "1.24.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0nl8rv0lgp4cwv029kl7y09ngcrik2657m4wjn0rnls8kpmdhd8j"; + sha256 = "0h5f1y29glq3l59gr54vln1jqfg5w9br3kg37wzwjjgvcac81ck9"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index a37377835f5..350ac7e13cd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.6.3"; - sha256Hash = "1bm0m1y3cf0zmaasz1wfkbz5fy9wm7ivyjn9bzs87yrvlj9x7wqz"; + version = "1.6.7"; + sha256Hash = "1537div6pky7wz3lansz67vsx2h6b653cx91xg9sswnxfsf8nrql"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "429149"; archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli"; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 3b75533e0e5..f2ae27e2c7d 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation rec { pname = "wire-desktop"; - version = "3.7.2891"; + version = "3.9.2895"; src = fetchurl { url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb"; - sha256 = "0x4nx1rpr9wai0h3n14h1r0f0lj5m29a3pkx1w6mfz5la74iczqc"; + sha256 = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 74e5e971742..45d0dadbe90 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.8.182821.0412"; + version = "2.8.183302.0415"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "18scnq9ga5nhslxg974zxlyqw1sjzg6l2g5mc6r4qqbbbn2nx92k"; + sha256 = "07afq614fy09mjymmv3cf8vwa8ps78s2s4909g1a2rwvgkj8bw2x"; }; }; diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix deleted file mode 100644 index 805b474e814..00000000000 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, unzip, firefox-unwrapped, makeWrapper }: - -stdenv.mkDerivation rec { - name = "chatzilla-0.9.92"; - - src = fetchurl { - # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. - url = "https://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp"; - sha256 = "09asg7ixjrin46xd19ri71g4jdrgb1gg0pk0lwk0dlb1qjxyf1xy"; - }; - - buildInputs = [ unzip makeWrapper ]; - - buildCommand = '' - mkdir -p $out/libexec/chatzilla - unzip $src -d $out/libexec/chatzilla - - makeWrapper ${firefox-unwrapped}/bin/firefox $out/bin/chatzilla \ - --add-flags "-app $out/libexec/chatzilla/application.ini" - - sed -i $out/libexec/chatzilla/application.ini -e 's/.*MaxVersion.*/MaxVersion=99.*/' - ''; - - meta = { - homepage = http://chatzilla.hacksrus.com/; - description = "Stand-alone version of Chatzilla, an IRC client"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index eac1acb1e6a..2e04ce856a8 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: let - version = "1.1.3-1"; + version = "1.1.4-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "15kyhyx1v4bb2sqzwq7bqrxxw7g733p5jnsgjqka2ygzg6dl2c5n"; + sha256 = "16w3l81j10syl2pis08sl752yapbgjy531qs0n1ghmsx2d12n7kl"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 32c4aafe28f..95f8ebea078 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.2.3"; + name = "homebank-5.2.4"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1wdg86gwd0rc9m3mni9qlh746kxmjn4mk5q7fplxrcp2ajdcqr3a"; + sha256 = "1lhj4pnszw4a1r8ls8lwqyakg5bmldziaxgydbx76nbah6w9ma3r"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix index 49b258c43fd..60fff1d0131 100644 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = { - homepage = http://ledger-cli.org/; + homepage = https://ledger-cli.org/; description = "A double-entry accounting system with a command-line reporting interface"; license = "BSD"; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 892ebcee99f..c992724b815 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation { updateScript = import ./update.nix { inherit stdenv writeScript runtimeShell; }; meta = with stdenv.lib; { - homepage = http://www.mendeley.com; + homepage = https://www.mendeley.com; description = "A reference manager and academic social network"; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 452407d9c49..ced3bccd7b6 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "06656lwbsjfs4hmh5xg38a1icgi49f37dkich0fx5yc92dvl8yfd"; + sha256 = "110fwlj2fw8jgrsgqfkha7lx8f06w0ymh51mgpckx8a0wycznhcy"; }; buildInputs = [ hackrf rtl-sdr airspy limesuite ]; diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix new file mode 100644 index 00000000000..a15425ec213 --- /dev/null +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: + +python27Packages.buildPythonApplication rec { + pname = "eggnog-mapper"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "eggnogdb"; + repo = "eggnog-mapper"; + rev = "${version}"; + sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv"; + }; + + patches = (fetchpatch { + url = https://github.com/eggnogdb/eggnog-mapper/pull/125/commits/b7828e4c8c1c453e391aef050f06ff3f84ff9faf.patch; + sha256 = "0nz1a7ybm4j5c7vdm3annnxz9036iam2044hia341a0am9wydmzk"; + }); + + buildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ]; + + # make emapper find diamond & hmmer + makeWrapperArgs = [ + ''--prefix PATH ':' "${diamond}/bin"'' + ''--prefix PATH ':' "${hmmer}/bin"'' + ]; + + # Tests rely on some of the databases being available, which is not bundled + # with this package as (1) in total, they represent >100GB of data, and (2) + # the user can download only those that interest them. + doCheck = false; + + meta = with stdenv.lib; { + description = "Fast genome-wide functional annotation through orthology assignment"; + license = licenses.gpl2; + homepage = https://github.com/eggnogdb/eggnog-mapper/wiki; + maintainers = with maintainers; [ luispedro ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index eb62a8c331f..2f21da02fb0 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "star-${version}"; - version = "2.7.0c"; + version = "2.7.0f"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "0r5jcckr45f71jwhz8xazi1w6kfhszq3y6r7f6zl9963ms1q1gfv"; + sha256 = "0ndqlyimf7xf00nghn8awg12pw985ixghiypg98r2gdm7pscgd0i"; }; sourceRoot = "source/source"; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c55766b8d61..94b059fe596 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.32"; + version = "14.29.36"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0jpl8smljyjpd3x1q6fcamgia1ij7gxk51faw99ys8ydnrzd57di"; + sha256 = "0f4wxlfxg7pd9lkphfsdq60p18ss1z2hkqvv95a1nn8nnivvs9c6"; }; patchPhase = '' diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 7d9d7a662f2..e4c743ccdef 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.99"; + version = "3.3.100"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "0lc4y2vizrbxldjk5yw2i4y7pyprjdjqx3iafzjfnin694zp2630"; + sha256 = "1z60i5nh8dz8j9ii63fwaw7k0p3x0scp91478cxmdv4xhp4njlxa"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index bc6e5e33ea2..277574ce2f1 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free EDA software to develop printed circuit boards"; - homepage = http://librepcb.org/; + homepage = https://librepcb.org/; maintainers = with maintainers; [ luz ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix new file mode 100644 index 00000000000..cb35b9f27d5 --- /dev/null +++ b/pkgs/applications/science/logic/petrinizer/default.nix @@ -0,0 +1,25 @@ +{ mkDerivation, async, base, bytestring, containers, fetchFromGitLab, mtl +, parallel-io, parsec, sbv, stdenv, stm, transformers +}: +mkDerivation rec { + pname = "petrinizer"; + version = "0.9.1.1"; + + src = fetchFromGitLab { + domain = "gitlab.lrz.de"; + owner = "i7"; + repo = pname; + rev = version; + sha256 = "1n7fzm96gq5rxm2f8w8sr1yzm1zcxpf0b473c6xnhsgqsis5j4xw"; + }; + + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base bytestring containers mtl parallel-io parsec sbv stm + transformers + ]; + description = "Safety and Liveness Analysis of Petri Nets with SMT solvers"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ raskin ]; +} diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 2047bb3fc9f..88f888ed04f 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "symbiyosys-${version}"; - version = "2018.12.09"; + version = "2019.03.28"; src = fetchFromGitHub { owner = "yosyshq"; repo = "symbiyosys"; - rev = "0772456a15b5a474c3c90a06b48e46a67d8a6614"; - sha256 = "00p2l1g9z8nnmkc57l1cfn9ignjjmxwnyaxj2xjd1fim4kzd5475"; + rev = "44869656b86993e7ebdc59e7b27191f3ecf119dc"; + sha256 = "1p18yzcadn91xzmqrg5xkwfl3p9mnlps57simz7dkkxzcqzjybvn"; }; buildInputs = [ python3 yosys ]; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index bc17147c16a..e14d24cf70e 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -72,6 +72,12 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id2=10407524b18659e14e184114b61c043fb816f3c2&id=c9b0cc9d0b8748ab85e568f8f57f316c5e8cbe54"; sha256 = "0wgp7yvn9sm1ynlhcr4l0hzmvr2n28llg4xc01p6k1zz4im64c17"; }) + # https://trac.sagemath.org/ticket/27224 + (fetchpatch { + name = "sig_on_in_matrix_misc.patch"; + url = "https://git.sagemath.org/sage.git/patch?id=85d25bf2eb73f7d3c6de4ee6222b0c399be43b07"; + sha256 = "1ciwhh57pnb9b4i8m3vb07wfsibsay5sg0jp5giq1pzc5zc79a4p"; + }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -151,6 +157,13 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch/?id=e351bf2f2914e683d5e2028597c45ae8d1b7f855"; sha256 = "00faa7fl0vaqcqbw0bidkhl78qa8l34d3a07zirbcl0vm74bdn1p"; }) + + # https://trac.sagemath.org/ticket/27653 + (fetchpatch { + name = "sympy-1.4.patch"; + url = "https://git.sagemath.org/sage.git/patch/?h=3277ba76d0ba7174608a31a0c6623e9210c63e3d"; + sha256 = "09avaanwmdgqv14mmllbgw9z2scf4lc0y0kzdhlriiq8ss9j8iir"; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 3571d705e31..d1da5a74e85 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "Free software for distributed and grid computing"; - homepage = http://boinc.berkeley.edu/; + homepage = https://boinc.berkeley.edu/; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; # arbitrary choice }; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index b665d5f4f68..f44d07d36db 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -58,5 +58,7 @@ stdenv.mkDerivation rec { license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ mdaiter ]; + # 20190414-174115: CMake cannot find CGAL which is passed as build input + broken = true; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index f30813cf120..a93682f0c2e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchgit, mercurial, makeWrapper, - asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 +{ stdenv, lib, fetchFromGitHub, mercurial, makeWrapper +, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 }: stdenv.mkDerivation rec { - rev = "e716a9e1a9e460a45663694ba4e9e8894a8452b2"; - version = "0.2-${rev}"; - name = "git-remote-hg-${version}"; + pname = "git-remote-hg"; + version = "1.0.0"; - src = fetchgit { - inherit rev; - url = "git://github.com/fingolfin/git-remote-hg.git"; - sha256 = "0cmlfdxfabrs3x10mfjfap8wz67s8xk2pjn2wlcj9k2v84gji60m"; + src = fetchFromGitHub { + owner = "mnauw"; + repo = "git-remote-hg"; + rev = "v${version}"; + sha256 = "0anl054zdi5rg5m4bm1n763kbdjkpdws3c89c8w8m5gq1ifsbd4d"; }; buildInputs = [ mercurial.python mercurial makeWrapper @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}" ''; - meta = with stdenv.lib; { - homepage = https://github.com/felipec/git-remote-hg; - description = "Semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones"; + meta = with lib; { + homepage = https://github.com/mnauw/git-remote-hg; + description = "Semi-official Mercurial bridge from Git project"; license = licenses.gpl2; maintainers = [ maintainers.garbas ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index e6e136e290d..24679085a65 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.11.1"; + version = "2.11.2"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "1gq3m4w4j63n3i43pyq2niwacd8cjypaj27yjabb582x63a431xy"; + sha256 = "11ipc2vpy52r1ql9r4iyam1sjchb7f01ffc39fvz6d5hhjaz3i9b"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix index 7b86b5429b2..abbec433c02 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,12 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "1.14.4"; + version = "1.15.1"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "1ly40348x9lkzsr7a9grkn7m8m6lhfsv0ihlnp288xbvmrirrmnk"; + sha256 = "1c4a6g3x44xkr75196m2qhb7fbm0lv40yv312g4hkl00mq713abm"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index ae1e0c5dc86..7912fe60bbc 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -25,11 +25,11 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { name = "avidemux-${version}"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "07fdz3y4iln7cizikdjj96dqvp2f8zzhs31ncxxwzdkngn5v8138"; + sha256 = "17x2mnnr5h8pp764p55l1xcn2ljnzhbj8cykajlllvk4rc4qwxld"; }; patches = [ diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index f7ecbc23a30..e5844eb827d 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -13,7 +13,7 @@ , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt , lzo, libcdio, libmodplug, libass, libbluray -, sqlite, mysql, nasm, gnutls, libva, libdrm, wayland +, sqlite, mysql, nasm, gnutls, libva, libdrm , curl, bzip2, zip, unzip, glxinfo, xdpyinfo , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd @@ -28,6 +28,8 @@ , udevSupport ? true, udev ? null , usbSupport ? false, libusb ? null , vdpauSupport ? true, libvdpau ? null +, useWayland ? false, wayland ? null, wayland-protocols ? null +, waylandpp ? null, libxkbcommon ? null }: assert dbusSupport -> dbus != null; @@ -38,6 +40,7 @@ assert sambaSupport -> samba != null; assert udevSupport -> udev != null; assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable assert vdpauSupport -> libvdpau != null; +assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; # TODO for Kodi 18.0 # - check if dbus support PR has been merged and add dbus as a buildInput @@ -110,7 +113,7 @@ let }; in stdenv.mkDerivation rec { - name = "kodi-${kodiVersion}"; + name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}"; src = kodi_src; @@ -123,7 +126,7 @@ in stdenv.mkDerivation rec { libX11 xorgproto libXt libXmu libXext libXinerama libXrandr libXtst libXfixes alsaLib libGLU_combined glew fontconfig freetype ftgl - libjpeg jasper libpng libtiff wayland + libjpeg jasper libpng libtiff libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray @@ -144,7 +147,12 @@ in stdenv.mkDerivation rec { ++ lib.optional sambaSupport samba ++ lib.optional udevSupport udev ++ lib.optional usbSupport libusb - ++ lib.optional vdpauSupport libvdpau; + ++ lib.optional vdpauSupport libvdpau + ++ lib.optional useWayland [ + wayland waylandpp + # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise + libxkbcommon.dev + ]; nativeBuildInputs = [ cmake @@ -153,7 +161,7 @@ in stdenv.mkDerivation rec { which pkgconfig gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 18.0 - ]; + ] ++ lib.optional useWayland [ wayland-protocols ]; cmakeFlags = [ "-Dlibdvdcss_URL=${libdvdcss.src}" @@ -164,6 +172,9 @@ in stdenv.mkDerivation rec { "-DENABLE_INTERNAL_CROSSGUID=OFF" "-DENABLE_OPTICAL=ON" "-DLIRC_DEVICE=/run/lirc/lircd" + ] ++ lib.optional useWayland [ + "-DCORE_PLATFORM_NAME=wayland" + "-DWAYLAND_RENDER_SYSTEM=gl" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index b4365eed949..6a0b1cbdf73 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -1,7 +1,9 @@ { stdenv, lib, makeWrapper, buildEnv, kodi, plugins }: -buildEnv { - name = "kodi-with-plugins-${(builtins.parseDrvName kodi.name).version}"; +let + drvName = builtins.parseDrvName kodi.name; +in buildEnv { + name = "${drvName.name}-with-plugins-${drvName.version}"; paths = [ kodi ] ++ plugins; pathsToLink = [ "/share" ]; diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index 6d02233be32..14f40ad8901 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "obs-linuxbrowser-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "bazukas"; repo = "obs-linuxbrowser"; rev = version; - sha256 = "000ngkiwfjjl25v4hz6lh6mdkf119pnq0qv3jwdmmp6fpd0dxcgh"; + sha256 = "1mi9pchy07ipnx1m2767n29d53v822yajcf6c3705dhz882z21zq"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 4cc0890a847..79f092a882c 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "1.0.0"; + version = "1.1.1"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "12x8gnp6lv3vi1z2wfb0vjim2wm6abpr938yy48kqj7qff385ihd"; + sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix index 32270607028..170c8cde514 100644 --- a/pkgs/data/fonts/ankacoder/default.nix +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -21,4 +21,3 @@ fetchzip rec { platforms = platforms.all; }; } - diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 29dd5adbf5c..b767c670650 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.3.0"; + version = "1.4.1"; in fetchzip rec { name = "ibm-plex-${version}"; url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; @@ -9,7 +9,7 @@ in fetchzip rec { mkdir -p $out/share/fonts unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "1xjvxyp7h1f7m82800m3q71hksddh25c9a9vnr3r070ppi19s5fc"; + sha256 = "1y2p0gf8znryfcidg26dn9xi81wl9vq5m56ylvg5jp0sn971r4xq"; meta = with lib; { description = "IBM Plex Typeface"; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index 455147d7aa7..942f79ca6e4 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zafiro-icons"; - version = "0.8.7"; + version = "0.9"; src = fetchFromGitHub { owner = "zayronxio"; repo = pname; rev = "v${version}"; - sha256 = "09zdaly9g11k6p36xdd7skgl78s6j78hn3gy1jnpsxh0136md89h"; + sha256 = "0zmnhih4gz8bidyzf1wimy85z7zx9i29mv1zirmykpqj819g7mx9"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 2dbd062d4fb..3cadb477ae8 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; - homepage = http://github.com/ddccontrol/ddccontrol-db; + homepage = https://github.com/ddccontrol/ddccontrol-db; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 9f135c423bc..a2df56c0898 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, gnome3 }: -let - version = "20190116"; - pname = "mobile-broadband-provider-info"; - name = "${pname}-${version}"; -in stdenv.mkDerivation rec { - inherit name; + pname = "mobile-broadband-provider-info"; + version = "20190116"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic"; }; - meta = { + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { description = "Mobile broadband service provider database"; - homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.publicDomain; + homepage = https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders; + license = licenses.publicDomain; maintainers = [ ]; + platforms = platforms.all; }; } diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 4bd2348cb4c..efff8f846b9 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "accerciser-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1j7wlks6j77kfjrw6lx1g0apsy2wwca63jsm5994av5l6xs8xd5m"; + sha256 = "0afzhbig5yw87zyfmid61368jj8l6i7k8gs29x0hv65fz4yiv4h4"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 38000a70f17..4e5595385b4 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "cheese-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ahkfs6v9qraz607k2sr4qw9a59lg2m8kiw5nxhc65qql110sjsl"; + sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index a8cdef1c1f1..a423dd85887 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -7,13 +7,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.32.0"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1skwhg3fbyg3acivknnpm7hs5xy0zwlvnyf5cxs59kxh1l41xmnc"; + sha256 = "0ns76w6vwv5k1nxpaqrizp1pnm89xzfgs60i6cwwfs35zqlmb7iq"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 0e09cc8c388..733b8ecca92 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "file-roller-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1id7f6qbgdxfixxyqjypgwy04mf1w1rbczklqmgpqx5ry4kk0a03"; + sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw"; }; LANG = "en_US.UTF-8"; # postinstall.py diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 8f2a2d1624c..c95d135e9e7 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-characters-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cwazk9x9fs4lf89jqxdian15dk8zfsnpypgl1kknnw8r9mv0bzd"; + sha256 = "1mpg125x9k879ryg8xgbm9w1amx6b3iq9sqv7xfii7kzaanjb4js"; }; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index e1349dd4514..37f2a859488 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-getting-started-docs-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1nzba7l33dgijwvfs777kcyy29xp7bmyrjk9nrwvm5zww4l35gai"; + sha256 = "0g4zaafj442gpir0hxv5hya37ax1ai40slls7sa2a02fdarilrjf"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index e8f434cf19c..7d9fa2d528c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-logs-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cn0ms24y9sg1kvhmk4mj7v9fi0n6ylyf11jjh4k81wfjsaah7w4"; + sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068"; }; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 6aaad41ee57..66680c0af58 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.32.0"; + version = "3.32.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "075q8y4i66nh6wjga6vwdcivsm1dfbwv54hfvk4q8mbws7zfzky7"; + sha256 = "11fdij1jznjsph1q5rkkvdhikzdh2lls921lv2m2di9x7i2xn3h4"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 94a36e39c1c..4a3c59eb3e5 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -5,13 +5,13 @@ , gnome3, libxml2 }: let - version = "3.32.0"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "gnome-notes-${version}"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "09l98yvgrfjw427wn271ap5v6hbwdf9liyrkp34bl0k3hv2d6dv3"; + sha256 = "02b7afg3ps0hxp5dkb4kv6315ydc2r6bxgk1kamwp581lc7ghd67"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 2cee50a8f09..fcce09e6c4f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-weather-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0b7cqd3wfrgm0hps0cb8vhjz0bpjw955hbc4r82l626g8l3hf86w"; + sha256 = "0xhfnm358hnbjiw084b732aalzdwyvyaqpabkplw81li9k4bmw54"; }; nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 80f73e41362..7fd092c1efa 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.32.0"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "005cjq0i4281yw9wa6dyp5ymbx1yiprx1k5lgvfdd37qpbkk017z"; + sha256 = "165axw63c2l5qk5k2xs7g9d97xnxf5a4br0hdb8s3bpv7lf5nw8q"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 81252c9e504..da99fb68b85 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.32.0"; + version = "3.32.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1pnxf0jcbmh86ahkjgn3l2521yvgypgmfz590wp350z4fi4vh44f"; + sha256 = "0jb8d2a4kzz7an7d3db8mfpvhb6r1wrp8dk11vpa3jby60cxbbyd"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index b8dd9543bf9..25c3cef3f6a 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.56.0"; + version = "1.56.1"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06pcfpscpdv9nir0hrcfglbkq0whlv7sncmlmdgi1c5daiasv9v4"; + sha256 = "0wylq6r0c0gf558hridlyly84vb03qzdrfph21z8dbqy8l7g2937"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index e316f627da9..38613bae2e9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-calculator-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0m4g7ml6ch9cc4wdchlyspakz3a9ak1rka26j08nvhhvllkdkqlw"; + sha256 = "121fyhrzdf7zf3iis0rlpag7hfg8jsan2zy83x5l00rq7abdpn8d"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 57924dce5b0..74f05012177 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -9,7 +9,7 @@ , gtk3, glib, glib-networking, gsettings-desktop-schemas , gnome-desktop, gnome-settings-daemon, gnome-online-accounts , vino, gnome-bluetooth, tracker, adwaita-icon-theme -, udisks2, gsound, libhandy, cups }: +, udisks2, gsound, libhandy, cups, mutter }: stdenv.mkDerivation rec { pname = "gnome-control-center"; @@ -60,6 +60,8 @@ stdenv.mkDerivation rec { # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" + # WM keyboard shortcuts + --prefix XDG_DATA_DIRS : "${mutter}/share" ) for i in $out/share/applications/*; do substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center" diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index c0be013fbfe..21c15267075 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; - version = "3.32.0"; + version = "3.32.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0m3vs3rhhykr4xnwzi18h4bb1l05l8ykpiw4mi90dz19zk2ksfd6"; + sha256 = "040s8ia26xyq25zcd9xji9f5jhsddqd7a23jassy429bir34sxkg"; }; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index f0cc94147a4..ed3a8e2e9d5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-disk-utility-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1prnmfxll1hskqqbhd8lyz2zafbrj2dv04fn817rn3266dr94kpq"; + sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 34fd83f03a6..7a469239fc5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-system-monitor-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1qvpibyhdcmscyja5a5i5nc206vmqw8xp3p8mgcignyi5njc805g"; + sha256 = "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 5a41c2c1f11..9b25ae9218d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1p4m2k63caprxmwf8d5ycpzkv3yj7146hhvnbjnr9dkl95bl41r4"; + sha256 = "0i613844gf5dmzpvwiy68lg8walhj4zr88scacp2qwpqs870si8x"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 7b9360f10cb..02bcb52b387 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0lqbhhihxkflwckm3b8dgq62rjljkzdghcc4k4ym7n2hyc304vxy"; + sha256 = "09g6fi9b1xpk0fnp6wgh350v1x318mrf20j4bfarww25vrj6irrw"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index 02e0c29fdaa..2e8c3c4a003 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,24 +1,67 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite, librest -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av, libgdata, libmediaart -, gmime, json-glib, avahi, tracker, dleyna-server, itstool, totem-pl-parser }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, gperf +, sqlite +, librest +, libarchive +, libsoup +, gnome3 +, libxml2 +, lua5_3 +, liboauth +, libgdata +, libmediaart +, grilo +, gnome-online-accounts +, gmime +, json-glib +, avahi +, tracker +, dleyna-server +, itstool +, totem-pl-parser +}: -let +stdenv.mkDerivation rec { pname = "grilo-plugins"; version = "0.3.8"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0nync07gah3jkpb5ph5d3gwbygmabnih2m3hfz7lkvjl2l5pgpac"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + itstool + gperf # for lua-factory + ]; + buildInputs = [ - gnome3.grilo libxml2 gupnp gssdp libgdata - lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts - totem-pl-parser librest gmime json-glib - avahi libmediaart tracker dleyna-server + grilo + libxml2 + libgdata + lua5_3 + liboauth + sqlite + gnome-online-accounts + totem-pl-parser + librest + libarchive + libsoup + gmime + json-glib + avahi + libmediaart + tracker + dleyna-server ]; passthru = { diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 5d60500b363..09ff43041fd 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -1,41 +1,90 @@ -{ stdenv, fetchurl, pkgconfig, vala, gettext, libxml2, gobject-introspection, gtk-doc, wrapGAppsHook, glib, gssdp, gupnp, gupnp-av, gupnp-dlna, gst_all_1, libgee, libsoup, gtk3, libmediaart, sqlite, systemd, tracker, shared-mime-info, gnome3 }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, vala +, gettext +, libxml2 +, gobject-introspection +, gtk-doc +, wrapGAppsHook +, python3 +, glib +, gssdp +, gupnp +, gupnp-av +, gupnp-dlna +, gst_all_1 +, libgee +, libsoup +, gtk3 +, libmediaart +, sqlite +, systemd +, tracker +, shared-mime-info +, gnome3 +}: -let +stdenv.mkDerivation rec { pname = "rygel"; - version = "0.36.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.38.0"; # TODO: split out lib outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0i12z6bzfzgcjidhxa2jsvpm4hqpab0s032z13jy2vbifrncfcnk"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "03ky18hwcz362lbhqm1zm0ax2a075r69xms5cznchn9p9w8z5axc"; }; nativeBuildInputs = [ - pkgconfig vala gettext libxml2 gobject-introspection gtk-doc wrapGAppsHook + meson + ninja + pkgconfig + vala + gettext + libxml2 + gobject-introspection + gtk-doc + wrapGAppsHook + python3 ]; + buildInputs = [ - glib gssdp gupnp gupnp-av gupnp-dlna libgee libsoup gtk3 libmediaart sqlite systemd tracker shared-mime-info + glib + gssdp + gupnp + gupnp-av + gupnp-dlna + libgee + libsoup + gtk3 + libmediaart + sqlite + systemd + tracker + shared-mime-info ] ++ (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly ]); - configureFlags = [ - "--with-systemduserunitdir=$(out)/lib/systemd/user" - "--enable-apidocs" + mesonFlags = [ + "-Dsystemd-user-units-dir=${placeholder "out"}/lib/systemd/user" + "-Dapi-docs=true" "--sysconfdir=/etc" ]; - installFlags = [ - "sysconfdir=$(out)/etc" - ]; - doCheck = true; - enableParallelBuilding = true; + postPatch = '' + patchShebangs data/xml/process-xml.py + ''; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index ad4012e57f0..ad2ac5d6e69 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.32.0"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1b1nspiwzgxan2b11n96ax0c2q93dz17m67z1krdsrzdkyhh4hnh"; + sha256 = "12r5hacwpf0gzca3p73xpmx3dksa1kx50nlj6w4nw8jfqzjlkq1k"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 4b450c17477..36199c3818c 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -30,8 +30,8 @@ in stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ - "-Ddbus_services=share/dbus-1/services" - "-Dsystemd_user_services=lib/systemd/user" + "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services" + "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user" # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas "-Dfunctional_tests=false" "-Ddocs=true" @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - glib_dev = glib.dev; + gdbus = "${glib.bin}/bin/gdbus"; }) ]; diff --git a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch index 2108afcab33..f5c13c3fcda 100644 --- a/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch @@ -5,7 +5,7 @@ Name=Tracker Store Comment=Metadata database store and lookup manager -Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 -+Exec=@glib_dev@/bin/gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 ++Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 Terminal=false Type=Application Categories=Utility; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index c5ea5e9b420..ecbb7b277ff 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "yelp-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "090klk2mhd87y5w228gd1ia1lvvxaj913lkvxzcb1apz8n0i8mm7"; + sha256 = "159ayfyswn9yh7g5hjs6lphh510n6qkyd1cj47hnc3ynnab9hn4r"; }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 7886054addb..647e7163d0b 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-devel-docs-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0kxa74ijsahipvpm57cpkvgllyg1qqap3lkxxqn6rbys474c5371"; + sha256 = "0xqpgf975rws60qxilq635pblbpgwspyykgzxnb4awd9zrs5lbx0"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index a3a351e4a65..33c127f449b 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "unstable-2019-03-10"; + version = "unstable-2019-04-01"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; - rev = "26c66da6795104802f3240bd9f5741f64367c8e7"; - sha256 = "153cdd0pip4nbpc2a9y1v3y7qivafv3wk296zqdamcjrd0p94nqz"; + rev = "37098909a50bafe2f2538819f988cb2327ed7c60"; + sha256 = "09sbby8zi9xn21lbdry57bp1vwgd5c73anvqpw9css3x2ryda5li"; }; dontBuild = true; diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix index b0e45c2b7bf..7d5de1062b1 100644 --- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-window-corner-preview"; - version = "unstable-2019-02-27"; + version = "unstable-2019-04-03"; src = fetchFromGitHub { owner = "medenagan"; repo = "window-corner-preview"; - rev = "9c1e97c7f7ecd530abac572050f6ec89c1ac7571"; - sha256 = "12yx3zfnqkpy9g8mhniw02q61axgb14aqiyj6pdfcdmd6hrgsmz6"; + rev = "a95bb1389d94474efab7509aac592fb58fff6006"; + sha256 = "03v18j9l0fb64xrg3swf1vcgl0kpgwjlp8ddn068bpvghrsvgfah"; }; dontBuild = true; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index 45373999699..00b3a04a168 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -3,13 +3,13 @@ let pname = "atomix"; - version = "3.32.0"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0qxmdrmqsxpfv6w0l557jsjbd7cpdf3jni5mdhnsr4h2n8knf7m0"; + sha256 = "19wpm7mn6r7x6jz1r0kkqg3xa69iycvgb7g7i8wi0d3cx0rsgjkl"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ]; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 9829d5813e9..fcbceab24ea 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,49 +1,73 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, - dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook, - glib, gobject-introspection, libpeas +{ stdenv +, fetchFromGitHub +, autoconf-archive +, appstream-glib +, pkgconfig +, wrapGAppsHook +, libcanberra +, gst_all_1 +, vala +, gtk3 +, gom +, sqlite +, libxml2 +, autoreconfHook +, glib +, gobject-introspection +, libpeas +, gnome-shell +, gsettings-desktop-schemas +, adwaita-icon-theme +, gettext }: stdenv.mkDerivation rec { - version = "0.13.4"; - name = "gnome-shell-pomodoro-${version}"; + pname = "gnome-shell-pomodoro"; + version = "0.15.1"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; - rev = "${version}"; - sha256 = "0fiql99nhj168wbfhvzrhfcm4c4569gikd2zaf10vzszdqjahrl1"; + rev = version; + sha256 = "0nmgd122gsfka0p50mila88iwrzckq2r36a3h20lswn5qkn321i1"; }; - patches = [ - # build with Vala ≥ 0.42 - (fetchpatch { - url = https://github.com/codito/gnome-pomodoro/commit/36778823ca5bd94b2aa948e5d8718f84d99d9af0.patch; - sha256 = "0a9x0p5wny3an9xawam9nhpffw5m4kgwj5jvv0g6c2lwlfzrx2rh"; - }) - ]; - nativeBuildInputs = [ - autoreconfHook vala autoconf-archive libtool intltool appstream-glib - wrapGAppsHook pkgconfig libxml2 + appstream-glib + autoconf-archive + autoreconfHook + gettext + gobject-introspection + libxml2 + pkgconfig + vala + wrapGAppsHook ]; buildInputs = [ - glib gobject-introspection libpeas - dbus-glib libcanberra gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3.gsettings-desktop-schemas - gnome3.gnome-shell gtk3 gnome3.adwaita-icon-theme + adwaita-icon-theme + glib + gnome-shell + gom + gsettings-desktop-schemas + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + gtk3 + libcanberra + libpeas + sqlite ]; meta = with stdenv.lib; { - homepage = http://gnomepomodoro.org/; - description = "A time management utility for GNOME based on the pomodoro technique"; + homepage = https://gnomepomodoro.org/; + description = "Time management utility for GNOME based on the pomodoro technique"; longDescription = '' This GNOME utility helps to manage time according to Pomodoro Technique. It intends to improve productivity and focus by taking short breaks. ''; - maintainers = with maintainers; [ ]; - license = licenses.gpl3; + maintainers = with maintainers; [ worldofpeace ]; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 57f721f49a2..4bad52dfb67 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple multi-page document viewer for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 64ef0cb57f2..ec1e8324e23 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { substituteInPlace $f --replace "/usr/bin/convert" "${imagemagick}/bin/convert" done ''; - + configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; meta = with stdenv.lib; { description = "Set of extensions for Caja file manager"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 130d44d6a1a..a497c48694f 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation rec { patches = [ ./caja-extension-dirs.patch ]; - + configureFlags = [ "--disable-update-mimedb" ]; - + meta = { description = "File manager for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index d6d189624f1..d00c4f0f051 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Archive Manager for MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 22f100008aa..658eef09058 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "An image viewing and cataloging program for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 0a562b1f3cc..8720c8ec050 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Applets for use with the MATE panel"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 79a322ccb0a..a3b59502163 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Background images and data for MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index d45563db8a1..0e4f97b8519 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Calculator for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = [ licenses.gpl2Plus ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 63adb1849da..b50860b8993 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "Common files for development of MATE packages"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 7d957e749b0..fd8bd77785b 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library with common API for various MATE modules"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 03f8c62c448..17b8f8d44c5 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Faenza icon theme from MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 9d813e715ff..57dad2185cd 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Icon themes from MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 90b97cd2bfb..461f8d7f889 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Media tools for MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo maintainers.chpatrick ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 35a7f1dae61..0a0e83c07ab 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Installing these utilities is recommended for netbooks and similar devices with low resolution displays. ''; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with licenses; [ gpl3 lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 5f1dfaa5ba4..74792aa471f 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Integrates polkit authentication for MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 88f497f21de..8ed54b558ae 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The MATE Power Manager"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo maintainers.chpatrick ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 089296a0b84..2e59b16d9a3 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Screen saver and locker for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 5757f5eb9b4..ff6faafca36 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System monitor for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 9b0018e8e2f..cce31bc6d35 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The MATE Terminal Emulator"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 58feb32cfa8..8f9b1f155d0 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of themes from MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 5264c772a53..4c1e2ca2c74 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MATE User Guide"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with licenses; [ gpl2Plus fdl12 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 17ec165f755..465c1f73e98 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index b27804e50a5..23d366dfa1c 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Powerful text editor for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index d66fa2049e6..2dca1fa29b0 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "A simple text editor for Xfce"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index 72d8e682c86..5cf39639a12 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { xfce.xfce4-panel ]; meta = { - homepage = http://www.xfce.org/projects/; + homepage = https://www.xfce.org/projects/; description = "A simple calendar application with reminders"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index 773a8274f34..31e851a469d 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ]; meta = { - homepage = http://www.xfce.org/projects/terminal; + homepage = https://www.xfce.org/projects/terminal; description = "A modern terminal emulator primarily for the Xfce desktop environment"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index 93a7fad4918..e1646d93a61 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { passthru = { inherit gst_plugins; }; meta = { - homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive + homepage = https://www.xfce.org/projects/xfce4-mixer; # referenced but inactive description = "A volume control application for the Xfce desktop environment"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 8e5bffd9dd6..085cfd7b8f9 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter; + homepage = https://goodies.xfce.org/projects/applications/xfce4-screenshooter; description = "Xfce screenshooter"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed.nix b/pkgs/desktops/xfce/applications/xfce4-volumed.nix index 8e4f952438f..dafb72582b3 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfce4-volumed; # referenced but inactive + homepage = https://www.xfce.org/projects/xfce4-volumed; # referenced but inactive description = "A volume keys control daemon for the Xfce desktop environment"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index a0f2ed00d0e..6ac601c6685 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool gtk2 ]; meta = { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Icons for Xfce"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes.nix index 80cf7dd28c5..783fbb13c83 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; meta = with stdenv.lib; { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Themes for Xfce"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index d9c918c0fdc..41d98f17516 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ]; meta = with stdenv.lib; { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Xfce menu support library"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 0d69d4d2f32..bb319e6fc6c 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; meta = { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "GTK+ theme engine for Xfce"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index e8d5b4acd76..797b51de8e4 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Basic GUI library for Xfce"; license = licenses.lgpl2Plus; platforms = platforms.linux; }; } - diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 5a411bfbb5b..b68b7059f8d 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -18,10 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib intltool ]; meta = { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Basic utility non-GUI functions for Xfce"; license = "bsd"; platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index 7fe76057c93..5c61c16cbcc 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Basic GUI library for Xfce"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index 39214ca57b1..eda3aab070a 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://goodies.xfce.org/projects/thunar-plugins/thunar-volman; + homepage = https://goodies.xfce.org/projects/thunar-plugins/thunar-volman; description = "Thunar extension for automatic management of removable drives and media"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index d2d992d54a8..b8ecae7e4e6 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfce4-panel; + homepage = https://www.xfce.org/projects/xfce4-panel; description = "Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index ffcc67bf0e9..266f3064507 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -35,11 +35,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; + homepage = https://goodies.xfce.org/projects/applications/xfce4-power-manager; description = "A power manager for the Xfce Desktop Environment"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; }; } - diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index 3f6237d6de1..b57dd252033 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -35,11 +35,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xsession-prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfce4-session; + homepage = https://www.xfce.org/projects/xfce4-session; description = "Session manager for Xfce"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; }; } - diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index 592b03e8954..584055c8ddf 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfce4-settings; + homepage = https://www.xfce.org/projects/xfce4-settings; description = "Settings manager for Xfce"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 48585b4004b..091dd03c0bc 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfdesktop; + homepage = https://www.xfce.org/projects/xfdesktop; description = "Xfce desktop manager"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index 313a2662f03..d26649ee6ce 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -22,11 +22,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfwm4; + homepage = https://www.xfce.org/projects/xfwm4; description = "Window manager for Xfce"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; }; } - diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index fbd4fdf3d6b..b62dc2def7f 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -99,7 +99,6 @@ rec { (lib.optional (p ? cpu) "-mcpu=${p.cpu}") (lib.optional (p ? abi) "-mabi=${p.abi}") (lib.optional (p ? fpu) "-mfpu=${p.fpu}") - (lib.optional (p ? float) "-mfloat=${p.float}") (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}") (lib.optional (p ? mode) "-mmode=${p.mode}") ]; diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 09422a7a862..ad68382c13a 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -4,7 +4,7 @@ with builtins; stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2018.09.08"; + version = "2018.09.09"; src = fetchFromGitHub { owner = "yosyshq"; diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/development/compilers/bupc/default.nix index f22549d06e6..ad10845e98c 100644 --- a/pkgs/development/compilers/bupc/default.nix +++ b/pkgs/development/compilers/bupc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { parallelism is fixed at program startup time, typically with a single thread of execution per processor. ''; - homepage = http://upc.lbl.gov/; + homepage = https://upc.lbl.gov/; license = licenses.mit; platforms = with platforms; [ linux ]; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 960a54489da..dab724ea607 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { inference with Variational inference (ADVI) and penalized maximum likelihood estimation with Optimization (L-BFGS). ''; - homepage = http://mc-stan.org/interfaces/cmdstan.html; + homepage = https://mc-stan.org/interfaces/cmdstan.html; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix index bf4fd6d68a7..3b89db14497 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix @@ -107,7 +107,7 @@ base binary bytestring containers ghc-prim ghci-ghcjs template-haskell-ghcjs ]; - homepage = "http://github.com/ghcjs"; + homepage = "https://github.com/ghcjs"; license = stdenv.lib.licenses.mit; }) {}; diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix index 4e5d656cb06..a89ab15c55f 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix @@ -107,7 +107,7 @@ base binary bytestring containers ghc-prim ghci-ghcjs template-haskell-ghcjs ]; - homepage = "http://github.com/ghcjs"; + homepage = "https://github.com/ghcjs"; license = stdenv.lib.licenses.mit; }) {}; diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix index b088e07c49e..06f321bc39c 100644 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ b/pkgs/development/compilers/javacard-devkit/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] For more details, please refer to the documentation by Oracle ''; - homepage = http://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html; + homepage = https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.ekleog ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 82c4188344f..cb5cf2c18a5 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.21"; + version = "1.3.30"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0mpb9l46jj4i4cgkrclblgd953ggq6gxivzn5qprmyp0cznzpiyv"; + sha256 = "1v5x64srafg7j3d31qhwhxv4hm2vg8vlbfncri3s5h3y6lcj4p1x"; }; propagatedBuildInputs = [ jre ] ; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { It is developed by a team at JetBrains although it is an OSS language and has external contributors. ''; - homepage = http://kotlinlang.org/; + homepage = https://kotlinlang.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ nequissimus ]; diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 400b040ae85..13fc3cf3c3d 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { inherit enableParallelBuilding; meta = with stdenv.lib; { - homepage = http://mono-project.com/; + homepage = https://mono-project.com/; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index 5ea3f63ccd1..89726f20c6b 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { Moscow ML is a light-weight implementation of Standard ML (SML), a strict functional language used in teaching and research. ''; - homepage = http://mosml.org/; + homepage = https://mosml.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ vaibhavsagar ]; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index ef07b01a750..e2aa5375835 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, boost, python3 +, boost, python3, eigen , icestorm, trellis # TODO(thoughtpolice) Currently the GUI build seems broken at runtime on my @@ -27,18 +27,18 @@ let in stdenv.mkDerivation rec { name = "nextpnr-${version}"; - version = "2019.02.20"; + version = "2019.04.02"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "e8d3aaaf34895a073e4023192d97fc936d090990"; - sha256 = "0ijqpjnn7x16crd6cmd4nmgay320flizmjb7bbvg9hv464z3p4x7"; + rev = "6adf37e3c1d4301e087d89c9e9c37563fe8d78df"; + sha256 = "0qqb2yd2s39hahh5qigvllgyzj7rp3r1k9jp2n9z2jrfpiaz68c6"; }; nativeBuildInputs = [ cmake makeWrapper ]; buildInputs - = [ boostPython python3 ] + = [ boostPython python3 eigen ] ++ (stdenv.lib.optional enableGui qtbase); enableParallelBuilding = true; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { [ "-DARCH=generic;ice40;ecp5" "-DICEBOX_ROOT=${icestorm}/share/icebox" "-DTRELLIS_ROOT=${trellisRoot}/trellis" + "-DUSE_OPENMP=ON" ] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF"); # Fix the version number. This is a bit stupid (and fragile) in practice @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { postInstall = stdenv.lib.optionalString enableGui '' for x in generic ice40 ecp5; do wrapProgram $out/bin/nextpnr-$x \ - --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtbase.qtCompatVersion}/plugins + --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" done ''; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index f2a566c87df..5840061ed53 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -18,16 +18,16 @@ let else "amd64"; major = "11"; - update = ".0.2"; - build = "9"; - repover = "jdk-${major}${update}+${build}"; + update = ".0.3"; + build = "ga"; + repover = "jdk-${major}${update}-${build}"; openjdk = stdenv.mkDerivation { - name = "openjdk-${major}${update}-b${build}"; + name = "openjdk-${major}${update}-${build}"; src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; - sha256 = "0xc7nksvj72cgw8zrmvlcwaasinpij1j1959398a4nqvzpvpxg30"; + sha256 = "1v6pam38iidlhz46046h17hf5kki6n3kl302awjcyxzk7bmkvb8x"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index a3a0a9d5934..832954dd67f 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,44 +21,44 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "202"; + update = "212"; build = "ga"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-${build}"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "0asx7qkhmrlfmhrljck5gb3yp4v0aa8k35y4xfcph41x0m0mvrdb"; + sha256 = "00rl33h4cl4b4p3hcid765h38x2jdkb14ylh8k1zhnd0ka76crgg"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "07q6l3slmi5fgwjnsk6bd8miv8glmw15w5f6yyvp8nlp2d54l33n"; + sha256 = "0va6g2dccf1ph6mpwxswbks5axp7zz258cl89qq9r8jn4ni04agw"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "01k4pwhn3nmkzdhdj1v58dgir4iwsj9mm2ml1541z31s53g037cq"; + sha256 = "0sgr9df10hs49pjld6c6kr374v4zwd9s52pc3drz68zrlk71ja4s"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0v39kl2iiyh74p3cp6bjhshkwxpgbffza9abzjgp7cpdfhcc73p0"; + sha256 = "1hq0sr4k4k4iv815kg72i9lvd7n7mn5pmw96ckk9p1rnyagn9z03"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0z1cy6aq09j25jyryj47rms15h5175p2h23fg5pv035zapf8nb1b"; + sha256 = "1fc59jrbfq8l067mggzy5dnrvni7lwaqd7hahs4nqv87kyrfg545"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0y0mk4sra9d29kgx842m5y4bz9gczc9ypkajv6m5igjv7sizzsv7"; + sha256 = "1ka2fvyxdmpfhk814s314gx53yvdr19vpsqygx283v9nbq90l1yg"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "07ssrjhffkdncxxhsbid21hlg51y7js3x7sb4g474vmmi3qj6vmb"; + sha256 = "15vlgs5v2ax8sqwh7bg50fnlrwlpnkp0myzrvpqs1mcza8pyasp8"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "0r0b8ra0ibzbdpxz6nv6i2zrzh2j5sxgprpnl6gf4d9h0i29ickj"; + sha256 = "1jzn0yi0v6lda5y8ib07g1p6zymnbcx9yy6iz8niggpm7205y93h"; }; openjdk8 = stdenv.mkDerivation { - name = "openjdk-8u${update}b${build}"; + name = "openjdk-8u${update}-${build}"; srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; sourceRoot = "."; diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 5f1d384a328..ab42eae31a6 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "0.10.0-RC1"; + version = "0.14.0-RC1"; name = "dotty-bare-${version}"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; - sha256 = "0s9vh0d6xx99gl0ji0dgmbq36f79c0iwfbrfqwmaclqm9yq5m54k"; + sha256 = "0nrgsyhqjlpvnjqgb18pryr8q7knq3dq25jhp98s4wh76nssm1zr"; }; propagatedBuildInputs = [ jre ncurses.dev ] ; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 7167a967c1c..eacb46e8ae8 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -8,14 +8,14 @@ with builtins; stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2019.02.22"; + version = "2019.04.08"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "c521f4632f1c82b48a5538c832980668044e8fd9"; - sha256 = "18pg1ry5qhhx8c49n2gqwlf55sd9bfsfk3khfyh1a1vjh1qpfgdf"; + rev = "0deaccbaae436bc94ad5b2913fa39a9368c09ace"; + sha256 = "13kil8z1f35lr9436njn2y60458wnjxldz0bsjcr9mpx8if0zp84"; name = "yosys"; }) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 83f65d87ce0..ad444e56b56 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.16 + # LTS Haskell 13.17 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -242,7 +242,7 @@ default-package-overrides: - avro ==0.4.4.1 - avwx ==0.3.0.2 - axel ==0.0.9 - - backprop ==0.2.6.1 + - backprop ==0.2.6.2 - bank-holidays-england ==0.1.0.8 - barbies ==1.1.2.1 - barrier ==0.1.1 @@ -561,7 +561,7 @@ default-package-overrides: - DAV ==1.3.3 - dbcleaner ==0.1.3 - DBFunctor ==0.1.1.1 - - dbus ==1.2.4 + - dbus ==1.2.5 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 @@ -681,7 +681,7 @@ default-package-overrides: - event-list ==0.1.2 - eventstore ==1.2.4 - every ==0.0.1 - - exact-combinatorics ==0.2.0.8 + - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 @@ -701,7 +701,7 @@ default-package-overrides: - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fast-digits ==0.2.1.0 - - fast-logger ==2.4.13 + - fast-logger ==2.4.15 - fast-math ==1.0.2 - fb ==1.2.1 - fclabels ==2.0.3.3 @@ -904,21 +904,21 @@ default-package-overrides: - haskell-gi-base ==0.21.5 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - - haskell-lsp ==0.8.1.0 - - haskell-lsp-types ==0.8.0.1 + - haskell-lsp ==0.8.2.0 + - haskell-lsp-types ==0.8.2.0 - haskell-names ==0.9.4 - HaskellNet ==0.5.1 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.3.0 - haskell-src-exts ==1.20.3 - - haskell-src-exts-util ==0.2.4 + - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.2 - haskey-btree ==0.3.0.0 - haskoin-core ==0.8.4 - hasql ==1.3.0.3 - hasql-optparse-applicative ==0.3.0.3 - hasql-pool ==0.5.0.1 - - hasql-transaction ==0.7 + - hasql-transaction ==0.7.1 - hasty-hamiltonian ==1.3.2 - haxl ==2.0.1.1 - hbeanstalk ==0.2.4 @@ -1260,7 +1260,7 @@ default-package-overrides: - long-double ==0.1 - loop ==0.3.0 - lrucaching ==0.3.3 - - lsp-test ==0.5.0.2 + - lsp-test ==0.5.1.0 - lucid ==2.9.11 - lucid-extras ==0.1.0.1 - lxd-client-config ==0.1.0.1 @@ -1533,7 +1533,7 @@ default-package-overrides: - persistent-iproute ==0.2.3 - persistent-mysql ==2.9.0 - persistent-mysql-haskell ==0.5.2 - - persistent-postgresql ==2.9.0 + - persistent-postgresql ==2.9.1 - persistent-sqlite ==2.9.3 - persistent-template ==2.5.4 - pgp-wordlist ==0.1.0.2 @@ -1702,7 +1702,7 @@ default-package-overrides: - regex-tdfa ==1.2.3.1 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.3.3 + - registry ==0.1.3.4 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.1.0 @@ -1844,8 +1844,8 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 - - simple-cmd ==0.1.3.1 - - simple-cmd-args ==0.1.0.1 + - simple-cmd ==0.1.4 + - simple-cmd-args ==0.1.1 - simple-log ==0.9.11 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.28 @@ -2112,7 +2112,7 @@ default-package-overrides: - typerep-map ==0.3.1 - type-spec ==0.3.0.1 - tz ==0.1.3.2 - - tzdata ==0.1.20181026.0 + - tzdata ==0.1.20190325.0 - ua-parser ==0.7.5.1 - ucam-webauth ==0.1.0.0 - ucam-webauth-types ==0.1.0.0 @@ -2296,8 +2296,8 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yam ==0.5.16 - - yam-datasource ==0.5.16 + - yam ==0.5.17 + - yam-datasource ==0.5.17 - yaml ==0.11.0.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 @@ -2308,7 +2308,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1 - yesod-auth-oauth2 ==0.6.1.1 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.13 + - yesod-core ==1.6.14 - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 @@ -9980,7 +9980,7 @@ broken-packages: - zeromq3-haskell - zeromq4-clone-pattern - zeromq4-conduit - - zeromq4-haskell + - zeromq4-haskell == 0.7.* - zeromq4-patterns - zeromq4-simple - zeroth diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 28912bc4927..ce4b3b2d707 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -942,16 +942,16 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Allure_0_9_3_0" = callPackage + "Allure_0_9_3_3" = callPackage ({ mkDerivation, async, base, enummapset, filepath, ghc-compact , LambdaHack, optparse-applicative, primitive, random , template-haskell, text, transformers }: mkDerivation { pname = "Allure"; - version = "0.9.3.0"; - sha256 = "0yfy8ygcm3aayi1vdsl3wy7kma0x50b7rw0b7ykzgcjkjwb3x45i"; - isLibrary = false; + version = "0.9.3.3"; + sha256 = "0s2f8fmcbcyvqg9vx492irr69ihkrwwf6nhp511b4y5xcgw69k12"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -965,7 +965,6 @@ self: { testHaskellDepends = [ async base filepath LambdaHack optparse-applicative ]; - doHaddock = false; description = "Near-future Sci-Fi roguelike and tactical squad combat game"; license = stdenv.lib.licenses.agpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; @@ -34413,27 +34412,6 @@ self: { }: mkDerivation { pname = "backprop"; - version = "0.2.6.1"; - sha256 = "1rn72fawix00byz7kyvn65g0h16mh8msiw6lx9l3xi1927hn28nj"; - libraryHaskellDepends = [ - base containers deepseq microlens primitive reflection transformers - vector vinyl - ]; - benchmarkHaskellDepends = [ - base criterion deepseq directory hmatrix microlens microlens-th - mwc-random time vector - ]; - description = "Heterogeneous automatic differentation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "backprop_0_2_6_2" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, directory - , hmatrix, microlens, microlens-th, mwc-random, primitive - , reflection, time, transformers, vector, vinyl - }: - mkDerivation { - pname = "backprop"; version = "0.2.6.2"; sha256 = "10w3fb25jw7s3bal6hd0a7g5hzbdd4b3whzxkm9b3g0y36i713dm"; libraryHaskellDepends = [ @@ -34446,7 +34424,6 @@ self: { ]; description = "Heterogeneous automatic differentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backtracking-exceptions" = callPackage @@ -46684,6 +46661,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "caster" = callPackage + ({ mkDerivation, base, bytestring, directory, fast-builder + , QuickCheck, quickcheck-instances, stm, tasty, tasty-discover + , tasty-hunit, tasty-quickcheck, text, unix-time + }: + mkDerivation { + pname = "caster"; + version = "0.0.1.0"; + sha256 = "0yybmrlqfki2v2952gf5xhfh5nr4dj0ldq780landjwh2ywrdcvq"; + libraryHaskellDepends = [ + base bytestring fast-builder stm text unix-time + ]; + testHaskellDepends = [ + base bytestring directory fast-builder QuickCheck + quickcheck-instances tasty tasty-discover tasty-hunit + tasty-quickcheck text + ]; + testToolDepends = [ tasty-discover ]; + description = "Multicast, thread-safe, and fast logger"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "castle" = callPackage ({ mkDerivation, base, containers, optparse-applicative, shelly , system-fileio, system-filepath, text @@ -51668,8 +51667,8 @@ self: { }: mkDerivation { pname = "coalpit"; - version = "0.1.1.0"; - sha256 = "0adays54vg3pyrc3hsdmir0cj7h4r4vvm3a4zakia82gd8bz99iq"; + version = "0.1.1.1"; + sha256 = "0fv5xr71yldqwsm5n69akdc7jm1v9xhskjq5sjq7y72ghblcs6jl"; libraryHaskellDepends = [ base megaparsec network-uri scientific time ]; @@ -63467,33 +63466,6 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.4"; - sha256 = "1lzpvl4lfl84j56cdyn64gxm6zkgbjaczc41g235fikyx83vci88"; - libraryHaskellDepends = [ - base bytestring cereal conduit containers deepseq exceptions - filepath lens network parsec random split template-haskell text - th-lift transformers unix vector xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath network - parsec process QuickCheck random resourcet tasty tasty-hunit - tasty-quickcheck text transformers unix vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "dbus_1_2_5" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, transformers, unix, vector, xml-conduit, xml-types - }: - mkDerivation { - pname = "dbus"; version = "1.2.5"; sha256 = "0s4j3j02iggvhzys9rnhr7m49dq8f5asv398jvsaibarjpdicnib"; libraryHaskellDepends = [ @@ -63510,7 +63482,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -72676,10 +72647,8 @@ self: { ({ mkDerivation, base, containers, newtype-generics, void }: mkDerivation { pname = "effects"; - version = "0.2.3"; - sha256 = "174mlzs1n2zw2jzxn95lkr8f2m2rjigvgpqljrvim9bsb991dhc0"; - revision = "1"; - editedCabalFile = "1vwywcrvb4qm3z7smxd9snvcwikyifl7fn8pxgiwchihm0ajnbvw"; + version = "0.2.4"; + sha256 = "06cx0l9vxpjpgc1cxai19hw9rxfq89m61qvf7wxp1w2xd6yqa7xk"; libraryHaskellDepends = [ base containers newtype-generics void ]; description = "Computational Effects"; license = stdenv.lib.licenses.bsd3; @@ -76636,8 +76605,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "exact-combinatorics"; - version = "0.2.0.8"; - sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j"; + version = "0.2.0.9"; + sha256 = "1ay98m9prmd1pi85v2n0rs2432hzb7mxizzg79sv0ln24an8amvj"; libraryHaskellDepends = [ base ]; description = "Efficient exact computation of combinatoric functions"; license = stdenv.lib.licenses.bsd3; @@ -78481,23 +78450,6 @@ self: { "fast-logger" = callPackage ({ mkDerivation, array, auto-update, base, bytestring, directory - , easy-file, filepath, hspec, text, unix-compat, unix-time - }: - mkDerivation { - pname = "fast-logger"; - version = "2.4.13"; - sha256 = "1ciji847kcpg8zfld964wd20c5n554y3ak5340rn07k6dx0fzm2b"; - libraryHaskellDepends = [ - array auto-update base bytestring directory easy-file filepath text - unix-compat unix-time - ]; - testHaskellDepends = [ base bytestring directory hspec ]; - description = "A fast logging system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fast-logger_2_4_15" = callPackage - ({ mkDerivation, array, auto-update, base, bytestring, directory , easy-file, filepath, hspec, hspec-discover, text, unix-compat , unix-time }: @@ -78513,7 +78465,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-math" = callPackage @@ -79370,21 +79321,20 @@ self: { }) {}; "fedora-img-dl" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , html-conduit, http-client, http-client-tls, http-types, hxt - , network-uri, optparse-applicative, simple-cmd, simple-cmd-args - , text, unix, xdg-userdirs, xml-conduit + ({ mkDerivation, base, bytestring, directory, filepath, http-client + , http-client-tls, http-directory, http-types, optparse-applicative + , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs }: mkDerivation { pname = "fedora-img-dl"; - version = "0.1"; - sha256 = "1img0scy9m5dahg4kz8gadd5x9hxh2fm6l06shf88n6bqjg9pwbh"; + version = "0.2"; + sha256 = "0jk9wljmqszfjr4alhx13112bbdgi84662v1f1fslq8w0q17y3m2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring directory filepath html-conduit http-client - http-client-tls http-types hxt network-uri optparse-applicative - simple-cmd simple-cmd-args text unix xdg-userdirs xml-conduit + base bytestring directory filepath http-client http-client-tls + http-directory http-types optparse-applicative simple-cmd + simple-cmd-args text unix xdg-userdirs ]; description = "Fedora image download tool"; license = stdenv.lib.licenses.gpl3; @@ -79968,8 +79918,8 @@ self: { pname = "ffunctor"; version = "1.1.99"; sha256 = "0b6r72921cr6xrwwnvlw7ndnhfyavrk5a4vsgz3xvisf3i0slb4c"; - revision = "1"; - editedCabalFile = "16brskfwrvdkbzb62ajklxgvzm1233pxnyv0wx5dhk5yi9jg0df9"; + revision = "2"; + editedCabalFile = "0772irhfscf3bkxgiy33g7np8wrkdc8pzc7pnap362qvd8v2xkjj"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ aeson base exceptions generic-lens http-client mtl servant @@ -88668,35 +88618,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_6_1" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers + "ghc_8_6_4" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap - , ghci, happy, hpc, process, template-haskell, terminfo, time + , ghci, hpc, process, template-haskell, terminfo, time , transformers, unix }: mkDerivation { pname = "ghc"; - version = "8.6.1"; - sha256 = "1s4iggkyki6fd1wv9l5qgpnkyf1wgyf2mcncj6jwl4whrii3r7br"; + version = "8.6.4"; + sha256 = "1ninm000qkpvvfgfrlvj0259451wwmfayh46px3zg6mkr19x64yi"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell terminfo time transformers unix ]; - libraryToolDepends = [ alex happy ]; description = "The GHC API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_6_1" = callPackage + "ghc-boot_8_6_4" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.6.1"; - sha256 = "0dy9p2vz7ccwrhk9l4vs4fhfg6w9p7pk88iy44i46089svzx0wja"; + version = "8.6.4"; + sha256 = "1clk84l47bdyj74jykyzqzlwxgpwhs2r9x9bxfnw6f7c24xiv4xp"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -88705,12 +88654,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_6_1" = callPackage + "ghc-boot-th_8_6_4" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.6.1"; - sha256 = "0z3d9niqzsv1zihazs1ghdwag53fcmdigj77z37licc5q0g0lc49"; + version = "8.6.4"; + sha256 = "15hvcns1vpagx0bdpzgm1cgwnxvz4cbbhbzsvdzpl8zf4y0jd8jz"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = stdenv.lib.licenses.bsd3; @@ -89748,15 +89697,15 @@ self: { broken = true; }) {}; - "ghci_8_6_1" = callPackage + "ghci_8_6_4" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap , template-haskell, transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.6.1"; - sha256 = "0ffv5xmq63y53fhfldx37g6881l07nvlgdsp9kfqz70flh0c1wm8"; + version = "8.6.4"; + sha256 = "0gjl2bs2alv56j45khylcdjm3cl71kfcadc83lw3b1zpiinhkb7m"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th ghc-heap template-haskell transformers unix @@ -89918,6 +89867,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_7_3" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.7.3"; + sha256 = "00af44r0y4n8nz9sc8mgbydgwzjmp32yrnf1k15lrlyahqrixhfl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base cmdargs directory extra filepath process time + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -101045,8 +101021,8 @@ self: { }: mkDerivation { pname = "haiji"; - version = "0.2.2.3"; - sha256 = "1490pyg5vk07y0nq8pjgz8347zj0npfy2a6psy9mzkckidcr2zd7"; + version = "0.2.3.0"; + sha256 = "12g7nlfci2hrsqi19z8mi7i8vqd1s7a8c3sr8k43f0hhzk6b528i"; libraryHaskellDepends = [ aeson attoparsec base data-default mtl scientific tagged template-haskell text transformers unordered-containers vector @@ -105020,36 +104996,6 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.8.1.0"; - sha256 = "1imy96hhhs2fcbs34pln0l430j19n4nqsgir4hww95wbl0058kcx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable haskell-lsp-types hslogger lens mtl network-uri parsec - sorted-list stm text time unordered-containers yi-rope - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hslogger lens mtl network-uri parsec stm text time transformers - unordered-containers vector yi-rope - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hspec lens network-uri sorted-list stm text yi-rope - ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp_0_8_2_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec - , lens, mtl, network-uri, parsec, sorted-list, stm, text, time - , transformers, unordered-containers, vector, yi-rope - }: - mkDerivation { - pname = "haskell-lsp"; version = "0.8.2.0"; sha256 = "18qkrybwvmyz5h03xj9wjigpqs6s6rw9wi1lqcla4ppg1pkd5zyd"; isLibrary = true; @@ -105070,7 +105016,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-lsp-client" = callPackage @@ -105102,23 +105047,6 @@ self: { }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.8.0.1"; - sha256 = "0czh6fqrzzp5xkawwiia5n437pmch41rnkp166lpvglfqg4gx8y8"; - libraryHaskellDepends = [ - aeson base bytestring data-default filepath hashable lens - network-uri scientific text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp-types_0_8_2_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, filepath - , hashable, lens, network-uri, scientific, text - , unordered-containers - }: - mkDerivation { - pname = "haskell-lsp-types"; version = "0.8.2.0"; sha256 = "13pgjm1pm1hp7bln115cn75ig6w3mj7g7rvnvpszlrg9lzmk3ip7"; libraryHaskellDepends = [ @@ -105127,7 +105055,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-menu" = callPackage @@ -105724,22 +105651,6 @@ self: { }: mkDerivation { pname = "haskell-src-exts-util"; - version = "0.2.4"; - sha256 = "1xbf28aisqizy3a0sy42p3rwib2s7jaqi6dcr6lp4b1j54xazf5y"; - libraryHaskellDepends = [ - base containers data-default haskell-src-exts semigroups - transformers uniplate - ]; - description = "Helper functions for working with haskell-src-exts trees"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-exts-util_0_2_5" = callPackage - ({ mkDerivation, base, containers, data-default, haskell-src-exts - , semigroups, transformers, uniplate - }: - mkDerivation { - pname = "haskell-src-exts-util"; version = "0.2.5"; sha256 = "0fvqi72m74p7q5sbpy8m2chm8a1lgy10mfrcxcz8wrh59vngj0n8"; libraryHaskellDepends = [ @@ -105748,7 +105659,6 @@ self: { ]; description = "Helper functions for working with haskell-src-exts trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta" = callPackage @@ -107215,8 +107125,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.13.1"; - sha256 = "1ci3ia7y8v679d0hwig8acd6anl35l19mas48730w4jrmhcw8ki4"; + version = "0.14.0"; + sha256 = "0d508vs1rhj54iixh1m4s7jcszav83bwbxd7g6d4hgn0vwf2l1wh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108329,24 +108239,6 @@ self: { }) {}; "hasql-transaction" = callPackage - ({ mkDerivation, async, base, base-prelude, bytestring - , bytestring-tree-builder, contravariant, contravariant-extras - , hasql, mtl, rebase, transformers - }: - mkDerivation { - pname = "hasql-transaction"; - version = "0.7"; - sha256 = "1kvzj16mw471z2vgm27k0nfwfgf5cq3w6qaqwqz4247p11dkrjyy"; - libraryHaskellDepends = [ - base base-prelude bytestring bytestring-tree-builder contravariant - contravariant-extras hasql mtl transformers - ]; - testHaskellDepends = [ async hasql rebase ]; - description = "A composable abstraction over the retryable transactions for Hasql"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql-transaction_0_7_1" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder , contravariant, contravariant-extras, hasql, mtl, rebase , transformers @@ -108362,7 +108254,6 @@ self: { testHaskellDepends = [ async hasql rebase ]; description = "A composable abstraction over the retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hastache" = callPackage @@ -112897,8 +112788,8 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.1.0.0"; - sha256 = "1r4i31m70c939vg14i2bss0k386cnmx7wxf7xydgzpvq3f3f6gw5"; + version = "0.1.1.0"; + sha256 = "0qkmf8bjg311a01qwb20vcihk1w8q4avy3lcfz0rj7qqhmfp6542"; libraryHaskellDepends = [ barbies base generic-lens QuickCheck ]; testHaskellDepends = [ base doctest hspec lens QuickCheck ]; description = "Partial types as a type constructor"; @@ -114101,8 +113992,8 @@ self: { }: mkDerivation { pname = "hjugement"; - version = "2.0.1.20190208"; - sha256 = "10921dk9y460dmgy5dhkfxcsc96cxkw2xxziykizp8zhmzrdlwz6"; + version = "2.0.2.20190414"; + sha256 = "0w9qmsy7b118wzdhz8ggyw2608sjhsaxzaw121lhzr8vbaznh6pi"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -114640,8 +114531,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.15"; - sha256 = "0xvr9b0ys0il0g0z145pxwyr3vq6fj571gad4858mpmqdvjh4b0i"; + version = "2.1.16"; + sha256 = "027v3aigghmghwbiwkhv9iadwv15fa40brkin489ahi6jwrlnp32"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -123791,15 +123682,15 @@ self: { "http-directory" = callPackage ({ mkDerivation, base, bytestring, html-conduit, http-client - , http-types, text, xml-conduit + , http-date, http-types, text, time, xml-conduit }: mkDerivation { pname = "http-directory"; - version = "0.1.0"; - sha256 = "15cqjbm37vj2pgjrd4kiszrfdspxdssfjncvaxj9f0lkgbr1x3ai"; + version = "0.1.1"; + sha256 = "1wv92w3dfsxp4y9qai6qxxv7fq807p9vcmm844ggcc9xblmmcr4r"; libraryHaskellDepends = [ - base bytestring html-conduit http-client http-types text - xml-conduit + base bytestring html-conduit http-client http-date http-types text + time xml-conduit ]; description = "http directory listing library"; license = stdenv.lib.licenses.mit; @@ -133341,19 +133232,18 @@ self: { "jammittools" = callPackage ({ mkDerivation, base, boxes, bytestring, conduit, conduit-audio - , containers, directory, filepath, HPDF, JuicyPixels, process - , resourcet, temporary, text, transformers, vector, xml + , containers, directory, filepath, JuicyPixels, process, resourcet + , text, transformers, vector, xml }: mkDerivation { pname = "jammittools"; - version = "0.5.5.1"; - sha256 = "1q660fvnvrj8cb9rzj7b5qmrbmqy8krq2w1bg824mf6pmvlw52z6"; + version = "0.5.5.2"; + sha256 = "0x7zyyn7q9j5d74bkvf5pbm5i6kcxv7v107j1z26x5m42gibs9kv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring conduit conduit-audio containers directory filepath - HPDF JuicyPixels process resourcet temporary text transformers - vector xml + JuicyPixels process resourcet text transformers vector xml ]; executableHaskellDepends = [ base boxes directory filepath ]; description = "Export sheet music and audio from Windows/Mac app Jammit"; @@ -147059,35 +146949,6 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.5.0.2"; - sha256 = "0g5kw8y59bdyzj7zzwif1810q7wk87d7q53idpw250g6s4dwycxa"; - revision = "1"; - editedCabalFile = "0ffrlrhkkd7amimljknqc93s742d43ikppi4b10mfzv2lkw1bgnx"; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal base bytestring conduit - conduit-parse containers data-default Diff directory filepath - haskell-lsp lens mtl parser-combinators process text transformers - unix unordered-containers yi-rope - ]; - testHaskellDepends = [ - aeson base data-default haskell-lsp hspec lens text - unordered-containers - ]; - description = "Functional test framework for LSP servers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "lsp-test_0_5_1_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base - , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl - , parser-combinators, process, text, transformers, unix - , unordered-containers, yi-rope - }: - mkDerivation { - pname = "lsp-test"; version = "0.5.1.0"; sha256 = "1kmffpfq6cnby3gij5sd1p2fp8hhn7gjk1nm5a4hs2gfhlyik57y"; libraryHaskellDepends = [ @@ -153083,6 +152944,36 @@ self: { broken = true; }) {}; + "minilight" = callPackage + ({ mkDerivation, aeson, base, containers, exceptions, FontyFruity + , hashable, linear, microlens, microlens-mtl, mtl, mwc-random + , scientific, sdl2, sdl2-gfx, sdl2-image, sdl2-ttf, tasty + , tasty-discover, tasty-hspec, template-haskell, text, trifecta + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "minilight"; + version = "0.1.1"; + sha256 = "0wl37m7wz5jdq4hwcbrnd0m5lhz9mgfk6p8ysinjwfc1458g8v91"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers exceptions FontyFruity hashable linear + microlens microlens-mtl mtl mwc-random scientific sdl2 sdl2-gfx + sdl2-image sdl2-ttf template-haskell text trifecta + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + base linear microlens mtl mwc-random sdl2 sdl2-ttf text vector + ]; + testHaskellDepends = [ + aeson base tasty tasty-hspec trifecta yaml + ]; + testToolDepends = [ tasty-discover ]; + description = "A SDL2-based graphics library, batteries-included"; + license = stdenv.lib.licenses.mit; + }) {}; + "minimal-configuration" = callPackage ({ mkDerivation, base, containers, directory, filepath, tconfig }: mkDerivation { @@ -153278,6 +153169,20 @@ self: { broken = true; }) {}; + "minitypeset-opengl" = callPackage + ({ mkDerivation, base, containers, filepath, OpenGL, stb-truetype + }: + mkDerivation { + pname = "minitypeset-opengl"; + version = "0.1.0.0"; + sha256 = "06fh4j0sfpd8w576s04a6bg6h4c7lsk7zm85dlcfhlghyg2gwri1"; + libraryHaskellDepends = [ + base containers filepath OpenGL stb-truetype + ]; + description = "Layout and render text with TrueType fonts using OpenGL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "miniutter" = callPackage ({ mkDerivation, base, binary, containers, HUnit, minimorph , test-framework, test-framework-hunit, text @@ -155515,6 +155420,8 @@ self: { pname = "monadLib"; version = "3.9"; sha256 = "1vibzls4ld4v7rib14nb9blni1c42csv4b1igaplks85xyr5grrm"; + revision = "1"; + editedCabalFile = "1vxd4ncwbg77vvny77b771lbh0xjdwim3lmpd14zcfqqpy0gn9bj"; libraryHaskellDepends = [ base ]; description = "A collection of monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -172768,28 +172675,6 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.9.0"; - sha256 = "1rqlbdz7wwjl1d3xqp01sz5xnn8hff35hgkhx6c66lzrfyl9q0mx"; - revision = "1"; - editedCabalFile = "0xrnww7n6kwr2371fj5xklslbx0114yj3pxcpdzwalmin5wm8vah"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers monad-logger - persistent postgresql-libpq postgresql-simple resource-pool - resourcet text time transformers unliftio-core - ]; - description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-postgresql_2_9_1" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-logger, persistent, postgresql-libpq - , postgresql-simple, resource-pool, resourcet, text, time - , transformers, unliftio-core - }: - mkDerivation { - pname = "persistent-postgresql"; version = "2.9.1"; sha256 = "02i5lq6j79cv1y6n7c3lzipngkwaqfa96i4nvnkrs535x9xbxlpq"; libraryHaskellDepends = [ @@ -172799,7 +172684,6 @@ self: { ]; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -176976,8 +176860,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "0.1.0.0"; - sha256 = "0zddn88c02jikdf6sh68z798pwji7b3d8snighfm0zkwfc7z54c8"; + version = "0.1.1.0"; + sha256 = "02x99b3pral2sclx4zizib9a7yrnahg0d5kc4w37yk15mpr5lmys"; libraryHaskellDepends = [ base mtl random syb template-haskell transformers ]; @@ -179325,8 +179209,8 @@ self: { pname = "presburger"; version = "1.3.1"; sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6"; - revision = "1"; - editedCabalFile = "0pabxck7iyhyj7wf1bflg86xb2jip4vaspf080rfdc5s2cg0d23w"; + revision = "2"; + editedCabalFile = "0295mpzywmg6qrp90fnl51pvr7nwzc2n5p51w90j735il0pqpa3q"; libraryHaskellDepends = [ base containers pretty ]; testHaskellDepends = [ base QuickCheck ]; description = "A decision procedure for quantifier-free linear arithmetic"; @@ -185237,6 +185121,32 @@ self: { broken = true; }) {}; + "r3x-haskell-sdk" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring + , case-insensitive, containers, cookie, http-types, mtl, regex-pcre + , text, transformers, wai, warp + }: + mkDerivation { + pname = "r3x-haskell-sdk"; + version = "0.1.0.0"; + sha256 = "0yf9id71g4nkgmncplv3irs4aww1yd1il9i1gfl63266wy9h871k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers cookie + http-types mtl regex-pcre text transformers wai warp + ]; + executableHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers cookie + http-types mtl regex-pcre text transformers wai warp + ]; + testHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers cookie + http-types mtl regex-pcre text transformers wai warp + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "raaz" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, criterion , deepseq, hspec, hspec-discover, HUnit, optparse-applicative @@ -186598,24 +186508,26 @@ self: { "rating-chgk-info" = callPackage ({ mkDerivation, aeson, base-noprelude, bytestring, cassava - , containers, gauge, http-client, iconv, lens, network - , optparse-generic, relude, servant, servant-client, servant-js - , servant-server, servant-swagger, swagger2, text, time, vector - , wai, warp, wreq + , containers, directory, gauge, http-client, http-client-tls, iconv + , lens, network, optparse-generic, relude, servant, servant-client + , servant-js, servant-server, servant-swagger, swagger2, tagsoup + , text, time, vector, wai, warp, wreq }: mkDerivation { pname = "rating-chgk-info"; - version = "0.3.6.3"; - sha256 = "0mwivwh33lmm7a0h2kc06n3453vbbkxzhjvm0xrb8qrrjk8mi1df"; + version = "0.3.6.4"; + sha256 = "0sfrsjlxlg08k0g8g65v21i2qr1ibq0cfgy7sayb1xbkqc319jvr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base-noprelude bytestring cassava containers http-client - iconv lens network optparse-generic relude servant servant-client - servant-js servant-server servant-swagger swagger2 text time vector - wai warp wreq + http-client-tls iconv lens network optparse-generic relude servant + servant-client servant-js servant-server servant-swagger swagger2 + tagsoup text time vector wai warp wreq + ]; + executableHaskellDepends = [ + aeson base-noprelude directory relude text time ]; - executableHaskellDepends = [ base-noprelude relude text time ]; testHaskellDepends = [ base-noprelude relude ]; benchmarkHaskellDepends = [ base-noprelude gauge relude ]; description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)"; @@ -188564,8 +188476,8 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.4"; - sha256 = "1cq06zlrfk2rbpbwxqqybqs5474gfvgx1dmqvzriha7zmd68wcx2"; + version = "0.4.1"; + sha256 = "1n3mdnknii99kvac4mmvjwi1nwk5527kci211w5n6z796dx56n8v"; libraryHaskellDepends = [ aeson base deepseq exceptions mtl prettyprinter QuickCheck template-haskell these transformers @@ -189792,35 +189704,6 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.3.3"; - sha256 = "1plhi31qpcxvfki18zh2lp348kb56vhf7f22njybbd95dzy7zqlc"; - libraryHaskellDepends = [ - base containers exceptions hashable mtl protolude resourcet - semigroupoids semigroups template-haskell text transformers-base - ]; - testHaskellDepends = [ - async base containers exceptions generic-lens hashable hedgehog - hedgehog-corpus io-memoize MonadRandom mtl multimap protolude - random resourcet semigroupoids semigroups tasty tasty-discover - tasty-hedgehog tasty-th template-haskell text transformers-base - universum - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "registry_0_1_3_4" = callPackage - ({ mkDerivation, async, base, containers, exceptions, generic-lens - , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl - , multimap, protolude, random, resourcet, semigroupoids, semigroups - , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell - , text, transformers-base, universum - }: - mkDerivation { - pname = "registry"; version = "0.1.3.4"; sha256 = "1l26b1isxqfax7c91l23fqx2kyl5cw4j2b6i0jiiz8lcn71qy0ha"; libraryHaskellDepends = [ @@ -192770,7 +192653,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rio_0_1_9_0" = callPackage + "rio_0_1_9_2" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, hashable, hspec, microlens, mtl, primitive , process, QuickCheck, text, time, typed-process, unix, unliftio @@ -192778,8 +192661,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.9.0"; - sha256 = "0pgyyk9j5nsdc8y65vxwl093aicwc7x299c18x7d28wxzwdsgmrj"; + version = "0.1.9.2"; + sha256 = "14ai4z9d490bwh7xfvv3a5v4ykmfly0xli2srz98i6rg3ngv1nac"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -196188,6 +196071,8 @@ self: { pname = "sbv"; version = "8.2"; sha256 = "11jvjgcbipnk65yxv758p5cja89fpjf3nkf8nvqi69lyx1jgb72q"; + revision = "1"; + editedCabalFile = "1bn2k9ydx5vyy4z91y22lc6yhnv299y7z2cyzp1prxpvb1dgh5xv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath @@ -202911,8 +202796,8 @@ self: { ({ mkDerivation, base, cdeps, composition-prelude, shake }: mkDerivation { pname = "shake-c"; - version = "0.4.2.0"; - sha256 = "13ma1mavah98rmxisd4hw5ja96kzbcd36gzxlrsdsjz72i7k9xlh"; + version = "0.4.3.0"; + sha256 = "1cnmwn63kx43khgy3n00sqla8pw11h7almir31zm0dzgld11znix"; libraryHaskellDepends = [ base cdeps composition-prelude shake ]; description = "Library for building C code with shake"; license = stdenv.lib.licenses.bsd3; @@ -204613,46 +204498,24 @@ self: { ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; - version = "0.1.3.1"; - sha256 = "075fcidyq93cm1y8ag5z50n7zvv0fmi9c6j1wmrzj2972cr16g9p"; - libraryHaskellDepends = [ base directory filepath process unix ]; - description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_1_4" = callPackage - ({ mkDerivation, base, directory, filepath, process, unix }: - mkDerivation { - pname = "simple-cmd"; version = "0.1.4"; sha256 = "1g63c0bdm3231aqf12i45nsfpy6bvl1w3nn0jcbbg2hij377y9rg"; libraryHaskellDepends = [ base directory filepath process unix ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.0.1"; - sha256 = "1fs528gr70ppwfz1yalvjdfdxf7b7zxcc9cvsmdba8r1m489qp9d"; - libraryHaskellDepends = [ base optparse-applicative ]; - description = "Simple command args parsing and execution"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd-args_0_1_1" = callPackage - ({ mkDerivation, base, optparse-applicative }: - mkDerivation { - pname = "simple-cmd-args"; version = "0.1.1"; sha256 = "0rgg8aqgq98yq9h5v29r0g2qjhr70gl1sgv713ihlpm7b7bykilz"; + revision = "1"; + editedCabalFile = "127m5x1k5c5ymxcxlbhjghlymdyci847qxq1ydfd8sf2m4qc4ffq"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-conduit" = callPackage @@ -205159,6 +205022,8 @@ self: { pname = "simple-smt"; version = "0.9.4"; sha256 = "0sbwgyw2a5p85yddvmvzk85709qjqny3xgps7zg9k17m9d5bwdm0"; + revision = "1"; + editedCabalFile = "13y564gh7qndkdxnrdx5zbqnkcb5bgg074al92c9rqxd9c66wx4k"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -211653,8 +211518,8 @@ self: { pname = "stack"; version = "1.9.3"; sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf"; - revision = "6"; - editedCabalFile = "1gz2p16jdbx27kd7p7xfbplviqvv9ybhzjfyjaxh9f9z9gj0n8gr"; + revision = "7"; + editedCabalFile = "0gc09yfhrphzn6r2g1ifx6l5k3g78q38myg83f2djjmy9vp047bl"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -213129,8 +212994,8 @@ self: { ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { pname = "stb-truetype"; - version = "0.1.2"; - sha256 = "1hbbi7hax5fw5zb7ashfs5paixqzqrrr64lwisda80dskdazld4m"; + version = "0.1.4"; + sha256 = "1fk9qkra5f18wql76vakdq9796z0dbg1d4apv2zjj47rla43ii38"; libraryHaskellDepends = [ array base bytestring containers ]; description = "A wrapper around Sean Barrett's TrueType rasterizer library"; license = stdenv.lib.licenses.publicDomain; @@ -220976,15 +220841,15 @@ self: { }) {}; "telega" = callPackage - ({ mkDerivation, aeson, base, http-client, lens, text, time + ({ mkDerivation, aeson, base, http-client, lens, tagged, text, time , transformers, wreq }: mkDerivation { pname = "telega"; - version = "0.1.7"; - sha256 = "136fra5yrpp3r1x2511d96h1mhpg3rlf0q60mmvgcvq1rzkibjg3"; + version = "0.2.0"; + sha256 = "1q2prviwbnwhi0xfwwblhncnpz2l0829i3zp2v573w9h91qc5yjn"; libraryHaskellDepends = [ - aeson base http-client lens text time transformers wreq + aeson base http-client lens tagged text time transformers wreq ]; description = "Telegram Bot API binding"; license = stdenv.lib.licenses.mit; @@ -224809,18 +224674,18 @@ self: { }) {}; "threads-supervisor" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, retry, stm, tasty - , tasty-hunit, tasty-quickcheck, time, transformers + ({ mkDerivation, base, bytestring, clock, QuickCheck, retry, stm + , tasty, tasty-hunit, tasty-quickcheck, time, transformers , unordered-containers }: mkDerivation { pname = "threads-supervisor"; - version = "1.1.0.0"; - sha256 = "0vnf6rwghhfvj4cq6d46dhhydyqqrj6jd0dwkg2vqj150y6mg5r2"; + version = "1.2.0.1"; + sha256 = "013j28ma6bwmf50n05ywli9pf5r4vyg8w4liv4yibr459207k31m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base retry stm time unordered-containers + base clock retry stm time transformers unordered-containers ]; executableHaskellDepends = [ base stm time unordered-containers ]; testHaskellDepends = [ @@ -231809,27 +231674,6 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.1.20181026.0"; - sha256 = "0b531ydcb63q44zjpcd2l70xp2hgkxqppnfld7n16ifh9vrxm6gf"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers deepseq vector - ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit - test-framework-th unix - ]; - description = "Time zone database (as files and as a module)"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "tzdata_0_1_20190325_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, HUnit - , test-framework, test-framework-hunit, test-framework-th, unix - , vector - }: - mkDerivation { - pname = "tzdata"; version = "0.1.20190325.0"; sha256 = "0vxisw10a414kh2rn0maj6zvcs8vi5kacfwxs0smjspvm513bkb2"; enableSeparateDataOutput = true; @@ -231842,7 +231686,6 @@ self: { ]; description = "Time zone database (as files and as a module)"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "u2f" = callPackage @@ -233724,8 +233567,8 @@ self: { }: mkDerivation { pname = "unliftio-streams"; - version = "0.1.0.0"; - sha256 = "0ylyk1g00isqzr7nbhrkf3m0yc36lfjb020lb1ip4s3ymlvkkp22"; + version = "0.1.1.0"; + sha256 = "0qp78c610anqpgpd13pz24x68kcpc69z2wjrz6a3qixvqjvp72bw"; libraryHaskellDepends = [ base bytestring io-streams text unliftio-core ]; @@ -246540,39 +246383,6 @@ self: { }: mkDerivation { pname = "yam"; - version = "0.5.16"; - sha256 = "107wnnb8q47kl78gl92b6w6z6pvjqqwpisvwcw0xipmisk5d6nzv"; - libraryHaskellDepends = [ - aeson base base16-bytestring binary bytestring data-default - fast-logger http-client http-types lens menshen monad-logger mtl - mwc-random reflection salak scientific servant-client - servant-server servant-swagger servant-swagger-ui swagger2 text - unliftio-core unordered-containers vault vector wai warp - ]; - testHaskellDepends = [ - aeson base base16-bytestring binary bytestring data-default - fast-logger hspec http-client http-types lens menshen monad-logger - mtl mwc-random QuickCheck reflection salak scientific - servant-client servant-server servant-swagger servant-swagger-ui - swagger2 text unliftio-core unordered-containers vault vector wai - warp - ]; - description = "Yam Web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "yam_0_5_17" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring - , data-default, fast-logger, hspec, http-client, http-types, lens - , menshen, monad-logger, mtl, mwc-random, QuickCheck, reflection - , salak, scientific, servant-client, servant-server - , servant-swagger, servant-swagger-ui, swagger2, text - , unliftio-core, unordered-containers, vault, vector, wai, warp - }: - mkDerivation { - pname = "yam"; version = "0.5.17"; sha256 = "128h0j2v9jsr8hpk43hd75i62xasq3g40v0fk20yzp82avyirqzq"; libraryHaskellDepends = [ @@ -246641,23 +246451,6 @@ self: { }: mkDerivation { pname = "yam-datasource"; - version = "0.5.16"; - sha256 = "0361nlw1fy8kb7wmkksp42zfx7fd7vdjxwvmx5j8mac4mgwyarzq"; - libraryHaskellDepends = [ - base conduit persistent resource-pool resourcet unliftio-core yam - ]; - description = "Yam DataSource Middleware"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "yam-datasource_0_5_17" = callPackage - ({ mkDerivation, base, conduit, persistent, resource-pool - , resourcet, unliftio-core, yam - }: - mkDerivation { - pname = "yam-datasource"; version = "0.5.17"; sha256 = "1ah2y614l0a3mkdrv6a4arbsy0a2wz7w7dwmkdf4rfl9zpm1lfsf"; libraryHaskellDepends = [ @@ -248263,8 +248056,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.13"; - sha256 = "0a7rsm71d8a0snbx6x9hj4ba0f0vg51rwzchsgvrh6fdfm0clkgq"; + version = "1.6.14"; + sha256 = "1p7rm95fb3d27khzq6c10mvqffj8jwiirgfy53hvi3x27w9hqg6s"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -251050,7 +250843,6 @@ self: { description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) zeromq;}; "zeromq4-patterns" = callPackage diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index e7bcef7bc3e..3d82535d29a 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Python interpreter written in Java"; - homepage = http://jython.org/; + homepage = https://jython.org/; license = stdenv.lib.licenses.psfl; platforms = jre.meta.platforms; }; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 918b2c2515e..f071aab94c7 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = http://mujs.com/; + homepage = https://mujs.com/; description = "A lightweight, embeddable Javascript interpreter"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch b/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch new file mode 100644 index 00000000000..c263cdbff4d --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch @@ -0,0 +1,17 @@ +--- a/Lib/py_compile.py ++++ b/Lib/py_compile.py +@@ -139,3 +139,4 @@ + source_stats = loader.path_stats(file) ++ source_mtime = 1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'] + bytecode = importlib._bootstrap_external._code_to_bytecode( +- code, source_stats['mtime'], source_stats['size']) ++ code, source_mtime, source_stats['size']) +--- a/Lib/importlib/_bootstrap_external.py ++++ b/Lib/importlib/_bootstrap_external.py +@@ -485,5 +485,5 @@ + if source_stats is not None: + try: +- source_mtime = int(source_stats['mtime']) ++ source_mtime = 1 + except KeyError: + pass diff --git a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch new file mode 100644 index 00000000000..ceb6047d31d --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch @@ -0,0 +1,248 @@ +--- a/Lib/_osx_support.py ++++ b/Lib/_osx_support.py +@@ -14,13 +14,13 @@ __all__ = [ + # configuration variables that may contain universal build flags, + # like "-arch" or "-isdkroot", that may need customization for + # the user environment +-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', +- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', +- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', +- 'PY_CORE_CFLAGS', 'PY_CORE_LDFLAGS') ++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', ++ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', ++ 'PY_CPPFLAGS', 'PY_CORE_LDFLAGS', 'PY_CORE_CFLAGS') + + # configuration variables that may contain compiler calls +-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') ++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') + + # prefix added to original configuration variable names + _INITPRE = '_OSX_SUPPORT_INITIAL_' +--- a/Lib/distutils/cygwinccompiler.py ++++ b/Lib/distutils/cygwinccompiler.py +@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler): + # dllwrap 2.10.90 is buggy + if self.ld_version >= "2.10.90": + self.linker_dll = "gcc" ++ self.linker_dll_cxx = "g++" + else: + self.linker_dll = "dllwrap" ++ self.linker_dll_cxx = "dllwrap" + + # ld_version >= "2.13" support -shared so use it instead of + # -mdll -static +@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler): + self.set_executables(compiler='gcc -mcygwin -O -Wall', + compiler_so='gcc -mcygwin -mdll -O -Wall', + compiler_cxx='g++ -mcygwin -O -Wall', ++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', + linker_exe='gcc -mcygwin', + linker_so=('%s -mcygwin %s' % +- (self.linker_dll, shared_option))) ++ (self.linker_dll, shared_option)), ++ linker_exe_cxx='g++ -mcygwin', ++ linker_so_cxx=('%s -mcygwin %s' % ++ (self.linker_dll_cxx, shared_option))) + + # cygwin and mingw32 need different sets of libraries + if self.gcc_version == "2.91.57": +@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler): + raise CompileError(msg) + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler): + self.set_executables(compiler='gcc -O -Wall', + compiler_so='gcc -mdll -O -Wall', + compiler_cxx='g++ -O -Wall', ++ compiler_so_cxx='g++ -mdll -O -Wall', + linker_exe='gcc', + linker_so='%s %s %s' + % (self.linker_dll, shared_option, ++ entry_point), ++ linker_exe_cxx='g++', ++ linker_so_cxx='%s %s %s' ++ % (self.linker_dll_cxx, shared_option, + entry_point)) + # Maybe we should also append -mthreads, but then the finished + # dlls need another dll (mingwm10.dll see Mingw32 docs) +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -170,9 +170,11 @@ def customize_compiler(compiler): + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' + +- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ ++ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ ++ cxxflags = cflags + + if 'CC' in os.environ: + newcc = os.environ['CC'] +@@ -187,19 +189,27 @@ def customize_compiler(compiler): + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = opt + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: +@@ -208,13 +218,17 @@ def customize_compiler(compiler): + archiver = ar + ' ' + ar_flags + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, + linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx, + archiver=archiver) + + compiler.shared_lib_extension = shlib_suffix +--- a/Lib/distutils/unixccompiler.py ++++ b/Lib/distutils/unixccompiler.py +@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): + # are pretty generic; they will probably have to be set by an outsider + # (eg. using information discovered by the sysconfig about building + # Python extensions). +- executables = {'preprocessor' : None, +- 'compiler' : ["cc"], +- 'compiler_so' : ["cc"], +- 'compiler_cxx' : ["cc"], +- 'linker_so' : ["cc", "-shared"], +- 'linker_exe' : ["cc"], +- 'archiver' : ["ar", "-cr"], +- 'ranlib' : None, ++ executables = {'preprocessor' : None, ++ 'compiler' : ["cc"], ++ 'compiler_so' : ["cc"], ++ 'compiler_cxx' : ["c++"], ++ 'compiler_so_cxx' : ["c++"], ++ 'linker_so' : ["cc", "-shared"], ++ 'linker_exe' : ["cc"], ++ 'linker_so_cxx' : ["c++", "-shared"], ++ 'linker_exe_cxx' : ["c++"], ++ 'archiver' : ["ar", "-cr"], ++ 'ranlib' : None, + } + + if sys.platform[:6] == "darwin": +@@ -110,12 +113,19 @@ class UnixCCompiler(CCompiler): + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + compiler_so = self.compiler_so ++ compiler_so_cxx = self.compiler_so_cxx + if sys.platform == 'darwin': + compiler_so = _osx_support.compiler_fixup(compiler_so, + cc_args + extra_postargs) ++ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, ++ cc_args + extra_postargs) + try: +- self.spawn(compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -173,30 +183,16 @@ class UnixCCompiler(CCompiler): + ld_args.extend(extra_postargs) + self.mkpath(os.path.dirname(output_filename)) + try: +- if target_desc == CCompiler.EXECUTABLE: +- linker = self.linker_exe[:] ++ if target_lang == "c++": ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe_cxx[:] ++ else: ++ linker = self.linker_so_cxx[:] + else: +- linker = self.linker_so[:] +- if target_lang == "c++" and self.compiler_cxx: +- # skip over environment variable settings if /usr/bin/env +- # is used to set up the linker's environment. +- # This is needed on OSX. Note: this assumes that the +- # normal and C++ compiler have the same environment +- # settings. +- i = 0 +- if os.path.basename(linker[0]) == "env": +- i = 1 +- while '=' in linker[i]: +- i += 1 +- +- if os.path.basename(linker[i]) == 'ld_so_aix': +- # AIX platforms prefix the compiler with the ld_so_aix +- # script, so we need to adjust our linker index +- offset = 1 ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe[:] + else: +- offset = 0 +- +- linker[i+offset] = self.compiler_cxx[i] ++ linker = self.linker_so[:] + + if sys.platform == 'darwin': + linker = _osx_support.compiler_fixup(linker, ld_args) +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -584,10 +584,10 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o + *\ -s*|s*) quiet="-q";; \ + *) quiet="";; \ + esac; \ +- echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ +- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build + diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 6fbeae38136..7d90e201d19 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -87,6 +87,9 @@ in with passthru; stdenv.mkDerivation { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). (./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch") + ] ++ optionals (isPy35 || isPy36) [ + # Determinism: Write null timestamps when compiling python files. + ./3.5/force_bytecode_determinism.patch ] ++ optionals isPy35 [ # Backports support for LD_LIBRARY_PATH from 3.6 ./3.5/ld_library_path.patch @@ -104,6 +107,8 @@ in with passthru; stdenv.mkDerivation { ( if isPy35 then ./3.5/python-3.x-distutils-C++.patch + else if isPy37 then + ./3.7/python-3.x-distutils-C++.patch else fetchpatch { url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; @@ -166,8 +171,8 @@ in with passthru; stdenv.mkDerivation { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" export MACOSX_DEPLOYMENT_TARGET=10.6 '' + optionalString (isPy3k && pythonOlder "3.7") '' - # Determinism: The interpreter is patched to write null timestamps when compiling python files. - # This way python does not try to update them when we freeze timestamps in nix store. + # Determinism: The interpreter is patched to write null timestamps when compiling Python files + # so Python doesn't try to update the bytecode when seeing frozen timestamps in Nix's store. export DETERMINISTIC_BUILD=1; '' + optionalString stdenv.hostPlatform.isMusl '' export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 1b40c71e2ea..16434837dd1 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { name = "renpy-${version}"; - version = "7.2.0"; + version = "7.2.2"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "1pnzxmh37zzldvlyklk2wgc8xbh3hm3wwmbl70zdphybjrxvc7i5"; + sha256 = "0b8pky0npi4gw59cnjicyrc9q1x2zsxa7x68y74dbgjg9r0dgkd7"; }; patches = [ diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index ea96e5ed334..1d7a11df5a4 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr, buildPackages }: let version = "52.9.0"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { setOutputFlags = false; # Configure script only understands --includedir buildInputs = [ readline icu zlib nspr ]; - nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; + nativeBuildInputs = [ autoconf213 pkgconfig perl which buildPackages.python2 zip ]; # Apparently this package fails to build correctly with modern compilers, which at least # on ARMv6 causes polkit testsuite to break with an assertion failure in spidermonkey. @@ -31,10 +31,12 @@ in stdenv.mkDerivation rec { }) ]; + configurePlatforms = [ "host" "target" ]; + preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out - export PYTHON="${python2.interpreter}" + export PYTHON="${buildPackages.python2.interpreter}" configureFlagsArray+=("--includedir=$dev/include") cd js/src @@ -43,7 +45,7 @@ in stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-system-nspr" + "--with-nspr-prefix=${nspr}" "--with-system-zlib" "--with-system-icu" "--with-intl-api" @@ -51,6 +53,12 @@ in stdenv.mkDerivation rec { "--enable-shared-js" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc"; + makeFlags = [ + "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + ]; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 787c54c1b0a..95984c97001 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.13"; + version = "4.14"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "1gzfz0fz7q5qyhzwfl3n1f5jrqa1ijq9kjjms7hb0ywpagipq6ax"; + sha256 = "0p0s1dl5a261zwy0hxa7ylkypk45rwc6n84lx507dwdhfz4ihv12"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 54c95d6087a..e0c46acb630 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.4"; + version = "6.5.5"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "0qs54p2kwkk05nfkijdn0rksjw86bkdk4mnh2nkxgnv32s6wdkv6"; + sha256 = "1r1bvy65n50l6lbxm1k1bscqcv29mpkgp0pgr5cvvv7ldisrjl39"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index fe2892c9627..95828c44f85 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility library to help manage common tasks with OpenAL applications"; - homepage = http://kcat.strangesoft.net/alure.html; + homepage = https://kcat.strangesoft.net/alure.html; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch b/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch new file mode 100644 index 00000000000..f8163f6d271 --- /dev/null +++ b/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch @@ -0,0 +1,45 @@ +diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam +index 273b28a..2d2031e 100644 +--- a/tools/build/v2/tools/python.jam ++++ b/tools/build/v2/tools/python.jam +@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? ) + + local rule darwin-installed-pythons ( version ? ) + { +- version ?= $(.version-countdown) ; +- +- local prefix +- = [ GLOB /System/Library/Frameworks /Library/Frameworks +- : Python.framework ] ; +- +- return $(prefix)/Versions/$(version)/bin/python ; ++ return ; + } + + +@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : + + # See if we can find a framework directory on darwin. + local framework-directory ; +- if $(target-os) = darwin +- { +- # Search upward for the framework directory. +- local framework-directory = $(libraries[-1]) ; +- while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework +- { +- framework-directory = $(framework-directory:D) ; +- } +- +- if $(framework-directory:D=) = Python.framework +- { +- debug-message framework directory is \"$(framework-directory)\" ; +- } +- else +- { +- debug-message "no framework directory found; using library path" ; +- framework-directory = ; +- } +- } + + local dll-path = $(libraries) ; + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index dd383bd0123..8ce44b878d0 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -104,7 +104,10 @@ stdenv.mkDerivation { patchFlags = ""; patches = patches - ++ optional stdenv.isDarwin ./darwin-no-system-python.patch; + ++ optional stdenv.isDarwin ( + if version == "1.55.0" + then ./darwin-1.55-no-system-python.patch + else ./darwin-no-system-python.patch); meta = { homepage = http://boost.org/; diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 787030eed98..9d83812fefb 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -1,10 +1,17 @@ -{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, gupnp }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkgconfig +, gupnp +}: stdenv.mkDerivation rec { pname = "dleyna-core"; - name = "${pname}-${version}"; version = "0.6.0"; + setupHook = ./setup-hook.sh; + src = fetchFromGitHub { owner = "01org"; repo = pname; @@ -12,12 +19,25 @@ stdenv.mkDerivation rec { sha256 = "1x5vj5zfk95avyg6g3nf6gar250cfrgla2ixj2ifn8pcick2d9vq"; }; - setupHook = ./setup-hook.sh; + patches = [ + ./0001-Search-connectors-in-DLEYNA_CONNECTOR_PATH.patch + + # fix build with gupnp 1.2 + # https://github.com/intel/dleyna-core/pull/52 + (fetchpatch { + url = https://github.com/intel/dleyna-core/commit/41b2e56f67b6fc9c8c256b86957d281644b9b846.patch; + sha256 = "1h758cp65v7qyfpvyqdri7q0gwx85mhdpkb2y8waq735q5q9ib39"; + }) + ]; - patches = [ ./0001-Search-connectors-in-DLEYNA_CONNECTOR_PATH.patch ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - propagatedBuildInputs = [ gupnp ]; + propagatedBuildInputs = [ + gupnp + ]; meta = with stdenv.lib; { description = "Library of utility functions that are used by the higher level dLeyna"; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index 99af28111a7..aae7861fef4 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,8 +1,20 @@ -{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup, makeWrapper }: +{ stdenv +, fetchurl +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, dleyna-connector-dbus +, dleyna-core +, gssdp +, gupnp +, gupnp-av +, gupnp-dlna +, libsoup +, makeWrapper +}: stdenv.mkDerivation rec { pname = "dleyna-renderer"; - name = "${pname}-${version}"; version = "0.6.0"; src = fetchFromGitHub { @@ -12,8 +24,27 @@ stdenv.mkDerivation rec { sha256 = "0jy54aq8hgrvzchrvfzqaj4pcn0cfhafl9bv8a9p6j82yjk4pvpp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; + patches = [ + # fix build with gupnp 1.2 + # comes from arch linux packaging https://git.archlinux.org/svntogit/packages.git/tree/trunk/gupnp-1.2.diff?h=packages/dleyna-renderer + ./gupnp-1.2.diff + ]; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + makeWrapper + ]; + + buildInputs = [ + dleyna-core + dleyna-connector-dbus + gssdp + gupnp + gupnp-av + gupnp-dlna + libsoup + ]; preFixup = '' wrapProgram "$out/libexec/dleyna-renderer-service" \ diff --git a/pkgs/development/libraries/dleyna-renderer/gupnp-1.2.diff b/pkgs/development/libraries/dleyna-renderer/gupnp-1.2.diff new file mode 100644 index 00000000000..3255695ab23 --- /dev/null +++ b/pkgs/development/libraries/dleyna-renderer/gupnp-1.2.diff @@ -0,0 +1,130 @@ + configure.ac | 4 ++-- + libdleyna/renderer/device.c | 51 +++++++++++++++++++++++++++++++++++++++++++-- + libdleyna/renderer/upnp.c | 4 ++-- + 3 files changed, 53 insertions(+), 6 deletions(-) + +diff --git c/configure.ac i/configure.ac +index 271ee92..364659d 100644 +--- c/configure.ac ++++ i/configure.ac +@@ -38,8 +38,8 @@ LT_LANG([C]) + PKG_PROG_PKG_CONFIG(0.16) + PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28]) + PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28]) +-PKG_CHECK_MODULES([GSSDP], [gssdp-1.0 >= 0.13.2]) +-PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.5]) ++PKG_CHECK_MODULES([GSSDP], [gssdp-1.2 >= 1.2.0]) ++PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 1.2.0]) + PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5]) + PKG_CHECK_MODULES([GUPNPDLNA], [gupnp-dlna-2.0 >= 0.9.4]) + PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.28.2]) +diff --git c/libdleyna/renderer/device.c i/libdleyna/renderer/device.c +index 7acef89..f6d571e 100644 +--- c/libdleyna/renderer/device.c ++++ i/libdleyna/renderer/device.c +@@ -2121,33 +2121,80 @@ exit: + return; + } + ++typedef struct ++{ ++ GMainLoop *loop; ++ GUPnPServiceIntrospection *introspection; ++ GError **error; ++} GetIntrospectionAsyncData; ++ ++static void ++get_introspection_async_cb (GUPnPServiceInfo *info, ++ GUPnPServiceIntrospection *introspection, ++ const GError *error, ++ gpointer user_data) ++{ ++ GetIntrospectionAsyncData *data = user_data; ++ data->introspection = introspection; ++ if (data->error) ++ *data->error = g_error_copy (error); ++ g_main_loop_quit (data->loop); ++} ++ ++static GUPnPServiceIntrospection * ++_gupnp_service_info_get_introspection (GUPnPServiceInfo *info, ++ GError **error) ++{ ++ GetIntrospectionAsyncData data; ++ GMainContext *context; ++ ++ context = g_main_context_new (); ++ data.loop = g_main_loop_new (context, FALSE); ++ data.error = error; ++ ++ g_main_context_push_thread_default (context); ++ ++ gupnp_service_info_get_introspection_async (info, ++ get_introspection_async_cb, ++ &data); ++ ++ g_main_loop_run (data.loop); ++ ++ g_main_context_pop_thread_default (context); ++ ++ g_main_loop_unref (data.loop); ++ g_main_context_unref (context); ++ ++ return data.introspection; ++} ++ + static gboolean prv_get_av_service_states_values(GUPnPServiceProxy *av_proxy, + GVariant **mpris_tp_speeds, + GPtrArray **upnp_tp_speeds, + double *min_rate, + double *max_rate, + gboolean *can_get_byte_pos) + { + const GUPnPServiceStateVariableInfo *svi; + const GUPnPServiceActionInfo *sai; + GUPnPServiceIntrospection *introspection; + GError *error = NULL; + GVariant *speeds = NULL; + GList *allowed_values; + gpointer weak_ref = NULL; + gboolean device_alive = TRUE; + + /* TODO: this weak_ref hack is needed as + gupnp_service_info_get_introspection iterates the main loop. + This can result in our device getting deleted before this + function returns. Ultimately, this code needs to be re-written + to use gupnp_service_info_get_introspection_async but this cannot + really be done until GUPnP provides a way to cancel this function. */ + + weak_ref = av_proxy; + g_object_add_weak_pointer(G_OBJECT(av_proxy), &weak_ref); + +- introspection = gupnp_service_info_get_introspection( ++ introspection = _gupnp_service_info_get_introspection( + GUPNP_SERVICE_INFO(av_proxy), + &error); + +@@ -2215,7 +2262,7 @@ static gboolean prv_get_rc_service_states_values(GUPnPServiceProxy *rc_proxy, + weak_ref = rc_proxy; + g_object_add_weak_pointer(G_OBJECT(rc_proxy), &weak_ref); + +- introspection = gupnp_service_info_get_introspection( ++ introspection = _gupnp_service_info_get_introspection( + GUPNP_SERVICE_INFO(rc_proxy), + &error); + +diff --git c/libdleyna/renderer/upnp.c i/libdleyna/renderer/upnp.c +index 17cbda7..068912b 100644 +--- c/libdleyna/renderer/upnp.c ++++ i/libdleyna/renderer/upnp.c +@@ -243,8 +243,8 @@ static void prv_server_unavailable_cb(GUPnPControlPoint *cp, + + udn = gupnp_device_info_get_udn((GUPnPDeviceInfo *)proxy); + +- ip_address = gupnp_context_get_host_ip( +- gupnp_control_point_get_context(cp)); ++ ip_address = gssdp_client_get_host_ip( ++ GSSDP_CLIENT(gupnp_control_point_get_context(cp))); + + if (!udn || !ip_address) + goto on_error; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 79b0155c913..4730d455950 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,8 +1,20 @@ -{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, makeWrapper +, pkgconfig +, dleyna-core +, dleyna-connector-dbus +, gssdp +, gupnp +, gupnp-av +, gupnp-dlna +, libsoup +}: stdenv.mkDerivation rec { pname = "dleyna-server"; - name = "${pname}-${version}"; version = "0.6.0"; src = fetchFromGitHub { @@ -12,8 +24,30 @@ stdenv.mkDerivation rec { sha256 = "13a2i6ms27s46yxdvlh2zm7pim7jmr5cylnygzbliz53g3gxxl3j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; + patches = [ + # fix build with gupnp 1.2 + # https://github.com/intel/dleyna-server/pull/161 + (fetchpatch { + url = https://github.com/intel/dleyna-server/commit/96c01c88363d6e5e9b7519bc4e8b5d86cf783e1f.patch; + sha256 = "0p8fn331x2whvn6skxqvfzilx0m0yx2q5mm2wh2625l396m3fzmm"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + makeWrapper + ]; + + buildInputs = [ + dleyna-core + dleyna-connector-dbus + gssdp + gupnp + gupnp-av + gupnp-dlna + libsoup + ]; preFixup = '' wrapProgram "$out/libexec/dleyna-server-service" \ diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 04fd04a564f..402bf023281 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "double-conversion-${version}"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "082w15xq8f4c422a71phvcahgc8vmqrig97av9g9628q5n2ybbgg"; + sha256 = "13xwcqk2c0q8c1siw566clxcpvp0xrxvb72mra42wa3nvq9wlsv6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index f3d06f7a01a..8518545665c 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "flatcc"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "dvidelabs"; repo = "flatcc"; rev = "v${version}"; - sha256 = "sha256:0cb6s9q1cbigss1q7dra0ix2a0iqlh2xxwncbrnmqv17h4lwvglr"; + sha256 = "06wnwvnkhw1rk0y3nncjmcyjy3bgpw8i9xqd5gpbhbrm38718cjk"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index c3cac531263..a4a0bd1a263 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { # patch taken from gtk_doc ./respect-xml-catalog-files-var.patch ./use-flatpak-from-path.patch + ./unset-env-vars.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch new file mode 100644 index 00000000000..798e388b23c --- /dev/null +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -0,0 +1,10 @@ +--- a/common/flatpak-run.c ++++ b/common/flatpak-run.c +@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = { + {"PERLLIB", NULL}, + {"PERL5LIB", NULL}, + {"XCURSOR_PATH", NULL}, ++ {"GDK_PIXBUF_MODULE_FILE", NULL}, + }; + + static const ExportData no_ld_so_cache_exports[] = { diff --git a/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch b/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch new file mode 100644 index 00000000000..b734c1c8b02 --- /dev/null +++ b/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch @@ -0,0 +1,323 @@ +This patch was generated by re-running Bison 3.0.4 on pro-gram-gen.y after +applying CVE-2018-18751.patch. This patch removes the need to add bison to +nativeBuildInputs. + +--- a/gettext-tools/src/po-gram-gen.c ++++ b/gettext-tools/src/po-gram-gen.c +@@ -568,9 +568,9 @@ static const yytype_uint8 yytranslate[] = + static const yytype_uint16 yyrline[] = + { + 0, 169, 169, 171, 172, 173, 174, 179, 187, 195, +- 216, 240, 249, 258, 269, 278, 292, 301, 315, 321, +- 332, 338, 350, 361, 372, 376, 391, 414, 422, 434, +- 442 ++ 216, 237, 246, 255, 266, 275, 289, 298, 312, 318, ++ 329, 335, 347, 358, 369, 373, 388, 411, 419, 431, ++ 439 + }; + #endif + +@@ -1419,14 +1419,11 @@ yyreduce: + check_obsolete ((yyvsp[-3].message_intro), (yyvsp[-1].string)); + check_obsolete ((yyvsp[-3].message_intro), (yyvsp[0].rhs)); + if (!(yyvsp[-3].message_intro).obsolete || pass_obsolete_entries) +- { +- do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string, +- (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos, +- (yyvsp[-3].message_intro).prev_ctxt, +- (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural, +- (yyvsp[-3].message_intro).obsolete); +- free ((yyvsp[-1].string).string); +- } ++ do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string, ++ (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos, ++ (yyvsp[-3].message_intro).prev_ctxt, ++ (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural, ++ (yyvsp[-3].message_intro).obsolete); + else + { + free_message_intro ((yyvsp[-3].message_intro)); +@@ -1435,11 +1432,11 @@ yyreduce: + free ((yyvsp[0].rhs).rhs.msgstr); + } + } +-#line 1439 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1436 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 11: +-#line 241 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 238 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist)); + check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].string)); +@@ -1448,11 +1445,11 @@ yyreduce: + string_list_destroy (&(yyvsp[-1].stringlist).stringlist); + free ((yyvsp[0].string).string); + } +-#line 1452 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1449 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 12: +-#line 250 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 247 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist)); + check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].rhs)); +@@ -1461,22 +1458,22 @@ yyreduce: + string_list_destroy (&(yyvsp[-1].stringlist).stringlist); + free ((yyvsp[0].rhs).rhs.msgstr); + } +-#line 1465 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1462 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 13: +-#line 259 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 256 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].message_intro), (yyvsp[0].stringlist)); + po_gram_error_at_line (&(yyvsp[-1].message_intro).pos, _("missing 'msgstr' section")); + free_message_intro ((yyvsp[-1].message_intro)); + string_list_destroy (&(yyvsp[0].stringlist).stringlist); + } +-#line 1476 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1473 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 14: +-#line 270 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 267 "po-gram-gen.y" /* yacc.c:1646 */ + { + (yyval.message_intro).prev_ctxt = NULL; + (yyval.message_intro).prev_id = NULL; +@@ -1485,11 +1482,11 @@ yyreduce: + (yyval.message_intro).pos = (yyvsp[0].string).pos; + (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete; + } +-#line 1489 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1486 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 15: +-#line 279 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 276 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].prev), (yyvsp[0].string)); + (yyval.message_intro).prev_ctxt = (yyvsp[-1].prev).ctxt; +@@ -1499,11 +1496,11 @@ yyreduce: + (yyval.message_intro).pos = (yyvsp[0].string).pos; + (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete; + } +-#line 1503 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1500 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 16: +-#line 293 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 290 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].string), (yyvsp[0].stringlist)); + (yyval.prev).ctxt = (yyvsp[-1].string).string; +@@ -1512,11 +1509,11 @@ yyreduce: + (yyval.prev).pos = (yyvsp[-1].string).pos; + (yyval.prev).obsolete = (yyvsp[-1].string).obsolete; + } +-#line 1516 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1513 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 17: +-#line 302 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 299 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-2].string), (yyvsp[-1].stringlist)); + check_obsolete ((yyvsp[-2].string), (yyvsp[0].string)); +@@ -1526,21 +1523,21 @@ yyreduce: + (yyval.prev).pos = (yyvsp[-2].string).pos; + (yyval.prev).obsolete = (yyvsp[-2].string).obsolete; + } +-#line 1530 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1527 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 18: +-#line 316 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 313 "po-gram-gen.y" /* yacc.c:1646 */ + { + (yyval.string).string = NULL; + (yyval.string).pos = (yyvsp[0].pos).pos; + (yyval.string).obsolete = (yyvsp[0].pos).obsolete; + } +-#line 1540 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1537 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 19: +-#line 322 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 319 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist)); + check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos)); +@@ -1548,21 +1545,21 @@ yyreduce: + (yyval.string).pos = (yyvsp[0].pos).pos; + (yyval.string).obsolete = (yyvsp[0].pos).obsolete; + } +-#line 1552 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1549 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 20: +-#line 333 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 330 "po-gram-gen.y" /* yacc.c:1646 */ + { + (yyval.string).string = NULL; + (yyval.string).pos = (yyvsp[0].pos).pos; + (yyval.string).obsolete = (yyvsp[0].pos).obsolete; + } +-#line 1562 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1559 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 21: +-#line 339 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 336 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist)); + check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos)); +@@ -1570,11 +1567,11 @@ yyreduce: + (yyval.string).pos = (yyvsp[0].pos).pos; + (yyval.string).obsolete = (yyvsp[0].pos).obsolete; + } +-#line 1574 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1571 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 22: +-#line 351 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 348 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist)); + plural_counter = 0; +@@ -1582,30 +1579,30 @@ yyreduce: + (yyval.string).pos = (yyvsp[-1].pos).pos; + (yyval.string).obsolete = (yyvsp[-1].pos).obsolete; + } +-#line 1586 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1583 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 23: +-#line 362 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 359 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist)); + (yyval.string).string = string_list_concat_destroy (&(yyvsp[0].stringlist).stringlist); + (yyval.string).pos = (yyvsp[-1].pos).pos; + (yyval.string).obsolete = (yyvsp[-1].pos).obsolete; + } +-#line 1597 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1594 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 24: +-#line 373 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 370 "po-gram-gen.y" /* yacc.c:1646 */ + { + (yyval.rhs) = (yyvsp[0].rhs); + } +-#line 1605 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1602 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 25: +-#line 377 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 374 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].rhs), (yyvsp[0].rhs)); + (yyval.rhs).rhs.msgstr = XNMALLOC ((yyvsp[-1].rhs).rhs.msgstr_len + (yyvsp[0].rhs).rhs.msgstr_len, char); +@@ -1617,11 +1614,11 @@ yyreduce: + (yyval.rhs).pos = (yyvsp[-1].rhs).pos; + (yyval.rhs).obsolete = (yyvsp[-1].rhs).obsolete; + } +-#line 1621 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1618 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 26: +-#line 392 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 389 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-4].pos), (yyvsp[-3].pos)); + check_obsolete ((yyvsp[-4].pos), (yyvsp[-2].number)); +@@ -1640,11 +1637,11 @@ yyreduce: + (yyval.rhs).pos = (yyvsp[-4].pos).pos; + (yyval.rhs).obsolete = (yyvsp[-4].pos).obsolete; + } +-#line 1644 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1641 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 27: +-#line 415 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 412 "po-gram-gen.y" /* yacc.c:1646 */ + { + string_list_init (&(yyval.stringlist).stringlist); + string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string); +@@ -1652,11 +1649,11 @@ yyreduce: + (yyval.stringlist).pos = (yyvsp[0].string).pos; + (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete; + } +-#line 1656 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1653 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 28: +-#line 423 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 420 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string)); + (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist; +@@ -1665,11 +1662,11 @@ yyreduce: + (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos; + (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete; + } +-#line 1669 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1666 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 29: +-#line 435 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 432 "po-gram-gen.y" /* yacc.c:1646 */ + { + string_list_init (&(yyval.stringlist).stringlist); + string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string); +@@ -1677,11 +1674,11 @@ yyreduce: + (yyval.stringlist).pos = (yyvsp[0].string).pos; + (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete; + } +-#line 1681 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1678 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 30: +-#line 443 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 440 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string)); + (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist; +@@ -1690,11 +1687,11 @@ yyreduce: + (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos; + (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete; + } +-#line 1694 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1691 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + +-#line 1698 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1695 "po-gram-gen.c" /* yacc.c:1646 */ + default: break; + } + /* User semantic actions sometimes alter yychar, and that requires diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 1dae2c443c8..75d1eec25f6 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, libiconv, xz, bison, automake115x, autoconf }: +let allowBisonDependency = !stdenv.isDarwin; in stdenv.mkDerivation rec { name = "gettext-${version}"; version = "0.19.8.1"; @@ -15,6 +16,9 @@ stdenv.mkDerivation rec { url = "https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=patch;h=dce3a16e5e9368245735e29bf498dcd5e3e474a4"; sha256 = "1lpjwwcjr1sb879faj0xyzw02kma0ivab6xwn3qciy13qy6fq5xn"; }) + ] ++ lib.optionals (!allowBisonDependency) [ + # Only necessary for CVE-2018-18751.patch: + ./CVE-2018-18751-bison.patch ]; outputs = [ "out" "man" "doc" "info" ]; @@ -47,7 +51,18 @@ stdenv.mkDerivation rec { sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in ''; - nativeBuildInputs = [ xz xz.bin bison automake115x autoconf]; + nativeBuildInputs = [ + xz + xz.bin + ] ++ lib.optional allowBisonDependency [ + # Only necessary for CVE-2018-18751.patch (unless CVE-2018-18751-bison.patch + # is also applied): + bison + ] ++ [ + # Only necessary for CVE-2018-18751.patch: + automake115x + autoconf + ]; # HACK, see #10874 (and 14664) buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index cb4571265af..33c8e5076da 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -214,10 +214,6 @@ stdenv.mkDerivation ({ // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { preInstall = null; # clobber the native hook - dontStrip = true; - - separateDebugInfo = false; # this is currently broken for crossDrv - # To avoid a dependency on the build system 'bash'. preFixup = '' rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace} diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix new file mode 100644 index 00000000000..5694c50e90a --- /dev/null +++ b/pkgs/development/libraries/gom/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, glib +, python3 +, sqlite +, gdk_pixbuf +, gnome3 +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "gom"; + version = "0.3.3"; + + outputs = [ "out" "py" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1n1n226dyb3q98216aah87in9hhjcwsbpspsdqqfswz2bx5y6mxc"; + }; + + patches = [ + # Needed to apply the next patch + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gom/commit/e8b7c314ce61d459132cf03c9e455d2a01fdc6ea.patch"; + sha256 = "0d7g3nm5lrfhfx9ly8qgf5bfp12kvr7m1xmlgin2q8vqpn0r2ggp"; + }) + # https://gitlab.gnome.org/GNOME/gom/merge_requests/3 + (fetchpatch { + url = "https://gitlab.gnome.org/worldofpeace/gom/commit/b621c15600b1c32826c9878565eb2398a50907f2.patch"; + sha256 = "1hqck9bb7sxn4akisnn26sbddlphjsavgksick5k4h3rsc0xwx1v"; + }) + ./longer-stress-timeout.patch + ]; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + ]; + + buildInputs = [ + gdk_pixbuf + glib + sqlite + python3.pkgs.pygobject3 + ]; + + mesonFlags = [ + "-Dpygobject-override-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + ]; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A GObject to SQLite object mapper"; + homepage = https://wiki.gnome.org/Projects/Gom; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/development/libraries/gom/longer-stress-timeout.patch b/pkgs/development/libraries/gom/longer-stress-timeout.patch new file mode 100644 index 00000000000..3dcd1d0a107 --- /dev/null +++ b/pkgs/development/libraries/gom/longer-stress-timeout.patch @@ -0,0 +1,13 @@ +diff --git a/tests/meson.build b/tests/meson.build +index 1df4884..d7a6f5d 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -25,7 +25,7 @@ test('test-gom-find', test_find) + + test_stress = executable('test-gom-stress', 'test-gom-stress.c', + dependencies: [libgom_dep]) +-test('test-gom-stress', test_stress, timeout: 300) ++test('test-gom-stress', test_stress, timeout: 500) + + test_transform = executable('test-gom-transform', 'test-gom-transform.c', + c_args: '-DIMAGE="@0@/gnome.png"'.format(meson.current_source_dir()), diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index ed1e5b6faab..ac7391dcaf9 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,26 +1,62 @@ -{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gobject-introspection +, vala +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, libsoup +, gtk3 +, glib +, gnome3 +}: stdenv.mkDerivation rec { - name = "gssdp-${version}"; - version = "1.0.2"; + pname = "gssdp"; + version = "1.2.0"; outputs = [ "out" "bin" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1"; + url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1l80znxzzpb2fmsrjf3hygi9gcxx5r405qrk5430nbsjgxafzjr2"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; - buildInputs = [ libsoup gtk3 ]; - propagatedBuildInputs = [ glib ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + gobject-introspection + vala + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; + + buildInputs = [ + libsoup + gtk3 + ]; - configureFlags = [ - "--enable-gtk-doc" + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dgtk_doc=true" ]; doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index cf04ca73f9e..b764ce2c2e2 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,18 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, glib, libxml2 }: +{ stdenv +, fetchurl +, pkgconfig +, gobject-introspection +, vala +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, glib +, libxml2 +, gnome3 +}: stdenv.mkDerivation rec { - name = "gupnp-av-${version}"; + pname = "gupnp-av"; version = "0.12.11"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; - buildInputs = [ gupnp glib libxml2 ]; + nativeBuildInputs = [ + pkgconfig + gobject-introspection + vala + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; + + buildInputs = [ + glib + libxml2 + ]; configureFlags = [ "--enable-gtk-doc" @@ -20,6 +42,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { homepage = http://gupnp.org/; description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index a6c11a569cf..4dfbaafdc32 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,18 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, gst_all_1 }: +{ stdenv +, fetchurl +, pkgconfig +, gobject-introspection +, vala +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, libxml2 +, gst_all_1 +, gnome3 +}: stdenv.mkDerivation rec { - name = "gupnp-dlna-${version}"; + pname = "gupnp-dlna"; version = "0.10.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-dlna/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj"; }; - nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; - buildInputs = [ gupnp gst_all_1.gst-plugins-base ]; + nativeBuildInputs = [ + pkgconfig + gobject-introspection + vala + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; + + buildInputs = [ + libxml2 + gst_all_1.gst-plugins-base + ]; configureFlags = [ "--enable-gtk-doc" @@ -25,6 +47,12 @@ stdenv.mkDerivation rec { patchShebangs tests/test-discoverer.sh.in ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GUPnP/; description = "Library to ease DLNA-related bits for applications using GUPnP"; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 05c8522aebc..56a274316e8 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,18 +1,51 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp }: +{ stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, pkgconfig +, gettext +, gobject-introspection +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, glib +, gupnp +, gnome3 +}: stdenv.mkDerivation rec { - name = "gupnp-igd-${version}"; + pname = "gupnp-igd"; version = "0.2.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-igd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb"; }; - nativeBuildInputs = [ pkgconfig gettext gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; - propagatedBuildInputs = [ glib gupnp ]; + patches = [ + # Add gupnp-1.2 compatibility + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e.patch; + sha256 = "0s8lkyy9fnnnnkkqwbk6gxb7795bb1kl1swk5ldjnlrzhfcy1ab2"; + }) + ]; + + nativeBuildInputs = [ + pkgconfig + autoreconfHook + gettext + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; + + propagatedBuildInputs = [ + glib + gupnp + ]; configureFlags = [ "--enable-gtk-doc" @@ -20,6 +53,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Library to handle UPnP IGD port mapping"; homepage = http://www.gupnp.org/; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 648209125fe..a69df33dd65 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,14 +1,32 @@ -{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, glib, gssdp, libsoup, libxml2, libuuid }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, gobject-introspection +, vala +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, docbook_xml_dtd_44 +, glib +, gssdp +, libsoup +, libxml2 +, libuuid +, gnome3 +}: stdenv.mkDerivation rec { - name = "gupnp-${version}"; - version = "1.0.3"; + pname = "gupnp"; + version = "1.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/gupnp-${version}.tar.xz"; - sha256 = "1fyb6yn75vf2y1b8nbc1df572swzr74yiwy3v3g5xn36wlp1cjvr"; + url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0911lv1bivsyv9wwdxm0i1w4r89j0vyyqp200gsfdnzk6v1a4x7x"; }; patches = [ @@ -19,17 +37,54 @@ stdenv.mkDerivation rec { # at least until Requires.internal or something is implemented # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7 ./fix-requires.patch + + # fix deadlock in gupnp-igd tests + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gupnp/commit/d208562657f62b34759896ca9e974bd582d1f963.patch; + sha256 = "02kzsb4glxhgb1npf6qqgafiki0ws75sly5h470431mihc6sgp4f"; + }) + # fix breakage in gupnp-igd tests + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gupnp/commit/0648399acb989473119fe59d0b9f65c923e69483.patch; + sha256 = "0ba0rngk3a4n3z4dmq06wzgh0n3q9la1nr25qdxqbwlszmxfxpjf"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gobject-introspection + vala + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + docbook_xml_dtd_44 + ]; + + buildInputs = [ + libuuid ]; - nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ]; - propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ]; + propagatedBuildInputs = [ + glib + gssdp + libsoup + libxml2 + ]; - configureFlags = [ - "--enable-gtk-doc" + mesonFlags = [ + "-Dgtk_doc=true" ]; doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { homepage = http://www.gupnp.org/; description = "An implementation of the UPnP specification"; diff --git a/pkgs/development/libraries/gupnp/fix-requires.patch b/pkgs/development/libraries/gupnp/fix-requires.patch index 4538fc55460..ffe9b68fd04 100644 --- a/pkgs/development/libraries/gupnp/fix-requires.patch +++ b/pkgs/development/libraries/gupnp/fix-requires.patch @@ -1,9 +1,26 @@ ---- a/gupnp-1.0.pc.in -+++ b/gupnp-1.0.pc.in -@@ -8,4 +8,5 @@ - Version: @VERSION@ - Libs: -L${libdir} -lgupnp-1.0 - Cflags: -I${includedir}/gupnp-1.0 --Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@ -+Requires: glib-2.0 gobject-2.0 gssdp-1.0 libxml-2.0 libsoup-2.4 -+Requires.private: @UUID_LIBS@ +--- a/libgupnp/meson.build ++++ b/libgupnp/meson.build +@@ -110,6 +110,7 @@ pkg.generate( + libraries : libgupnp, + subdirs: 'gupnp-1.2', + name : 'gupnp-1.2', ++ requires: requires, + description : 'GObject-based UPnP library', + version : meson.project_version(), + filebase : 'gupnp-1.2' +--- a/meson.build ++++ a/meson.build +@@ -18,6 +18,13 @@ add_global_arguments('-DHAVE_CONFIG_H=1', language : 'c') + + guul = subproject('guul', default_options : ['default_library=static']) + ++requires = [ ++ dependency('glib-2.0', version : '>= 2.44'), ++ dependency('gssdp-1.2', version : '>= 1.1'), ++ dependency('libsoup-2.4', version : '>= 2.48.0'), ++ dependency('libxml-2.0') ++] ++ + dependencies = [ + dependency('glib-2.0', version : '>= 2.44'), + dependency('gio-2.0', version : '>= 2.44'), diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index c1d46524093..d9163c97cb7 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -9,13 +9,13 @@ let pname = "gvfs"; - version = "1.40.0"; + version = "1.40.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wp266dx3v2nwrf46cb4vpmv5d4qaag5yb5gkw7rynn9g55xcf9p"; + sha256 = "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj"; }; postPatch = '' diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 7a42ff94fc0..37f01372005 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper -, perlPackages, libxml2 }: +, perlPackages, libxml2, libiconv }: stdenv.mkDerivation rec { name = "hivex-${version}"; @@ -15,12 +15,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoreconfHook makeWrapper libxml2 - ] ++ (with perlPackages; [ perl IOStringy ]); + ] + ++ (with perlPackages; [ perl IOStringy ]) + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; postInstall = '' - for bin in $out/bin/*; do - wrapProgram "$bin" --prefix "PATH" : "$out/bin" - done + wrapProgram $out/bin/hivexregedit \ + --set PERL5LIB "$out/${perlPackages.perl.libPrefix}" \ + --prefix "PATH" : "$out/bin" + + wrapProgram $out/bin/hivexml \ + --prefix "PATH" : "$out/bin" ''; meta = with stdenv.lib; { @@ -28,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; homepage = https://github.com/libguestfs/hivex; maintainers = with maintainers; [offline]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index aab64b941ca..f3206700cb8 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The network analysis package"; - homepage = http://igraph.org/; + homepage = https://igraph.org/; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.MostAwesomeDude ]; }; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index c6ead673982..5816f044f57 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { libnova libjpeg gsl ]; meta = { - homepage = http://www.indilib.org/; + homepage = https://www.indilib.org/; license = stdenv.lib.licenses.lgpl2Plus; description = "Implementaion of the INDI protocol for POSIX operating systems"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index 1bc918af835..744419dcd53 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.jflex.de/; + homepage = https://www.jflex.de/; description = "Lexical analyzer generator for Java, written in Java"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 54d33e5f425..e93467fba0a 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://lasso.entrouvert.org/; + homepage = https://lasso.entrouvert.org/; description = "Liberty Alliance Single Sign-On library"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix new file mode 100644 index 00000000000..4ff58843d15 --- /dev/null +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, cmake +}: + +stdenv.mkDerivation rec { + name = "ldacBT-${version}"; + version = "2.0.2.3"; + + src = fetchFromGitHub { + repo = "ldacBT"; + owner = "ehfive"; + rev = "v${version}"; + sha256 = "09dalysx4fgrgpfdm9a51x6slnf4iik1sqba4xjgabpvq91bnb63"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with stdenv.lib; { + description = "AOSP libldac dispatcher"; + homepage = https://github.com/EHfive/ldacBT; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ adisbladis ]; + }; +} diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 3c78b6265bf..50747090011 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, pth, libgpgerror }: +{ fetchurl, stdenv, gettext, pth, libgpgerror, buildPackages }: stdenv.mkDerivation rec { pname = "libassuan"; @@ -12,7 +12,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # libassuan-config - buildInputs = [ libgpgerror pth gettext]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + buildInputs = [ pth gettext ]; + + configureFlags = [ + "--with-libgpg-error-prefix=${libgpgerror.dev}" + ]; doCheck = true; diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index bcfee044475..313cb7f8d5d 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -14,10 +14,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library of Assorted Spiffy Things"; - homepage = http://www.eterm.org; + homepage = https://www.eterm.org; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 8102838113b..59f07202fde 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }: let - version = "3.32.0"; + version = "3.32.1"; pname = "libdazzle"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1mi87c10wa8d9bz2c8lil7gs2m76i51hq7i8ixm839zqrq5xi7ll"; + sha256 = "0wprqgn480r31pcgmpyk9l6cfvlczfcx10fpqaq9pbn3vjgs3393"; }; nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ]; diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index 33d835d6919..b8f62901eed 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://libestr.adiscon.com/; + homepage = https://libestr.adiscon.com/; description = "Some essentials for string handling"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index cab04438dd3..95860ac9420 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -36,7 +36,7 @@ assert postgresSupport -> postgresql != null; meta = with stdenv.lib; { description = "Database access library"; - homepage = http://www.gnome-db.org/; + homepage = https://www.gnome-db.org/; license = [ licenses.lgpl2 licenses.gpl2 ]; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index 012400a49ab..4367cc5b276 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ bindings for libgda"; - homepage = http://www.gnome-db.org/; + homepage = https://www.gnome-db.org/; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 7126d027c7a..b77690bd159 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; meta = { - homepage = http://gtkpod.sourceforge.net/; + homepage = https://gtkpod.sourceforge.net/; description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 5c29a41d856..3300e9b1d68 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.32.0"; + version = "3.32.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04qxm5jgj5fzjb06ghwqx3c2qsc502arrfw0xl9f09wb58wjp6ny"; + sha256 = "1079d26y8d2zaw9w50l9scqjhbrynpdd6kyaa32x4393f7nih8hw"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 4c0119f473c..4fa3addc0a6 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libraw1394 ]; meta = with stdenv.lib; { - homepage = http://www.linux1394.org; + homepage = https://www.linux1394.org; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index f4eafcdaace..83a500c1380 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "libimobiledevice"; - version = "2018-07-24"; + version = "2019-04-04"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "d7a2e04d2e7880c56116fd35489a7f98755501b7"; - sha256 = "0cj0j10lmfr28c7nh79n2mcmy31xx50g93h0bqs0l7y76ph4dqkc"; + rev = "eea4f1be9107c8ab621fd71460e47d0d38e55d71"; + sha256 = "0wh6z5f5znlqs0grh7c8jj1s411azgyy45klmql5kj3p8qqybqrs"; }; outputs = [ "out" "dev" ]; @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index b03ab0e3fab..d77b452e3e9 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-regexp" ]; meta = with stdenv.lib; { - homepage = http://www.liblognorm.com/; + homepage = https://www.liblognorm.com/; description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 15e642832df..d2fba5cddd8 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-fpermissive"/*gcc7*/ ]; meta = with stdenv.lib; { - homepage = http://libmemcached.org; + homepage = https://libmemcached.org; description = "Open source C/C++ client library and tools for the memcached server"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index d1ee30698a0..182d642bc08 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to send/receive data according to the Modbus protocol"; - homepage = http://libmodbus.org/; + homepage = https://libmodbus.org/; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 904206ab79b..d622584c9da 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -5,15 +5,15 @@ let in stdenv.mkDerivation rec { pname = "libplist"; - version = "2019-01-20"; + version = "2019-04-04"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "bec850fe399639f3b8582a39386216970dea15ed"; - sha256 = "197yw8xz8x2xld8b6975scgnl30j4ibm9llmzljyqngs0zsdwnin"; + rev = "42bb64ba966082b440cb68cbdadf317f44710017"; + sha256 = "19yw80yblq29i2jx9yb7bx0lfychy9dncri3fk4as35kq5bf26i8"; }; outputs = ["bin" "dev" "out" "py"]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "A library to handle Apple Property List format in binary or XML"; homepage = https://github.com/libimobiledevice/libplist; license = licenses.lgpl21Plus; - maintainers = [ ]; + maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index cb30a890f40..574fa18ae4e 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://www.five-ten-sg.com/libpst/; + homepage = https://www.five-ten-sg.com/libpst/; description = "A library to read PST (MS Outlook Personal Folders) files"; license = licenses.gpl2; maintainers = [maintainers.tohl]; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 011de93e668..82a71be5210 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls zlib ]; meta = with stdenv.lib; { - homepage = http://www.librelp.com/; + homepage = https://www.librelp.com/; description = "A reliable logging library"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 4192e3c14d3..d9e008af977 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; - version = "2019-01-18"; + version = "2019-03-23"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "c75605d862cd1c312494f6c715246febc26b2e05"; - sha256 = "0467a045k4znmaz61i7a2s7yywj67q830ja6zn7z39k5pqcl2z4p"; + rev = "873252dc8b4e469c7dc692064ac616104fca5f65"; + sha256 = "0qx3q0n1f2ajfm3vnairikayzln6iyb2y0i7sqfl8mj45ahl6wyj"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/libimobiledevice/libusbmuxd; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 12fd972b871..7bd89b44d88 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library of exchange-correlation functionals for density-functional theory"; - homepage = http://octopus-code.org/wiki/Libxc; + homepage = https://octopus-code.org/wiki/Libxc; license = licenses.lgpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index e730cc6eaab..0d034f5385f 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; - homepage = http://xkbcommon.org; + homepage = https://xkbcommon.org; license = licenses.mit; maintainers = with maintainers; [ garbas ttuegel ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix index ed824ec7592..4b06c58af5f 100644 --- a/pkgs/development/libraries/marisa/default.nix +++ b/pkgs/development/libraries/marisa/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "marisa-${version}"; - version = "0.2.4"; + pname = "marisa"; + version = "0.2.5"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/marisa-trie/marisa-${version}.tar.gz"; - sha256 = "1cwzf8hr348zihkiy0qckx0n6rxg7sy113xhbslb1irw1pvs99v7"; + src = fetchFromGitHub { + owner = "s-yata"; + repo = "marisa-trie"; + rev = "v${version}"; + sha256 = "0z4bf55np08q3cbi6gvj3cpw3zp8kf2d0jq6k74pjk066m7rapbb"; }; enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; + meta = with stdenv.lib; { homepage = https://github.com/s-yata/marisa-trie; description = "Static and space-efficient trie data structure library"; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 72743efeb8e..9abdf4bbd85 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.14"; + name = "matio-1.5.15"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "0vhzh0idzlm0m28gxsnv1dcfp0229vdj49d749qn4xfdyncbnfhb"; + sha256 = "1kxi15ph68nnbi0s1m8icb0685wg8ql8gj7wnkdk20kzpf3lbgr1"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 78ae8875fcf..9519e295213 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { control repository. An installation of mm-common is not required for building tarball releases, unless configured to use maintainer-mode. ''; - homepage = http://www.gtkmm.org; + homepage = https://www.gtkmm.org; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index c57353ccbd4..51591c9d8e8 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://motif.ics.com; + homepage = https://motif.ics.com; description = "Unix standard widget-toolkit and window-manager"; platforms = with platforms; linux ++ darwin; license = with licenses; [ lgpl21 ]; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 42c0de4d493..3081c6c839c 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { name = "opencolorio-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "0cjsyn681xsg89lirlll5pqlsqg2vnk1278iiicmzjy2a2v8x7zq"; + sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index c8c66969ef9..cd3210dd08b 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "0x9wfcqd8hq4h349s7j77sr60h8xjdfshqw1m3a2n6z5bdr9qkm1"; + sha256 = "0fqgk8195kz21is09gwzwnrg7fr9526bi9mh4apyskapz27pbhr1"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix index c11098c52ab..00f4f45df96 100644 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -12,10 +12,9 @@ stdenv.mkDerivation rec { meta = { description = "C++ implementation of the OpenTracing API"; - homepage = http://opentracing.io; + homepage = https://opentracing.io; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ rob ]; }; } - diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index 3eb4ddaab69..30b56afb8a9 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A PDF Evolution Library"; license = licenses.gpl3; - homepage = http://apfel.mi.infn.it/; + homepage = https://apfel.mi.infn.it/; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 737a9a5badf..f47d2713f1a 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -2,6 +2,7 @@ , intltool, spidermonkey_52 , gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? stdenv.isLinux, systemd +, withGnome ? true , doCheck ? stdenv.isLinux }: @@ -42,11 +43,12 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ gtk-doc pkgconfig autoreconfHook intltool gobject-introspection perl ] + [ glib gtk-doc pkgconfig intltool perl ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = - [ glib expat pam spidermonkey_52 gobject-introspection ] - ++ stdenv.lib.optional useSystemd systemd; + [ glib expat pam spidermonkey_52 ] + ++ stdenv.lib.optional useSystemd systemd + ++ stdenv.lib.optional withGnome gobject-introspection; NIX_CFLAGS_COMPILE = " -Wno-deprecated-declarations "; # for polkit 0.114 and glib 2.56 @@ -73,7 +75,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS - "--enable-introspection" + (if withGnome then "--enable-introspection" else "--disable-introspection") ] ++ stdenv.lib.optional (!doCheck) "--disable-test"; makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix index 4d53c42a347..c3a815c45ac 100644 --- a/pkgs/development/libraries/protobufc/1.3.nix +++ b/pkgs/development/libraries/protobufc/1.3.nix @@ -5,7 +5,8 @@ callPackage ./generic.nix (args // rec { src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; - rev = "v${version}"; - sha256 = "1dmvs0bhyx94ipaq3c7jmwcz4hwjmznn7310kqkqx7ly0w5vxxxr"; + #rev = "v${version}"; + rev = "9412830d0680150d429d2aa170b8d7218ab49397"; + sha256 = "175cmaj5231iqzhf5a9sxw2y3i165chk3681m1b5mp8di927q5ai"; }; }) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 2f0e39eb5c9..88330712dcd 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }: stdenv.mkDerivation rec { - name = "qtstyleplugin-kvantum-qt4-${version}"; - version = "0.10.4"; + pname = "qtstyleplugin-kvantum-qt4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; - rev = "0527bb03f2252269fd382e11181a34ca72c96b4b"; - sha256 = "0ky44s1fgqxraywagx1mv07yz76ppgiz3prq447db78wkwqg2d8p"; + rev = "V${version}"; + sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 39f7fa91b02..dc11cb56091 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.10.9"; + version = "0.11.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "1zpq6wsl57kfx0jf0rkxf15ic22ihazj03i3kfiqb07vcrs2cka9"; + sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 3e8524b4014..01b0faf89f9 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "High quality system independent, portable, open source libm implementation"; - homepage = http://www.openlibm.org/; + homepage = https://www.openlibm.org/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ttuegel ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 38e96570f27..7089da984a9 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.56.0"; + version = "0.56.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w5p26p7gadvh49g28m2yiihpmhhxlsc7ad1qvgvfnwxdgk51asz"; + sha256 = "0z6w4vrz51bjnvk773j4pnrqfmkvaaa58yc6yi3jwcx90b68xyh2"; }; passthru = { diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix new file mode 100644 index 00000000000..4fd94a29f9c --- /dev/null +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL }: + +stdenv.mkDerivation rec { + pname = "waylandpp"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "NilsBrause"; + repo = pname; + rev = version; + sha256 = "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ pugixml wayland libGL ]; + + meta = with stdenv.lib; { + description = "Wayland C++ binding"; + homepage = https://github.com/NilsBrause/waylandpp/; + license = with licenses; [ bsd2 hpnd ]; + maintainers = with maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/development/mobile/cocoapods/Gemfile b/pkgs/development/mobile/cocoapods/Gemfile index 8308684860e..329b51518e4 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile +++ b/pkgs/development/mobile/cocoapods/Gemfile @@ -1,2 +1,3 @@ -source 'https://rubygems.org' -gem 'cocoapods' +source 'https://rubygems.org' do + gem 'cocoapods' +end diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta b/pkgs/development/mobile/cocoapods/Gemfile-beta new file mode 100644 index 00000000000..dd4b350b437 --- /dev/null +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta @@ -0,0 +1,5 @@ +source 'https://rubygems.org' do + # We need to specify a version including prerelease to pick up prereleases. + # This should pick up all future releases / prereleases. + gem 'cocoapods', '>=1.7.0.beta.1' +end diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock new file mode 100644 index 00000000000..37b8602b4b4 --- /dev/null +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -0,0 +1,76 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.0) + activesupport (4.2.11.1) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + atomos (0.1.3) + claide (1.0.2) + cocoapods (1.7.0.beta.3) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.7.0.beta.3) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.2.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.6.6) + nap (~> 1.0) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.2, < 2.0) + cocoapods-core (1.7.0.beta.3) + activesupport (>= 4.0.2, < 6) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.4) + cocoapods-downloader (1.2.2) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.1.0) + cocoapods-trunk (1.3.1) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.1.0) + colored2 (3.1.2) + concurrent-ruby (1.1.5) + escape (0.0.4) + fourflusher (2.2.0) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + minitest (5.11.3) + molinillo (0.6.6) + nanaimo (0.2.6) + nap (1.1.0) + netrc (0.11.0) + ruby-macho (1.4.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + xcodeproj (1.8.2) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.6) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods (>= 1.7.0.beta.1)! + +BUNDLED WITH + 1.17.2 diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 89ba7cec32f..9145ca18188 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.11) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -32,7 +32,7 @@ GEM activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.3) + cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap @@ -43,7 +43,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) escape (0.0.4) fourflusher (2.2.0) fuzzy_match (2.0.4) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.8.1) + xcodeproj (1.8.2) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -70,7 +70,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods + cocoapods! BUNDLED WITH 1.17.2 diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix index 56624370b14..9a816261b3e 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -1,9 +1,13 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp, ruby +, beta ? false }: -bundlerEnv rec { +bundlerApp rec { inherit ruby; pname = "cocoapods"; - gemdir = ./.; + gemfile = if beta then ./Gemfile-beta else ./Gemfile; + lockfile = if beta then ./Gemfile-beta.lock else ./Gemfile.lock; + gemset = if beta then ./gemset-beta.nix else ./gemset.nix; + exes = [ "pod" ]; meta = with lib; { description = "CocoaPods manages dependencies for your Xcode projects."; @@ -12,6 +16,7 @@ bundlerEnv rec { platforms = platforms.darwin; maintainers = with maintainers; [ peterromfeldhk + lilyball ]; }; } diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix new file mode 100644 index 00000000000..0b207415eb5 --- /dev/null +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -0,0 +1,300 @@ +{ + activesupport = { + dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; + type = "gem"; + }; + version = "4.2.11.1"; + }; + atomos = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx"; + type = "gem"; + }; + version = "0.1.3"; + }; + CFPropertyList = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z"; + type = "gem"; + }; + version = "3.0.0"; + }; + claide = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + type = "gem"; + }; + version = "1.0.2"; + }; + cocoapods = { + dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03xnnj5di75wqsd1c9ca9gfnzc4lqr8k2cx5gca5979b7kxb2x1z"; + type = "gem"; + }; + version = "1.7.0.beta.3"; + }; + cocoapods-core = { + dependencies = ["activesupport" "fuzzy_match" "nap"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wwnjdcwj4nc1cjl9pf0dlh83x2s6x0v491fpcmw3342vbs0v4sq"; + type = "gem"; + }; + version = "1.7.0.beta.3"; + }; + cocoapods-deintegrate = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; + type = "gem"; + }; + version = "1.0.4"; + }; + cocoapods-downloader = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3"; + type = "gem"; + }; + version = "1.2.2"; + }; + cocoapods-plugins = { + dependencies = ["nap"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16na82sfyc8801qs1n22nwq486s4j7yj6rj7fcp8cbxmj371fpbj"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-search = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-stats = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww"; + type = "gem"; + }; + version = "1.1.0"; + }; + cocoapods-trunk = { + dependencies = ["nap" "netrc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl"; + type = "gem"; + }; + version = "1.3.1"; + }; + cocoapods-try = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + type = "gem"; + }; + version = "1.1.0"; + }; + colored2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + type = "gem"; + }; + version = "1.1.5"; + }; + escape = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sa1xkfc9jvkwyw1jbz3jhkq0ms1zrvswi6mmfiwcisg5fp497z4"; + type = "gem"; + }; + version = "0.0.4"; + }; + fourflusher = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3"; + type = "gem"; + }; + version = "2.2.0"; + }; + fuzzy_match = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19gw1ifsgfrv7xdi6n61658vffgm1867f4xdqfswb2b5h6alzpmm"; + type = "gem"; + }; + version = "2.0.4"; + }; + gh_inspector = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04"; + type = "gem"; + }; + version = "1.1.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + type = "gem"; + }; + version = "0.9.5"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + type = "gem"; + }; + version = "5.11.3"; + }; + molinillo = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6"; + type = "gem"; + }; + version = "0.6.6"; + }; + nanaimo = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6"; + type = "gem"; + }; + version = "0.2.6"; + }; + nap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll"; + type = "gem"; + }; + version = "1.1.0"; + }; + netrc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + ruby-macho = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb"; + type = "gem"; + }; + version = "1.4.0"; + }; + thread_safe = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + type = "gem"; + }; + version = "1.2.5"; + }; + xcodeproj = { + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ji3wmpr6xm4172vxh9y6731vm2xrvv7ccwk4ijd5n4if1dakm03"; + type = "gem"; + }; + version = "1.8.2"; + }; +} \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 8cd829d56ab..de6c524633f 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4"; + sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; atomos = { source = { @@ -61,10 +61,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m3hi4va9cr7anxkjf44as14j1hsrvw00bzvz7c906hyb8qcm4fp"; + sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; cocoapods-downloader = { groups = ["default"]; @@ -133,10 +133,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.5"; }; escape = { source = { @@ -254,9 +254,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13z3109lwq632vhazndqjlccpwadljg58sflbyl0m57j9d4blv2y"; + sha256 = "0ji3wmpr6xm4172vxh9y6731vm2xrvv7ccwk4ijd5n4if1dakm03"; type = "gem"; }; - version = "1.8.1"; + version = "1.8.2"; }; } \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update index 8215d1abe4f..53c113046c6 100755 --- a/pkgs/development/mobile/cocoapods/update +++ b/pkgs/development/mobile/cocoapods/update @@ -1,11 +1,10 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p bash ruby bundler bundix +#! nix-shell -i bash -p bash bundix bundler -BUNDIX_CACHE="$(mktemp -d)" +set -e -rm -f Gemfile.lock -bundler package --path "$BUNDIX_CACHE" -bundix --bundle-pack-path="$BUNDIX_CACHE" - -rm -rf "$BUNDIX_CACHE" -rm -rf .bundle +rm -f Gemfile.lock Gemfile-beta.lock +bundler lock +BUNDLE_GEMFILE=Gemfile-beta bundler lock --lockfile=Gemfile-beta.lock +bundix --gemfile=Gemfile --lockfile=Gemfile.lock --gemset=gemset.nix +bundix --gemfile=Gemfile-beta --lockfile=Gemfile-beta.lock --gemset=gemset-beta.nix diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 25fd7dbb425..b68d53f83cc 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -94,4 +94,18 @@ nodePackages // { webtorrent-cli = nodePackages.webtorrent-cli.override { buildInputs = [ nodePackages.node-gyp-build ]; }; + + joplin = nodePackages.joplin.override { + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = with pkgs; [ + # sharp, dep list: + # http://sharp.pixelplumbing.com/en/stable/install/ + cairo expat fontconfig freetype fribidi gettext giflib + glib harfbuzz lcms libcroco libexif libffi libgsf + libjpeg_turbo libpng librsvg libtiff vips + libwebp libxml2 pango pixman zlib + + nodePackages.node-pre-gyp + ]; + }; } diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 54261521a34..1f2db6951d6 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -48,6 +48,7 @@ , "indium" , "jake" , "javascript-typescript-langserver" +, "joplin" , "jsdoc" , "jshint" , "json" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index ea5dd14b8c2..4de3d6b7ec9 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,31 +13,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.13.6" = { + "@angular-devkit/architect-0.13.8" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.13.6"; + version = "0.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.6.tgz"; - sha512 = "Cg9z4lmCvjt5uD00E/0tBRz3ESjYicmqT3NL/BIsNVNb+s1GwCCoPSOIM8Ss4nyGDtrdono1XKSOmkJnlzF3Cw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.8.tgz"; + sha512 = "gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg=="; }; }; - "@angular-devkit/core-7.3.6" = { + "@angular-devkit/core-7.3.8" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "7.3.6"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.6.tgz"; - sha512 = "aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.8.tgz"; + sha512 = "3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg=="; }; }; - "@angular-devkit/schematics-7.3.6" = { + "@angular-devkit/schematics-7.3.8" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "7.3.6"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.6.tgz"; - sha512 = "YXF7QusmMy3D9H0vNczc1n5BkuEHLwt7cW33euNeGNgTIsD0n6DrUhgClurXicnr2GNPSDYE5+3115lmJkhyrg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.8.tgz"; + sha512 = "mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw=="; }; }; "@apollographql/apollo-tools-0.3.5" = { @@ -94,13 +94,13 @@ let sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA=="; }; }; - "@babel/core-7.4.0" = { + "@babel/core-7.4.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.4.0.tgz"; - sha512 = "Dzl7U0/T69DFOTwqz/FJdnOSWS57NpjNfCwMKHABr589Lg8uX1RrlBIJ7L5Dubt/xkLsx0xH5EBFzlBVes1ayA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.4.3.tgz"; + sha512 = "oDpASqKFlbspQfzAE7yaeTmdljSH2ADIvBlb0RwbStltTuWa0+7CCI1fYVINNv9saHPa1W7oaKeuNuKj+RQCvA=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -166,13 +166,13 @@ let sha512 = "SdqDfbVdNQCBp3WhK2mNdDvHd3BD6qbmIc43CAyjnsfCmgHMeqgDcM3BzY2lchi7HBJGJ2CVdynLWbezaE4mmQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.4.0" = { + "@babel/helper-create-class-features-plugin-7.4.3" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.0.tgz"; - sha512 = "2K8NohdOT7P6Vyp23QH4w2IleP8yG3UJsbRKwA4YP6H8fErcLkFuuEEqbF2/BYBKSNci/FWJiqm6R3VhM/QHgw=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.3.tgz"; + sha512 = "UMl3TSpX11PuODYdWGrUeW6zFkdYhDn7wRLrOuNVM6f9L+S9CzmDXYyrp3MTHcwWjnzur1f/Op8A7iYZWya2Yg=="; }; }; "@babel/helper-define-map-7.4.0" = { @@ -238,13 +238,13 @@ let sha512 = "aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A=="; }; }; - "@babel/helper-module-transforms-7.2.2" = { + "@babel/helper-module-transforms-7.4.3" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.2.2"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz"; - sha512 = "YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.3.tgz"; + sha512 = "H88T9IySZW25anu5uqyaC1DaQre7ofM+joZtAaO2F8NBdFfupH0SZ4gKjgSFVcvtx/aAirqA9L9Clio2heYbZA=="; }; }; "@babel/helper-optimise-call-expression-7.0.0" = { @@ -265,13 +265,13 @@ let sha512 = "CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="; }; }; - "@babel/helper-regex-7.0.0" = { + "@babel/helper-regex-7.4.3" = { name = "_at_babel_slash_helper-regex"; packageName = "@babel/helper-regex"; - version = "7.0.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0.tgz"; - sha512 = "TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg=="; + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.3.tgz"; + sha512 = "hnoq5u96pLCfgjXuj8ZLX3QQ+6nAulS+zSgi6HulUwFbEruRAKwbGLU5OvXkE14L8XW6XsQEKsIDfgthKLRAyA=="; }; }; "@babel/helper-remap-async-to-generator-7.1.0" = { @@ -319,13 +319,13 @@ let sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ=="; }; }; - "@babel/helpers-7.4.2" = { + "@babel/helpers-7.4.3" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.4.2"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.2.tgz"; - sha512 = "gQR1eQeroDzFBikhrCccm5Gs2xBjZ57DNjGbqTaHo911IpmSxflOQWMAHPw/TXk8L3isv7s9lYzUkexOeTQUYg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.3.tgz"; + sha512 = "BMh7X0oZqb36CfyhvtbSmcWc3GXocfxv3yNsAEuM0l+fAqSO22rQrUpijr3oE/10jCTrB6/0b9kzmG4VetCj8Q=="; }; }; "@babel/highlight-7.0.0" = { @@ -346,13 +346,13 @@ let sha512 = "tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ=="; }; }; - "@babel/parser-7.4.2" = { + "@babel/parser-7.4.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.4.2"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz"; - sha512 = "9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.4.3.tgz"; + sha512 = "gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -391,13 +391,13 @@ let sha512 = "MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.4.0" = { + "@babel/plugin-proposal-object-rest-spread-7.4.3" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.0.tgz"; - sha512 = "uTNi8pPYyUH2eWHyYWWSYJKwKg34hhgl4/dbejEjL+64OhbHjTX7wEVWMQl82tEmdDsGeu77+s8HHLS627h6OQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.3.tgz"; + sha512 = "xC//6DNSSHVjq8O2ge0dyYlhshsH4T7XdCVoxbi5HzLYWfsC5ooFlJjrXk8RcAT+hjHAK9UjBXdylzSoDK3t4g=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.2.0" = { @@ -508,13 +508,13 @@ let sha512 = "AWyt3k+fBXQqt2qb9r97tn3iBwFpiv9xdAiG+Gr2HpAZpuayvbL55yWrsV3MyHvXk/4vmSiedhDRl1YI2Iy5nQ=="; }; }; - "@babel/plugin-transform-classes-7.4.0" = { + "@babel/plugin-transform-classes-7.4.3" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.0.tgz"; - sha512 = "XGg1Mhbw4LDmrO9rSTNe+uI79tQPdGs0YASlxgweYRLZqo/EQktjaOV4tchL/UZbM0F+/94uOipmdNGoaGOEYg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.3.tgz"; + sha512 = "PUaIKyFUDtG6jF5DUJOfkBdwAS/kFFV3XFk7Nn0a6vR7ZT8jYw5cGtIlat77wcnd0C6ViGqo/wyNf4ZHytF/nQ=="; }; }; "@babel/plugin-transform-computed-properties-7.2.0" = { @@ -526,22 +526,22 @@ let sha512 = "kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA=="; }; }; - "@babel/plugin-transform-destructuring-7.4.0" = { + "@babel/plugin-transform-destructuring-7.4.3" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.0.tgz"; - sha512 = "HySkoatyYTY3ZwLI8GGvkRWCFrjAGXUHur5sMecmCIdIharnlcWWivOqDJI76vvmVZfzwb6G08NREsrY96RhGQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.3.tgz"; + sha512 = "rVTLLZpydDFDyN4qnXdzwoVpk1oaXHIvPEOkOLyr88o7oHxVc/LyrnDx+amuBWGOwUb7D1s/uLsKBNTx08htZg=="; }; }; - "@babel/plugin-transform-dotall-regex-7.2.0" = { + "@babel/plugin-transform-dotall-regex-7.4.3" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.2.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz"; - sha512 = "sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.3.tgz"; + sha512 = "9Arc2I0AGynzXRR/oPdSALv3k0rM38IMFyto7kOCwb5F9sLUt2Ykdo3V9yUPR+Bgr4kb6bVEyLkPEiBhzcTeoA=="; }; }; "@babel/plugin-transform-duplicate-keys-7.2.0" = { @@ -571,22 +571,22 @@ let sha512 = "PmQC9R7DwpBFA+7ATKMyzViz3zCaMNouzZMPZN2K5PnbBbtL3AXFYTkDk+Hey5crQq2A90UG5Uthz0mel+XZrA=="; }; }; - "@babel/plugin-transform-for-of-7.4.0" = { + "@babel/plugin-transform-for-of-7.4.3" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.0.tgz"; - sha512 = "vWdfCEYLlYSxbsKj5lGtzA49K3KANtb8qCPQ1em07txJzsBwY+cKJzBHizj5fl3CCx7vt+WPdgDLTHmydkbQSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.3.tgz"; + sha512 = "UselcZPwVWNSURnqcfpnxtMehrb8wjXYOimlYQPBnup/Zld426YzIhNEvuRsEWVHfESIECGrxoI6L5QqzuLH5Q=="; }; }; - "@babel/plugin-transform-function-name-7.2.0" = { + "@babel/plugin-transform-function-name-7.4.3" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.2.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz"; - sha512 = "kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.3.tgz"; + sha512 = "uT5J/3qI/8vACBR9I1GlAuU/JqBtWdfCrynuOkrWG6nCDieZd5przB1vfP59FRHBZQ9DC2IUfqr/xKqzOD5x0A=="; }; }; "@babel/plugin-transform-literals-7.2.0" = { @@ -598,6 +598,15 @@ let sha512 = "2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg=="; }; }; + "@babel/plugin-transform-member-expression-literals-7.2.0" = { + name = "_at_babel_slash_plugin-transform-member-expression-literals"; + packageName = "@babel/plugin-transform-member-expression-literals"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz"; + sha512 = "HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA=="; + }; + }; "@babel/plugin-transform-modules-amd-7.2.0" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; @@ -616,13 +625,13 @@ let sha512 = "V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.4.0" = { + "@babel/plugin-transform-modules-commonjs-7.4.3" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.0.tgz"; - sha512 = "iWKAooAkipG7g1IY0eah7SumzfnIT3WNhT4uYB2kIsvHnNSB6MDYVa5qyICSwaTBDBY2c4SnJ3JtEa6ltJd6Jw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.3.tgz"; + sha512 = "sMP4JqOTbMJMimqsSZwYWsMjppD+KRyDIUVW91pd7td0dZKAvPmhCaxhOzkzLParKwgQc7bdL9UNv+rpJB0HfA=="; }; }; "@babel/plugin-transform-modules-systemjs-7.4.0" = { @@ -670,13 +679,22 @@ let sha512 = "VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg=="; }; }; - "@babel/plugin-transform-parameters-7.4.0" = { + "@babel/plugin-transform-parameters-7.4.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.0.tgz"; - sha512 = "Xqv6d1X+doyiuCGDoVJFtlZx0onAX0tnc3dY8w71pv/O0dODAbusVv2Ale3cGOwfiyi895ivOBhYa9DhAM8dUA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.3.tgz"; + sha512 = "ULJYC2Vnw96/zdotCZkMGr2QVfKpIT/4/K+xWWY0MbOJyMZuk660BGkr3bEKWQrrciwz6xpmft39nA4BF7hJuA=="; + }; + }; + "@babel/plugin-transform-property-literals-7.2.0" = { + name = "_at_babel_slash_plugin-transform-property-literals"; + packageName = "@babel/plugin-transform-property-literals"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz"; + sha512 = "9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ=="; }; }; "@babel/plugin-transform-react-jsx-7.3.0" = { @@ -688,22 +706,31 @@ let sha512 = "a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg=="; }; }; - "@babel/plugin-transform-regenerator-7.4.0" = { + "@babel/plugin-transform-regenerator-7.4.3" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.4.0"; + version = "7.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.3.tgz"; + sha512 = "kEzotPuOpv6/iSlHroCDydPkKYw7tiJGKlmYp6iJn4a6C/+b2FdttlJsLKYxolYHgotTJ5G5UY5h0qey5ka3+A=="; + }; + }; + "@babel/plugin-transform-reserved-words-7.2.0" = { + name = "_at_babel_slash_plugin-transform-reserved-words"; + packageName = "@babel/plugin-transform-reserved-words"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.0.tgz"; - sha512 = "SZ+CgL4F0wm4npojPU6swo/cK4FcbLgxLd4cWpHaNXY/NJ2dpahODCqBbAwb2rDmVszVb3SSjnk9/vik3AYdBw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz"; + sha512 = "fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw=="; }; }; - "@babel/plugin-transform-runtime-7.4.0" = { + "@babel/plugin-transform-runtime-7.4.3" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.0.tgz"; - sha512 = "1uv2h9wnRj98XX3g0l4q+O3jFM6HfayKup7aIu4pnnlzGz0H+cYckGBC74FZIWJXJSXAmeJ9Yu5Gg2RQpS4hWg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.3.tgz"; + sha512 = "7Q61bU+uEI7bCUFReT1NKn7/X6sDQsZ7wL1sJ9IYMAO7cI+eg6x9re1cEw2fCRMbbTVyoeUKWSV1M6azEfKCfg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.2.0" = { @@ -751,13 +778,13 @@ let sha512 = "2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.2.0" = { + "@babel/plugin-transform-unicode-regex-7.4.3" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.2.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz"; - sha512 = "m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.3.tgz"; + sha512 = "lnSNgkVjL8EMtnE8eSS7t2ku8qvKH3eqNf/IwIfnSPUqzgqYmRwzdsQWv4mNQAN9Nuo6Gz1Y0a4CSmdpu1Pp6g=="; }; }; "@babel/polyfill-7.2.5" = { @@ -778,13 +805,13 @@ let sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA=="; }; }; - "@babel/preset-env-7.4.2" = { + "@babel/preset-env-7.4.3" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.4.2"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.2.tgz"; - sha512 = "OEz6VOZaI9LW08CWVS3d9g/0jZA6YCn1gsKIy/fut7yZCJti5Lm1/Hi+uo/U+ODm7g4I6gULrCP+/+laT8xAsA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.3.tgz"; + sha512 = "FYbZdV12yHdJU5Z70cEg0f6lvtpZ8jFSDakTm7WXeJbLXh4R0ztGEu/SW7G1nJ2ZvKwDhz8YrbA84eYyprmGqw=="; }; }; "@babel/preset-stage-2-7.0.0" = { @@ -814,13 +841,13 @@ let sha512 = "IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g=="; }; }; - "@babel/runtime-7.4.2" = { + "@babel/runtime-7.4.3" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.4.2"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz"; - sha512 = "7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz"; + sha512 = "9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA=="; }; }; "@babel/template-7.2.2" = { @@ -850,13 +877,13 @@ let sha512 = "TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ=="; }; }; - "@babel/traverse-7.4.0" = { + "@babel/traverse-7.4.3" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.4.0"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz"; - sha512 = "/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.3.tgz"; + sha512 = "HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -931,6 +958,15 @@ let sha512 = "9hKVIN2+maygxkngnXDsZXRZqCYDY4pxIRljJqqJ5A+eJZzW3k/NZj5lixEmStjWFjlPlOHGYBytBehpf0l+hA=="; }; }; + "@cronvel/get-pixels-3.3.1" = { + name = "_at_cronvel_slash_get-pixels"; + packageName = "@cronvel/get-pixels"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cronvel/get-pixels/-/get-pixels-3.3.1.tgz"; + sha512 = "jgDb8vGPkpjRDbiYyHTI2Bna4HJysjPNSiERzBnRJjCR/YqC3u0idTae0tmNECsaZLOpAWmlK9wiIwnLGIT9Bg=="; + }; + }; "@cycle/dom-18.3.0" = { name = "_at_cycle_slash_dom"; packageName = "@cycle/dom"; @@ -1597,58 +1633,58 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@node-red/editor-api-0.20.3" = { + "@node-red/editor-api-0.20.5" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "0.20.3"; + version = "0.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.3.tgz"; - sha512 = "FQtWytVp3JrsDz9m7KIUwKh3TFwi+8yuBZ9y5sx7v6vj9LICcaLH5CZALH9SSeWUBLpwJ6ZesKEm2fGVCgty4Q=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.5.tgz"; + sha512 = "UPVrqqoz2LLP1LVF0BZs1sAqQL1z7bYeF3JTx93Jxl6OFKOvH9NDn0DXMVbaxatANdfNu0PZ8E++oW2c5kj59A=="; }; }; - "@node-red/editor-client-0.20.3" = { + "@node-red/editor-client-0.20.5" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "0.20.3"; + version = "0.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.3.tgz"; - sha512 = "5R0A2vqv36fSWkoiU3LMg4Q1Arvvy5iq7nFlowlZlcw3/RJBUdw+EJjd05RRBfnUkgk/Z2ycwus23G9BbIyCAw=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.5.tgz"; + sha512 = "ujuCM1FdkL3bUOsiQJyLs7MGyjKFcy8F7fFMfev8P+JEa558WeGr/Va0paexMe6h7YEu3zq8r7U/EK/lgIXHZA=="; }; }; - "@node-red/nodes-0.20.3" = { + "@node-red/nodes-0.20.5" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "0.20.3"; + version = "0.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.3.tgz"; - sha512 = "ZqFQPPn2lMxhELuzftm7K7YJ7NOm83iFWNe9IV89B0+8eRxcLjNHKLFp4SN/CzDvN/EM/vNadpUC8wNLtSLVcA=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.5.tgz"; + sha512 = "aAf0rBsfkOi113J/7w2YxAt0jtq0Qg4AsIU2M3ggO1h+JUkZkKvmvxhZTKkBF5j/EGuLb00++n0z/cMkERfLPA=="; }; }; - "@node-red/registry-0.20.3" = { + "@node-red/registry-0.20.5" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "0.20.3"; + version = "0.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.3.tgz"; - sha512 = "KiQ39lxNJEHz3tce0c/ipe1HsKtU49u4xte+cjCqne0GECwEeMWie+L+WYL1dK05LoURxm0TFFnNCWRHmqq+Gg=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.5.tgz"; + sha512 = "OlyO6MZWlQmEVTSewgPOrdKOnkwBKnUSNeJ9eg/0AZirL9PG2Q+7/8ViwW2qWvNqt5TqImmg3kmnOZ1zteaB4g=="; }; }; - "@node-red/runtime-0.20.3" = { + "@node-red/runtime-0.20.5" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "0.20.3"; + version = "0.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.3.tgz"; - sha512 = "eIVf5VonAHGf9MI4XBdRlNUIbgy4WJsHZWjEYYZ5AdqV5+mv9R4nXoeZLWHHWcHXmoQrWuW+1EEITss9z90W4w=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.5.tgz"; + sha512 = "pUMRfeO8K1fDFYagAZfE4jzdnQqJdjYl4efKOP9CblLE3VFKn58xs+r1TsdaXZoUkuspllGNEkTXtOqqJw9bzw=="; }; }; - "@node-red/util-0.20.3" = { + "@node-red/util-0.20.5" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "0.20.3"; + version = "0.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.3.tgz"; - sha512 = "dvUkwhf9jXp8ME9cRWsgeN7IOKa678BtKBmWvSZEbCfyhrLZ6ng3EncaPvwNYIdW2YU2hX03z6tWt7PsYxuG0A=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.5.tgz"; + sha512 = "oTRVjGWBs4K1n26CrRs4ts9MBzrdqr04yVZ4Z5Cg/NOynK+Had+nPDFZyD575U0Yaj6H3IVickDvG2FBw+tlxw=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -1687,13 +1723,13 @@ let sha512 = "lxVlYYvwGbKSHXfbPk5vxEA8w4zHOH1wobado4a9EfsyD3Cbhuhus1w0Ye9Ro0eMubGO8kNy5d+xNFisM3Tvaw=="; }; }; - "@octokit/rest-16.20.0" = { + "@octokit/rest-16.23.2" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.20.0"; + version = "16.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.20.0.tgz"; - sha512 = "tN5j64P6QymlMzKo94DG1LRNHCwMnLg5poZlVhsCfkHhEWKpofZ1qBDr2/0w6qDLav4EA1XXMmZdNpvGhc9BDQ=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.23.2.tgz"; + sha512 = "ZxiZMaCuqBG/IsbgNRVfGwYsvBb5DjHuMGjJgOrinT+/b+1j1U7PiGyRkHDJdjTGA6N/PsMC2lP2ZybX9579iA=="; }; }; "@parcel/fs-1.11.0" = { @@ -1831,22 +1867,22 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@schematics/angular-7.3.6" = { + "@schematics/angular-7.3.8" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "7.3.6"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.6.tgz"; - sha512 = "Q4VXAjVaCDb2zXFXoIdOfNPsn+EQjqDBHK4a97omytnSNAmu1erl3l2FkEMi6x/VuzK2mQSzBbmHJIgauMmOAA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.8.tgz"; + sha512 = "7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ=="; }; }; - "@schematics/update-0.13.6" = { + "@schematics/update-0.13.8" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.13.6"; + version = "0.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.6.tgz"; - sha512 = "TkeigdQTHG40ZGj4CAAzQHh7/rSotg0J6nkBBtc4Y+9md7IGg6dzSFJAvYbDX5JZ9tk7DpukdRHOVVopS/J0AQ=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.8.tgz"; + sha512 = "2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -1867,13 +1903,13 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; - "@snyk/dep-graph-1.4.0" = { + "@snyk/dep-graph-1.4.1" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.4.0.tgz"; - sha512 = "dz4Fo4L9sN0Rt8hMe+zMYZ4mAiljtyIeWvujLyCxhIT5iHSlceUYlba5TDsOFuKyuZKkuhVjORWY1oFEuRzCcA=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.4.1.tgz"; + sha512 = "7L096NNuNggcSjyOlITaU17n0dz0J4K4WpIHvatP4K0kIbhxolil1QbJF/+xKMRpW6OuaXILiP0hp7szhkEIzQ=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -2119,22 +2155,22 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-10.14.1" = { + "@types/node-10.14.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.14.1"; + version = "10.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.14.1.tgz"; - sha512 = "Rymt08vh1GaW4vYB6QP61/5m/CFLGnFZP++bJpWbiNxceNa6RBipDmb413jvtSf/R1gg5a/jQVl2jY4XVRscEA=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz"; + sha512 = "DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg=="; }; }; - "@types/node-11.11.4" = { + "@types/node-11.13.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.11.4"; + version = "11.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.11.4.tgz"; - sha512 = "02tIL+QIi/RW4E5xILdoAMjeJ9kYq5t5S2vciUdFPXv/ikFTb0zK8q9vXkg4+WAJuYXGiVT1H28AkD2C+IkXVw=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.13.0.tgz"; + sha512 = "rx29MMkRdVmzunmiA4lzBYJNnXsW/PhG4kMBy2ATsYaDjGGR75dCFEVVROKpNwlVdcUX3xxlghKQOeDPBJobng=="; }; }; "@types/node-6.14.4" = { @@ -2146,13 +2182,13 @@ let sha512 = "UqB7h2dVJr/KdZXRMJIhNUWT0HXVe9UNvfLCOsqiSGKAVaAp0QniYHlU9yegxyG6Ug2rc7VdAD4hYj3VghqvAw=="; }; }; - "@types/node-8.10.44" = { + "@types/node-8.10.45" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.44"; + version = "8.10.45"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.44.tgz"; - sha512 = "HY3SK7egERHGUfY8p6ztXIEQWcIPHouYhCGcLAPQin7gE2G/fALFz+epnMwcxKUS6aKqTVoAFdi+t1llQd3xcw=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz"; + sha512 = "tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ=="; }; }; "@types/q-1.5.2" = { @@ -2218,31 +2254,31 @@ let sha512 = "hCB7UbKeeC41w2Q8+Q7jmw3gHdq+ltRqp80S3uDRRGxwiOhxrSmdBHMzKUjh01L8bXOBRgvLey+BERi1Nj9n6Q=="; }; }; - "@vue/cli-ui-3.5.1" = { + "@vue/cli-ui-3.5.5" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.5.1"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.5.1.tgz"; - sha512 = "/yobVdHcQ8/t13YmDmJylrlHXiItl5PLkm2AYc4HrSSbl/jAc/ws3vr3oVqwtLGem2o54nF99sBhxK0L7uhOrw=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.5.5.tgz"; + sha512 = "Bh2rnvhoaL4iWkzdfGXcUZnsldubRKkaMgn4cgjm+rXjHh37Ww2KPw83JijVk+6qsZbJPoBLcXED0mWWLojhvg=="; }; }; - "@vue/cli-ui-addon-webpack-3.5.1" = { + "@vue/cli-ui-addon-webpack-3.5.5" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.5.1"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.5.1.tgz"; - sha512 = "PaS6m6ipAJefjwngx3WVJ1B4ZxOH4yAGxbQzJcweG98CUppAzBQVvXWQNjqlMDaizMjIUdmpfWhmr5Z6dQ8tJg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.5.5.tgz"; + sha512 = "JmEJwOQkQYRgdEBLgIkHHE+UUkzO5+5QtDHXW9TlL2LUstLvJdK1bmhikT/zQFr7v9j5mMhre8xYl5rh6A/5kQ=="; }; }; - "@vue/cli-ui-addon-widgets-3.5.1" = { + "@vue/cli-ui-addon-widgets-3.5.5" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.5.1"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.5.1.tgz"; - sha512 = "wGKDhmqvknLvQWdNHJEDPD5nRsaC7XspNiCkOXZg7Qm+uutFcu0I83ChKnvYRijhp4Mpmv0o5G50P7UKutM+AQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.5.5.tgz"; + sha512 = "64L5r01j4i2xi7b8YZctWF6C/aFrwaJpp0iTlF/nFbPErueHbJTcNYk3zTw8xRWJzBoCRq21np94E5MxNWfaZA=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -3127,15 +3163,6 @@ let sha512 = "0mAYXMSauA8RZ7r+B4+EAOYcZEcO9OK5EiQCR7W7Cv4E44pJj56ZnkKLJ9/PAcOc0dT+LlV9fdDcq2TxVJfOYw=="; }; }; - "aliasify-2.1.0" = { - name = "aliasify"; - packageName = "aliasify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aliasify/-/aliasify-2.1.0.tgz"; - sha1 = "7c30825b9450b9e6185ba27533eaf6e2067d4b42"; - }; - }; "align-text-0.1.4" = { name = "align-text"; packageName = "align-text"; @@ -3145,13 +3172,13 @@ let sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; }; }; - "aligned-block-file-1.1.5" = { + "aligned-block-file-1.2.0" = { name = "aligned-block-file"; packageName = "aligned-block-file"; - version = "1.1.5"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.1.5.tgz"; - sha512 = "is4MUrvNeD1NT6hs44n1GcHqTlm27oZJkgcrAeNytiGMKS/J2l72wtlLezdBzyQq7M6COZoBQR+P6lpaPyI12A=="; + url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.2.0.tgz"; + sha512 = "kBF1xv3mlGBuMxJ/5IrbQD43q7Pi3yyM5IedXxuTbbc6QV3vEnZK18fH9MadoA5LvIKkgCVWRPEMlHemfz5tMg=="; }; }; "almond-0.3.3" = { @@ -3244,6 +3271,15 @@ let sha512 = "XnTdFDQzbEewrDx8epWXdw7oqHMvv315vEtfqDiEhhWghIf4++h26c3/FMz7iTLhNrnj56DNIXpbxHZq+3s6qw=="; }; }; + "ansi-escape-sequences-4.1.0" = { + name = "ansi-escape-sequences"; + packageName = "ansi-escape-sequences"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-4.1.0.tgz"; + sha512 = "dzW9kHxH011uBsidTXd14JXgzye/YLb2LzeKZ4bsgl/Knwx8AtbSFkkGxagdNOoh0DlqHCmfiEjWKBaqjOanVw=="; + }; + }; "ansi-escapes-1.4.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -3262,6 +3298,15 @@ let sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; + "ansi-escapes-4.1.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.1.0.tgz"; + sha512 = "2VY/iCUZTDLD/qxptS3Zn3c6k2MeIbYqjRXqM8T5oC7N2mMjh3xIU3oYru6cHGbldFa9h5i8N0fP65UaUqrMWA=="; + }; + }; "ansi-gray-0.1.1" = { name = "ansi-gray"; packageName = "ansi-gray"; @@ -3757,6 +3802,15 @@ let sha512 = "RRj/vu8WhmMM71G9BxMLRvcwpr1QUJZ9NXURGGo1v3fPiauzkQfNi31kM7irRNqR87NV+lJ/qI62iTzcAc+V0Q=="; }; }; + "app-module-path-2.2.0" = { + name = "app-module-path"; + packageName = "app-module-path"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz"; + sha1 = "641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5"; + }; + }; "append-0.1.1" = { name = "append"; packageName = "append"; @@ -4018,6 +4072,24 @@ let sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; }; + "array-back-2.0.0" = { + name = "array-back"; + packageName = "array-back"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz"; + sha512 = "eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw=="; + }; + }; + "array-back-3.1.0" = { + name = "array-back"; + packageName = "array-back"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz"; + sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; + }; + }; "array-differ-1.0.0" = { name = "array-differ"; packageName = "array-differ"; @@ -4378,13 +4450,13 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-types-0.12.2" = { + "ast-types-0.12.3" = { name = "ast-types"; packageName = "ast-types"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.12.2.tgz"; - sha512 = "8c83xDLJM/dLDyXNLiR6afRRm4dPKN6KAnKqytRK3DBJul9lA+atxdQkNDkSVPdTqea5HiRq3lnnOIZ0MBpvdg=="; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.12.3.tgz"; + sha512 = "wJUcAfrdW+IgDoMGNz5MmcvahKgB7BwIbLupdKVVHxHNYt+HVR2k35swdYNv9aZpF8nvlkjbnkp2rrNwxGckZA=="; }; }; "ast-types-0.9.6" = { @@ -4531,6 +4603,15 @@ let sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; }; }; + "async-mutex-0.1.3" = { + name = "async-mutex"; + packageName = "async-mutex"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.1.3.tgz"; + sha1 = "0aad2112369795ab3f17e33744556d2ecf547566"; + }; + }; "async-retry-1.2.3" = { name = "async-retry"; packageName = "async-retry"; @@ -4594,6 +4675,15 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; + "atob-lite-2.0.0" = { + name = "atob-lite"; + packageName = "atob-lite"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz"; + sha1 = "0fef5ad46f1bd7a8502c65727f0367d5ee43d696"; + }; + }; "atomic-batcher-1.0.2" = { name = "atomic-batcher"; packageName = "atomic-batcher"; @@ -4612,6 +4702,15 @@ let sha512 = "TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ=="; }; }; + "atomic-file-2.0.0" = { + name = "atomic-file"; + packageName = "atomic-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/atomic-file/-/atomic-file-2.0.0.tgz"; + sha512 = "8acsmdYLYCzawXHRV+ryvRppE6dkkPrSywy6wiCzjp2T0wX4rzxw1tJbPgUgZPdi3OQ3AMvvZ3Anrnq6bERvLg=="; + }; + }; "attach-ware-1.1.1" = { name = "attach-ware"; packageName = "attach-ware"; @@ -4648,13 +4747,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.425.0" = { + "aws-sdk-2.437.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.425.0"; + version = "2.437.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.425.0.tgz"; - sha512 = "SM2qZJPlZUKVzSSqNuCvONOhJ2kcFvU+hAwutjQeje2VKpSAbUbFCFWl6cki2FjiyGZYEPfl0Q+3ANJO8gx9BA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.437.0.tgz"; + sha512 = "sDZb5QBOO6FOMvuKDEdO16YQRk0WUhnQd38EaSt0yUCi4Gev8uypODyYONgODZcXe8Cr1GMwC8scUKr00S/I5w=="; }; }; "aws-sign2-0.6.0" = { @@ -5287,6 +5386,15 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; + "base-64-0.1.0" = { + name = "base-64"; + packageName = "base-64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz"; + sha1 = "780a99c84e7d600260361511c4877613bf24f6bb"; + }; + }; "base62-0.1.1" = { name = "base62"; packageName = "base62"; @@ -5323,24 +5431,6 @@ let sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "base64-js-1.1.2" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; - sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; - }; - }; - "base64-js-1.2.0" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; - sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; - }; - }; "base64-js-1.2.3" = { name = "base64-js"; packageName = "base64-js"; @@ -5368,13 +5458,13 @@ let sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; }; }; - "base64-url-2.2.0" = { + "base64-url-2.2.1" = { name = "base64-url"; packageName = "base64-url"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-2.2.0.tgz"; - sha512 = "Y4qHHAE+rWjmAFPQmHPiiD+hWwM/XvuFLlP6kVxlwZJK7rjiE2uIQR9tZ37iEr1E6iCj9799yxMAmiXzITb3lQ=="; + url = "https://registry.npmjs.org/base64-url/-/base64-url-2.2.1.tgz"; + sha512 = "RWaW1M7+pLUikK1bnGyiDe1oY2BKOtbS30Ua1pSAH41st59qDxi/XiggjVhHVPIejXY1eqJ21W3uxHtZpM6KQw=="; }; }; "base64id-0.1.0" = { @@ -5449,13 +5539,13 @@ let sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; }; }; - "bcrypt-2.0.1" = { + "bcrypt-3.0.5" = { name = "bcrypt"; packageName = "bcrypt"; - version = "2.0.1"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-2.0.1.tgz"; - sha512 = "DwB7WgJPdskbR+9Y3OTJtwRq09Lmm7Na6b+4ewvXjkD0nfNRi1OozxljHm5ETlDCBq9DTy04lQz+rj+T2ztIJg=="; + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.5.tgz"; + sha512 = "m4o91nB+Ce8696Ao4R3B/WtVWTc1Lszgd098/OIjU9D/URmdYwT3ooBs9uv1b97J5YhZweTq9lldPefTYZ0TwA=="; }; }; "bcrypt-nodejs-0.0.3" = { @@ -5566,13 +5656,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.42" = { + "big-integer-1.6.43" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.42"; + version = "1.6.43"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.42.tgz"; - sha512 = "3UQFKcRMx+5Z+IK5vYTMYK2jzLRJkt+XqyDdacgWgtMjjuifKpKTFneJLEgeBElOE2/lXZ1LcMcb5s8pwG2U8Q=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.43.tgz"; + sha512 = "9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg=="; }; }; "big.js-5.2.2" = { @@ -5620,13 +5710,13 @@ let sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; }; }; - "binary-extensions-1.13.0" = { + "binary-extensions-1.13.1" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz"; - sha512 = "EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; "binary-search-1.3.5" = { @@ -5899,13 +5989,13 @@ let sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; }; }; - "bluebird-3.5.3" = { + "bluebird-3.5.4" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz"; - sha512 = "/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz"; + sha512 = "FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="; }; }; "blueimp-md5-2.10.0" = { @@ -6079,15 +6169,6 @@ let sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e"; }; }; - "bplist-creator-0.0.7" = { - name = "bplist-creator"; - packageName = "bplist-creator"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; - sha1 = "37df1536092824b87c42f957b01344117372ae45"; - }; - }; "bplist-parser-0.1.1" = { name = "bplist-parser"; packageName = "bplist-parser"; @@ -6214,15 +6295,6 @@ let sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; }; - "browserify-14.4.0" = { - name = "browserify"; - packageName = "browserify"; - version = "14.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz"; - sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9"; - }; - }; "browserify-aes-1.2.0" = { name = "browserify-aes"; packageName = "browserify-aes"; @@ -6295,15 +6367,6 @@ let sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; }; }; - "browserify-transform-tools-1.7.0" = { - name = "browserify-transform-tools"; - packageName = "browserify-transform-tools"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-transform-tools/-/browserify-transform-tools-1.7.0.tgz"; - sha1 = "83e277221f63259bed2e7eb2a283a970a501f4c4"; - }; - }; "browserify-zlib-0.1.4" = { name = "browserify-zlib"; packageName = "browserify-zlib"; @@ -6322,13 +6385,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.5.2" = { + "browserslist-4.5.4" = { name = "browserslist"; packageName = "browserslist"; - version = "4.5.2"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.5.2.tgz"; - sha512 = "zmJVLiKLrzko0iszd/V4SsjTaomFeoVzQGYYOYgRgsbh7WNh95RgDB0CmBdFWYs/3MyFSt69NypjL/h3iaddKQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.5.4.tgz"; + sha512 = "rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag=="; }; }; "bser-2.0.0" = { @@ -6610,13 +6673,13 @@ let sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; }; }; - "busboy-0.3.0" = { + "busboy-0.3.1" = { name = "busboy"; packageName = "busboy"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-0.3.0.tgz"; - sha512 = "e+kzZRAbbvJPLjQz2z+zAyr78BSi9IFeBTyLwF76g78Q2zRt/RZ1NtS3MS17v2yLqYfLz69zHdC+1L4ja8PwqQ=="; + url = "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz"; + sha512 = "y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw=="; }; }; "byline-5.0.0" = { @@ -6853,13 +6916,13 @@ let sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; }; }; - "callsites-3.0.0" = { + "callsites-3.1.0" = { name = "callsites"; packageName = "callsites"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz"; - sha512 = "tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw=="; + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; }; "camel-case-3.0.0" = { @@ -6907,13 +6970,13 @@ let sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; }; }; - "camelcase-5.2.0" = { + "camelcase-5.3.1" = { name = "camelcase"; packageName = "camelcase"; - version = "5.2.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz"; - sha512 = "IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; "camelcase-keys-2.1.0" = { @@ -6943,13 +7006,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30000951" = { + "caniuse-lite-1.0.30000957" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000951"; + version = "1.0.30000957"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000951.tgz"; - sha512 = "eRhP+nQ6YUkIcNQ6hnvdhMkdc7n3zadog0KXNRxAZTT2kHjUb1yGn71OrPhSn8MOvlX97g5CR97kGVj8fMsXWg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz"; + sha512 = "8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ=="; }; }; "capture-exit-2.0.0" = { @@ -7267,13 +7330,13 @@ let sha512 = "pmmkpIQRcnDA7EawKcg9+ncSZNTYfXqDx+K3oqqYvpZlqVBChjTomTfw+hePnkqYR3Y013818c0R1Q5P/7PGrQ=="; }; }; - "chloride-2.2.12" = { + "chloride-2.2.14" = { name = "chloride"; packageName = "chloride"; - version = "2.2.12"; + version = "2.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/chloride/-/chloride-2.2.12.tgz"; - sha512 = "NNi7PsCL8gKKr3b2Lrg5WbMi76yqZBq01FyT2chj0ISE3UXjr1YezLkiJi2Lw9WFc5CeJteYsJY6hbh38KbUDQ=="; + url = "https://registry.npmjs.org/chloride/-/chloride-2.2.14.tgz"; + sha512 = "Jp3kpDIO4MlcJCFi4jER9P7k3sAVvIwbe4QJtM9Nkp43e/GQ/98HU1wJS6NdU6cbzfGrKWmMdRB+VNRrCynzfw=="; }; }; "chloride-test-1.2.4" = { @@ -7321,6 +7384,15 @@ let sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg=="; }; }; + "chokidar-2.1.5" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz"; + sha512 = "i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A=="; + }; + }; "chownr-0.0.2" = { name = "chownr"; packageName = "chownr"; @@ -7555,13 +7627,13 @@ let sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg=="; }; }; - "cli-spinners-2.0.0" = { + "cli-spinners-2.1.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.0.0.tgz"; - sha512 = "yiEBmhaKPPeBj7wWm4GEdtPZK940p9pl3EANIrnJ3JnvWyrPjcFcsEq6qRUuQ7fzB0+Y82ld3p6B34xo95foWw=="; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.1.0.tgz"; + sha512 = "8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA=="; }; }; "cli-table-0.3.1" = { @@ -7654,6 +7726,15 @@ let sha512 = "2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA=="; }; }; + "cliss-0.0.2" = { + name = "cliss"; + packageName = "cliss"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cliss/-/cliss-0.0.2.tgz"; + sha512 = "6rj9pgdukjT994Md13JCUAgTk91abAKrygL9sAvmHY4F6AKMOV8ccGaxhUUfcBuyg3sundWnn3JE0Mc9W6ZYqw=="; + }; + }; "cliui-2.1.0" = { name = "cliui"; packageName = "cliui"; @@ -8194,6 +8275,15 @@ let sha512 = "PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw=="; }; }; + "command-line-usage-4.1.0" = { + name = "command-line-usage"; + packageName = "command-line-usage"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.1.0.tgz"; + sha512 = "MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g=="; + }; + }; "commander-0.6.1" = { name = "commander"; packageName = "commander"; @@ -8266,6 +8356,15 @@ let sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; }; }; + "commander-2.20.0" = { + name = "commander"; + packageName = "commander"; + version = "2.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"; + sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; + }; + }; "commander-2.3.0" = { name = "commander"; packageName = "commander"; @@ -8365,6 +8464,15 @@ let sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648"; }; }; + "compare-version-0.1.2" = { + name = "compare-version"; + packageName = "compare-version"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz"; + sha1 = "0162ec2d9351f5ddd59a9202cba935366a725080"; + }; + }; "component-bind-1.0.0" = { name = "component-bind"; packageName = "component-bind"; @@ -8500,22 +8608,22 @@ let sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; - "configstore-1.4.0" = { + "configstore-3.1.2" = { name = "configstore"; packageName = "configstore"; - version = "1.4.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz"; - sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021"; + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; + sha512 = "vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw=="; }; }; - "configstore-3.1.2" = { + "configstore-4.0.0" = { name = "configstore"; packageName = "configstore"; - version = "3.1.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; - sha512 = "vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw=="; + url = "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz"; + sha512 = "CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ=="; }; }; "connect-1.9.2" = { @@ -9004,76 +9112,58 @@ let sha512 = "7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A=="; }; }; - "cordova-app-hello-world-3.12.0" = { + "cordova-app-hello-world-4.0.0" = { name = "cordova-app-hello-world"; packageName = "cordova-app-hello-world"; - version = "3.12.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.12.0.tgz"; - sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; + url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-4.0.0.tgz"; + sha512 = "hTNYHUJT5YyMa1cQQE1naGyU6Eh5D5Jl33sMnCh3+q15ZwWTL/TOy3k8+mUvjTp8bwhO5eECGKULYoVO+fp9ZA=="; }; }; - "cordova-common-2.2.5" = { + "cordova-common-3.1.0" = { name = "cordova-common"; packageName = "cordova-common"; - version = "2.2.5"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.5.tgz"; - sha1 = "f93cef2ad494cfcbf56c46e3d612aaa9cb5fcc32"; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-3.1.0.tgz"; + sha512 = "J2MM1ioyLlBYdwdXH40OZL4hN7XEBOfurddKYifF4aTkb2PkbeM+KVORt53eyU+8ScA0QmRLuTG0EM55eLms0A=="; }; }; - "cordova-create-1.1.2" = { + "cordova-create-2.0.0" = { name = "cordova-create"; packageName = "cordova-create"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.2.tgz"; - sha1 = "83b09271b378d1c03bc7d9a786fedd60485c3ccf"; + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-2.0.0.tgz"; + sha512 = "72CaGg/7x+tiZlzeXKQXLTc8Jh4tbwLdu4Ib97kJ6+R3bcew/Yv/l2cVA2E0CaCuOCtouTqwi+YLcA2I4dPFTQ=="; }; }; - "cordova-fetch-1.3.1" = { + "cordova-fetch-2.0.1" = { name = "cordova-fetch"; packageName = "cordova-fetch"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.1.tgz"; - sha512 = "/0PNQUPxHvVcjlzVQcydD5BQtfx1XdCfzQ2KigdtZma5oVVUtR4IxfnYB15RuT/GVb/SGRLvR5AIi2Gd5Gb+mg=="; - }; - }; - "cordova-js-4.2.4" = { - name = "cordova-js"; - packageName = "cordova-js"; - version = "4.2.4"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.4.tgz"; - sha512 = "Qy0O3w/gwbIqIJzlyCy60nPwJlF1c74ELpsfDIGXB92/uST5nQSSUDVDP4UOfb/c6OU7yPqxhCWOGROyTYKPDw=="; + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-2.0.1.tgz"; + sha512 = "q21PeobERzE3Drli5htcl5X9Mtfvodih5VkqIwdRUsjDBCPv+I6ZonRjYGbNnXhYrYx7dm0m0j/7/Smf6Av3hg=="; }; }; - "cordova-lib-8.1.1" = { + "cordova-lib-9.0.1" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "8.1.1"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.1.1.tgz"; - sha512 = "PcrlEGRGubV2c9ThcSwoVtN/1hKQ0qtwRopl4188rD10gjtt8K+NSKrnRqh6Ia5PouVUUOZBrlhBxDd5BRbfeg=="; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-9.0.1.tgz"; + sha512 = "P9nQhq91gLOyKZkamvKNzzK89gLDpq8rKue/Vu7NUSgNzhPkiWW0w+6VRTbj/9QGVM9w2uDVhB9c9f6rrTXzCw=="; }; }; - "cordova-registry-mapper-1.1.15" = { - name = "cordova-registry-mapper"; - packageName = "cordova-registry-mapper"; - version = "1.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz"; - sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; - }; - }; - "cordova-serve-2.0.1" = { + "cordova-serve-3.0.0" = { name = "cordova-serve"; packageName = "cordova-serve"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.1.tgz"; - sha512 = "3Xl1D5eyiQlY5ow6Kn/say0us2TqSw/zgQmyTLxbewTngQZ1CIqxmqD7EFGoCNBrB4HsdPmpiSpFCitybKQN9g=="; + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-3.0.0.tgz"; + sha512 = "h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w=="; }; }; "core-js-2.5.7" = { @@ -9094,40 +9184,40 @@ let sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="; }; }; - "core-js-3.0.0" = { + "core-js-3.0.0-beta.13" = { name = "core-js"; packageName = "core-js"; - version = "3.0.0"; + version = "3.0.0-beta.13"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz"; - sha512 = "WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.13.tgz"; + sha512 = "16Q43c/3LT9NyePUJKL8nRIQgYWjcBhjJSMWg96PVSxoS0PeE0NHitPI3opBrs9MGGHjte1KoEVr9W63YKlTXQ=="; }; }; - "core-js-3.0.0-beta.13" = { + "core-js-3.0.1" = { name = "core-js"; packageName = "core-js"; - version = "3.0.0-beta.13"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.13.tgz"; - sha512 = "16Q43c/3LT9NyePUJKL8nRIQgYWjcBhjJSMWg96PVSxoS0PeE0NHitPI3opBrs9MGGHjte1KoEVr9W63YKlTXQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.0.1.tgz"; + sha512 = "sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew=="; }; }; - "core-js-compat-3.0.0" = { + "core-js-compat-3.0.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.0.0.tgz"; - sha512 = "W/Ppz34uUme3LmXWjMgFlYyGnbo1hd9JvA0LNQ4EmieqVjg2GPYbj3H6tcdP2QGPGWdRKUqZVbVKLNIFVs/HiA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.0.1.tgz"; + sha512 = "2pC3e+Ht/1/gD7Sim/sqzvRplMiRnFQVlPpDVaHtY9l7zZP7knamr3VRD6NyGfHd84MrDC0tAM9ulNxYMW0T3g=="; }; }; - "core-js-pure-3.0.0" = { + "core-js-pure-3.0.1" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.0.0.tgz"; - sha512 = "yPiS3fQd842RZDgo/TAKGgS0f3p2nxssF1H65DIZvZv0Od5CygP8puHXn3IQiM/39VAvgCbdaMQpresrbGgt9g=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.0.1.tgz"; + sha512 = "mSxeQ6IghKW3MoyF4cz19GJ1cMm7761ON+WObSyLfTu/Jn3x7w4NwNFnrZxgl4MTSvYYepVLNuRtlB4loMwJ5g=="; }; }; "core-util-is-1.0.2" = { @@ -9184,13 +9274,13 @@ let sha512 = "6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ=="; }; }; - "cosmiconfig-5.1.0" = { + "cosmiconfig-5.2.0" = { name = "cosmiconfig"; packageName = "cosmiconfig"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.1.0.tgz"; - sha512 = "kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q=="; + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.0.tgz"; + sha512 = "nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g=="; }; }; "couch-login-0.1.20" = { @@ -9211,22 +9301,22 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; - "cp-file-6.1.0" = { + "cp-file-6.2.0" = { name = "cp-file"; packageName = "cp-file"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cp-file/-/cp-file-6.1.0.tgz"; - sha512 = "an34I0lJwKncRKjxe3uGWUuiIIVYsHHjBGKld3OQB56hfoPCYom31VysvfuysKqHLbz6drnqP5YrCfLw17I2kw=="; + url = "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz"; + sha512 = "fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA=="; }; }; - "cpy-7.1.0" = { + "cpy-7.2.0" = { name = "cpy"; packageName = "cpy"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy/-/cpy-7.1.0.tgz"; - sha512 = "HT6xnKeHwACUObD3LEFAsjeQ9IUVhC1Pn6Qbk0q6CEWy0WG061khT3ZxQU6IuMXPEEyb+vvluyUOyTdl+9EPWQ=="; + url = "https://registry.npmjs.org/cpy/-/cpy-7.2.0.tgz"; + sha512 = "CUYi9WYd7vdtEcq1NKqiS/yY2WdaDCNOBA/AoTQHVJzlpJMqctB8py9JrHgGIft6TgO5m8ZidI4l1ZD+RMr/wA=="; }; }; "crc-0.2.0" = { @@ -9328,13 +9418,13 @@ let sha512 = "KMd0KuvwVUg1grlRd5skG9ZkSbBYDDkAjDUMLnvxdRn0rL7ph3IwoOk7I8u1yLX4HYjGiLVlWYO55YWNNPjJFA=="; }; }; - "creato-1.0.4" = { + "creato-1.0.5" = { name = "creato"; packageName = "creato"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/creato/-/creato-1.0.4.tgz"; - sha512 = "JwtxKvu+1zbzZoV6SPCRagkU3v5wylfvfsG/KCf6TUE0gjCE8V/Ft447WyV1JPTont080EVvz07k6qov0GDY1w=="; + url = "https://registry.npmjs.org/creato/-/creato-1.0.5.tgz"; + sha512 = "bneB5jF+I0XNe4d3E6PYszPRb+5S8B3UQ3hDlY6ZSkfEU34RKqCfbUodxwwJn8DhmPYiuefEqEGxvstXEwXuUA=="; }; }; "cron-1.7.0" = { @@ -9733,13 +9823,13 @@ let sha1 = "541097234cb2513c83ceed3acddc27ff27987d54"; }; }; - "cssstyle-1.2.1" = { + "cssstyle-1.2.2" = { name = "cssstyle"; packageName = "cssstyle"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.1.tgz"; - sha512 = "7DYm8qe+gPx/h77QlCyFmX80+fGaE/6A/Ekl0zaszYOubvySO2saYFdQ78P29D0UsULxFKCetDGNaNRUdSF+2A=="; + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.2.tgz"; + sha512 = "43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow=="; }; }; "csurf-1.8.3" = { @@ -9850,6 +9940,15 @@ let sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425"; }; }; + "cwise-compiler-1.1.3" = { + name = "cwise-compiler"; + packageName = "cwise-compiler"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cwise-compiler/-/cwise-compiler-1.1.3.tgz"; + sha1 = "f4d667410e850d3a313a7d2db7b1e505bb034cc5"; + }; + }; "cycle-1.0.3" = { name = "cycle"; packageName = "cycle"; @@ -9949,13 +10048,13 @@ let sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf"; }; }; - "dat-dns-3.2.0" = { + "dat-dns-3.2.1" = { name = "dat-dns"; packageName = "dat-dns"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.2.0.tgz"; - sha512 = "3U17SGiMgSflp0CnqMxoOkyNPZF93q/ieITIjogmWc/gVwZ/z0PgAALgPxrwmebxf8rYCPukVRWfue/8F9PRMg=="; + url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.2.1.tgz"; + sha512 = "gCfU2FBg41Qg7RgqYBRD3bjYWAaJFO6UvKfCU9SA1LBy6vZ3EoTZH5doCYdTTQmVEsAxMef18W0lnvr1Z7rx0g=="; }; }; "dat-doctor-2.1.2" = { @@ -10057,22 +10156,13 @@ let sha512 = "gz9RuhUxq3coYBrelzuFXCNyC579aO3Bm1Wlwa12/9tJr1NP0AAGxpHJYA1HZvt8X7ZdrtMzpFyNvs2Y9PFG6w=="; }; }; - "data-uri-to-buffer-1.2.0" = { + "data-uri-to-buffer-2.0.1" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz"; - sha512 = "vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ=="; - }; - }; - "data-uri-to-buffer-2.0.0" = { - name = "data-uri-to-buffer"; - packageName = "data-uri-to-buffer"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.0.tgz"; - sha512 = "YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw=="; + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.1.tgz"; + sha512 = "OkVVLrerfAKZlW2ZZ3Ve2y65jgiWqBKsTfUIAFbn8nVbPcCZg6l6gikKlEYv0kXcmzqGm6mFq/Jf2vriuEkv8A=="; }; }; "data-urls-1.1.0" = { @@ -10444,6 +10534,15 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; + "deep-is-0.1.2" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.2.tgz"; + sha1 = "9ced65ea0bc0b09f42a6d79c1b1903f9d913cc18"; + }; + }; "deep-is-0.1.3" = { name = "deep-is"; packageName = "deep-is"; @@ -10678,13 +10777,13 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "denque-1.4.0" = { + "denque-1.4.1" = { name = "denque"; packageName = "denque"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-1.4.0.tgz"; - sha512 = "gh513ac7aiKrAgjiIBWZG0EASyDF9p4JMWwKA8YU5s9figrL5SRNEMT6FDynsegakuhWd1wVqTvqvqAoDxw7wQ=="; + url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz"; + sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="; }; }; "dep-graph-1.1.0" = { @@ -10714,15 +10813,6 @@ let sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; - "dependency-ls-1.1.1" = { - name = "dependency-ls"; - packageName = "dependency-ls"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz"; - sha1 = "0481b07f023d74ce311192e5c690d13e18600054"; - }; - }; "deprecated-0.0.1" = { name = "deprecated"; packageName = "deprecated"; @@ -10876,6 +10966,15 @@ let sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; }; }; + "diacritics-1.3.0" = { + name = "diacritics"; + packageName = "diacritics"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz"; + sha1 = "3efa87323ebb863e6696cebb0082d48ff3d6f7a1"; + }; + }; "diagnostics-1.1.1" = { name = "diagnostics"; packageName = "diagnostics"; @@ -10939,13 +11038,13 @@ let sha512 = "s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q=="; }; }; - "diff2html-2.4.0" = { + "diff2html-2.7.0" = { name = "diff2html"; packageName = "diff2html"; - version = "2.4.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-2.4.0.tgz"; - sha1 = "de632384eefa5a7f6b0e92eafb1fa25d22dc88ab"; + url = "https://registry.npmjs.org/diff2html/-/diff2html-2.7.0.tgz"; + sha512 = "xaVsOea1ONo4lYIXd4G+pBLZ6RDkSM82My7irpuwXYK1WymbVdHgmWkBUGJKZyTyJhDHM3E30ml1nSOl5AyyEQ=="; }; }; "diffie-hellman-5.0.3" = { @@ -11641,13 +11740,13 @@ let sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; }; }; - "electron-to-chromium-1.3.118" = { + "electron-to-chromium-1.3.124" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.118"; + version = "1.3.124"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.118.tgz"; - sha512 = "/1FpHvmKmKo2Z6CCza2HfkrKvKhU7Rq4nvyX1FOherdTrdTufhVrJbCrcrIqgqUCI+BG6JC2rlY4z5QA1G0NOw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz"; + sha512 = "glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w=="; }; }; "elegant-spinner-1.0.1" = { @@ -11659,15 +11758,6 @@ let sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; }; }; - "elementtree-0.1.6" = { - name = "elementtree"; - packageName = "elementtree"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; - sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; - }; - }; "elementtree-0.1.7" = { name = "elementtree"; packageName = "elementtree"; @@ -11768,6 +11858,15 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; + "emphasize-1.5.0" = { + name = "emphasize"; + packageName = "emphasize"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emphasize/-/emphasize-1.5.0.tgz"; + sha1 = "e3c5af2ddccb4982822a3349b471613cc7cecc92"; + }; + }; "enable-1.3.2" = { name = "enable"; packageName = "enable"; @@ -11849,6 +11948,15 @@ let sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; }; }; + "endent-1.3.0" = { + name = "endent"; + packageName = "endent"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/endent/-/endent-1.3.0.tgz"; + sha512 = "C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A=="; + }; + }; "ends-with-0.2.0" = { name = "ends-with"; packageName = "ends-with"; @@ -12218,6 +12326,15 @@ let sha512 = "aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="; }; }; + "es6-promise-pool-2.5.0" = { + name = "es6-promise-pool"; + packageName = "es6-promise-pool"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise-pool/-/es6-promise-pool-2.5.0.tgz"; + sha1 = "147c612b36b47f105027f9d2bf54a598a99d9ccb"; + }; + }; "es6-promisify-5.0.0" = { name = "es6-promisify"; packageName = "es6-promisify"; @@ -12371,13 +12488,13 @@ let sha512 = "nqD5WQMisciZC5EHZowejLKQjWGuFS5c70fxqSKlnDME+oz9zmE8KTlX+lHSg+/5wsC/kf9Q9eMkC8qS3oM2fg=="; }; }; - "eslint-5.15.3" = { + "eslint-5.16.0" = { name = "eslint"; packageName = "eslint"; - version = "5.15.3"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.15.3.tgz"; - sha512 = "vMGi0PjCHSokZxE0NLp2VneGw5sio7SSiDNgIUn2tC0XkWJRNOIoHIg3CliLVfXnJsiHxGAYrkw0PieAu8+KYQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz"; + sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -12425,13 +12542,13 @@ let sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; }; }; - "esm-3.2.19" = { + "esm-3.2.22" = { name = "esm"; packageName = "esm"; - version = "3.2.19"; + version = "3.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/esm/-/esm-3.2.19.tgz"; - sha512 = "thFxRC6o0gKfSiSwuUI2JO01f9JOm1qRWGfBLry0LF3L8mSeSTK58DqCE3+0ZKq02e/DClCJf3BW9nVwd/ejCw=="; + url = "https://registry.npmjs.org/esm/-/esm-3.2.22.tgz"; + sha512 = "z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA=="; }; }; "espree-3.5.4" = { @@ -12893,6 +13010,15 @@ let sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; }; }; + "expand-template-1.1.1" = { + name = "expand-template"; + packageName = "expand-template"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.1.tgz"; + sha512 = "cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg=="; + }; + }; "expand-template-2.0.3" = { name = "expand-template"; packageName = "expand-template"; @@ -13307,13 +13433,22 @@ let sha512 = "0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w=="; }; }; - "fast-json-patch-2.0.7" = { + "fast-json-parse-1.0.3" = { + name = "fast-json-parse"; + packageName = "fast-json-parse"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz"; + sha512 = "FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="; + }; + }; + "fast-json-patch-2.1.0" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "2.0.7"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.7.tgz"; - sha512 = "DQeoEyPYxdTtfmB3yDlxkLyKTdbJ6ABfFGcMynDqjvGhPYLto/pZyb/dG2Nyd/n9CArjEWN9ZST++AFmgzgbGw=="; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.1.0.tgz"; + sha512 = "PipOsAKamRw7+CXtKiieehyjUeDVPJ5J7b2kdJYerEf6TSUQoD2ijpVyZ88KQm5YXziff4h762bz3+vzf56khg=="; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -13514,6 +13649,15 @@ let sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; }; }; + "file-type-10.10.0" = { + name = "file-type"; + packageName = "file-type"; + version = "10.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-10.10.0.tgz"; + sha512 = "3CTQE/db3dnK2jsfd4XiXMKw9nD0QVEMRLdBzqYDRr5BvYMUccDpP8hMc1uPb1VZ9Iw/cAJjYPNwJ5UzxGqsRg=="; + }; + }; "file-type-3.9.0" = { name = "file-type"; packageName = "file-type"; @@ -13793,6 +13937,15 @@ let sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; }; }; + "findup-sync-3.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz"; + sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg=="; + }; + }; "fined-1.1.1" = { name = "fined"; packageName = "fined"; @@ -13982,6 +14135,15 @@ let sha1 = "36ce06abe2e0e01c44dd69f2a165305a2320649b"; }; }; + "flumecodec-0.0.1" = { + name = "flumecodec"; + packageName = "flumecodec"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.1.tgz"; + sha1 = "ae049a714386bb83e342657a82924b70364a90d6"; + }; + }; "flumedb-1.0.6" = { name = "flumedb"; packageName = "flumedb"; @@ -14036,13 +14198,13 @@ let sha512 = "3HkgA4u5aIrUIFJ+uRfEpRy/xFwTresz05wf/Sg3NigWrw8JWaGMmHToJpoL8ec9EvYKgP3JNj5wHLw9WEocsA=="; }; }; - "flumeview-reduce-1.3.15" = { + "flumeview-reduce-1.3.16" = { name = "flumeview-reduce"; packageName = "flumeview-reduce"; - version = "1.3.15"; + version = "1.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.15.tgz"; - sha512 = "zxDvjzRKA9uvit6Za7u2qTLyeziZIzeEPtJT9X7UcsOKxrjydkq6k6AlCq9hM7mZLS7msYqRyn4XfItC4cZtYQ=="; + url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.16.tgz"; + sha512 = "4ATidV3QARML74eNdi+HPzGa4JtSZfnQpW6QQArlKZ6NRkjax3EFLt42hK2VJyADxnVnsVInt/ItqJL/4G1/5g=="; }; }; "flush-write-stream-1.1.1" = { @@ -14072,6 +14234,24 @@ let sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; }; }; + "for-each-property-0.0.4" = { + name = "for-each-property"; + packageName = "for-each-property"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each-property/-/for-each-property-0.0.4.tgz"; + sha1 = "cfa857aec1422e1d126ff08784fcf62629bc83f6"; + }; + }; + "for-each-property-deep-0.0.3" = { + name = "for-each-property-deep"; + packageName = "for-each-property-deep"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each-property-deep/-/for-each-property-deep-0.0.3.tgz"; + sha1 = "31309a4afc38a9cca06f1b223f53d64a6d083fad"; + }; + }; "for-in-0.1.8" = { name = "for-in"; packageName = "for-in"; @@ -14342,6 +14522,15 @@ let sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; }; + "fs-copy-file-sync-1.1.1" = { + name = "fs-copy-file-sync"; + packageName = "fs-copy-file-sync"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-copy-file-sync/-/fs-copy-file-sync-1.1.1.tgz"; + sha512 = "2QY5eeqVv4m2PfyMiEuy9adxNP+ajf+8AR05cEi+OAzPcOj90hvFImeZhTmKLBgSd9EvG33jsD7ZRxsx9dThkQ=="; + }; + }; "fs-exists-sync-0.1.0" = { name = "fs-exists-sync"; packageName = "fs-exists-sync"; @@ -14729,6 +14918,15 @@ let sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; }; }; + "get-prototype-chain-1.0.1" = { + name = "get-prototype-chain"; + packageName = "get-prototype-chain"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-prototype-chain/-/get-prototype-chain-1.0.1.tgz"; + sha1 = "a171a115ea1e4906c6ed3843a1f001c18510416f"; + }; + }; "get-proxy-2.1.0" = { name = "get-proxy"; packageName = "get-proxy"; @@ -14792,15 +14990,6 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; - "get-uri-2.0.2" = { - name = "get-uri"; - packageName = "get-uri"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-uri/-/get-uri-2.0.2.tgz"; - sha512 = "ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw=="; - }; - }; "get-uri-2.0.3" = { name = "get-uri"; packageName = "get-uri"; @@ -15225,13 +15414,13 @@ let sha512 = "yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w=="; }; }; - "globby-9.1.0" = { + "globby-9.2.0" = { name = "globby"; packageName = "globby"; - version = "9.1.0"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-9.1.0.tgz"; - sha512 = "VtYjhHr7ncls724Of5W6Kaahz0ag7dB4G62/2HsN+xEKG6SrPzM1AJMerGxQTwJGnN9reeyxdvXbuZYpfssCvg=="; + url = "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz"; + sha512 = "ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg=="; }; }; "globule-0.1.0" = { @@ -15414,13 +15603,13 @@ let sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; }; }; - "graphql-14.1.1" = { + "graphql-14.2.1" = { name = "graphql"; packageName = "graphql"; - version = "14.1.1"; + version = "14.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz"; - sha512 = "C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q=="; + url = "https://registry.npmjs.org/graphql/-/graphql-14.2.1.tgz"; + sha512 = "2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ=="; }; }; "graphql-anywhere-4.2.1" = { @@ -15549,13 +15738,13 @@ let sha512 = "C8+EqwNCiQxUhbrWEokxN16oINAkhIDBzEpKHXeatBRaAyMczXm0J6HMaMSKOuQmk7P1PbDHIVW3FVZwXF2WJQ=="; }; }; - "graphql-subscriptions-1.0.0" = { + "graphql-subscriptions-1.1.0" = { name = "graphql-subscriptions"; packageName = "graphql-subscriptions"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.0.0.tgz"; - sha512 = "+ytmryoHF1LVf58NKEaNPRUzYyXplm120ntxfPcgOBC7TnK7Tv/4VRHeh4FAR9iL+O1bqhZs4nkibxQ+OA5cDQ=="; + url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.1.0.tgz"; + sha512 = "6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA=="; }; }; "graphql-tag-2.10.1" = { @@ -15576,22 +15765,22 @@ let sha512 = "chF12etTIGVVGy3fCTJ1ivJX2KB7OSG4c6UOJQuqOHCmBQwTyNgCDuejZKvpYxNZiEx7bwIjrodDgDe9RIkjlw=="; }; }; - "graphql-type-json-0.2.2" = { + "graphql-type-json-0.2.4" = { name = "graphql-type-json"; packageName = "graphql-type-json"; - version = "0.2.2"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.2.2.tgz"; - sha512 = "srKbRJWxvZ8J6b7P3F0PrOtKgWg3pxlUPb1xbSIB+aMdK+UPKpp4aDzPV1A+IUTlea6lk9FWwI08UXQApC03lw=="; + url = "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.2.4.tgz"; + sha512 = "/tq02ayMQjrG4oDFDRLLrPk0KvJXue0nVXoItBe7uAdbNXjQUu+HYCBdAmPLQoseVzUKKMzrhq2P/sfI76ON6w=="; }; }; - "graphql-upload-8.0.4" = { + "graphql-upload-8.0.5" = { name = "graphql-upload"; packageName = "graphql-upload"; - version = "8.0.4"; + version = "8.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-upload/-/graphql-upload-8.0.4.tgz"; - sha512 = "jsTfVYXJ5mU6BXiiJ20CUCAcf41ICCQJ2ltwQFUuaFKiY4JhlG99uZZp5S3hbpQ/oA1kS7hz4pRtsnxPCa7Yfg=="; + url = "https://registry.npmjs.org/graphql-upload/-/graphql-upload-8.0.5.tgz"; + sha512 = "iv8R/E1b0GJ203Z2sdPgnCnU8tl9hQY+jkebiTNAjsWBT3j/I5VLBnPJdDhJSKIreWJ4/1LZjgOt60qjnH4/EQ=="; }; }; "gray-matter-2.1.1" = { @@ -15666,13 +15855,13 @@ let sha512 = "7Isf9Y690o/Q5MVjEylH1H7L8WeZ89woW7DnhD5unTintOdZb67KdOayRgp9trUFo+f9UyJtuatV42e/+kghPg=="; }; }; - "gulp-cli-2.0.1" = { + "gulp-cli-2.1.0" = { name = "gulp-cli"; packageName = "gulp-cli"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz"; - sha512 = "RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ=="; + url = "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.1.0.tgz"; + sha512 = "txzgdFVlEPShBZus6JJyGyKJoBVDq6Do0ZQgIgx5RAsmhNVTDjymmOxpQvo3c20m66FldilS68ZXj2Q9w5dKbA=="; }; }; "gulp-less-3.5.0" = { @@ -16143,6 +16332,15 @@ let sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; }; }; + "highlight.js-9.12.0" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "9.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz"; + sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; + }; + }; "highlight.js-9.15.6" = { name = "highlight.js"; packageName = "highlight.js"; @@ -16179,13 +16377,13 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "hoek-6.1.2" = { + "hoek-6.1.3" = { name = "hoek"; packageName = "hoek"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz"; - sha512 = "6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="; + url = "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz"; + sha512 = "YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ=="; }; }; "hogan.js-3.0.2" = { @@ -16278,6 +16476,15 @@ let sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; }; }; + "html-minifier-3.5.21" = { + name = "html-minifier"; + packageName = "html-minifier"; + version = "3.5.21"; + src = fetchurl { + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz"; + sha512 = "LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="; + }; + }; "html-tags-1.2.0" = { name = "html-tags"; packageName = "html-tags"; @@ -16530,13 +16737,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.25.0" = { + "hypercore-6.25.2" = { name = "hypercore"; packageName = "hypercore"; - version = "6.25.0"; + version = "6.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.25.0.tgz"; - sha512 = "lUzqx3d0l+Ex7XryiUkNAM7wU7XVa9b4JcmulRqpdXLJGEV1VKTqn2IYnhAfKcoBjm5KjIgJZiiv5JBEdeEcQw=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.25.2.tgz"; + sha512 = "l6beYZTbWbbsklFv/YehVPofOM2O7T5e3Zz7V4O93xxXb4JhBQ4z3Kgexzl5B0OkbcsUg/bgqRGdqSAS20VAEg=="; }; }; "hypercore-crypto-1.0.0" = { @@ -16602,13 +16809,13 @@ let sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; - "i18next-14.1.1" = { + "i18next-15.0.9" = { name = "i18next"; packageName = "i18next"; - version = "14.1.1"; + version = "15.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/i18next/-/i18next-14.1.1.tgz"; - sha512 = "HItn9RHLyrDqe6pw6qXMYHGPHNc3y1FZndJfBlD6k4sRS0FAlYLvqCDVIWFc1XultBgsv348TtvL/lleG6JgBg=="; + url = "https://registry.npmjs.org/i18next/-/i18next-15.0.9.tgz"; + sha512 = "IdVj7DqErUuMbGuj2dFT431T7zKlmDci63eae6pNA/bMwgBZKT74/KnwHXE0WH7ivo2EV/LNme4pP4Yw6vB79w=="; }; }; "iconv-lite-0.4.11" = { @@ -16665,13 +16872,22 @@ let sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; }; }; - "ieee754-1.1.12" = { + "idb-kv-store-4.4.0" = { + name = "idb-kv-store"; + packageName = "idb-kv-store"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/idb-kv-store/-/idb-kv-store-4.4.0.tgz"; + sha1 = "22c56a8d5f90bd88f818a859db9c58627de278be"; + }; + }; + "ieee754-1.1.13" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz"; - sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; }; "ieee754-1.1.8" = { @@ -16737,6 +16953,15 @@ let sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ=="; }; }; + "image-data-uri-2.0.0" = { + name = "image-data-uri"; + packageName = "image-data-uri"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/image-data-uri/-/image-data-uri-2.0.0.tgz"; + sha512 = "PhIJxgfSQai/Xy8Nij1lWgK6++Y6x/ga2FKQTd8F71Nz2ArqtFr1F1UAREK0twrfp7mcEqidgGSF06No14/m+Q=="; + }; + }; "image-size-0.5.5" = { name = "image-size"; packageName = "image-size"; @@ -16746,6 +16971,15 @@ let sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"; }; }; + "image-type-3.1.0" = { + name = "image-type"; + packageName = "image-type"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/image-type/-/image-type-3.1.0.tgz"; + sha512 = "edYRXKQ3WD2yHXFGUbwoJVn5v7j1A6Z505uZUYIfzCwOOhPGLYSc3VOucF9fqbsaUbgb37DdjOU+WV4uo7ZooQ=="; + }; + }; "imap-0.8.19" = { name = "imap"; packageName = "imap"; @@ -17133,15 +17367,6 @@ let sha512 = "kLGeYQkh18f8KuC68QKdi0iwUcIaayJVB/STpX7x452/7pAUm1yfG4giJwcxbrTh0zNYtc8kBR+6maLMOzglOQ=="; }; }; - "insight-0.8.4" = { - name = "insight"; - packageName = "insight"; - version = "0.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; - sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; - }; - }; "inspect-custom-symbol-1.1.0" = { name = "inspect-custom-symbol"; packageName = "inspect-custom-symbol"; @@ -17151,6 +17376,60 @@ let sha512 = "vtI2YXBRZBkU6DlfHfd0GtZENfiEiTacAXUd0ZY6HA+X7aPznpFfPmzSC+tHKXAkz9KDSdI4AYfwAMXR5t+isg=="; }; }; + "inspect-function-0.2.2" = { + name = "inspect-function"; + packageName = "inspect-function"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inspect-function/-/inspect-function-0.2.2.tgz"; + sha1 = "85da0c5258bc4c330ae3283b6747e0759d90a635"; + }; + }; + "inspect-function-0.3.4" = { + name = "inspect-function"; + packageName = "inspect-function"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inspect-function/-/inspect-function-0.3.4.tgz"; + sha512 = "s0RsbJqK/sNZ+U1mykGoTickog3ea1A9Qk4mXniogOBu4PgkkZ56elScO7QC/r8D94lhGmJ2NyDI1ipOA/uq/g=="; + }; + }; + "inspect-parameters-declaration-0.0.10" = { + name = "inspect-parameters-declaration"; + packageName = "inspect-parameters-declaration"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/inspect-parameters-declaration/-/inspect-parameters-declaration-0.0.10.tgz"; + sha512 = "L8/Bvt9iDXQTZ63xY5/MAyvzz+FagR/qGh1kIXvUpsno3AAE0Z95d6QO51zrcMGaEGpwh/57idfMxTxbvRmytg=="; + }; + }; + "inspect-parameters-declaration-0.0.8" = { + name = "inspect-parameters-declaration"; + packageName = "inspect-parameters-declaration"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/inspect-parameters-declaration/-/inspect-parameters-declaration-0.0.8.tgz"; + sha512 = "W4QzN1LgFmasKOM+NoLlDd2OAZM3enNZlVUOXoGQKmYBDFgxoPDOyebF55ALaf8avyM9TavNwibXxg347RrzCg=="; + }; + }; + "inspect-parameters-declaration-0.0.9" = { + name = "inspect-parameters-declaration"; + packageName = "inspect-parameters-declaration"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/inspect-parameters-declaration/-/inspect-parameters-declaration-0.0.9.tgz"; + sha512 = "c3jrKKA1rwwrsjdGMAo2hFWV0vNe3/RKHxpE/OBt41LP3ynOVI1qmgxpZYK5SQu3jtWCyaho8L7AZzCjJ4mEUw=="; + }; + }; + "inspect-property-0.0.6" = { + name = "inspect-property"; + packageName = "inspect-property"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inspect-property/-/inspect-property-0.0.6.tgz"; + sha512 = "LgjHkRl9W6bj2n+kWrAOgvCYPTYt+LanE4rtd/vKNq6yEb+SvVV7UTLzoSPpDX6/U1cAz7VfqPr+lPAIz7wHaQ=="; + }; + }; "int53-0.2.4" = { name = "int53"; packageName = "int53"; @@ -17160,6 +17439,15 @@ let sha1 = "5ed8d7aad6c5c6567cae69aa7ffc4a109ee80f86"; }; }; + "int53-1.0.0" = { + name = "int53"; + packageName = "int53"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/int53/-/int53-1.0.0.tgz"; + sha512 = "u8BMiMa05OPBgd32CKTead0CVTsFVgwFk23nNXo1teKPF6Sxcu0lXxEzP//zTcaKzXbGgPDXGmj/woyv+I4C5w=="; + }; + }; "int64-buffer-0.1.10" = { name = "int64-buffer"; packageName = "int64-buffer"; @@ -17268,6 +17556,15 @@ let sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; }; }; + "iota-array-1.0.0" = { + name = "iota-array"; + packageName = "iota-array"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz"; + sha1 = "81ef57fe5d05814cd58c2483632a99c30a0e8087"; + }; + }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -17376,6 +17673,15 @@ let sha1 = "847491119fccb5fb436217cc737f7faad50f603f"; }; }; + "is-absolute-0.2.6" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz"; + sha1 = "20de69f3db942ef2d87b9c2da36f172235b1b5eb"; + }; + }; "is-absolute-1.0.0" = { name = "is-absolute"; packageName = "is-absolute"; @@ -17700,15 +18006,6 @@ let sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; }; }; - "is-git-url-1.0.0" = { - name = "is-git-url"; - packageName = "is-git-url"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-git-url/-/is-git-url-1.0.0.tgz"; - sha1 = "53f684cd143285b52c3244b4e6f28253527af66b"; - }; - }; "is-glob-2.0.1" = { name = "is-glob"; packageName = "is-glob"; @@ -17727,13 +18024,13 @@ let sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; }; }; - "is-glob-4.0.0" = { + "is-glob-4.0.1" = { name = "is-glob"; packageName = "is-glob"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz"; - sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; "is-hexadecimal-1.0.2" = { @@ -17997,6 +18294,15 @@ let sha1 = "905fee8ae86f45b3ec614bc3c15c869df0876e82"; }; }; + "is-relative-0.2.1" = { + name = "is-relative"; + packageName = "is-relative"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz"; + sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5"; + }; + }; "is-relative-1.0.0" = { name = "is-relative"; packageName = "is-relative"; @@ -18132,6 +18438,15 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "is-unc-path-0.1.2" = { + name = "is-unc-path"; + packageName = "is-unc-path"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz"; + sha1 = "6ab053a72573c10250ff416a3814c35178af39b9"; + }; + }; "is-unc-path-1.0.0" = { name = "is-unc-path"; packageName = "is-unc-path"; @@ -18213,6 +18528,15 @@ let sha512 = "SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ=="; }; }; + "is-windows-0.2.0" = { + name = "is-windows"; + packageName = "is-windows"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz"; + sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -18240,6 +18564,15 @@ let sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; + "is2-0.0.9" = { + name = "is2"; + packageName = "is2"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/is2/-/is2-0.0.9.tgz"; + sha1 = "119556d1d1651a41ba105af803267c80b299f629"; + }; + }; "isarray-0.0.1" = { name = "isarray"; packageName = "isarray"; @@ -18492,6 +18825,33 @@ let sha512 = "LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ=="; }; }; + "joplin-turndown-4.0.11" = { + name = "joplin-turndown"; + packageName = "joplin-turndown"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.11.tgz"; + sha512 = "2oiwWX0nKYi1NVcaprSsrXQkYdGoRtPWFmnXdWQnQW44jlgjFV38B4VrgliwX5ZMq7cbx6A9IBwfXcBL2YV2NA=="; + }; + }; + "joplin-turndown-plugin-gfm-1.0.7" = { + name = "joplin-turndown-plugin-gfm"; + packageName = "joplin-turndown-plugin-gfm"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/joplin-turndown-plugin-gfm/-/joplin-turndown-plugin-gfm-1.0.7.tgz"; + sha512 = "z0SveNcchtWwglkO7SgvDzPnVHYk1WumD0QRcWvUchIihqXwDVlve3G8AHkIhM69LY1YdC0HCZJlSMp2spBe/g=="; + }; + }; + "jpeg-js-0.1.2" = { + name = "jpeg-js"; + packageName = "jpeg-js"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz"; + sha1 = "135b992c0575c985cfa0f494a3227ed238583ece"; + }; + }; "jquery-3.3.1" = { name = "jquery"; packageName = "jquery"; @@ -18519,13 +18879,13 @@ let sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; }; }; - "js-beautify-1.9.0" = { + "js-beautify-1.9.1" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.0.tgz"; - sha512 = "P0skmY4IDjfLiVrx+GLDeme8w5G0R1IGXgccVU5HP2VM3lRblH7qN2LTea5vZAxrDjpZBD0Jv+ahpjwVcbz/rw=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.1.tgz"; + sha512 = "oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ=="; }; }; "js-levenshtein-1.1.6" = { @@ -18600,22 +18960,22 @@ let sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; }; }; - "js-yaml-3.12.2" = { + "js-yaml-3.13.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.2"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz"; - sha512 = "QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; + sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; }; }; - "js-yaml-3.13.0" = { + "js-yaml-3.13.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; - sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; }; "js2xmlparser-3.0.0" = { @@ -18753,13 +19113,13 @@ let sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89"; }; }; - "json-refs-3.0.12" = { + "json-refs-3.0.13" = { name = "json-refs"; packageName = "json-refs"; - version = "3.0.12"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.12.tgz"; - sha512 = "6RbO1Y3e0Hty/tEpXtQG6jUx7g1G8e39GIOuPugobPC8BX1gZ0OGZQpBn1FLWGkuWF35GRGADvhwdEIFpwIjyA=="; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.13.tgz"; + sha512 = "/FJ+BJ6BASjmNsBJHE8qMVj46HTS2Pfq5gI5BQRhyUsdrw9HaHRWSOsOh87deTOyWMtGas5Qr8H6ikrcWHdZbw=="; }; }; "json-rpc2-0.8.1" = { @@ -19041,6 +19401,15 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; + "jssha-2.3.1" = { + name = "jssha"; + packageName = "jssha"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jssha/-/jssha-2.3.1.tgz"; + sha1 = "147b2125369035ca4b2f7d210dc539f009b3de9a"; + }; + }; "jstransform-10.1.0" = { name = "jstransform"; packageName = "jstransform"; @@ -19059,13 +19428,13 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.2.0" = { + "jszip-3.2.1" = { name = "jszip"; packageName = "jszip"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.2.0.tgz"; - sha512 = "4WjbsaEtBK/DHeDZOPiPw5nzSGLDEDDreFRDEgnoMwmknPjTqa+23XuYFk6NiGbeiAeZCctiQ/X/z0lQBmDVOQ=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.2.1.tgz"; + sha512 = "iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw=="; }; }; "jszip-git://github.com/anmonteiro/jszip#patch-1" = { @@ -19474,6 +19843,15 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; + "lazyness-1.1.1" = { + name = "lazyness"; + packageName = "lazyness"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lazyness/-/lazyness-1.1.1.tgz"; + sha512 = "rYHC6l6LeRlJSt5jxpqN8z/49gZ0CqLi89HAGzJjHahCFlqEjFGFN9O15hmzSzUGFl7zN/vOWduv/+0af3r/kQ=="; + }; + }; "lazystream-1.0.0" = { name = "lazystream"; packageName = "lazystream"; @@ -19564,22 +19942,22 @@ let sha1 = "a4b5244bb6a4c2f723d68a1d64e980c53627d9d4"; }; }; - "level-codec-9.0.0" = { + "level-codec-9.0.1" = { name = "level-codec"; packageName = "level-codec"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/level-codec/-/level-codec-9.0.0.tgz"; - sha512 = "OIpVvjCcZNP5SdhcNupnsI1zo5Y9Vpm+k/F1gfG5kXrtctlrwanisakweJtE0uA0OpLukRfOQae+Fg0M5Debhg=="; + url = "https://registry.npmjs.org/level-codec/-/level-codec-9.0.1.tgz"; + sha512 = "ajFP0kJ+nyq4i6kptSM+mAvJKLOg1X5FiFPtLG9M5gCEZyBmgDi3FkDrvlMkEzrUn1cWxtvVmrvoS4ASyO/q+Q=="; }; }; - "level-errors-2.0.0" = { + "level-errors-2.0.1" = { name = "level-errors"; packageName = "level-errors"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/level-errors/-/level-errors-2.0.0.tgz"; - sha512 = "AmY4HCp9h3OiU19uG+3YWkdELgy05OTP/r23aNHaQKWv8DO787yZgsEuGVkoph40uwN+YdUKnANlrxSsoOaaxg=="; + url = "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz"; + sha512 = "UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw=="; }; }; "level-iterator-stream-3.0.1" = { @@ -19654,6 +20032,15 @@ let sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; }; }; + "levenshtein-1.0.5" = { + name = "levenshtein"; + packageName = "levenshtein"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/levenshtein/-/levenshtein-1.0.5.tgz"; + sha1 = "3911737a9cb56da345d008f55782c6f138979ba3"; + }; + }; "levn-0.3.0" = { name = "levn"; packageName = "levn"; @@ -19726,6 +20113,15 @@ let sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; }; }; + "liftoff-3.1.0" = { + name = "liftoff"; + packageName = "liftoff"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz"; + sha512 = "DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog=="; + }; + }; "linewise-0.0.3" = { name = "linewise"; packageName = "linewise"; @@ -19924,6 +20320,15 @@ let sha1 = "c6940128a9d30f8e902cd2cf99fd0cba4ecfc183"; }; }; + "lodash-es-4.17.11" = { + name = "lodash-es"; + packageName = "lodash-es"; + version = "4.17.11"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.11.tgz"; + sha512 = "DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q=="; + }; + }; "lodash-id-0.14.0" = { name = "lodash-id"; packageName = "lodash-id"; @@ -20302,15 +20707,6 @@ let sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.debounce-3.1.1" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz"; - sha1 = "812211c378a94cc29d5aa4e3346cf0bfce3a7df5"; - }; - }; "lodash.debounce-4.0.8" = { name = "lodash.debounce"; packageName = "lodash.debounce"; @@ -20869,22 +21265,22 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-4.0.2" = { + "log4js-4.1.0" = { name = "log4js"; packageName = "log4js"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-4.0.2.tgz"; - sha512 = "KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww=="; + url = "https://registry.npmjs.org/log4js/-/log4js-4.1.0.tgz"; + sha512 = "eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA=="; }; }; - "logform-1.10.0" = { + "logform-2.1.2" = { name = "logform"; packageName = "logform"; - version = "1.10.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz"; - sha512 = "em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg=="; + url = "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz"; + sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; "lokijs-1.5.3" = { @@ -21004,6 +21400,15 @@ let sha1 = "5b46f80147edee578870f086d04821cf998e551f"; }; }; + "loud-rejection-2.1.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.1.0.tgz"; + sha512 = "g/6MQxUXYHeVqZ4PGpPL1fS1fOvlXoi7bay0pizmjAd/3JhyXwxzwrnr74yzdmhuerlslbRJ3x7IOXzFz0cE5w=="; + }; + }; "lowdb-1.0.0" = { name = "lowdb"; packageName = "lowdb"; @@ -21049,6 +21454,15 @@ let sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; }; + "lowlight-1.9.2" = { + name = "lowlight"; + packageName = "lowlight"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lowlight/-/lowlight-1.9.2.tgz"; + sha512 = "Ek18ElVCf/wF/jEm1b92gTnigh94CtBNWiZ2ad+vTgW7cTmQxUY3I98BjHK68gZAJEWmybGBZgx9qv3QxLQB/Q=="; + }; + }; "lru-2.0.1" = { name = "lru"; packageName = "lru"; @@ -21166,13 +21580,13 @@ let sha512 = "mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA=="; }; }; - "macos-release-2.1.0" = { + "macos-release-2.2.0" = { name = "macos-release"; packageName = "macos-release"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-2.1.0.tgz"; - sha512 = "8TCbwvN1mfNxbBv0yBtfyIFMo3m1QsNbKHv7PYIp/abRBKVQBXN7ecu3aeGGgT18VC/Tf397LBDGZF9KBGJFFw=="; + url = "https://registry.npmjs.org/macos-release/-/macos-release-2.2.0.tgz"; + sha512 = "iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA=="; }; }; "magic-string-0.22.5" = { @@ -21193,6 +21607,24 @@ let sha512 = "iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg=="; }; }; + "magicli-0.0.5" = { + name = "magicli"; + packageName = "magicli"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/magicli/-/magicli-0.0.5.tgz"; + sha1 = "cee7d0fbb4c70518aacb11ec3eb7e25ff49a4921"; + }; + }; + "magicli-0.0.8" = { + name = "magicli"; + packageName = "magicli"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/magicli/-/magicli-0.0.8.tgz"; + sha512 = "x/eBenweAHF+DsYy172sK4doRxZl0yrJnfxhLJiN7H6hPM3Ya0PfI6uBZshZ3ScFFSQD7HXgBqMdbnXKEZsO1g=="; + }; + }; "magnet-uri-2.0.1" = { name = "magnet-uri"; packageName = "magnet-uri"; @@ -21508,6 +21940,15 @@ let sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; }; }; + "md5-file-4.0.0" = { + name = "md5-file"; + packageName = "md5-file"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/md5-file/-/md5-file-4.0.0.tgz"; + sha512 = "UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg=="; + }; + }; "md5.js-1.3.5" = { name = "md5.js"; packageName = "md5.js"; @@ -21589,15 +22030,6 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "media-typer-1.0.1" = { - name = "media-typer"; - packageName = "media-typer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-1.0.1.tgz"; - sha512 = "v42gdPIuqYCoDVH5OiaKsVrv6aJqdMWJzl8KCyDs/KeDyBveYp3Wxq4UWJfsWjkSZUNC0xlLfDlLCPa1h/oo+g=="; - }; - }; "mediasource-2.3.0" = { name = "mediasource"; packageName = "mediasource"; @@ -21616,13 +22048,13 @@ let sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; }; - "mem-4.2.0" = { + "mem-4.3.0" = { name = "mem"; packageName = "mem"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-4.2.0.tgz"; - sha512 = "5fJxa68urlY0Ir8ijatKa3eRz5lwXnRCTvo9+TbTGAuTFJOwpGcY0X05moBd0nW45965Njt4CDI2GFQoG8DvqA=="; + url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; }; }; "mem-fs-1.1.3" = { @@ -21976,6 +22408,15 @@ let sha512 = "ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w=="; }; }; + "mime-2.4.1" = { + name = "mime"; + packageName = "mime"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.1.tgz"; + sha512 = "VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ=="; + }; + }; "mime-db-1.12.0" = { name = "mime-db"; packageName = "mime-db"; @@ -22003,6 +22444,15 @@ let sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; + "mime-db-1.39.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.39.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.39.0.tgz"; + sha512 = "DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw=="; + }; + }; "mime-types-2.0.14" = { name = "mime-types"; packageName = "mime-types"; @@ -22039,13 +22489,13 @@ let sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; }; - "mimic-fn-2.0.0" = { + "mimic-fn-2.1.0" = { name = "mimic-fn"; packageName = "mimic-fn"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.0.0.tgz"; - sha512 = "jbex9Yd/3lmICXwYT6gA/j2mNQGU48wCh/VzRd+/Y/PjYQtlg1gLMdZqvu9s/xH7qKvngxRObl56XZR609IMbA=="; + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; "mimic-response-1.0.1" = { @@ -22309,15 +22759,6 @@ let sha1 = "cf67e0b31c47ab9badb5c9c25651862127bb8317"; }; }; - "moment-2.22.2" = { - name = "moment"; - packageName = "moment"; - version = "2.22.2"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz"; - sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; - }; - }; "moment-2.24.0" = { name = "moment"; packageName = "moment"; @@ -22858,6 +23299,15 @@ let sha512 = "I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA=="; }; }; + "nan-2.13.2" = { + name = "nan"; + packageName = "nan"; + version = "2.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz"; + sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; + }; + }; "nanoassert-1.1.0" = { name = "nanoassert"; packageName = "nanoassert"; @@ -23078,6 +23528,24 @@ let sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; }; }; + "ndarray-1.0.18" = { + name = "ndarray"; + packageName = "ndarray"; + version = "1.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/ndarray/-/ndarray-1.0.18.tgz"; + sha1 = "b60d3a73224ec555d0faa79711e502448fd3f793"; + }; + }; + "ndarray-pack-1.2.1" = { + name = "ndarray-pack"; + packageName = "ndarray-pack"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ndarray-pack/-/ndarray-pack-1.2.1.tgz"; + sha1 = "8caebeaaa24d5ecf70ff86020637977da8ee585a"; + }; + }; "ndjson-1.5.0" = { name = "ndjson"; packageName = "ndjson"; @@ -23285,6 +23753,15 @@ let sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; }; }; + "nextgen-events-1.1.0" = { + name = "nextgen-events"; + packageName = "nextgen-events"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.1.0.tgz"; + sha512 = "Emz5rh584fygInd3gtwP+xGyJhEnyxQa0/Xbmw8sbpXVGV/luqDnVPq1cQopYR7qg6KUlPfwWVhxrhZri1wDAw=="; + }; + }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -23321,13 +23798,13 @@ let sha512 = "OV8Bq1OrPh6z+Y4dqwo05HqrRL9YNF7QVMRfq1/pguwKLG+q9UB/Lk0x5qXjO23JjJg+/jqCHSTaG1P3tfKfuw=="; }; }; - "node-addon-api-1.6.2" = { + "node-addon-api-1.6.3" = { name = "node-addon-api"; packageName = "node-addon-api"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.2.tgz"; - sha512 = "479Bjw9nTE5DdBSZZWprFryHGjUaQC31y1wHo19We/k0BZlrmhqQitWoUL0cD8+scljCbIUL+E58oRDEakdGGA=="; + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.3.tgz"; + sha512 = "FXWH6mqjWgU8ewuahp4spec8LkroFZK2NicOv6bNwZC3kcwZUI8LeZdG80UzTSLLhK4T7MsgNwlYDVRlDdfTDg=="; }; }; "node-alias-1.0.4" = { @@ -23339,6 +23816,15 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; + "node-bitmap-0.0.1" = { + name = "node-bitmap"; + packageName = "node-bitmap"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-bitmap/-/node-bitmap-0.0.1.tgz"; + sha1 = "180eac7003e0c707618ef31368f62f84b2a69091"; + }; + }; "node-cache-4.2.0" = { name = "node-cache"; packageName = "node-cache"; @@ -23366,6 +23852,25 @@ let sha512 = "I3CWm/ExYYQ/a9bjB0OL9VsGa3Lmgbb8QOs4y2kEiB/DTkTqkcTaCr/lVyOYjRpgR25TsmOBATscsg6H6aC9Hg=="; }; }; + "node-emoji-1.10.0" = { + name = "node-emoji"; + packageName = "node-emoji"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz"; + sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; + }; + }; + "node-emoji-git+https://github.com/laurent22/node-emoji.git" = { + name = "node-emoji"; + packageName = "node-emoji"; + version = "1.8.1"; + src = fetchgit { + url = "https://github.com/laurent22/node-emoji.git"; + rev = "9fa01eac463e94dde1316ef8c53089eeef4973b5"; + sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; + }; + }; "node-environment-flags-1.0.4" = { name = "node-environment-flags"; packageName = "node-environment-flags"; @@ -23492,6 +23997,15 @@ let sha512 = "SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ=="; }; }; + "node-persist-2.1.0" = { + name = "node-persist"; + packageName = "node-persist"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-persist/-/node-persist-2.1.0.tgz"; + sha1 = "e652bbf3885a04dad6a353d74176177c83914707"; + }; + }; "node-phantom-simple-2.2.4" = { name = "node-phantom-simple"; packageName = "node-phantom-simple"; @@ -23510,6 +24024,24 @@ let sha1 = "25b4d1d9d8eb02b48271c96000c4e6d366eef689"; }; }; + "node-pre-gyp-0.11.0" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz"; + sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; + }; + }; + "node-pre-gyp-0.12.0" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; + sha512 = "4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A=="; + }; + }; "node-pre-gyp-0.6.39" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -23573,13 +24105,13 @@ let sha512 = "mkw8HOosXHMBRdyJkio77vPx4Ls5IY26P5ZyoMWmKMkimXKTnX00DdpmNlkW+dHwMDYq1H66WzFtQhNOdEAbgA=="; }; }; - "node-releases-1.1.11" = { + "node-releases-1.1.13" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.11"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.11.tgz"; - sha512 = "8v1j5KfP+s5WOTa1spNUAOfreajQPN12JXbRR0oDE+YrJBQCXBnNqUDj27EKpPLOoSiU3tKi3xGPB+JaOdUEQQ=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.13.tgz"; + sha512 = "fKZGviSXR6YvVPyc011NHuJDSD8gFQvLPmc2d2V3BS4gr52ycyQ1Xzs7a8B+Ax3Ni/W+5h1h4SqmzeoA8WZRmA=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -23816,13 +24348,13 @@ let sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; }; }; - "now-and-later-2.0.0" = { + "now-and-later-2.0.1" = { name = "now-and-later"; packageName = "now-and-later"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.0.tgz"; - sha1 = "bc61cbb456d79cb32207ce47ca05136ff2e7d6ee"; + url = "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz"; + sha512 = "KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ=="; }; }; "npm-2.15.12" = { @@ -23834,13 +24366,13 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; - "npm-6.4.1" = { + "npm-6.9.1-next.0" = { name = "npm"; packageName = "npm"; - version = "6.4.1"; + version = "6.9.1-next.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.4.1.tgz"; - sha512 = "mXJL1NTVU136PtuopXCUQaNWuHlXCTp4McwlSW8S9/Aj8OEPAlSBgo8og7kJ01MjCDrkmqFQTvN5tTEhBMhXQg=="; + url = "https://registry.npmjs.org/npm/-/npm-6.9.1-next.0.tgz"; + sha512 = "rw/KR5zPIz5VGhhTusLrXRchqteHO+1uRrg0WjDSj6r7uHuaC/mnjbWO0p7i7Td19azWWQtFS3TKBvE/gAfE9w=="; }; }; "npm-bundled-1.0.6" = { @@ -24113,13 +24645,13 @@ let sha512 = "3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ=="; }; }; - "nwsapi-2.1.1" = { + "nwsapi-2.1.3" = { name = "nwsapi"; packageName = "nwsapi"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.1.tgz"; - sha512 = "T5GaA1J/d34AC8mkrFD2O0DR17kwJ702ZOtJOsS8RpbsQZVOC2/xYFb1i/cw+xdM54JIlMuojjDOYct8GIWtwg=="; + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.3.tgz"; + sha512 = "RowAaJGEgYXEZfQ7tvvdtAQUKPyTR6T6wNu0fwlNsGQYr/h3yQc6oI8WnVZh3Y/Sylwc+dtAlvPqfFZjhTyk3A=="; }; }; "oauth-0.9.15" = { @@ -24249,13 +24781,13 @@ let sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; }; }; - "object-keys-1.1.0" = { + "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz"; - sha512 = "6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="; + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; "object-path-0.11.4" = { @@ -24267,6 +24799,15 @@ let sha1 = "370ae752fbf37de3ea70a861c23bba8915691949"; }; }; + "object-to-arguments-0.0.8" = { + name = "object-to-arguments"; + packageName = "object-to-arguments"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/object-to-arguments/-/object-to-arguments-0.0.8.tgz"; + sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w=="; + }; + }; "object-values-1.0.0" = { name = "object-values"; packageName = "object-values"; @@ -24357,6 +24898,15 @@ let sha512 = "8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg=="; }; }; + "objectorarray-1.0.3" = { + name = "objectorarray"; + packageName = "objectorarray"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz"; + sha512 = "kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw=="; + }; + }; "observ-0.2.0" = { name = "observ"; packageName = "observ"; @@ -24402,6 +24952,15 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; + "omggif-1.0.9" = { + name = "omggif"; + packageName = "omggif"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/omggif/-/omggif-1.0.9.tgz"; + sha1 = "dcb7024dacd50c52b4d303f04802c91c057c765f"; + }; + }; "on-change-network-0.0.2" = { name = "on-change-network"; packageName = "on-change-network"; @@ -24555,6 +25114,15 @@ let sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; }; }; + "open-6.0.0" = { + name = "open"; + packageName = "open"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-6.0.0.tgz"; + sha512 = "/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw=="; + }; + }; "opencollective-postinstall-2.0.2" = { name = "opencollective-postinstall"; packageName = "opencollective-postinstall"; @@ -24573,15 +25141,6 @@ let sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; - "opener-1.5.1" = { - name = "opener"; - packageName = "opener"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz"; - sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="; - }; - }; "openid-2.0.6" = { name = "openid"; packageName = "openid"; @@ -24618,22 +25177,22 @@ let sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g=="; }; }; - "opn-5.4.0" = { + "opn-5.5.0" = { name = "opn"; packageName = "opn"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz"; - sha512 = "YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw=="; + url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"; + sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; }; }; - "opn-5.5.0" = { + "opn-6.0.0" = { name = "opn"; packageName = "opn"; - version = "5.5.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"; - sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; + url = "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz"; + sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ=="; }; }; "optimism-0.6.9" = { @@ -24735,13 +25294,13 @@ let sha512 = "LBS97LFe2RV6GJmXBi6OKcETKyklHNMV0xw7BtsVn2MlsgsydyZetSCbCANr+PFLmDyv4KV88nn0eCKza665Mg=="; }; }; - "ora-3.2.0" = { + "ora-3.4.0" = { name = "ora"; packageName = "ora"; - version = "3.2.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-3.2.0.tgz"; - sha512 = "XHMZA5WieCbtg+tu0uPF8CjvwQdNzKCX6BVh3N6GFsEXH40mTk5dsw/ya1lBTUGJslcEFJFQ8cBhOgkkZXQtMA=="; + url = "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz"; + sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; }; }; "orchestrator-0.3.8" = { @@ -24798,6 +25357,15 @@ let sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; + "os-homedir-2.0.0" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-2.0.0.tgz"; + sha512 = "saRNz0DSC5C/I++gFIaJTXoFJMRwiP5zHar5vV3xQ2TkgEw6hDCcU5F272JjUylpiVgBrZNQHnfjkLabTfb92Q=="; + }; + }; "os-locale-1.4.0" = { name = "os-locale"; packageName = "os-locale"; @@ -24825,15 +25393,6 @@ let sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; }; }; - "os-name-1.0.3" = { - name = "os-name"; - packageName = "os-name"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz"; - sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; - }; - }; "os-name-2.0.1" = { name = "os-name"; packageName = "os-name"; @@ -24843,13 +25402,13 @@ let sha1 = "b9a386361c17ae3a21736ef0599405c9a8c5dc5e"; }; }; - "os-name-3.0.0" = { + "os-name-3.1.0" = { name = "os-name"; packageName = "os-name"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-name/-/os-name-3.0.0.tgz"; - sha512 = "7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g=="; + url = "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz"; + sha512 = "h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg=="; }; }; "os-shim-0.1.3" = { @@ -24888,15 +25447,6 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "osx-release-1.1.0" = { - name = "osx-release"; - packageName = "osx-release"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz"; - sha1 = "f217911a28136949af1bf9308b241e2737d3cd6c"; - }; - }; "p-any-1.1.0" = { name = "p-any"; packageName = "p-any"; @@ -24969,13 +25519,13 @@ let sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; }; }; - "p-is-promise-2.0.0" = { + "p-is-promise-2.1.0" = { name = "p-is-promise"; packageName = "p-is-promise"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz"; - sha512 = "pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="; + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; }; }; "p-limit-1.3.0" = { @@ -25086,13 +25636,13 @@ let sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; }; - "p-try-2.1.0" = { + "p-try-2.2.0" = { name = "p-try"; packageName = "p-try"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-2.1.0.tgz"; - sha512 = "H2RyIJ7+A3rjkwKC2l5GGtU4H1vkxKCAGsWasNVd0Set+6i4znxbWy6/j16YDPJDWxhsgZiKAstMEP8wCdSpjA=="; + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; "p-waterfall-1.0.0" = { @@ -25104,15 +25654,6 @@ let sha1 = "7ed94b3ceb3332782353af6aae11aa9fc235bb00"; }; }; - "pac-proxy-agent-2.0.2" = { - name = "pac-proxy-agent"; - packageName = "pac-proxy-agent"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz"; - sha512 = "cDNAN1Ehjbf5EHkNY5qnRhGPUCp6SnpyVof5fRzN800QV1Y2OkzbH9rmjZkbBRa8igof903yOnjIl6z0SlAhxA=="; - }; - }; "pac-proxy-agent-3.0.0" = { name = "pac-proxy-agent"; packageName = "pac-proxy-agent"; @@ -25149,13 +25690,13 @@ let sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="; }; }; - "package-json-6.1.0" = { + "package-json-6.3.0" = { name = "package-json"; packageName = "package-json"; - version = "6.1.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-6.1.0.tgz"; - sha512 = "TCE9JWb3IU1XMy/d9j3lwLJFF8UUfO7tiXminR3OhtsEm6147k+IFwQ3gAu2VqLZmFvcnOoIKUwOVteUmKwW4Q=="; + url = "https://registry.npmjs.org/package-json/-/package-json-6.3.0.tgz"; + sha512 = "XO7WS3EEXd48vmW633Y97Mh9xuENFiOevI9G+ExfTG/k6xuY9cBd3fxkAoDMSEsNZXasaVJIJ1rD/n7GMf18bA=="; }; }; "package-json-versionify-1.0.4" = { @@ -25266,13 +25807,13 @@ let sha512 = "b6t7ORo/MwT6xvRiuu1c1do3+CAUd7/0rgc1d3qNHUeP64zxy4ttLIvK7SEHzyfyDLvD9pPuV9mYKHf6MgUkmg=="; }; }; - "parent-module-1.0.0" = { + "parent-module-1.0.1" = { name = "parent-module"; packageName = "parent-module"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.0.tgz"; - sha512 = "8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA=="; + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; "parents-1.0.1" = { @@ -25725,13 +26266,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "path-loader-1.0.9" = { + "path-loader-1.0.10" = { name = "path-loader"; packageName = "path-loader"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.9.tgz"; - sha512 = "pD37gArtr+/72Tst9oJoDB9k7gB9A09Efj7yyBi5HDUqaxqULXBWW8Rnw2TfNF+3sN7QZv0ZNdW1Qx2pFGW5Jg=="; + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.10.tgz"; + sha512 = "CMP0v6S6z8PHeJ6NFVyVJm6WyJjIwFvyz2b0n2/4bKdS/0uZa/9sKUlYZzubrn3zuDRU0zIuEDX9DZYQ2ZI8TA=="; }; }; "path-parse-1.0.6" = { @@ -26067,13 +26608,22 @@ let sha512 = "NIua0mGb9Adknq35ONvQmvh93LCUVUjp2+1q1EcvIkJmpJnSd3E5rHVKlKNjzMXFl/z3fI+QA0xXCjPEKNiLvQ=="; }; }; - "pino-std-serializers-2.3.0" = { + "pino-std-serializers-2.4.0" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; - version = "2.3.0"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.4.0.tgz"; + sha512 = "ysT2ylXu1aEec9k8cm/lz7emBcfpdxFWHqvHeGXf1wvfw7TKPMGhLWwS+ciHw6u4ffnmV+pkAMF4MUIZmZZdSg=="; + }; + }; + "pipe-functions-1.3.0" = { + name = "pipe-functions"; + packageName = "pipe-functions"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.3.0.tgz"; - sha512 = "klfGoOsP6sJH7ON796G4xoUSx2fkpFgKHO4YVVO2zmz31jR+etzc/QzGJILaOIiCD6HTCFgkPx+XN8nk+ruqPw=="; + url = "https://registry.npmjs.org/pipe-functions/-/pipe-functions-1.3.0.tgz"; + sha512 = "6Rtbp7criZRwedlvWbUYxqlqJoAlMvYHo2UcRWq79xZ54vZcaNHpVBOcWkX3ErT2aUA69tv+uiv4zKJbhD/Wgg=="; }; }; "pkg-dir-2.0.0" = { @@ -26157,24 +26707,6 @@ let sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; }; }; - "plist-2.0.1" = { - name = "plist"; - packageName = "plist"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz"; - sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; - }; - }; - "plist-2.1.0" = { - name = "plist"; - packageName = "plist"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz"; - sha1 = "57ccdb7a0821df21831217a3cad54e3e146a1025"; - }; - }; "plist-3.0.1" = { name = "plist"; packageName = "plist"; @@ -26256,6 +26788,15 @@ let sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; }; }; + "pngjs-2.3.1" = { + name = "pngjs"; + packageName = "pngjs"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pngjs/-/pngjs-2.3.1.tgz"; + sha1 = "11d1e12b9cb64d63e30c143a330f4c1f567da85f"; + }; + }; "po2json-0.4.5" = { name = "po2json"; packageName = "po2json"; @@ -26671,6 +27212,15 @@ let sha512 = "jL6eFIzoN3xUEvbo33OAkSDE2VIKU4JQ1wENOows1DpfnrdapR/K3Q1/fB43Mq7wQlcSgRm23nFrvoioufM7eA=="; }; }; + "prebuild-install-4.0.0" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz"; + sha512 = "7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA=="; + }; + }; "prebuild-install-5.2.5" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -26797,13 +27347,13 @@ let sha512 = "dWBTeQbyWr/4d97ZKjxFPvIHytnNlBsNzgsJC1eew3qoZ9A8vtRIFhsnPiD3kYIf67w56i2QO2O5Infe2FzMww=="; }; }; - "prismjs-1.15.0" = { + "prismjs-1.16.0" = { name = "prismjs"; packageName = "prismjs"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.15.0.tgz"; - sha512 = "Lf2JrFYx8FanHrjoV5oL8YHCclLQgbJcVZR+gikGGMqz6ub5QVWDTM6YIwm3BuPxM/LOV+rKns3LssXNLIf+DA=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.16.0.tgz"; + sha512 = "OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA=="; }; }; "private-0.1.8" = { @@ -26959,6 +27509,15 @@ let sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; }; }; + "promisize-1.1.2" = { + name = "promisize"; + packageName = "promisize"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/promisize/-/promisize-1.1.2.tgz"; + sha1 = "9b47e2cb2ae497eb1ebadc2c4191d64d15c949d1"; + }; + }; "prompt-0.2.14" = { name = "prompt"; packageName = "prompt"; @@ -27004,6 +27563,15 @@ let sha512 = "8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ=="; }; }; + "proper-lockfile-2.0.1" = { + name = "proper-lockfile"; + packageName = "proper-lockfile"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz"; + sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d"; + }; + }; "properties-1.2.1" = { name = "properties"; packageName = "properties"; @@ -27013,15 +27581,6 @@ let sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; }; }; - "properties-parser-0.3.1" = { - name = "properties-parser"; - packageName = "properties-parser"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz"; - sha1 = "1316e9539ffbfd93845e369b211022abd478771a"; - }; - }; "proto-list-1.2.4" = { name = "proto-list"; packageName = "proto-list"; @@ -27103,15 +27662,6 @@ let sha512 = "5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA=="; }; }; - "proxy-agent-2.3.1" = { - name = "proxy-agent"; - packageName = "proxy-agent"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz"; - sha512 = "CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg=="; - }; - }; "proxy-agent-3.1.0" = { name = "proxy-agent"; packageName = "proxy-agent"; @@ -27814,22 +28364,22 @@ let sha512 = "pdE/OKi/jnp9DqGgNRzLY0oVHffn/8TXJmBPzv+ikdvpkeA0J//l5d7TZk1yWwZj9P0JcOIEVDOuHzhXaeBlmw=="; }; }; - "q-1.0.1" = { + "q-0.9.7" = { name = "q"; packageName = "q"; - version = "1.0.1"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz"; - sha1 = "11872aeedee89268110b10a718448ffb10112a14"; + url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }; }; - "q-1.4.1" = { + "q-1.1.2" = { name = "q"; packageName = "q"; - version = "1.4.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; - sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; + url = "https://registry.npmjs.org/q/-/q-1.1.2.tgz"; + sha1 = "6357e291206701d99f197ab84e57e8ad196f2a89"; }; }; "q-1.5.1" = { @@ -27940,13 +28490,13 @@ let sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; - "qs-6.6.0" = { + "qs-6.7.0" = { name = "qs"; packageName = "qs"; - version = "6.6.0"; + version = "6.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.6.0.tgz"; - sha512 = "KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA=="; + url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; "query-string-1.0.1" = { @@ -27958,6 +28508,15 @@ let sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; }; }; + "query-string-4.3.4" = { + name = "query-string"; + packageName = "query-string"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz"; + sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; + }; + }; "query-string-5.1.1" = { name = "query-string"; packageName = "query-string"; @@ -28246,13 +28805,13 @@ let sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; - "react-is-16.8.4" = { + "react-is-16.8.6" = { name = "react-is"; packageName = "react-is"; - version = "16.8.4"; + version = "16.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.8.4.tgz"; - sha512 = "PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA=="; + url = "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz"; + sha512 = "aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="; }; }; "read-1.0.7" = { @@ -28273,6 +28832,15 @@ let sha1 = "6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"; }; }; + "read-chunk-3.2.0" = { + name = "read-chunk"; + packageName = "read-chunk"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz"; + sha512 = "CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ=="; + }; + }; "read-cmd-shim-1.0.1" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -28444,13 +29012,13 @@ let sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.2.0" = { + "readable-stream-3.3.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz"; - sha512 = "RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz"; + sha512 = "EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw=="; }; }; "readdir-scoped-modules-1.0.2" = { @@ -28498,13 +29066,13 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "recast-0.17.4" = { + "recast-0.17.5" = { name = "recast"; packageName = "recast"; - version = "0.17.4"; + version = "0.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.17.4.tgz"; - sha512 = "94mbtFr2e4XoleJVCQQ138gK7xT2IScq25+thwEzNWd/hjOXQd6ejFiztgZZGVSByoV7/k3pLBXO3RK1BvJsIw=="; + url = "https://registry.npmjs.org/recast/-/recast-0.17.5.tgz"; + sha512 = "K+DgfAMIyEjNKjaFSWgg9TTu7wFgU/4KTyw4E9vl6M5QPDuUYbyt49Yzb0EIDbZks+6lXk/UZ9eTuE4jlLyf2A=="; }; }; "rechoir-0.6.2" = { @@ -28579,6 +29147,24 @@ let sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; }; }; + "reduce-flatten-1.0.1" = { + name = "reduce-flatten"; + packageName = "reduce-flatten"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz"; + sha1 = "258c78efd153ddf93cb561237f61184f3696e327"; + }; + }; + "redux-3.7.2" = { + name = "redux"; + packageName = "redux"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz"; + sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; + }; + }; "regenerate-1.4.0" = { name = "regenerate"; packageName = "regenerate"; @@ -28732,13 +29318,13 @@ let sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; - "registry-url-5.0.0" = { + "registry-url-5.1.0" = { name = "registry-url"; packageName = "registry-url"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/registry-url/-/registry-url-5.0.0.tgz"; - sha512 = "qH1SjdlyxreHU8atIDzP1MOb1GG2g5746L3nnwISWTUh8GBLotl82sOayZJtm/KwmrMeMaEzAV26o6Pk1hJuoA=="; + url = "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; }; "regjsgen-0.2.0" = { @@ -29551,13 +30137,13 @@ let sha512 = "SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ=="; }; }; - "rollup-pluginutils-2.5.0" = { + "rollup-pluginutils-2.6.0" = { name = "rollup-pluginutils"; packageName = "rollup-pluginutils"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.5.0.tgz"; - sha512 = "9Muh1H+XB5f5ONmKMayUoTYR1EZwHbwJJ9oZLrKT5yuTf/RLIQ5mYIGsrERquVucJmjmaAW0Y7+6Qo1Ep+5w3Q=="; + url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz"; + sha512 = "aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ=="; }; }; "root-check-1.0.0" = { @@ -29839,15 +30425,6 @@ let sha1 = "612da1c96473fa02dccda92dcd5b4ab164a6772a"; }; }; - "sax-0.3.5" = { - name = "sax"; - packageName = "sax"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; - sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; - }; - }; "sax-1.1.4" = { name = "sax"; packageName = "sax"; @@ -30046,6 +30623,24 @@ let sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="; }; }; + "semver-5.7.0" = { + name = "semver"; + packageName = "semver"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; + }; + }; + "semver-6.0.0" = { + name = "semver"; + packageName = "semver"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz"; + sha512 = "0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ=="; + }; + }; "semver-compare-1.0.0" = { name = "semver-compare"; packageName = "semver-compare"; @@ -30244,13 +30839,13 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; - "serve-handler-5.0.8" = { + "serve-handler-6.0.0" = { name = "serve-handler"; packageName = "serve-handler"; - version = "5.0.8"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-5.0.8.tgz"; - sha512 = "pqk0SChbBLLHfMIxQ55czjdiW7tj2cFy53svvP8e5VqEN/uB/QpfiTJ8k1uIYeFTDVoi+FGi5aqXScuu88bymg=="; + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-6.0.0.tgz"; + sha512 = "2/e0+N1abV1HAN+YN8uCOPi1B0bIYaR6kRcSfzezRwszak5Yzr6QhT34XJk2Bw89rhXenqwLNJb4NnF2/krnGQ=="; }; }; "serve-index-1.7.3" = { @@ -30370,6 +30965,15 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; + "seventh-0.7.18" = { + name = "seventh"; + packageName = "seventh"; + version = "0.7.18"; + src = fetchurl { + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.18.tgz"; + sha512 = "fwO9/Ogh28KdAUz71fgJBn3NezuFWaiVLa2HW2/6TlAGsUzTUVPIuxQEGMKqPNerTJ+ZZDrFlPH98sdvBZpa1A=="; + }; + }; "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; @@ -30406,6 +31010,15 @@ let sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; }; }; + "sharp-0.20.8" = { + name = "sharp"; + packageName = "sharp"; + version = "0.20.8"; + src = fetchurl { + url = "https://registry.npmjs.org/sharp/-/sharp-0.20.8.tgz"; + sha512 = "A8NaPGWRDKpmHTi8sl2xzozYXhTQWBb/GaJ8ZPU7L/vKW8wVvd4Yq+isJ0c7p9sX5gnjPQcM3eOfHuvvnZ2fOQ=="; + }; + }; "shasum-1.0.2" = { name = "shasum"; packageName = "shasum"; @@ -30451,15 +31064,6 @@ let sha1 = "3596e6307a781544f591f37da618360f31db57b1"; }; }; - "shelljs-0.5.3" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"; - sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113"; - }; - }; "shelljs-0.7.7" = { name = "shelljs"; packageName = "shelljs"; @@ -30595,13 +31199,13 @@ let sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; - "simple-git-1.107.0" = { + "simple-git-1.110.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.107.0"; + version = "1.110.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.107.0.tgz"; - sha512 = "t4OK1JRlp4ayKRfcW6owrWcRVLyHRUlhGd0uN6ZZTqfDq8a5XpcUdOKiGRNobHEuMtNqzp0vcJNvhYWwh5PsQA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.110.0.tgz"; + sha512 = "UYY0rQkknk0P5eb+KW+03F4TevZ9ou0H+LoGaj7iiVgpnZH4wdj/HTViy/1tNNkmIPcmtxuBqXWiYt2YwlRKOQ=="; }; }; "simple-peer-6.4.4" = { @@ -30613,22 +31217,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.2.1" = { + "simple-peer-9.3.0" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.2.1"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.2.1.tgz"; - sha512 = "NDAQefJCcmpni/csZgBEBDyDglTMBJOoZSl3pUQTWud+jqy02CX8LMz8Ys9qVLmm1D4IW/NP24pM9vKK0MRgXQ=="; - }; - }; - "simple-plist-0.2.1" = { - name = "simple-plist"; - packageName = "simple-plist"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; - sha1 = "71766db352326928cf3a807242ba762322636723"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.3.0.tgz"; + sha512 = "5dLDfrRomrS2LuZUuH2aO7yTGtHFEl5Eb+8ZzqM0KC0lHcYUyJudUomP9ZY/lPUKBx2broL/Eee9bQ53yycEgQ=="; }; }; "simple-sha1-2.1.2" = { @@ -30793,15 +31388,6 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "smart-buffer-1.1.15" = { - name = "smart-buffer"; - packageName = "smart-buffer"; - version = "1.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; - sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; - }; - }; "smart-buffer-4.0.2" = { name = "smart-buffer"; packageName = "smart-buffer"; @@ -30910,13 +31496,13 @@ let sha512 = "eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA=="; }; }; - "snyk-docker-plugin-1.22.0" = { + "snyk-docker-plugin-1.22.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.22.0.tgz"; - sha512 = "bykxNtfeWQNFjF6gv8u8w+TOa4fdr+teLm+DkvYlWkdlvaw5m4yywRI5USve4X6S9p4G+Fw4/wfjXx7LgCcxrQ=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.22.1.tgz"; + sha512 = "4Qj+Fn9uCD7ydl60soVFfDG27ghZ6sCIiVPs5Wr62zgzbpnKCNF2MzXtxmsbZA1QRLKH2YxbJTog1Rvu013akA=="; }; }; "snyk-go-plugin-1.6.1" = { @@ -30928,13 +31514,13 @@ let sha512 = "hFOMyznfcMzF1HaZP18VmjQSqK/jBOowh0lpJY4UqmaQSZyJury3Ax+44O9oVUJi8lb8A4g7RVbxhlWl6bIqlA=="; }; }; - "snyk-gradle-plugin-2.3.0" = { + "snyk-gradle-plugin-2.5.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.3.0.tgz"; - sha512 = "XnADEkQ4YXxFrKnd+F2+ixmvhgDG4yyBpYE1RMx3i/2y9auXkt/E+pWTmU4xnofFEtuAnZiYcfvOE6dIGk06KA=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.5.0.tgz"; + sha512 = "XBXIYSeAaTye0mBdnr9TTHXfdebb5tUBUOuh6gCAcf3I/QMKPdWeMcKR1r+cEnMm+M4FGXonz+fpbxTHArX7Jg=="; }; }; "snyk-module-1.9.1" = { @@ -30955,22 +31541,22 @@ let sha512 = "TBrdcFXHdYuRYFCvpyUeFC+mCi6SOV3vdxgHrP7JRNnJwO8PYaKCObLJyhpRWa8IaHv/8CjJTmnEbWIh7BPHAA=="; }; }; - "snyk-nodejs-lockfile-parser-1.11.0" = { + "snyk-nodejs-lockfile-parser-1.12.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.11.0.tgz"; - sha512 = "eTdq5VcaHJwGoApejebTChi5hRcIDdNbO6lMwncS0zz9ZxXskoQ0C+VMdep8ELmJa0Gcz6es1sSkABPZs7frrg=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.12.0.tgz"; + sha512 = "HKLH30guWkRoLf4S5a39dz+wVdopeEI3dpxGjHzd8mbtxDKXY/8a8X9c+mkMrjmKxUA0UlbUwvRPCrJuVhvsZg=="; }; }; - "snyk-nuget-plugin-1.7.2" = { + "snyk-nuget-plugin-1.9.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.7.2"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.7.2.tgz"; - sha512 = "zmYD9veH7OeIqGnZHiGv8c8mKtmYrxo2o7P4lNUkpHdCMMsar7moRJxGgO9WlcIrwAGjIhMdP9fUvJ+jVDEteQ=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.9.0.tgz"; + sha512 = "GsxMcX2HpOFMv1oqAvI8b9dp4EKvOkvCixm24mwS4GjNo/ibeLAnsxs51W9qUyIaNF+F0y2J4k54n6azAnsxdw=="; }; }; "snyk-paket-parser-1.4.3" = { @@ -30991,13 +31577,13 @@ let sha512 = "s/s9s7mslHjLnzin2BNLGdy/s6tNBfJ4/T/d9JBjsjIwdJFaUKY/ciWwBLNaWt2Aqtyr3DiUcqg3j/pwTKhEDg=="; }; }; - "snyk-policy-1.13.3" = { + "snyk-policy-1.13.4" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.13.3"; + version = "1.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.13.3.tgz"; - sha512 = "6J2a+Wt9zgvTtCwi4x8rLtkDQzFNPqubfIgs3aR35ZsEXPwI4XHGo0cxnJPDriqncp2JK72vnRpNfIZ7v0L1Mw=="; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.13.4.tgz"; + sha512 = "b7KdS/q2uCbQZblf6OpdyBv+2V8l1yBkqSBd+ROTVi/+MT8MgfsnOFwayndEO6sQiUEUXmmKY4ocplk8GbJwYw=="; }; }; "snyk-python-plugin-1.9.1" = { @@ -31198,15 +31784,6 @@ let sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng=="; }; }; - "socks-1.1.10" = { - name = "socks"; - packageName = "socks"; - version = "1.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; - sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; - }; - }; "socks-2.3.2" = { name = "socks"; packageName = "socks"; @@ -31216,15 +31793,6 @@ let sha512 = "pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ=="; }; }; - "socks-proxy-agent-3.0.1" = { - name = "socks-proxy-agent"; - packageName = "socks-proxy-agent"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz"; - sha512 = "ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA=="; - }; - }; "socks-proxy-agent-4.0.2" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -31261,13 +31829,13 @@ let sha512 = "FbZ/X/2Xq3DAMhuRA4bnN0jy1QxaPTVPLFvyv6CEj0QDKSTdWp9yRxo1JhqXmWKhPQeJyUMajHJB2UjT43pFcw=="; }; }; - "sodium-browserify-1.2.5" = { + "sodium-browserify-1.2.7" = { name = "sodium-browserify"; packageName = "sodium-browserify"; - version = "1.2.5"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.2.5.tgz"; - sha512 = "X3+Z4uYPGceVjRz6qLY/4clVU/gYo1KC9q4L4FSjqFfomzsndMutNAgbVoJa0nsilQw6I/Y7jDQ7SCbUdaOiKw=="; + url = "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.2.7.tgz"; + sha512 = "PGhNO8KravjroRDYvurMPRYi4xMM7zjTW10R77Nq9sjkU314YA2sPeXS6UA5k/rLHaXLaZ6YfLLVz+DdCU5w0g=="; }; }; "sodium-browserify-tweetnacl-0.2.5" = { @@ -31603,13 +32171,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.3" = { + "spdx-license-ids-3.0.4" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz"; - sha512 = "uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz"; + sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="; }; }; "spdy-1.32.5" = { @@ -31666,6 +32234,24 @@ let sha1 = "b7e8e0ab51345158b72c1f6dbef2406d51f1d027"; }; }; + "split-skip-0.0.1" = { + name = "split-skip"; + packageName = "split-skip"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split-skip/-/split-skip-0.0.1.tgz"; + sha1 = "80ad8e36e98e576454cc3b667c1dd25d865e8f00"; + }; + }; + "split-skip-0.0.2" = { + name = "split-skip"; + packageName = "split-skip"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/split-skip/-/split-skip-0.0.2.tgz"; + sha1 = "d89d88bbd2f73e46b5158aa370a561224e80d461"; + }; + }; "split-string-3.1.0" = { name = "split-string"; packageName = "split-string"; @@ -31711,6 +32297,24 @@ let sha1 = "cffcaf702daf65ea39bb4e0fa2b299cec1a1be46"; }; }; + "sprintf-js-1.1.2" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz"; + sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; + }; + }; + "sqlite3-4.0.6" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.6.tgz"; + sha512 = "EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw=="; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -31765,13 +32369,13 @@ let sha512 = "/4nFP7yj1JD5jrwX9bHG2nipBefl++xXXbNWD14eL+Ohs3X8kdmJeBKnHgiIF7Je4HQOI31OmEIdyyLKum5niQ=="; }; }; - "ssb-ebt-5.5.3" = { + "ssb-ebt-5.5.5" = { name = "ssb-ebt"; packageName = "ssb-ebt"; - version = "5.5.3"; + version = "5.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.5.3.tgz"; - sha512 = "eB41pjKGJspgHo9XioR6LVoxy60p4acyv1J/bRflncOd121Md29aPbTY3X4rAMKGlaXkrUPSD9C1jB+kXSjWVg=="; + url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.5.5.tgz"; + sha512 = "oXyFJrlMIH57hUtq7elzYGmiECArCR/tXdasbSJJvGJOCd/GvlEX+JCp9Ivoxs7zWIhruC85gy/rJqsvtIMdfQ=="; }; }; "ssb-friends-3.1.13" = { @@ -31918,13 +32522,13 @@ let sha512 = "Wbttwlr+wVqcoxGsn+WoiBbSI9UMqgL/DZU6Pjm/KQ61LO7jaxV4hGw3+H4uRBtgtOE4pidvHeCk7jUuoXWZfQ=="; }; }; - "ssh-config-1.1.5" = { + "ssh-config-1.1.6" = { name = "ssh-config"; packageName = "ssh-config"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.5.tgz"; - sha512 = "j3Yo++WWfc+2eFrSFclQZ79RRyMF2BOkDLboaUxyysYNomrLjIoOWanFbulHH5fLErRuW8YrO31p7MKpI4XrZw=="; + url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.6.tgz"; + sha512 = "ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA=="; }; }; "sshpk-1.14.1" = { @@ -32332,13 +32936,13 @@ let sha512 = "UxSISjxmguvfYzZdq6d4XAjc3gAocqTIOS1CjgwkDkkGT/LMTsIYiV8agIw42IHFFHf8k4lPOoroCCf4W9oqzg=="; }; }; - "streamroller-1.0.3" = { + "streamroller-1.0.4" = { name = "streamroller"; packageName = "streamroller"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-1.0.3.tgz"; - sha512 = "P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-1.0.4.tgz"; + sha512 = "Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ=="; }; }; "streamsearch-0.1.2" = { @@ -32395,6 +32999,15 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; + "string-kit-0.9.1" = { + name = "string-kit"; + packageName = "string-kit"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.9.1.tgz"; + sha512 = "2iWkq43jbvG7WSqei4iVlpjmA7JWgqIC4lHgpwib0687B2d3qUOQQeaVDjqyG4Epuxx/0NY87zOqOyIjZVKxVA=="; + }; + }; "string-length-2.0.0" = { name = "string-length"; packageName = "string-length"; @@ -32404,6 +33017,15 @@ let sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed"; }; }; + "string-padding-1.0.2" = { + name = "string-padding"; + packageName = "string-padding"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-padding/-/string-padding-1.0.2.tgz"; + sha1 = "3aaad855b3e9735c5e412dfe72198ccf99c7f48e"; + }; + }; "string-similarity-2.0.0" = { name = "string-similarity"; packageName = "string-similarity"; @@ -32431,6 +33053,15 @@ let sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; }; }; + "string-to-stream-1.1.1" = { + name = "string-to-stream"; + packageName = "string-to-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-to-stream/-/string-to-stream-1.1.1.tgz"; + sha512 = "QySF2+3Rwq0SdO3s7BAp4x+c3qsClpPQ6abAmb0DGViiSBAkT5kL6JT2iyzEVP+T1SmzHrQD1TwlP9QAHCc+Sw=="; + }; + }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -32458,15 +33089,6 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string.prototype.codepointat-0.2.1" = { - name = "string.prototype.codepointat"; - packageName = "string.prototype.codepointat"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz"; - sha512 = "2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="; - }; - }; "string.prototype.padstart-3.0.0" = { name = "string.prototype.padstart"; packageName = "string.prototype.padstart"; @@ -32503,15 +33125,6 @@ let sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; }; - "string_decoder-1.0.3" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ=="; - }; - }; "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; @@ -32539,6 +33152,15 @@ let sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A=="; }; }; + "stringify-parameters-0.0.4" = { + name = "stringify-parameters"; + packageName = "stringify-parameters"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-parameters/-/stringify-parameters-0.0.4.tgz"; + sha512 = "H3L90ERn5UPtkpO8eugnKcLgpIVlvTyUTrcLGm607AV5JDH6z0GymtNLr3gjGlP6I6NB/mxNX9QpY6jEQGLPdQ=="; + }; + }; "stringstream-0.0.6" = { name = "stringstream"; packageName = "stringstream"; @@ -32845,15 +33467,6 @@ let sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA=="; }; }; - "superagent-4.0.0" = { - name = "superagent"; - packageName = "superagent"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-4.0.0.tgz"; - sha512 = "qaGDf+QUYxgMYdJBWCezHnc3UjrCUwxm5bCfxBhTXI5BbCluVzmVNYzxvCw1jP9PXmwUZeOW2yPpGm9fLbhtFg=="; - }; - }; "superagent-4.1.0" = { name = "superagent"; packageName = "superagent"; @@ -32971,13 +33584,13 @@ let sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"; }; }; - "svgo-1.2.0" = { + "svgo-1.2.1" = { name = "svgo"; packageName = "svgo"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz"; - sha512 = "xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw=="; + url = "https://registry.npmjs.org/svgo/-/svgo-1.2.1.tgz"; + sha512 = "Y1+LyT4/y1ms4/0yxPMSlvx6dIbgklE9w8CIOnfeoFGB74MEkq8inSfEr6NhocTaFbyYp0a1dvNgRKGRmEBlzA=="; }; }; "swagger-converter-0.1.7" = { @@ -33079,6 +33692,15 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; + "syswide-cas-5.3.0" = { + name = "syswide-cas"; + packageName = "syswide-cas"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/syswide-cas/-/syswide-cas-5.3.0.tgz"; + sha512 = "+RLgS6VInsX8rBpL+gy5qpa7phngecbK7NABelBZpqYpBTwOIK1y7CqHlXK5Vy/rA4erD9q/FyKzMjx2uX3zYg=="; + }; + }; "table-3.8.3" = { name = "table"; packageName = "table"; @@ -33097,6 +33719,15 @@ let sha512 = "N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ=="; }; }; + "table-layout-0.4.4" = { + name = "table-layout"; + packageName = "table-layout"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/table-layout/-/table-layout-0.4.4.tgz"; + sha512 = "uNaR3SRMJwfdp9OUr36eyEi6LLsbcTqTO/hfTsNviKsNeyMBPICJCC7QXRF3+07bAP6FRwA8rczJPBqXDc0CkQ=="; + }; + }; "tabtab-1.3.2" = { name = "tabtab"; packageName = "tabtab"; @@ -33269,6 +33900,15 @@ let sha512 = "G3I7QWUBSNWaekrJcDabydF6dcvy+vZ2PrX04JYq1p914TOLgpN+ryMtheGavs1LYVevTbTmwjQY8aeX8yLsyA=="; }; }; + "tcp-port-used-0.1.2" = { + name = "tcp-port-used"; + packageName = "tcp-port-used"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-0.1.2.tgz"; + sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29"; + }; + }; "temp-0.6.0" = { name = "temp"; packageName = "temp"; @@ -33287,6 +33927,15 @@ let sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; }; }; + "temp-0.9.0" = { + name = "temp"; + packageName = "temp"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz"; + sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="; + }; + }; "temp-dir-1.0.0" = { name = "temp-dir"; packageName = "temp-dir"; @@ -33323,6 +33972,15 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; + "terminal-kit-1.27.2" = { + name = "terminal-kit"; + packageName = "terminal-kit"; + version = "1.27.2"; + src = fetchurl { + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.27.2.tgz"; + sha512 = "aLfIz8ReP6Ifky5UxyRfP9dtnvtHR2rKa7nZuXeC+6uExQMpH7NFM/UL02ppiO9oNyGS4l3o8447y0ix6uRZeg=="; + }; + }; "terser-3.17.0" = { name = "terser"; packageName = "terser"; @@ -33620,15 +34278,6 @@ let sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; }; }; - "timespan-2.3.0" = { - name = "timespan"; - packageName = "timespan"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz"; - sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929"; - }; - }; "timsort-0.3.0" = { name = "timsort"; packageName = "timsort"; @@ -33683,6 +34332,15 @@ let sha512 = "rUwGDruKq1gX+FFHbTl5qjI7teVO7eOe+C8IcQ7QT+1BK3eEUXJqbZcBOeaRP4FwSC/C1A5jDoIVta0nIQ9yew=="; }; }; + "tkwidgets-0.5.26" = { + name = "tkwidgets"; + packageName = "tkwidgets"; + version = "0.5.26"; + src = fetchurl { + url = "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.26.tgz"; + sha512 = "zxhwsBpxD5fglnqHYZ9ZjunC8Hc67u/7QXzxHmhAIzzSr4a/Cq5PbzCeHsBZ7WL99uBUa6xgVLfjmGxnFU8XMg=="; + }; + }; "tmp-0.0.29" = { name = "tmp"; packageName = "tmp"; @@ -33710,6 +34368,15 @@ let sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; + "tmp-0.1.0" = { + name = "tmp"; + packageName = "tmp"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz"; + sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; + }; + }; "tmp-graphql-config-extension-openapi-1.0.7" = { name = "tmp-graphql-config-extension-openapi"; packageName = "tmp-graphql-config-extension-openapi"; @@ -34088,6 +34755,15 @@ let sha512 = "4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q=="; }; }; + "tree-kit-0.6.1" = { + name = "tree-kit"; + packageName = "tree-kit"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.6.1.tgz"; + sha512 = "7mV4KbsLMuA6ths3J1wpVUj2PLmLdoNEGnP9fm3kxef4UXYC/A0rL5gKsqtkUaCMuRYUMORyioy8IpBWUBQ1Ig=="; + }; + }; "trim-0.0.1" = { name = "trim"; packageName = "trim"; @@ -34367,6 +35043,15 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; + "type-fest-0.3.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.3.0.tgz"; + sha512 = "fg3sfdDdJDtdHLUpeGsf/fLyG1aapk6zgFiYG5+MDUPybGrJemH4SLk5tP7hGRe8ntxjg0q5LYW53b6YpJIQ9Q=="; + }; + }; "type-is-1.5.7" = { name = "type-is"; packageName = "type-is"; @@ -34430,13 +35115,13 @@ let sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; }; }; - "typescript-3.3.4000" = { + "typescript-3.4.2" = { name = "typescript"; packageName = "typescript"; - version = "3.3.4000"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz"; - sha512 = "jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.4.2.tgz"; + sha512 = "Og2Vn6Mk7JAuWA1hQdDQN/Ekm/SchX80VzLhjKN9ETYrIepBFAd8PkOdOTK2nKt0FCkmMZKBJvQ1dV1gIxPu/A=="; }; }; "typewise-1.0.3" = { @@ -34466,6 +35151,15 @@ let sha1 = "c8882fa1bb1092c06005a97f34ef5c8508e3664e"; }; }; + "typical-2.6.1" = { + name = "typical"; + packageName = "typical"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz"; + sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; + }; + }; "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; @@ -34502,13 +35196,13 @@ let sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; }; }; - "uglify-js-3.5.1" = { + "uglify-js-3.5.3" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.5.1"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.1.tgz"; - sha512 = "kI+3c+KphOAKIikQsZoT2oDsVYH5qvhpTtFObfMCdhPAYnjSvmW4oTWMhvDD4jtAGHJwztlBXQgozGcq3Xw9oQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; + sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -34592,6 +35286,15 @@ let sha512 = "jNn1eEi81BLiZfJkjbiAKPDMj7iFrturKazqpBu0aJYLr6evgkn+9rgkX/gUwPBj5j2Ri5oUelsqC/S1zmpWBA=="; }; }; + "uint48be-2.0.1" = { + name = "uint48be"; + packageName = "uint48be"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uint48be/-/uint48be-2.0.1.tgz"; + sha512 = "LQvWofTo3RCz+XaQR3VNch+dDFwpIvWr/98imhQne++vFhpQP16YAC/a8w9N00Heqqra00ACjHT18cgvn5H+bg=="; + }; + }; "uint64be-2.0.2" = { name = "uint64be"; packageName = "uint64be"; @@ -35042,13 +35745,13 @@ let sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg=="; }; }; - "unorm-1.5.0" = { - name = "unorm"; - packageName = "unorm"; - version = "1.5.0"; + "unpack-string-0.0.2" = { + name = "unpack-string"; + packageName = "unpack-string"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unorm/-/unorm-1.5.0.tgz"; - sha512 = "sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw=="; + url = "https://registry.npmjs.org/unpack-string/-/unpack-string-0.0.2.tgz"; + sha1 = "302ecf08238b0139bd434a4d7fd67cdf33ca275d"; }; }; "unpipe-1.0.0" = { @@ -35285,6 +35988,15 @@ let sha512 = "rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw=="; }; }; + "url-parse-1.4.4" = { + name = "url-parse"; + packageName = "url-parse"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz"; + sha512 = "/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg=="; + }; + }; "url-parse-lax-1.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -35573,15 +36285,6 @@ let sha512 = "axKLXVqwtdI/czrjG0X8hyV1KLgeWx8F4KvSbvVCnS+RUvsQMGRjx0kfuZDXXqj0LYvVJmx3B9kWlKtEdRrJLg=="; }; }; - "uuid-2.0.3" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; - sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; - }; - }; "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; @@ -35636,13 +36339,13 @@ let sha512 = "MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw=="; }; }; - "valid-identifier-0.0.1" = { + "valid-identifier-0.0.2" = { name = "valid-identifier"; packageName = "valid-identifier"; - version = "0.0.1"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"; - sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; + url = "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.2.tgz"; + sha512 = "zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g=="; }; }; "valid-url-1.0.9" = { @@ -36311,13 +37014,13 @@ let sha512 = "nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="; }; }; - "websocket-stream-5.1.2" = { + "websocket-stream-5.4.0" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "5.1.2"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.2.tgz"; - sha512 = "lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw=="; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.4.0.tgz"; + sha512 = "7I4o+mmi0slEI7sUjbhYmhbP2O5qXeEV2fOs+oaRJ/Y/4+JgkTsIXvU6QqTN2i4vinxs4NOq2OwhHsLK3x0pWA=="; }; }; "webtorrent-0.103.1" = { @@ -36347,6 +37050,15 @@ let sha512 = "dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="; }; }; + "whatwg-fetch-3.0.0" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz"; + sha512 = "9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="; + }; + }; "whatwg-mimetype-2.3.0" = { name = "whatwg-mimetype"; packageName = "whatwg-mimetype"; @@ -36527,13 +37239,13 @@ let sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; }; }; - "windows-release-3.1.0" = { + "windows-release-3.2.0" = { name = "windows-release"; packageName = "windows-release"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/windows-release/-/windows-release-3.1.0.tgz"; - sha512 = "hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA=="; + url = "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz"; + sha512 = "QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA=="; }; }; "winreg-0.0.12" = { @@ -36599,13 +37311,13 @@ let sha512 = "NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q=="; }; }; - "winston-3.1.0" = { + "winston-3.2.1" = { name = "winston"; packageName = "winston"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.1.0.tgz"; - sha512 = "FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg=="; + url = "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz"; + sha512 = "zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw=="; }; }; "winston-transport-4.3.0" = { @@ -36617,6 +37329,15 @@ let sha512 = "B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A=="; }; }; + "with-open-file-0.1.6" = { + name = "with-open-file"; + packageName = "with-open-file"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.6.tgz"; + sha512 = "SQS05JekbtwQSgCYlBsZn/+m2gpn4zWsqpCYIrCHva0+ojXcnmUEPsBN6Ipoz3vmY/81k5PvYEWSxER2g4BTqA=="; + }; + }; "word-wrap-1.2.3" = { name = "word-wrap"; packageName = "word-wrap"; @@ -36653,6 +37374,15 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; + "wordwrapjs-3.0.0" = { + name = "wordwrapjs"; + packageName = "wordwrapjs"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-3.0.0.tgz"; + sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; + }; + }; "worker-farm-1.6.0" = { name = "worker-farm"; packageName = "worker-farm"; @@ -36725,15 +37455,6 @@ let sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; }; }; - "write-file-atomic-1.3.4" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; - sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; - }; - }; "write-file-atomic-2.4.2" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -36824,13 +37545,13 @@ let sha512 = "eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA=="; }; }; - "ws-6.2.0" = { + "ws-6.2.1" = { name = "ws"; packageName = "ws"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.0.tgz"; - sha512 = "deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w=="; + url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; "wtf-8-1.0.0" = { @@ -36860,24 +37581,6 @@ let sha1 = "474b50865af3a49a9c4657f05acd145458f77d82"; }; }; - "xcode-1.1.0" = { - name = "xcode"; - packageName = "xcode"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-1.1.0.tgz"; - sha512 = "hllHFtfsNu5WbVzj8KbGNdI3NgOYmTLZqyF4a9c9J1aGMhAdxmLLsXlpG0Bz8fEtKh6I3pyargRXN0ZlLpcF5w=="; - }; - }; - "xdg-basedir-2.0.0" = { - name = "xdg-basedir"; - packageName = "xdg-basedir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; - sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; - }; - }; "xdg-basedir-3.0.0" = { name = "xdg-basedir"; packageName = "xdg-basedir"; @@ -37239,6 +37942,15 @@ let sha512 = "1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg=="; }; }; + "yargs-13.2.2" = { + name = "yargs"; + packageName = "yargs"; + version = "13.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz"; + sha512 = "WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -37410,13 +38122,13 @@ let sha512 = "KLxE5ft/74Qj7h3AsQZv8G6MEEHYJwmD5F99nfOVaep3rBzCtbrJKkdqWc7bDV141Nr8UZZsIXmzc3IcCm6E2w=="; }; }; - "yn-3.0.0" = { + "yn-3.1.0" = { name = "yn"; packageName = "yn"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yn/-/yn-3.0.0.tgz"; - sha512 = "+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q=="; + url = "https://registry.npmjs.org/yn/-/yn-3.1.0.tgz"; + sha512 = "kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg=="; }; }; "yosay-2.0.2" = { @@ -37506,17 +38218,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "7.3.6"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.6.tgz"; - sha512 = "u5lBcYVQRk9cez/DozJvFOYomeko9b5kE+NElyFhPtM3GF1SBcXKb5QyNxH/zSOc850VL7KPe7ZfC6kW3Phhyw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.8.tgz"; + sha512 = "5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.13.6" - sources."@angular-devkit/core-7.3.6" - sources."@angular-devkit/schematics-7.3.6" - sources."@schematics/angular-7.3.6" - sources."@schematics/update-0.13.6" + sources."@angular-devkit/architect-0.13.8" + sources."@angular-devkit/core-7.3.8" + sources."@angular-devkit/schematics-7.3.8" + sources."@schematics/angular-7.3.8" + sources."@schematics/update-0.13.8" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.2.1" @@ -37540,8 +38252,8 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-1.13.0" - sources."bluebird-3.5.3" + sources."binary-extensions-1.13.1" + sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -37690,7 +38402,7 @@ in sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -37730,7 +38442,7 @@ in sources."move-concurrently-1.0.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanomatch-1.2.13" sources."node-fetch-npm-2.0.2" sources."normalize-package-data-2.5.0" @@ -37762,7 +38474,7 @@ in sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.4.0" + sources."open-6.0.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -37851,7 +38563,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."split-string-3.1.0" sources."ssri-6.0.1" (sources."static-extend-0.1.2" // { @@ -37951,10 +38663,10 @@ in }; dependencies = [ sources."balanced-match-1.0.0" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."cuint-0.2.2" sources."fs.realpath-1.0.0" @@ -37984,16 +38696,16 @@ in azure-functions-core-tools = nodeEnv.buildNodePackage { name = "azure-functions-core-tools"; packageName = "azure-functions-core-tools"; - version = "2.4.419"; + version = "2.5.553"; src = fetchurl { - url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.4.419.tgz"; - sha512 = "GMVzgR1VwKGOZ819qkgYV0PxqK/xJRZU4ZwLGRHfJZmngHC/FN1fw/yaQxNahCokBuCoSHECzbVG6jobUxbriw=="; + url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.5.553.tgz"; + sha512 = "vaJKdRL//+YpUgJux2VKvWKMkTvA6FtrBb1o3aQH7jJJY9et75BAZLDR7zGcs7F3t9/4p4oUPYwMS7MH1JnAqQ=="; }; dependencies = [ sources."agent-base-4.2.1" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.0" - sources."big-integer-1.6.42" + sources."big-integer-1.6.43" sources."binary-0.3.0" sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" @@ -38134,7 +38846,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.38.0" + sources."mime-db-1.39.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -38173,14 +38885,14 @@ in sources."glob-7.1.3" ]; }) - sources."semver-5.6.0" + sources."semver-5.7.0" sources."signal-exit-3.0.2" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -38286,7 +38998,7 @@ in sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" @@ -38444,12 +39156,12 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-1.0.7" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.2.0" + sources."readable-stream-3.3.0" sources."string_decoder-1.2.0" ]; }) @@ -38676,7 +39388,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" @@ -38701,7 +39413,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" @@ -38830,7 +39542,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.3" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" sources."follow-redirects-1.7.0" @@ -38863,10 +39575,10 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.0.1.tgz"; - sha512 = "Agj3tsKjvXD53aSdy7rmEo35vYMSHm1MiW8NssH4+z+TpifPQwJxl0y72z+v4TbTg/K1xe5IUGrMfqZ00Z82zw=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.1.0.tgz"; + sha512 = "HwWCWql35j7EIp29mO4yRAxPH+Z2t2gwsLk3RLr6wktYjRacy0S83sG4RBDNfbfyLqJeZxFgMoKaCC/bTNxoWA=="; }; dependencies = [ sources."async-2.6.2" @@ -38894,25 +39606,30 @@ in sources."isarray-1.0.0" sources."kuler-1.0.1" sources."lodash-4.17.11" - sources."logform-1.10.0" + sources."logform-2.1.2" sources."lynx-0.2.0" sources."mersenne-0.0.4" sources."ms-2.1.1" sources."one-time-0.0.4" sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.6" + sources."readable-stream-3.3.0" sources."requires-port-1.0.0" sources."safe-buffer-5.1.2" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."statsd-parser-0.0.4" sources."strftime-0.10.0" - sources."string_decoder-1.1.1" + sources."string_decoder-1.2.0" sources."text-hex-1.0.0" sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" - sources."winston-3.1.0" - sources."winston-transport-4.3.0" + sources."winston-3.2.1" + (sources."winston-transport-4.3.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -38926,164 +39643,129 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "8.1.2"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-8.1.2.tgz"; - sha512 = "IfslM3MP42CA/ebVJVlit6FhQ2P6Fercwx9NNQjkVs0wahEwqamL4bcqh1gKiTti7+/ZsDtBRSVmRv+y7LcTbg=="; + url = "https://registry.npmjs.org/cordova/-/cordova-9.0.0.tgz"; + sha512 = "zWEPo9uGj9KNcEhU2Lpo3r4HYK21tL+at496N2LLnuCWuWVndv6QWed8+EYl/08rrcNshrEtfzXj9Ux6vQm2PQ=="; }; dependencies = [ - sources."JSONStream-1.3.5" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.stat-1.1.3" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-11.13.0" sources."abbrev-1.1.1" sources."accepts-1.3.5" - sources."acorn-5.7.3" - sources."acorn-dynamic-import-4.0.0" - (sources."acorn-node-1.6.2" // { - dependencies = [ - sources."acorn-6.1.1" - ]; - }) - sources."acorn-walk-6.1.1" sources."ajv-6.10.0" - sources."aliasify-2.1.0" sources."ansi-0.3.1" sources."ansi-align-2.0.0" - sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."array-filter-0.0.1" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-find-index-1.0.2" sources."array-flatten-1.1.1" - sources."array-map-0.0.0" - sources."array-reduce-0.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" sources."asn1-0.2.4" - sources."asn1.js-4.10.1" - (sources."assert-1.4.1" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) sources."assert-plus-1.0.0" - sources."async-1.5.2" + sources."assign-symbols-1.0.0" + sources."async-2.6.2" sources."asynckit-0.4.0" + sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" - sources."base64-js-1.2.0" - sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.42" - sources."block-stream-0.0.9" - sources."bn.js-4.11.8" - sources."body-parser-1.18.3" - (sources."boxen-1.3.0" // { + (sources."base-0.11.2" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."supports-color-5.5.0" + sources."define-property-1.0.0" ]; }) - sources."bplist-creator-0.0.7" + sources."base64-js-1.3.0" + sources."bcrypt-pbkdf-1.0.2" + sources."big-integer-1.6.43" + sources."body-parser-1.18.3" + sources."boxen-1.3.0" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" - 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-14.4.0" // { + (sources."braces-2.3.2" // { dependencies = [ - sources."glob-7.1.3" + sources."extend-shallow-2.0.1" ]; }) - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.0.1" - sources."browserify-sign-4.0.4" - sources."browserify-transform-tools-1.7.0" - sources."browserify-zlib-0.1.4" - sources."buffer-5.2.1" - sources."buffer-from-1.1.1" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" sources."bytes-3.0.0" - sources."cached-path-relative-1.0.2" + sources."cache-base-1.0.1" + sources."call-me-maybe-1.0.1" + sources."callsites-3.1.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" - sources."chalk-1.1.3" + sources."chalk-2.4.2" + sources."chardet-0.4.2" sources."ci-info-1.6.0" - sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (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" + sources."kind-of-5.1.0" + ]; + }) sources."cli-boxes-1.0.0" - sources."cli-cursor-1.0.2" - sources."cli-width-1.1.1" - sources."code-point-at-1.1.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combine-source-map-0.8.0" sources."combined-stream-1.0.7" + sources."component-emitter-1.2.1" sources."compressible-2.0.16" sources."compression-1.7.4" sources."concat-map-0.0.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) - sources."configstore-3.1.2" - sources."console-browserify-1.1.0" - sources."constants-browserify-1.0.0" + sources."conf-1.4.0" + sources."configstore-4.0.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" - sources."convert-source-map-1.1.3" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."cordova-app-hello-world-3.12.0" - sources."cordova-common-2.2.5" - (sources."cordova-create-1.1.2" // { - dependencies = [ - sources."q-1.0.1" - sources."shelljs-0.3.0" - ]; - }) - (sources."cordova-fetch-1.3.1" // { - dependencies = [ - sources."glob-7.1.3" - sources."shelljs-0.7.8" - ]; - }) - sources."cordova-js-4.2.4" - (sources."cordova-lib-8.1.1" // { + sources."copy-descriptor-0.1.1" + sources."cordova-app-hello-world-4.0.0" + sources."cordova-common-3.1.0" + sources."cordova-create-2.0.0" + (sources."cordova-fetch-2.0.1" // { dependencies = [ - sources."base64-js-1.1.2" - sources."elementtree-0.1.7" - sources."glob-7.1.3" - sources."plist-2.0.1" - sources."sax-1.1.4" - sources."shelljs-0.3.0" + sources."pify-4.0.1" ]; }) - sources."cordova-registry-mapper-1.1.15" - sources."cordova-serve-2.0.1" + sources."cordova-lib-9.0.1" + sources."cordova-serve-3.0.0" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.3" sources."create-error-class-3.0.2" - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."cross-spawn-5.1.0" - sources."crypto-browserify-3.12.0" + sources."cross-spawn-6.0.5" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."dash-ast-1.0.0" sources."dashdash-1.14.1" - sources."date-now-0.1.4" sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."dedent-0.7.0" + sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" sources."defined-1.0.0" sources."delayed-stream-1.0.0" (sources."dep-graph-1.1.0" // { @@ -39092,363 +39774,453 @@ in ]; }) sources."depd-1.1.2" - (sources."dependency-ls-1.1.1" // { - dependencies = [ - sources."q-1.4.1" - ]; - }) - sources."deps-sort-2.0.0" - sources."des.js-1.0.0" sources."destroy-1.0.4" sources."detect-indent-5.0.0" - sources."detective-4.7.1" - sources."diffie-hellman-5.0.3" - sources."domain-browser-1.1.7" + sources."dir-glob-2.2.2" sources."dot-prop-4.2.0" - sources."duplexer2-0.1.4" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."editor-1.0.0" sources."ee-first-1.1.1" - sources."elementtree-0.1.6" - sources."elliptic-6.4.1" + sources."elementtree-0.1.7" sources."encodeurl-1.0.2" + sources."endent-1.3.0" + sources."env-paths-1.0.0" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."events-1.1.1" - sources."evp_bytestokey-1.0.3" - sources."execa-0.7.0" - sources."exit-hook-1.1.1" + (sources."execa-0.7.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + 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" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) sources."express-4.16.4" sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-2.2.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) sources."extsprintf-1.3.0" - sources."falafel-2.1.0" sources."fast-deep-equal-2.0.1" + sources."fast-glob-2.2.6" + sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.0.0" - sources."figures-1.7.0" + sources."figures-2.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."finalhandler-1.1.1" - sources."foreach-2.0.5" + sources."find-up-2.1.0" + sources."for-each-0.3.3" + sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" sources."fresh-0.5.2" + sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" sources."function-bind-1.1.1" - sources."get-assigned-identifiers-1.2.0" sources."get-stream-3.0.0" + sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-5.0.15" + sources."glob-7.1.3" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" + (sources."globby-9.2.0" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) sources."got-6.7.1" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" - sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."hash-base-3.0.4" - sources."hash.js-1.1.7" - sources."hmac-drbg-1.0.1" + sources."has-symbols-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."hosted-git-info-2.7.1" - sources."htmlescape-1.1.1" sources."http-errors-1.6.3" sources."http-signature-1.2.0" - sources."https-browserify-1.0.0" sources."iconv-lite-0.4.23" - sources."ieee754-1.1.12" + sources."ignore-4.0.6" + sources."import-fresh-3.0.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."indexof-0.0.1" + sources."indent-string-3.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - (sources."init-package-json-1.10.3" // { - dependencies = [ - sources."glob-7.1.3" - ]; - }) - sources."inline-source-map-0.6.2" - sources."inquirer-0.10.1" - (sources."insert-module-globals-7.2.0" // { - dependencies = [ - sources."concat-stream-1.6.2" - ]; - }) - (sources."insight-0.8.4" // { + sources."init-package-json-1.10.3" + (sources."inquirer-5.2.0" // { dependencies = [ - (sources."configstore-1.4.0" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) - sources."write-file-atomic-1.3.4" - sources."xdg-basedir-2.0.0" + sources."mute-stream-0.0.7" ]; }) - sources."interpret-1.2.0" + sources."insight-0.10.1" sources."ipaddr.js-1.8.0" + sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" sources."is-ci-1.2.1" - sources."is-fullwidth-code-point-1.0.0" - sources."is-git-url-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.1" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" sources."is-redirect-1.0.0" + sources."is-regex-1.0.4" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" + sources."is-windows-1.0.2" sources."is-wsl-1.1.0" - sources."isarray-0.0.1" + sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" 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."jsonify-0.0.0" - sources."jsonparse-1.3.1" + sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - (sources."labeled-stream-splicer-2.0.1" // { - dependencies = [ - sources."isarray-2.0.4" - ]; - }) + sources."kind-of-6.0.2" sources."latest-version-3.1.0" - sources."lodash-3.10.1" - sources."lodash._getnative-3.9.1" - sources."lodash.debounce-3.1.1" - sources."lodash.memoize-3.0.4" - sources."loud-rejection-1.6.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.11" + sources."lodash.debounce-4.0.8" + sources."loud-rejection-2.1.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" + sources."macos-release-1.1.0" sources."make-dir-1.3.0" - sources."md5.js-1.3.5" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."md5-file-4.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" + sources."merge2-1.2.3" sources."methods-1.1.2" - sources."miller-rabin-4.0.1" + sources."micromatch-3.1.10" sources."mime-1.4.1" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { + (sources."mixin-deep-1.3.1" // { dependencies = [ - sources."minimist-0.0.8" + sources."is-extendable-1.0.1" ]; }) - sources."module-deps-4.1.1" sources."ms-2.0.0" sources."mute-stream-0.0.8" + sources."nanomatch-1.2.13" sources."negotiator-0.6.1" + sources."nice-try-1.0.5" sources."nopt-4.0.1" sources."normalize-package-data-2.5.0" sources."npm-package-arg-6.1.0" sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."object-keys-1.1.0" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-inspect-1.6.0" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."objectorarray-1.0.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-1.1.0" - sources."opener-1.5.1" + sources."onetime-2.0.1" sources."opn-5.5.0" - sources."os-browserify-0.1.2" sources."os-homedir-1.0.2" - sources."os-name-1.0.3" + sources."os-name-2.0.1" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."osx-release-1.1.0" sources."p-finally-1.0.0" + (sources."p-limit-1.3.0" // { + dependencies = [ + sources."p-try-1.0.0" + ]; + }) + sources."p-locate-2.0.0" + sources."p-try-2.2.0" sources."package-json-4.0.1" - sources."pako-0.2.9" - sources."parents-1.0.1" - sources."parse-asn1-5.1.4" + sources."parent-module-1.0.1" sources."parseurl-1.3.2" - sources."path-browserify-0.0.1" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.6" - sources."path-platform-0.11.15" sources."path-to-regexp-0.1.7" - sources."pbkdf2-3.0.17" + sources."path-type-3.0.0" sources."performance-now-2.1.0" sources."pify-3.0.0" - sources."plist-2.1.0" + sources."pkg-up-2.0.0" + sources."plist-3.0.1" + sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."process-0.11.10" - sources."process-nextick-args-1.0.7" sources."promzard-0.3.0" - sources."properties-parser-0.3.1" sources."proxy-addr-2.0.4" sources."pseudomap-1.0.2" sources."psl-1.1.31" - sources."public-encrypt-4.0.3" - sources."punycode-1.4.1" + sources."punycode-2.1.1" sources."q-1.5.1" sources."qs-6.5.2" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" - sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."range-parser-1.2.0" sources."raw-body-2.3.3" sources."rc-1.2.8" sources."read-1.0.7" - sources."read-chunk-2.1.0" - sources."read-only-stream-2.0.0" - (sources."read-package-json-2.0.13" // { + (sources."read-chunk-3.2.0" // { dependencies = [ - sources."glob-7.1.3" - ]; - }) - (sources."readable-stream-2.3.6" // { - dependencies = [ - sources."isarray-1.0.0" - sources."process-nextick-args-2.0.0" - sources."string_decoder-1.1.1" + sources."pify-4.0.1" ]; }) - (sources."readline2-1.0.1" // { + (sources."read-package-json-2.0.13" // { dependencies = [ - sources."mute-stream-0.0.5" + sources."slash-1.0.0" ]; }) - sources."rechoir-0.6.2" + sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."request-2.88.0" - sources."resolve-1.10.0" - sources."restore-cursor-1.0.1" - (sources."rimraf-2.6.3" // { + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + (sources."request-2.88.0" // { dependencies = [ - sources."glob-7.1.3" + sources."punycode-1.4.1" + sources."tough-cookie-2.4.3" ]; }) - sources."ripemd160-2.0.2" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" + sources."resolve-1.10.0" + sources."resolve-from-4.0.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."resumer-0.0.0" + sources."ret-0.1.15" + sources."run-async-2.3.0" + sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-0.3.5" - sources."semver-5.6.0" + sources."sax-1.1.4" + sources."semver-5.7.0" sources."semver-diff-2.1.0" sources."send-0.16.2" sources."serve-static-1.13.2" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."setprototypeof-1.1.0" - sources."sha.js-2.4.11" - sources."shasum-1.0.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.6.1" - sources."shelljs-0.5.3" sources."signal-exit-3.0.2" - sources."simple-concat-1.0.0" - (sources."simple-plist-0.2.1" // { + sources."slash-2.0.0" + (sources."snapdragon-0.8.2" // { dependencies = [ - sources."base64-js-1.1.2" - sources."plist-2.0.1" + 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" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" ]; }) - sources."slash-1.0.0" - sources."slide-1.1.6" sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" + sources."split-string-3.1.0" sources."sshpk-1.16.1" - sources."statuses-1.4.0" - sources."stream-browserify-2.0.2" - sources."stream-buffers-2.2.0" - sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.3" - sources."stream-splicer-2.0.0" - (sources."string-width-2.1.1" // { + (sources."static-extend-0.1.2" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" + sources."define-property-0.2.5" + (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" + sources."kind-of-5.1.0" ]; }) - sources."string.prototype.codepointat-0.2.1" - sources."string_decoder-1.0.3" - sources."strip-ansi-3.0.1" + sources."statuses-1.4.0" + sources."string-width-2.1.1" + sources."string.prototype.trim-1.1.2" + sources."strip-ansi-4.0.0" + sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."subarg-1.0.0" - sources."supports-color-2.0.0" - sources."syntax-error-1.4.0" - sources."tar-2.2.1" + sources."supports-color-5.5.0" + sources."symbol-observable-1.0.1" + sources."tape-4.10.1" sources."term-size-1.2.0" sources."through-2.3.8" - sources."through2-2.0.5" sources."timed-out-4.0.1" - sources."timers-browserify-1.4.2" - sources."to-arraybuffer-1.0.1" - sources."tough-cookie-2.4.3" - sources."tty-browserify-0.0.1" + sources."tmp-0.0.33" + (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."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.16" - sources."typedarray-0.0.6" - sources."umd-3.0.3" - sources."undeclared-identifiers-1.1.3" sources."underscore-1.9.1" - sources."unique-string-1.0.0" - sources."unorm-1.5.0" - sources."unpipe-1.0.0" - sources."unzip-response-2.0.1" - (sources."update-notifier-2.5.0" // { + (sources."union-value-1.0.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."supports-color-5.5.0" + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" ]; }) - (sources."uri-js-4.2.2" // { + sources."unique-string-1.0.0" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { dependencies = [ - sources."punycode-2.1.1" + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" ]; }) - (sources."url-0.11.0" // { + sources."unzip-response-2.0.1" + (sources."update-notifier-2.5.0" // { dependencies = [ - sources."punycode-1.3.2" + sources."configstore-3.1.2" ]; }) + sources."uri-js-4.2.2" + sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - sources."util-0.10.4" - sources."util-deprecate-1.0.2" + sources."use-3.1.1" sources."utils-merge-1.0.1" sources."uuid-3.3.2" - sources."valid-identifier-0.0.1" + sources."valid-identifier-0.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vm-browserify-0.0.4" sources."which-1.3.1" sources."widest-line-2.0.1" sources."win-release-1.1.1" + (sources."with-open-file-0.1.6" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.2" - sources."xcode-1.1.0" sources."xdg-basedir-3.0.0" - sources."xmlbuilder-8.2.2" + sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" - sources."xtend-4.0.1" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -39474,7 +40246,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-11.11.4" + sources."@types/node-11.13.0" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -39522,8 +40294,8 @@ in sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" - sources."cp-file-6.1.0" - sources."cpy-7.1.0" + sources."cp-file-6.2.0" + sources."cpy-7.2.0" sources."currently-unhandled-0.4.1" sources."debug-2.6.9" sources."decamelize-1.2.0" @@ -39583,7 +40355,7 @@ in ]; }) sources."glob-to-regexp-0.3.0" - sources."globby-9.1.0" + sources."globby-9.2.0" sources."graceful-fs-4.1.15" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -39603,7 +40375,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -39685,7 +40457,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.6.0" + sources."semver-5.7.0" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -39727,7 +40499,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -39806,7 +40578,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-11.11.4" + sources."@types/node-11.13.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -39885,7 +40657,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" - sources."qs-6.6.0" + sources."qs-6.7.0" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.6" @@ -40048,7 +40820,7 @@ in sources."path-exists-3.0.0" sources."pseudomap-1.0.2" sources."regenerator-runtime-0.11.1" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."source-map-0.5.7" @@ -40091,10 +40863,10 @@ in dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; - version = "13.11.5"; + version = "13.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat/-/dat-13.11.5.tgz"; - sha512 = "ORD9AdA61EiiuO5hoPkQgDgaJruAykPHXl0r9cRsIzKgGM/BCe7g957REaxCr2nilT+YWhlTloitAPc2B03DSg=="; + url = "https://registry.npmjs.org/dat/-/dat-13.12.1.tgz"; + sha512 = "Ygh+T7IVJvfqKs1NYmoxFjc9KUMQxu0SU5MnyjhE3Ly15X5RN+REEKqfG5xOfYbJ69ErY8ZIJ2jf2UHZUl0/tw=="; }; dependencies = [ sources."abstract-random-access-1.1.2" @@ -40211,7 +40983,7 @@ in sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" - sources."dat-dns-3.2.0" + sources."dat-dns-3.2.1" sources."dat-doctor-2.1.2" sources."dat-encoding-5.0.1" sources."dat-ignore-2.1.2" @@ -40343,7 +41115,7 @@ in }) sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.25.0" // { + (sources."hypercore-6.25.2" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -40436,7 +41208,7 @@ in sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" - sources."mime-2.4.0" + sources."mime-2.4.1" sources."mime-db-1.38.0" sources."mime-types-2.1.22" sources."mimic-response-1.0.1" @@ -40460,7 +41232,7 @@ in sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.2.0" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" sources."nanomatch-1.2.13" @@ -40491,7 +41263,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -40549,7 +41321,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" (sources."set-value-2.0.0" // { dependencies = [ @@ -40712,7 +41484,7 @@ in sources."utile-0.3.0" (sources."utp-native-2.1.3" // { dependencies = [ - sources."readable-stream-3.2.0" + sources."readable-stream-3.3.0" sources."unordered-set-2.0.1" ]; }) @@ -40840,7 +41612,7 @@ in sources."mime-types-2.1.22" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.13.1" + sources."nan-2.13.2" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -40911,10 +41683,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.6.0.tgz"; - sha512 = "AUHAYzYJNV6QlCxHlZt40iNXc00ibi2pLGwEjcIpXiNW7w28C57SW2bbVa8e+mYwgSr89GRi8RnihooOsZmOcg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.7.0.tgz"; + sha512 = "IM2NBRcNO5sV5Lnl5OzIujZj7glVasgL7w7qHgX+qQM4pf3Qyt+xRTY0oTj5mi+uzC6/Aia+5BfiUJdWJwlsUA=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -40923,7 +41695,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.425.0" + sources."aws-sdk-2.437.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -41093,7 +41865,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."component-emitter-1.2.1" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -41292,7 +42064,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sane-4.1.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."send-0.16.2" sources."serve-static-1.13.2" (sources."set-value-2.0.0" // { @@ -41398,7 +42170,7 @@ in sources."walker-1.0.7" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-6.2.0" + sources."ws-6.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -41435,7 +42207,7 @@ in sources."isobject-3.0.1" ]; }) - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."braces-1.8.5" (sources."cache-base-1.0.1" // { dependencies = [ @@ -41609,7 +42381,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.13.1" + sources."nan-2.13.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -41728,7 +42500,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."send-0.16.2" sources."serve-static-1.13.2" (sources."set-value-2.0.0" // { @@ -41888,10 +42660,10 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."binwrap-0.2.0" sources."block-stream-0.0.9" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -42023,7 +42795,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -42062,7 +42834,7 @@ in sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" sources."mustache-2.3.2" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanomatch-1.2.13" sources."node-elm-compiler-5.0.3" sources."normalize-path-3.0.0" @@ -42400,7 +43172,7 @@ in sources."private-0.1.8" sources."prop-types-15.7.2" sources."pseudomap-1.0.2" - sources."react-is-16.8.4" + sources."react-is-16.8.6" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -42420,7 +43192,7 @@ in sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" sources."safe-buffer-5.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -42431,7 +43203,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" @@ -42475,10 +43247,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.15.3"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.15.3.tgz"; - sha512 = "vMGi0PjCHSokZxE0NLp2VneGw5sio7SSiDNgIUn2tC0XkWJRNOIoHIg3CliLVfXnJsiHxGAYrkw0PieAu8+KYQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz"; + sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" @@ -42493,7 +43265,7 @@ in sources."astral-regex-1.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."callsites-3.0.0" + sources."callsites-3.1.0" sources."chalk-2.4.2" sources."chardet-0.7.0" sources."cli-cursor-2.1.0" @@ -42544,7 +43316,7 @@ in sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" @@ -42561,7 +43333,7 @@ in sources."onetime-2.0.1" sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" - sources."parent-module-1.0.0" + sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -42575,7 +43347,7 @@ in sources."run-async-2.3.0" sources."rxjs-6.4.0" sources."safer-buffer-2.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -42636,7 +43408,7 @@ in sources."astral-regex-1.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."callsites-3.0.0" + sources."callsites-3.1.0" sources."chalk-2.4.2" sources."chardet-0.7.0" sources."cli-cursor-2.1.0" @@ -42651,7 +43423,7 @@ in sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-5.15.3" + sources."eslint-5.16.0" sources."eslint-scope-4.0.3" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -42689,7 +43461,7 @@ in sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" @@ -42707,7 +43479,7 @@ in sources."onetime-2.0.1" sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" - sources."parent-module-1.0.0" + sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -42723,7 +43495,7 @@ in sources."run-async-2.3.0" sources."rxjs-6.4.0" sources."safer-buffer-2.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -42927,12 +43699,12 @@ in sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."signal-exit-3.0.2" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -43107,7 +43879,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sec-1.0.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -43115,7 +43887,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."split2-2.2.0" sources."string-width-2.1.1" sources."string_decoder-1.1.1" @@ -43158,10 +43930,10 @@ in forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; - version = "0.15.3"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-0.15.3.tgz"; - sha1 = "77d9d7e15fd2f511ad9d84a110c7dd8fc8ecebc2"; + url = "https://registry.npmjs.org/forever/-/forever-1.0.0.tgz"; + sha512 = "ZaNWo5aMdtfui5GZWxaPcmFPW/TaaJZgGE0/p47lhn0FGRhFehuG338zuUURIqjn0dZEmgNPUAahZMOdykEAiw=="; }; dependencies = [ sources."anymatch-1.3.2" @@ -43180,12 +43952,13 @@ in sources."isobject-3.0.1" ]; }) - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."brace-expansion-1.1.11" sources."braces-1.8.5" (sources."broadway-0.3.6" // { dependencies = [ sources."cliff-0.1.9" + sources."utile-0.2.1" sources."winston-0.8.0" ]; }) @@ -43229,7 +44002,7 @@ in sources."cycle-1.0.3" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" - sources."deep-equal-0.1.2" + sources."deep-equal-1.0.1" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -43261,7 +44034,11 @@ in }) sources."for-in-1.0.2" sources."for-own-0.1.5" - sources."forever-monitor-1.7.1" + (sources."forever-monitor-1.7.1" // { + dependencies = [ + sources."utile-0.2.1" + ]; + }) sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" sources."fsevents-1.2.7" @@ -43344,7 +44121,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.13.1" + sources."nan-2.13.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -43400,7 +44177,11 @@ in ]; }) sources."process-nextick-args-2.0.0" - sources."prompt-0.2.14" + (sources."prompt-0.2.14" // { + dependencies = [ + sources."utile-0.2.1" + ]; + }) sources."ps-tree-0.0.3" (sources."randomatic-3.1.1" // { dependencies = [ @@ -43528,9 +44309,12 @@ in }) sources."string_decoder-1.1.1" sources."strip-json-comments-0.1.3" - sources."tape-2.3.3" + (sources."tape-2.3.3" // { + dependencies = [ + sources."deep-equal-0.1.2" + ]; + }) sources."through-2.3.8" - sources."timespan-2.3.0" sources."to-object-path-0.3.0" sources."to-regex-3.0.2" (sources."to-regex-range-2.1.1" // { @@ -43558,7 +44342,13 @@ in sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."utile-0.2.1" + (sources."utile-0.3.0" // { + dependencies = [ + sources."async-0.9.2" + sources."deep-equal-0.2.2" + sources."ncp-1.0.1" + ]; + }) sources."winston-0.8.3" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" @@ -43588,7 +44378,7 @@ in sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.1.1" - sources."simple-git-1.107.0" + sources."simple-git-1.110.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -43610,9 +44400,9 @@ in }; dependencies = [ sources."asyncmemo-1.0.0" - sources."chloride-2.2.12" + sources."chloride-2.2.14" sources."chloride-test-1.2.4" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."debug-4.1.1" sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" @@ -43662,7 +44452,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nearley-2.16.0" sources."node-gyp-build-3.8.0" sources."node-polyglot-1.0.0" @@ -43726,12 +44516,12 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."secret-handshake-1.1.16" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.0.2" sources."socks-2.3.2" - sources."sodium-browserify-1.2.5" + sources."sodium-browserify-1.2.7" (sources."sodium-browserify-tweetnacl-0.2.5" // { dependencies = [ sources."sha.js-2.4.11" @@ -43854,7 +44644,7 @@ in sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" (sources."body-parser-1.18.3" // { dependencies = [ sources."iconv-lite-0.4.23" @@ -43877,7 +44667,7 @@ in sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.0.0" + sources."cli-spinners-2.1.0" sources."cli-width-2.2.0" sources."cliui-4.1.0" sources."clone-1.0.4" @@ -43893,7 +44683,7 @@ in }) sources."combined-stream-1.0.7" sources."command-exists-1.2.8" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."common-tags-1.8.0" sources."concat-map-0.0.1" sources."configstore-3.1.2" @@ -43906,7 +44696,7 @@ in sources."core-util-is-1.0.2" sources."cosmiconfig-4.0.0" sources."create-error-class-3.0.2" - sources."creato-1.0.4" + sources."creato-1.0.5" (sources."cross-fetch-2.2.2" // { dependencies = [ sources."node-fetch-2.1.2" @@ -43968,7 +44758,11 @@ in ]; }) sources."extend-3.0.2" - sources."external-editor-3.0.3" + (sources."external-editor-3.0.3" // { + dependencies = [ + sources."tmp-0.0.33" + ]; + }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" @@ -44005,7 +44799,7 @@ in sources."ms-2.1.1" ]; }) - sources."graphql-14.1.1" + sources."graphql-14.2.1" (sources."graphql-cli-prepare-1.4.19" // { dependencies = [ sources."chalk-2.3.1" @@ -44083,7 +44877,7 @@ in sources."isstream-0.1.2" sources."iterall-1.2.2" sources."js-base64-2.5.1" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" @@ -44179,7 +44973,7 @@ in sources."ono-4.0.11" sources."open-0.0.5" sources."opn-5.5.0" - (sources."ora-3.2.0" // { + (sources."ora-3.4.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."strip-ansi-5.2.0" @@ -44189,7 +44983,7 @@ in sources."os-tmpdir-1.0.2" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -44270,7 +45064,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."scuid-1.1.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" sources."send-0.16.2" sources."sentence-case-2.1.1" @@ -44292,7 +45086,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."statuses-1.4.0" @@ -44320,7 +45114,7 @@ in sources."through2-2.0.5" sources."timed-out-4.0.1" sources."title-case-2.1.1" - sources."tmp-0.0.33" + sources."tmp-0.1.0" sources."tmp-graphql-config-extension-openapi-1.0.7" sources."to-fast-properties-2.0.0" (sources."tough-cookie-2.4.3" // { @@ -44373,19 +45167,19 @@ in sources."yaml-ast-parser-0.0.40" (sources."yargs-12.0.5" // { dependencies = [ - sources."camelcase-5.2.0" + sources."camelcase-5.3.1" sources."execa-1.0.0" sources."find-up-3.0.0" sources."get-stream-4.1.0" sources."invert-kv-2.0.0" sources."lcid-2.0.0" sources."locate-path-3.0.0" - sources."mem-4.2.0" - sources."mimic-fn-2.0.0" + sources."mem-4.3.0" + sources."mimic-fn-2.1.0" sources."os-locale-3.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" sources."yargs-parser-11.1.1" ]; }) @@ -44722,7 +45516,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -44733,7 +45527,7 @@ in sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."camelcase-3.0.0" - (sources."chokidar-2.1.2" // { + (sources."chokidar-2.1.5" // { dependencies = [ sources."normalize-path-3.0.0" ]; @@ -44834,11 +45628,7 @@ in ]; }) sources."find-up-1.1.2" - (sources."findup-sync-2.0.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."findup-sync-3.0.0" sources."fined-1.1.1" sources."flagged-respawn-1.0.1" sources."flush-write-stream-1.1.1" @@ -44863,7 +45653,7 @@ in sources."global-prefix-1.0.2" sources."glogg-1.0.2" sources."graceful-fs-4.1.15" - sources."gulp-cli-2.0.1" + sources."gulp-cli-2.1.0" sources."gulplog-1.0.0" sources."has-symbols-1.0.0" sources."has-value-1.0.0" @@ -44889,7 +45679,7 @@ in sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" sources."is-negated-glob-1.0.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -44912,12 +45702,17 @@ in sources."lazystream-1.0.0" sources."lcid-1.0.0" sources."lead-1.0.0" - sources."liftoff-2.5.0" + sources."liftoff-3.1.0" sources."load-json-file-1.1.0" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."matchdep-2.0.0" + (sources."matchdep-2.0.0" // { + dependencies = [ + sources."findup-sync-2.0.0" + sources."is-glob-3.1.0" + ]; + }) sources."micromatch-3.1.10" sources."minimatch-3.0.4" (sources."mixin-deep-1.3.1" // { @@ -44927,12 +45722,12 @@ in }) sources."ms-2.0.0" sources."mute-stdout-1.0.1" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanomatch-1.2.13" sources."next-tick-1.0.0" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" - sources."now-and-later-2.0.0" + sources."now-and-later-2.0.1" sources."number-is-nan-1.0.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -44947,7 +45742,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" sources."object.defaults-1.1.0" @@ -45003,7 +45798,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { @@ -45046,7 +45841,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -45137,10 +45932,10 @@ in gulp-cli = nodeEnv.buildNodePackage { name = "gulp-cli"; packageName = "gulp-cli"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz"; - sha512 = "RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ=="; + url = "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.1.0.tgz"; + sha512 = "txzgdFVlEPShBZus6JJyGyKJoBVDq6Do0ZQgIgx5RAsmhNVTDjymmOxpQvo3c20m66FldilS68ZXj2Q9w5dKbA=="; }; dependencies = [ sources."ansi-colors-1.1.0" @@ -45230,7 +46025,7 @@ in ]; }) sources."find-up-1.1.2" - sources."findup-sync-2.0.0" + sources."findup-sync-3.0.0" sources."fined-1.1.1" sources."flagged-respawn-1.0.1" sources."for-in-1.0.2" @@ -45276,7 +46071,7 @@ in sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-glob-3.1.0" + sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -45292,7 +46087,7 @@ in sources."isobject-3.0.1" sources."kind-of-5.1.0" sources."lcid-1.0.0" - sources."liftoff-2.5.0" + sources."liftoff-3.1.0" sources."load-json-file-1.1.0" (sources."make-iterator-1.0.1" // { dependencies = [ @@ -45301,7 +46096,12 @@ in }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."matchdep-2.0.0" + (sources."matchdep-2.0.0" // { + dependencies = [ + sources."findup-sync-2.0.0" + sources."is-glob-3.1.0" + ]; + }) (sources."micromatch-3.1.10" // { dependencies = [ sources."kind-of-6.0.2" @@ -45373,7 +46173,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { @@ -45408,7 +46208,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -45595,22 +46395,22 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.21"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz"; - sha512 = "LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz"; + sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig=="; }; dependencies = [ sources."camel-case-3.0.0" sources."clean-css-4.2.1" - sources."commander-2.17.1" + sources."commander-2.20.0" sources."he-1.2.0" sources."lower-case-1.1.4" sources."no-case-2.3.2" sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - (sources."uglify-js-3.4.10" // { + (sources."uglify-js-3.5.3" // { dependencies = [ sources."commander-2.19.0" ]; @@ -45715,7 +46515,7 @@ in sources."npm-2.15.12" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."readable-stream-3.2.0" + sources."readable-stream-3.3.0" sources."safe-buffer-5.1.2" sources."sprintf-js-1.0.3" sources."string_decoder-1.2.0" @@ -45753,7 +46553,7 @@ in sources."@ionic/utils-stream-0.0.1" sources."@ionic/utils-subprocess-0.1.0" sources."@ionic/utils-terminal-0.0.1" - sources."@types/node-8.10.44" + sources."@types/node-8.10.45" sources."agent-base-4.2.1" (sources."ansi-align-2.0.0" // { dependencies = [ @@ -45764,7 +46564,7 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."ast-types-0.12.2" + sources."ast-types-0.12.3" sources."astral-regex-1.0.0" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" @@ -45798,7 +46598,7 @@ in sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" sources."crypto-random-string-1.0.0" - sources."data-uri-to-buffer-2.0.0" + sources."data-uri-to-buffer-2.0.1" sources."debug-4.1.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" @@ -45811,6 +46611,7 @@ in sources."duplexer3-0.1.4" sources."elementtree-0.1.7" sources."emoji-regex-7.0.3" + sources."end-of-stream-1.4.1" sources."es6-promise-4.2.6" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" @@ -45818,7 +46619,7 @@ in sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."execa-0.10.0" + sources."execa-1.0.0" sources."extend-3.0.2" sources."external-editor-3.0.3" sources."fast-levenshtein-2.0.6" @@ -45836,15 +46637,19 @@ in sources."string_decoder-0.10.31" ]; }) - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" (sources."get-uri-2.0.3" // { dependencies = [ - sources."readable-stream-3.2.0" + sources."readable-stream-3.3.0" ]; }) sources."glob-7.1.3" sources."global-dirs-0.1.1" - sources."got-6.7.1" + (sources."got-6.7.1" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) sources."graceful-fs-4.1.15" sources."has-flag-3.0.0" sources."http-errors-1.6.3" @@ -45918,10 +46723,10 @@ in }) sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-2.1.0" + sources."macos-release-2.2.0" sources."make-dir-1.3.0" sources."methods-1.1.2" - sources."mime-2.4.0" + sources."mime-2.4.1" sources."mime-db-1.38.0" sources."mime-types-2.1.22" sources."mimic-fn-1.2.0" @@ -45947,7 +46752,7 @@ in sources."onetime-2.0.1" sources."opn-5.5.0" sources."optionator-0.8.2" - sources."os-name-3.0.0" + sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" (sources."pac-proxy-agent-3.0.0" // { @@ -45971,7 +46776,8 @@ in }) sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" - sources."qs-6.6.0" + sources."pump-3.0.0" + sources."qs-6.7.0" (sources."raw-body-2.3.3" // { dependencies = [ sources."iconv-lite-0.4.23" @@ -45989,7 +46795,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" @@ -46002,10 +46808,10 @@ in sources."source-map-0.6.1" (sources."split2-3.1.1" // { dependencies = [ - sources."readable-stream-3.2.0" + sources."readable-stream-3.3.0" ]; }) - sources."ssh-config-1.1.5" + sources."ssh-config-1.1.6" sources."statuses-1.5.0" sources."stream-combiner2-1.1.1" sources."string-width-3.1.0" @@ -46019,7 +46825,7 @@ in sources."strip-json-comments-2.0.1" (sources."superagent-4.1.0" // { dependencies = [ - sources."readable-stream-3.2.0" + sources."readable-stream-3.3.0" ]; }) (sources."superagent-proxy-2.0.0" // { @@ -46037,6 +46843,7 @@ in dependencies = [ sources."cross-spawn-5.1.0" sources."execa-0.7.0" + sources."get-stream-3.0.0" ]; }) sources."through-2.3.8" @@ -46063,7 +46870,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."windows-release-3.1.0" + sources."windows-release-3.2.0" sources."wordwrap-1.0.0" (sources."wrap-ansi-4.0.0" // { dependencies = [ @@ -46073,7 +46880,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.2" - sources."ws-6.2.0" + sources."ws-6.2.1" sources."xdg-basedir-3.0.0" sources."xregexp-2.0.0" sources."yallist-2.1.2" @@ -46138,7 +46945,7 @@ in }) sources."moment-2.24.0" sources."mv-2.1.1" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -46180,7 +46987,7 @@ in sources."commander-2.11.0" sources."node-fetch-2.3.0" sources."safe-buffer-5.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."source-map-0.7.3" sources."ultron-1.1.1" sources."ws-3.3.3" @@ -46250,13 +47057,13 @@ in sources."check-error-1.0.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" sources."error-7.0.2" sources."escape-string-regexp-1.0.5" - sources."fast-json-patch-2.0.7" + sources."fast-json-patch-2.1.0" sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" sources."glob-7.1.3" @@ -46310,6 +47117,477 @@ in production = true; bypassCache = true; }; + joplin = nodeEnv.buildNodePackage { + name = "joplin"; + packageName = "joplin"; + version = "1.0.124"; + src = fetchurl { + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.124.tgz"; + sha512 = "+ADcAggh5HUOZLEW3Q60KcV7Mz86w+2wYrkG6mHtnyJ+nqEdXHWwOG3g61QH9A+3w3vSFDUvEMs6wraGg+ySQQ=="; + }; + dependencies = [ + sources."@cronvel/get-pixels-3.3.1" + sources."abab-2.0.0" + sources."abbrev-1.1.1" + sources."acorn-5.7.3" + (sources."acorn-globals-4.3.0" // { + dependencies = [ + sources."acorn-6.1.1" + ]; + }) + sources."acorn-walk-6.1.1" + sources."ajv-6.10.0" + (sources."ansi-escape-sequences-4.1.0" // { + dependencies = [ + sources."array-back-3.1.0" + ]; + }) + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.1" + sources."app-module-path-2.2.0" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) + sources."array-back-2.0.0" + sources."array-equal-1.0.0" + sources."asap-2.0.6" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.0" + sources."async-mutex-0.1.3" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."balanced-match-1.0.0" + sources."base-64-0.1.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bl-1.2.2" + sources."brace-expansion-1.1.11" + sources."browser-process-hrtime-0.1.3" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" + sources."camel-case-3.0.0" + sources."camelcase-4.1.0" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."charenc-0.0.2" + sources."chownr-1.1.1" + sources."clean-css-4.2.1" + sources."cliss-0.0.2" + sources."code-point-at-1.1.0" + sources."color-3.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.5.3" + sources."combined-stream-1.0.7" + sources."command-line-usage-4.1.0" + sources."commander-2.17.1" + sources."compare-version-0.1.2" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."crypt-0.0.2" + sources."cssom-0.3.6" + sources."cssstyle-1.2.2" + sources."cwise-compiler-1.1.3" + sources."dashdash-1.14.1" + (sources."data-urls-1.1.0" // { + dependencies = [ + sources."whatwg-url-7.0.0" + ]; + }) + sources."debug-3.2.6" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."deepmerge-2.2.1" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."diacritics-1.3.0" + sources."domexception-1.0.1" + sources."ecc-jsbn-0.1.2" + (sources."emphasize-1.5.0" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."encoding-0.1.12" + sources."end-of-stream-1.4.1" + sources."entities-1.1.2" + sources."es6-promise-pool-2.5.0" + sources."escape-string-regexp-1.0.5" + sources."escodegen-1.11.1" + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."expand-template-1.1.1" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."fault-1.0.2" + sources."file-type-10.10.0" + sources."find-up-2.1.0" + sources."follow-redirects-1.7.0" + sources."for-each-property-0.0.4" + sources."for-each-property-deep-0.0.3" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."format-0.2.2" + sources."fs-constants-1.0.0" + sources."fs-copy-file-sync-1.1.1" + sources."fs-extra-5.0.0" + sources."fs-minipass-1.2.5" + sources."fs.realpath-1.0.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."strip-ansi-3.0.1" + ]; + }) + sources."get-prototype-chain-1.0.1" + sources."get-stdin-5.0.1" + sources."getpass-0.1.7" + sources."github-from-package-0.0.0" + sources."glob-7.1.3" + sources."graceful-fs-4.1.15" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-unicode-2.0.1" + sources."he-1.2.0" + sources."highlight.js-9.12.0" + sources."html-encoding-sniffer-1.0.2" + sources."html-entities-1.2.1" + sources."html-minifier-3.5.21" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."ignore-walk-3.0.1" + (sources."image-data-uri-2.0.0" // { + dependencies = [ + sources."fs-extra-0.26.7" + sources."jsonfile-2.4.0" + ]; + }) + sources."image-type-3.1.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + (sources."inspect-function-0.2.2" // { + dependencies = [ + sources."split-skip-0.0.1" + ]; + }) + (sources."inspect-parameters-declaration-0.0.9" // { + dependencies = [ + sources."magicli-0.0.5" + ]; + }) + (sources."inspect-property-0.0.6" // { + dependencies = [ + sources."inspect-function-0.3.4" + (sources."inspect-parameters-declaration-0.0.8" // { + dependencies = [ + sources."split-skip-0.0.2" + ]; + }) + (sources."magicli-0.0.5" // { + dependencies = [ + sources."inspect-function-0.2.2" + ]; + }) + sources."split-skip-0.0.1" + ]; + }) + sources."iota-array-1.0.0" + sources."is-absolute-0.2.6" + sources."is-arrayish-0.3.2" + sources."is-buffer-1.1.6" + sources."is-fullwidth-code-point-1.0.0" + sources."is-relative-0.2.1" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-unc-path-0.1.2" + sources."is-windows-0.2.0" + (sources."is2-0.0.9" // { + dependencies = [ + sources."deep-is-0.1.2" + ]; + }) + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."joplin-turndown-4.0.11" + sources."joplin-turndown-plugin-gfm-1.0.7" + sources."jpeg-js-0.1.2" + sources."js-tokens-4.0.0" + sources."jsbn-0.1.1" + sources."jsdom-11.12.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-4.0.0" + sources."jsprim-1.4.1" + sources."jssha-2.3.1" + sources."klaw-1.3.1" + sources."lazyness-1.1.1" + sources."left-pad-1.3.0" + sources."levenshtein-1.0.5" + sources."levn-0.3.0" + sources."linkify-it-2.1.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.11" + sources."lodash-es-4.17.11" + sources."lodash.padend-4.6.1" + sources."lodash.sortby-4.7.0" + sources."lodash.toarray-4.4.0" + sources."loose-envify-1.4.0" + sources."lower-case-1.1.4" + sources."lowlight-1.9.2" + sources."magicli-0.0.8" + sources."markdown-it-8.4.2" + sources."md5-2.2.1" + sources."mdurl-1.0.1" + sources."mime-2.4.1" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" + sources."mkdirp-0.5.1" + sources."moment-2.24.0" + sources."ms-2.1.1" + sources."nan-2.13.2" + sources."ndarray-1.0.18" + sources."ndarray-pack-1.2.1" + (sources."needle-2.2.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."nextgen-events-1.1.0" + sources."no-case-2.3.2" + sources."node-abi-2.7.1" + sources."node-bitmap-0.0.1" + sources."node-emoji-1.10.0" + sources."node-fetch-1.7.3" + sources."node-persist-2.1.0" + sources."node-pre-gyp-0.11.0" + sources."noop-logger-0.1.1" + sources."nopt-4.0.1" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."nwsapi-2.1.3" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + (sources."object-to-arguments-0.0.8" // { + dependencies = [ + sources."inspect-parameters-declaration-0.0.10" + sources."magicli-0.0.5" + ]; + }) + sources."omggif-1.0.9" + sources."once-1.4.0" + sources."optionator-0.8.2" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."param-case-2.1.1" + sources."parse5-4.0.0" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."pify-3.0.0" + sources."pipe-functions-1.3.0" + sources."pn-1.1.0" + sources."pngjs-2.3.1" + (sources."prebuild-install-4.0.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.0" + sources."promise-7.3.1" + sources."proper-lockfile-2.0.1" + sources."psl-1.1.31" + sources."pump-2.0.1" + sources."punycode-2.1.1" + sources."q-1.1.2" + sources."qs-6.5.2" + sources."query-string-4.3.4" + sources."querystringify-2.1.1" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."read-chunk-2.1.0" + sources."readable-stream-2.3.6" + sources."reduce-flatten-1.0.1" + sources."redux-3.7.2" + sources."relateurl-0.2.7" + sources."request-2.88.0" + sources."request-promise-core-1.1.2" + sources."request-promise-native-1.0.7" + sources."requires-port-1.0.0" + sources."retry-0.10.1" + sources."rimraf-2.6.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.0" + sources."server-destroy-1.0.1" + sources."set-blocking-2.0.0" + sources."setimmediate-1.0.5" + sources."seventh-0.7.18" + sources."sharp-0.20.8" + sources."signal-exit-3.0.2" + sources."simple-concat-1.0.0" + sources."simple-get-2.8.1" + sources."simple-swizzle-0.2.2" + (sources."slice-ansi-1.0.0" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."source-map-0.6.1" + sources."split-skip-0.0.2" + sources."sprintf-js-1.1.2" + (sources."sqlite3-4.0.6" // { + dependencies = [ + sources."nan-2.10.0" + ]; + }) + sources."sshpk-1.16.1" + sources."stealthy-require-1.1.1" + sources."strict-uri-encode-1.1.0" + sources."string-kit-0.9.1" + sources."string-padding-1.0.2" + sources."string-to-stream-1.1.1" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."strip-ansi-3.0.1" + ]; + }) + sources."string_decoder-1.1.1" + (sources."stringify-parameters-0.0.4" // { + dependencies = [ + sources."magicli-0.0.5" + ]; + }) + (sources."strip-ansi-4.0.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + ]; + }) + sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" + sources."symbol-observable-1.2.0" + sources."symbol-tree-3.2.2" + sources."syswide-cas-5.3.0" + sources."table-layout-0.4.4" + sources."tar-4.4.8" + (sources."tar-fs-1.16.3" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."tar-stream-1.6.2" + (sources."tcp-port-used-0.1.2" // { + dependencies = [ + sources."debug-0.7.4" + sources."q-0.9.7" + ]; + }) + sources."terminal-kit-1.27.2" + (sources."tkwidgets-0.5.26" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + sources."node-emoji-git+https://github.com/laurent22/node-emoji.git" + sources."string-width-2.1.1" + ]; + }) + sources."to-buffer-1.1.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tr46-1.0.1" + sources."tree-kit-0.6.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."typical-2.6.1" + sources."uc.micro-1.0.6" + (sources."uglify-js-3.4.10" // { + dependencies = [ + sources."commander-2.19.0" + ]; + }) + sources."unc-path-regex-0.1.2" + sources."uniq-1.0.1" + sources."universalify-0.1.2" + sources."unpack-string-0.0.2" + sources."upper-case-1.1.3" + sources."uri-js-4.2.2" + sources."url-parse-1.4.4" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + sources."valid-url-1.0.9" + sources."verror-1.10.0" + sources."w3c-hr-time-1.0.1" + sources."webidl-conversions-4.0.2" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-6.5.0" + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.3" + sources."word-wrap-1.2.3" + sources."wordwrap-1.0.0" + sources."wordwrapjs-3.0.0" + (sources."wrap-ansi-3.0.1" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-5.2.2" + sources."xml-name-validator-3.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xtend-4.0.1" + sources."yallist-3.0.3" + sources."yargs-parser-7.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Joplin CLI Client"; + homepage = "https://github.com/laurent22/joplin#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; @@ -46320,7 +47598,7 @@ in }; dependencies = [ sources."babylon-7.0.0-beta.19" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" sources."catharsis-0.8.9" sources."escape-string-regexp-1.0.5" sources."graceful-fs-4.1.15" @@ -46423,16 +47701,16 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.0.tgz"; - sha512 = "P0skmY4IDjfLiVrx+GLDeme8w5G0R1IGXgccVU5HP2VM3lRblH7qN2LTea5vZAxrDjpZBD0Jv+ahpjwVcbz/rw=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.1.tgz"; + sha512 = "oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ=="; }; dependencies = [ sources."abbrev-1.1.1" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."editorconfig-0.15.3" @@ -46453,7 +47731,7 @@ in sources."path-is-absolute-1.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."sigmund-1.0.1" sources."wrappy-1.0.2" sources."yallist-2.1.2" @@ -46519,16 +47797,16 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.12"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.12.tgz"; - sha512 = "6RbO1Y3e0Hty/tEpXtQG6jUx7g1G8e39GIOuPugobPC8BX1gZ0OGZQpBn1FLWGkuWF35GRGADvhwdEIFpwIjyA=="; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.13.tgz"; + sha512 = "/FJ+BJ6BASjmNsBJHE8qMVj46HTS2Pfq5gI5BQRhyUsdrw9HaHRWSOsOh87deTOyWMtGas5Qr8H6ikrcWHdZbw=="; }; dependencies = [ sources."argparse-1.0.10" sources."asynckit-0.4.0" sources."combined-stream-1.0.7" - sources."commander-2.11.0" + sources."commander-2.19.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" @@ -46541,7 +47819,7 @@ in sources."graphlib-2.1.7" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."lodash-4.17.11" sources."methods-1.1.2" sources."mime-1.6.0" @@ -46549,17 +47827,17 @@ in sources."mime-types-2.1.22" sources."ms-2.1.1" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.9" + sources."path-loader-1.0.10" sources."process-nextick-args-2.0.0" sources."punycode-2.1.1" - sources."qs-6.6.0" + sources."qs-6.7.0" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" - sources."slash-1.0.0" + sources."slash-2.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-3.0.2" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -46712,7 +47990,7 @@ in sources."make-dir-1.3.0" sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" - sources."mem-4.2.0" + sources."mem-4.3.0" sources."merge-descriptors-1.0.1" (sources."method-override-3.0.0" // { dependencies = [ @@ -46723,7 +48001,7 @@ in sources."mime-1.4.1" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - sources."mimic-fn-2.0.0" + sources."mimic-fn-2.1.0" sources."minimist-1.2.0" sources."morgan-1.9.1" sources."ms-2.0.0" @@ -46746,10 +48024,10 @@ in }) sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" sources."package-json-4.0.1" sources."parseurl-1.3.2" sources."path-exists-3.0.0" @@ -46777,7 +48055,7 @@ in sources."require-main-filename-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" (sources."send-0.16.2" // { @@ -46839,7 +48117,7 @@ in sources."yargs-12.0.5" (sources."yargs-parser-11.1.1" // { dependencies = [ - sources."camelcase-5.2.0" + sources."camelcase-5.3.1" ]; }) ]; @@ -46855,10 +48133,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; - sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; dependencies = [ sources."argparse-1.0.10" @@ -46910,9 +48188,9 @@ in sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" sources."better-assert-1.0.2" - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."blob-0.0.5" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" sources."braces-2.3.2" @@ -46922,7 +48200,7 @@ in sources."bytes-3.0.0" sources."cache-base-1.0.1" sources."callsite-1.0.0" - sources."chokidar-2.1.2" + sources."chokidar-2.1.5" sources."class-utils-0.3.6" sources."collection-visit-1.0.0" sources."colors-1.3.3" @@ -47046,7 +48324,7 @@ in }) sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" sources."is-number-3.0.0" sources."is-plain-object-2.0.4" sources."is-windows-1.0.2" @@ -47056,9 +48334,9 @@ in sources."jsonfile-4.0.0" sources."kind-of-3.2.2" sources."lodash-4.17.11" - (sources."log4js-4.0.2" // { + (sources."log4js-4.1.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-4.1.1" sources."ms-2.1.1" ]; }) @@ -47074,7 +48352,7 @@ in sources."kind-of-6.0.2" ]; }) - sources."mime-2.4.0" + sources."mime-2.4.1" sources."mime-db-1.38.0" sources."mime-types-2.1.22" sources."minimatch-3.0.4" @@ -47085,7 +48363,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.13.1" + sources."nan-2.13.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -47177,7 +48455,7 @@ in }) sources."static-extend-0.1.2" sources."statuses-1.5.0" - (sources."streamroller-1.0.3" // { + (sources."streamroller-1.0.4" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" @@ -47288,8 +48566,8 @@ in sources."lead-1.0.0" sources."minimatch-3.0.4" sources."normalize-path-2.1.1" - sources."now-and-later-2.0.0" - sources."object-keys-1.1.0" + sources."now-and-later-2.0.1" + sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" sources."ordered-read-streams-1.0.1" @@ -47442,9 +48720,9 @@ in sources."lodash-4.17.11" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" - (sources."mem-4.2.0" // { + (sources."mem-4.3.0" // { dependencies = [ - sources."mimic-fn-2.0.0" + sources."mimic-fn-2.1.0" ]; }) sources."mime-db-1.38.0" @@ -47479,10 +48757,10 @@ in sources."os-locale-1.4.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" sources."parse5-1.5.1" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -47512,7 +48790,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."secure-keys-1.0.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -47572,7 +48850,7 @@ in }) (sources."yargs-parser-11.1.1" // { dependencies = [ - sources."camelcase-5.2.0" + sources."camelcase-5.3.1" ]; }) ]; @@ -47652,7 +48930,7 @@ in sources."@octokit/endpoint-3.2.3" sources."@octokit/plugin-enterprise-rest-2.2.2" sources."@octokit/request-2.4.2" - sources."@octokit/rest-16.20.0" + sources."@octokit/rest-16.23.2" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.2.1" @@ -47680,6 +48958,7 @@ in sources."assign-symbols-1.0.0" sources."asynckit-0.4.0" sources."atob-2.1.2" + sources."atob-lite-2.0.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" @@ -47691,7 +48970,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."before-after-hook-1.4.0" sources."block-stream-0.0.9" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -47709,7 +48988,7 @@ in sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" - sources."camelcase-5.2.0" + sources."camelcase-5.3.1" (sources."camelcase-keys-4.2.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -47774,7 +49053,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."cosmiconfig-5.1.0" + sources."cosmiconfig-5.2.0" sources."cross-spawn-6.0.5" sources."currently-unhandled-0.4.1" sources."cyclist-0.2.2" @@ -47848,7 +49127,7 @@ in sources."fast-deep-equal-2.0.1" (sources."fast-glob-2.2.6" // { dependencies = [ - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" ]; }) sources."fast-json-stable-stringify-2.0.0" @@ -48006,7 +49285,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -48040,7 +49319,7 @@ in sources."lodash.uniq-4.5.0" sources."loud-rejection-1.6.0" sources."lru-cache-5.1.1" - sources."macos-release-2.1.0" + sources."macos-release-2.2.0" sources."make-dir-1.3.0" (sources."make-fetch-happen-4.0.1" // { dependencies = [ @@ -48052,9 +49331,9 @@ in sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" - (sources."mem-4.2.0" // { + (sources."mem-4.3.0" // { dependencies = [ - sources."mimic-fn-2.0.0" + sources."mimic-fn-2.1.0" ]; }) sources."meow-4.0.1" @@ -48139,19 +49418,19 @@ in }) sources."os-homedir-1.0.2" sources."os-locale-3.1.0" - sources."os-name-3.0.0" + sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" sources."p-map-1.2.0" sources."p-map-series-1.0.0" sources."p-pipe-1.2.0" sources."p-reduce-1.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" sources."p-waterfall-1.0.0" sources."pacote-9.5.0" sources."parallel-transform-1.1.0" @@ -48241,7 +49520,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { dependencies = [ @@ -48291,7 +49570,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."split-1.0.1" sources."split-string-3.1.0" sources."split2-2.2.0" @@ -48356,7 +49635,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - (sources."uglify-js-3.5.1" // { + (sources."uglify-js-3.5.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -48398,12 +49677,7 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" - (sources."windows-release-3.1.0" // { - dependencies = [ - sources."execa-0.10.0" - sources."get-stream-3.0.0" - ]; - }) + sources."windows-release-3.2.0" sources."wordwrap-0.0.3" (sources."wrap-ansi-2.1.0" // { dependencies = [ @@ -48566,7 +49840,7 @@ in sources."basic-auth-2.0.1" sources."batch-0.6.1" sources."bcryptjs-2.4.3" - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -48574,7 +49848,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."chokidar-2.1.2" + sources."chokidar-2.1.5" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -48678,7 +49952,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -48700,7 +49974,7 @@ in sources."mixin-deep-1.3.1" sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanomatch-1.2.13" sources."negotiator-0.6.1" sources."normalize-path-3.0.0" @@ -48722,7 +49996,7 @@ in sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" - sources."opn-5.5.0" + sources."opn-6.0.0" sources."parseurl-1.3.2" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -48895,7 +50169,7 @@ in sources."base64id-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."blob-0.0.5" sources."body-parser-1.18.3" sources."braces-1.8.5" @@ -49100,7 +50374,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.13.1" + sources."nan-2.13.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -49366,12 +50640,12 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/core-7.4.0" + sources."@babel/core-7.4.3" sources."@babel/generator-7.4.0" sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" sources."@babel/helper-call-delegate-7.4.0" - sources."@babel/helper-create-class-features-plugin-7.4.0" + sources."@babel/helper-create-class-features-plugin-7.4.3" sources."@babel/helper-define-map-7.4.0" sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" @@ -49379,23 +50653,23 @@ in sources."@babel/helper-hoist-variables-7.4.0" sources."@babel/helper-member-expression-to-functions-7.0.0" sources."@babel/helper-module-imports-7.0.0" - sources."@babel/helper-module-transforms-7.2.2" + sources."@babel/helper-module-transforms-7.4.3" sources."@babel/helper-optimise-call-expression-7.0.0" sources."@babel/helper-plugin-utils-7.0.0" - sources."@babel/helper-regex-7.0.0" + sources."@babel/helper-regex-7.4.3" sources."@babel/helper-remap-async-to-generator-7.1.0" sources."@babel/helper-replace-supers-7.4.0" sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.4.0" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.4.2" + sources."@babel/helpers-7.4.3" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.2" + sources."@babel/parser-7.4.3" sources."@babel/plugin-external-helpers-7.0.0" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-class-properties-7.4.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.4.0" + sources."@babel/plugin-proposal-object-rest-spread-7.4.3" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.4.0" sources."@babel/plugin-syntax-async-generators-7.2.0" @@ -49406,36 +50680,39 @@ in sources."@babel/plugin-transform-async-to-generator-7.4.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" sources."@babel/plugin-transform-block-scoping-7.4.0" - sources."@babel/plugin-transform-classes-7.4.0" + sources."@babel/plugin-transform-classes-7.4.3" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.4.0" - sources."@babel/plugin-transform-dotall-regex-7.2.0" + sources."@babel/plugin-transform-destructuring-7.4.3" + sources."@babel/plugin-transform-dotall-regex-7.4.3" sources."@babel/plugin-transform-duplicate-keys-7.2.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" - sources."@babel/plugin-transform-for-of-7.4.0" - sources."@babel/plugin-transform-function-name-7.2.0" + sources."@babel/plugin-transform-for-of-7.4.3" + sources."@babel/plugin-transform-function-name-7.4.3" sources."@babel/plugin-transform-literals-7.2.0" + sources."@babel/plugin-transform-member-expression-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.2.0" - sources."@babel/plugin-transform-modules-commonjs-7.4.0" + sources."@babel/plugin-transform-modules-commonjs-7.4.3" sources."@babel/plugin-transform-modules-systemjs-7.4.0" sources."@babel/plugin-transform-modules-umd-7.2.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.2" sources."@babel/plugin-transform-new-target-7.4.0" sources."@babel/plugin-transform-object-super-7.2.0" - sources."@babel/plugin-transform-parameters-7.4.0" - sources."@babel/plugin-transform-regenerator-7.4.0" - sources."@babel/plugin-transform-runtime-7.4.0" + sources."@babel/plugin-transform-parameters-7.4.3" + sources."@babel/plugin-transform-property-literals-7.2.0" + sources."@babel/plugin-transform-regenerator-7.4.3" + sources."@babel/plugin-transform-reserved-words-7.2.0" + sources."@babel/plugin-transform-runtime-7.4.3" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.2.0" sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-unicode-regex-7.2.0" - sources."@babel/preset-env-7.4.2" + sources."@babel/plugin-transform-unicode-regex-7.4.3" + sources."@babel/preset-env-7.4.3" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.4.2" + sources."@babel/runtime-7.4.3" sources."@babel/template-7.4.0" - sources."@babel/traverse-7.4.0" + sources."@babel/traverse-7.4.3" sources."@babel/types-7.4.0" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" @@ -49447,7 +50724,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-11.11.4" + sources."@types/node-11.13.0" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -49624,9 +50901,9 @@ in }) sources."base64-js-1.3.0" sources."big.js-5.2.2" - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."bl-1.2.2" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."braces-1.8.5" @@ -49637,7 +50914,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.5.2" + sources."browserslist-4.5.4" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -49659,8 +50936,8 @@ in ]; }) sources."call-me-maybe-1.0.1" - sources."camelcase-5.2.0" - sources."caniuse-lite-1.0.30000951" + sources."camelcase-5.3.1" + sources."caniuse-lite-1.0.30000957" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -49669,7 +50946,7 @@ in ]; }) sources."cherow-1.6.9" - (sources."chokidar-2.1.2" // { + (sources."chokidar-2.1.5" // { dependencies = [ sources."array-unique-0.3.2" sources."braces-2.3.2" @@ -49681,7 +50958,7 @@ in ]; }) sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" sources."is-number-3.0.0" sources."isobject-3.0.1" sources."normalize-path-3.0.0" @@ -49709,7 +50986,7 @@ in ]; }) sources."cli-cursor-2.1.0" - sources."cli-spinners-2.0.0" + sources."cli-spinners-2.1.0" (sources."cliui-4.1.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -49737,9 +51014,13 @@ in sources."convert-source-map-1.6.0" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.0.0" - sources."core-js-compat-3.0.0" - sources."core-js-pure-3.0.0" + sources."core-js-3.0.1" + (sources."core-js-compat-3.0.1" // { + dependencies = [ + sources."semver-6.0.0" + ]; + }) + sources."core-js-pure-3.0.1" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" @@ -49816,7 +51097,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.118" + sources."electron-to-chromium-1.3.124" sources."elliptic-6.4.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -49899,7 +51180,7 @@ in ]; }) sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -50032,7 +51313,7 @@ in sources."hosted-git-info-2.7.1" sources."http-cache-semantics-3.8.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."iferr-0.1.5" sources."ignore-3.3.10" sources."import-local-2.0.0" @@ -50134,17 +51415,17 @@ in sources."map-visit-1.0.0" sources."math-random-1.0.4" sources."md5.js-1.3.5" - (sources."mem-4.2.0" // { + (sources."mem-4.3.0" // { dependencies = [ - sources."mimic-fn-2.0.0" - sources."p-is-promise-2.0.0" + sources."mimic-fn-2.1.0" + sources."p-is-promise-2.1.0" ]; }) sources."memory-fs-0.4.1" sources."merge2-1.2.3" sources."micromatch-2.3.11" sources."miller-rabin-4.0.1" - sources."mime-db-1.38.0" + sources."mime-db-1.39.0" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -50165,7 +51446,7 @@ in sources."move-concurrently-1.0.1" sources."ms-2.1.1" sources."multistream-2.1.1" - sources."nan-2.13.1" + sources."nan-2.13.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -50187,7 +51468,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.11" + sources."node-releases-1.1.13" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" (sources."normalize-url-2.0.1" // { @@ -50215,7 +51496,7 @@ in }) ]; }) - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -50230,7 +51511,7 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - (sources."ora-3.2.0" // { + (sources."ora-3.4.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."strip-ansi-5.2.0" @@ -50273,7 +51554,7 @@ in sources."locate-path-3.0.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" ]; }) sources."posix-character-classes-0.1.1" @@ -50388,7 +51669,7 @@ in (sources."resolve-dependencies-2.2.2" // { dependencies = [ sources."dir-glob-2.2.2" - sources."globby-9.1.0" + sources."globby-9.2.0" sources."ignore-4.0.6" (sources."path-type-3.0.0" // { dependencies = [ @@ -50418,7 +51699,7 @@ in }) sources."rollup-plugin-node-resolve-3.4.0" sources."rollup-plugin-replace-2.1.0" - (sources."rollup-pluginutils-2.5.0" // { + (sources."rollup-pluginutils-2.6.0" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -50464,7 +51745,7 @@ in sources."safe-regex-1.1.0" sources."schema-utils-1.0.0" sources."seek-bzip-1.0.5" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."serialize-javascript-1.6.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { @@ -50520,7 +51801,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."split-string-3.1.0" sources."ssri-6.0.1" (sources."static-extend-0.1.2" // { @@ -50563,7 +51844,7 @@ in sources."tar-stream-1.6.2" (sources."terser-3.17.0" // { dependencies = [ - sources."commander-2.19.0" + sources."commander-2.20.0" sources."source-map-0.6.1" ]; }) @@ -50720,7 +52001,7 @@ in sources."locate-path-3.0.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" ]; }) sources."yargs-parser-11.1.1" @@ -50777,7 +52058,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -50923,7 +52204,7 @@ in dependencies = [ sources."glob-7.1.3" sources."minimatch-3.0.4" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."uglify-js-2.8.29" ]; }) @@ -51366,7 +52647,7 @@ in sources."natives-1.1.6" sources."next-tick-1.0.0" sources."normalize-path-2.1.1" - sources."now-and-later-2.0.0" + sources."now-and-later-2.0.1" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -51382,7 +52663,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" sources."object.defaults-1.1.0" @@ -51550,7 +52831,7 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."typescript-3.3.4000" + sources."typescript-3.4.2" (sources."uglify-js-3.4.9" // { dependencies = [ sources."source-map-0.6.1" @@ -51652,7 +52933,7 @@ in }) sources."browser-stdout-1.3.1" sources."cache-base-1.0.1" - sources."camelcase-5.2.0" + sources."camelcase-5.3.1" (sources."chalk-2.4.2" // { dependencies = [ sources."supports-color-5.5.0" @@ -51799,9 +53080,9 @@ in sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."mem-4.2.0" + sources."mem-4.3.0" sources."micromatch-3.1.10" - sources."mimic-fn-2.0.0" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" (sources."mixin-deep-1.3.1" // { @@ -51829,7 +53110,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.0.3" @@ -51838,10 +53119,10 @@ in sources."os-locale-3.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-exists-3.0.0" @@ -51858,7 +53139,7 @@ in sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-regex-1.1.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { dependencies = [ @@ -51988,7 +53269,7 @@ in sources."argparse-1.0.10" sources."asynckit-0.4.0" sources."combined-stream-1.0.7" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" @@ -52001,10 +53282,10 @@ in sources."graphlib-2.1.7" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."js-yaml-3.13.0" - (sources."json-refs-3.0.12" // { + sources."js-yaml-3.13.1" + (sources."json-refs-3.0.13" // { dependencies = [ - sources."commander-2.11.0" + sources."commander-2.19.0" ]; }) sources."lodash-4.17.11" @@ -52014,17 +53295,17 @@ in sources."mime-types-2.1.22" sources."ms-2.1.1" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.9" + sources."path-loader-1.0.10" sources."process-nextick-args-2.0.0" sources."punycode-2.1.1" - sources."qs-6.6.0" + sources."qs-6.7.0" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" - sources."slash-1.0.0" + sources."slash-2.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" sources."superagent-3.8.3" - sources."uri-js-3.0.2" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -52038,10 +53319,10 @@ in neovim = nodeEnv.buildNodePackage { name = "neovim"; packageName = "neovim"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/neovim/-/neovim-4.4.0.tgz"; - sha512 = "zFsmjUeiK7vJNXsSljaAXt8eUmwKIJ4d7iTn7Mq2PmTEPmtBCuaVEGRpkl5z3AWJKPmOYNzlIu9Lgyq4s4FTew=="; + url = "https://registry.npmjs.org/neovim/-/neovim-4.5.0.tgz"; + sha512 = "+Q5EEIYIZG14NYAAQmvHHdYZ8hg0TbcsFo9vDf2rHhwidqdJv7jrDk0vQz+kUrNvhNQO/pqkBrZ08yEWZbD/0A=="; }; dependencies = [ sources."async-1.0.0" @@ -52049,15 +53330,17 @@ in sources."cycle-1.0.3" sources."event-lite-0.1.2" sources."eyes-0.1.8" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."int64-buffer-0.1.10" sources."isarray-1.0.0" + sources."isexe-2.0.0" sources."isstream-0.1.2" sources."lodash-4.17.11" sources."msgpack-lite-0.1.26" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."stack-trace-0.0.10" sources."traverse-0.6.6" + sources."which-1.3.1" sources."winston-2.4.4" ]; buildInputs = globalBuildInputs; @@ -52211,7 +53494,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -52411,7 +53694,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.42" + sources."big-integer-1.6.43" sources."block-stream-0.0.9" sources."body-parser-1.18.3" sources."boom-2.10.1" @@ -52530,13 +53813,13 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."negotiator-0.6.1" (sources."node-pre-gyp-0.6.39" // { dependencies = [ sources."glob-7.1.3" sources."rimraf-2.6.3" - sources."semver-5.6.0" + sources."semver-5.7.0" ]; }) sources."nopt-4.0.1" @@ -52601,7 +53884,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -52741,7 +54024,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -52794,7 +54077,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -52807,7 +54090,7 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."chalk-2.4.2" - sources."chokidar-2.1.2" + sources."chokidar-2.1.5" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -52918,7 +54201,7 @@ in sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" (sources."is-number-3.0.0" // { @@ -52948,7 +54231,7 @@ in sources."minimist-1.2.0" sources."mixin-deep-1.3.1" sources."ms-2.0.0" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanomatch-1.2.13" sources."nopt-1.0.10" sources."normalize-path-3.0.0" @@ -52994,7 +54277,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" (sources."set-value-2.0.0" // { dependencies = [ @@ -53120,29 +54403,37 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.20.3"; + version = "0.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.20.3.tgz"; - sha512 = "Ws9yCaG7LXWV5AlfM6z7wQYM7/LBkuulm78I+aXag0ED4HTcNoFNxtaez2eNvBYLiwHlvhhFvw/mthGDJ6HTow=="; + url = "https://registry.npmjs.org/node-red/-/node-red-0.20.5.tgz"; + sha512 = "kF95ob7BZSiS1rOuy/QqATVHKCN6tDyybLHiqXYgSGgBcrsE+raYGhQcpS5DaCffl4GecYTNl0ijk6gle2ObXQ=="; }; dependencies = [ - sources."@node-red/editor-api-0.20.3" - sources."@node-red/editor-client-0.20.3" - (sources."@node-red/nodes-0.20.3" // { + sources."@babel/runtime-7.4.3" + sources."@node-red/editor-api-0.20.5" + sources."@node-red/editor-client-0.20.5" + (sources."@node-red/nodes-0.20.5" // { dependencies = [ sources."iconv-lite-0.4.24" - sources."media-typer-1.0.1" ]; }) - sources."@node-red/registry-0.20.3" - sources."@node-red/runtime-0.20.3" - sources."@node-red/util-0.20.3" + sources."@node-red/registry-0.20.5" + sources."@node-red/runtime-0.20.5" + sources."@node-red/util-0.20.5" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."addressparser-1.0.1" sources."agent-base-4.2.1" sources."ajv-6.10.0" + sources."ansi-regex-2.1.1" sources."append-field-1.0.0" + sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-indexofobject-0.0.1" @@ -53155,7 +54446,7 @@ in sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."basic-auth-2.0.1" - sources."bcrypt-2.0.1" + sources."bcrypt-3.0.5" sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" (sources."bl-1.2.2" // { @@ -53184,9 +54475,11 @@ in }) sources."caseless-0.12.0" sources."cheerio-0.22.0" + sources."chownr-1.1.1" sources."clone-2.1.2" + sources."code-point-at-1.1.0" sources."combined-stream-1.0.7" - sources."commander-2.17.1" + sources."commander-2.19.0" sources."commist-1.1.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -53195,6 +54488,7 @@ in sources."string_decoder-1.1.1" ]; }) + sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" @@ -53209,10 +54503,13 @@ in sources."d-1.0.0" sources."dashdash-1.14.1" sources."debug-2.6.9" + sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" - sources."denque-1.4.0" + sources."delegates-1.0.0" + sources."denque-1.4.1" sources."depd-1.1.2" sources."destroy-1.0.4" + sources."detect-libc-1.0.3" (sources."dicer-0.2.5" // { dependencies = [ sources."isarray-0.0.1" @@ -53273,8 +54570,10 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-7.0.1" + sources."fs-minipass-1.2.5" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.3" sources."glob-parent-3.1.0" @@ -53287,6 +54586,7 @@ in sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" + sources."has-unicode-2.0.1" sources."hash-sum-1.0.2" sources."help-me-1.1.0" sources."htmlparser2-3.10.1" @@ -53298,8 +54598,9 @@ in sources."ms-2.1.1" ]; }) - sources."i18next-14.1.1" + sources."i18next-15.0.9" sources."iconv-lite-0.4.23" + sources."ignore-walk-3.0.1" (sources."imap-0.8.19" // { dependencies = [ sources."isarray-0.0.1" @@ -53309,9 +54610,11 @@ in }) sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.5" sources."ipaddr.js-1.8.0" sources."is-absolute-1.0.0" sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" sources."is-relative-1.0.0" @@ -53321,7 +54624,7 @@ in sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."js-yaml-3.12.2" + sources."js-yaml-3.13.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -53367,6 +54670,12 @@ in sources."mime-types-2.1.22" sources."minimatch-3.0.4" sources."minimist-1.2.0" + (sources."minipass-2.3.5" // { + dependencies = [ + sources."yallist-3.0.3" + ]; + }) + sources."minizlib-1.2.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -53385,9 +54694,15 @@ in sources."ms-2.0.0" sources."multer-1.4.1" sources."mustache-3.0.1" - sources."nan-2.10.0" + sources."nan-2.13.1" + sources."needle-2.2.4" sources."negotiator-0.6.1" sources."next-tick-1.0.0" + (sources."node-pre-gyp-0.12.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."node-red-node-email-1.3.0" sources."node-red-node-feedparser-0.1.14" sources."node-red-node-rbe-0.2.4" @@ -53396,7 +54711,11 @@ in sources."node-red-node-twitter-1.1.4" sources."nodemailer-4.7.0" sources."nopt-4.0.1" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.1" + sources."npmlog-4.1.2" sources."nth-check-1.0.2" + sources."number-is-nan-1.0.1" sources."oauth-0.9.15" sources."oauth-sign-0.9.0" sources."oauth2orize-1.11.0" @@ -53444,15 +54763,18 @@ in sources."random-bytes-1.0.0" sources."range-parser-1.2.0" sources."raw-body-2.3.3" - sources."readable-stream-3.2.0" + sources."rc-1.2.8" + sources."readable-stream-3.3.0" + sources."regenerator-runtime-0.13.2" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."request-2.88.0" sources."retry-0.6.1" + sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.6.0" + sources."semver-6.0.0" (sources."send-0.16.2" // { dependencies = [ sources."mime-1.4.1" @@ -53461,7 +54783,9 @@ in }) sources."sentiment-2.1.0" sources."serve-static-1.13.2" + sources."set-blocking-2.0.0" sources."setprototypeof-1.1.0" + sources."signal-exit-3.0.2" sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" @@ -53469,8 +54793,16 @@ in sources."statuses-1.5.0" sources."stream-shift-1.0.0" sources."streamsearch-0.1.2" + sources."string-width-1.0.2" sources."string_decoder-1.2.0" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" sources."tail-2.0.2" + (sources."tar-4.4.8" // { + dependencies = [ + sources."yallist-3.0.3" + ]; + }) (sources."through2-2.0.5" // { dependencies = [ sources."readable-stream-2.3.6" @@ -53489,7 +54821,7 @@ in sources."twitter-ng-0.6.2" sources."type-is-1.6.16" sources."typedarray-0.0.6" - sources."uglify-js-3.4.9" + sources."uglify-js-3.5.3" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."ultron-1.1.1" @@ -53509,7 +54841,7 @@ in sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" - (sources."websocket-stream-5.1.2" // { + (sources."websocket-stream-5.4.0" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" @@ -53517,9 +54849,10 @@ in ]; }) sources."when-3.7.8" + sources."wide-align-1.1.3" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - sources."ws-6.2.0" + sources."ws-6.2.1" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xtend-4.0.1" @@ -53722,19 +55055,20 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "3.1.1"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.1.tgz"; - sha512 = "xUf4iL28QAMjOkd9eH2CIxt98KMub3Z5BN1rkLMphb3WoGeiRZ4YDs82KmR3Jl5cheeWjJjI+HBXiiGFAxAYuQ=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.4.tgz"; + sha512 = "kiz2Z+Wn5J1JyIZGTcCRLCUVwO+C1l0Mj6c7fKDlXRUxSHOEoUUuQsj+fPLU1htuNNeL7gbM1KbvE1SIGLOgvA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."agent-base-4.2.1" sources."ansi-align-2.0.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" sources."boxen-1.3.0" sources."cacheable-request-6.0.0" sources."camelcase-4.1.0" @@ -53748,7 +55082,8 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.0.3" - sources."commander-2.19.0" + sources."commander-2.20.0" + sources."config-chain-1.1.12" sources."configstore-3.1.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -53760,6 +55095,8 @@ in sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."end-of-stream-1.4.1" + sources."es6-promise-4.2.6" + sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" (sources."execa-0.7.0" // { @@ -53769,6 +55106,7 @@ in }) sources."fast-diff-1.2.0" sources."find-up-3.0.0" + sources."get-proxy-2.1.0" sources."get-stdin-6.0.0" sources."get-stream-4.1.0" sources."global-dirs-0.1.1" @@ -53777,6 +55115,7 @@ in sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."http-cache-semantics-4.0.3" + sources."https-proxy-agent-2.2.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."ini-1.3.5" @@ -53791,7 +55130,7 @@ in sources."is-stream-1.1.0" sources."isexe-2.0.0" sources."jju-1.4.0" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" sources."json5-1.0.1" @@ -53824,16 +55163,17 @@ in ]; }) sources."normalize-url-3.3.0" + sources."npm-conf-1.1.3" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" - sources."package-json-6.1.0" + sources."p-try-2.2.0" + sources."package-json-6.3.0" sources."path-exists-3.0.0" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -53842,18 +55182,19 @@ in sources."prepend-http-2.0.0" sources."progress-2.0.3" sources."prompts-2.0.4" + sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."rc-1.2.8" sources."rc-config-loader-2.0.2" sources."registry-auth-token-3.4.0" - sources."registry-url-5.0.0" + sources."registry-url-5.1.0" sources."require-from-string-2.0.2" sources."requireg-0.2.1" sources."resolve-1.7.1" sources."responselike-1.0.2" sources."safe-buffer-5.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" sources."semver-utils-1.1.4" sources."shebang-command-1.2.0" @@ -53961,7 +55302,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.1" - sources."big-integer-1.6.42" + sources."big-integer-1.6.43" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -54080,7 +55421,7 @@ in sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-2.4.0" + sources."mime-2.4.1" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -54164,7 +55505,7 @@ in sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."server-destroy-1.0.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" @@ -54181,7 +55522,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -54430,7 +55771,7 @@ in sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.11" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."immediate-chunk-store-1.0.8" sources."indexof-0.0.1" sources."inflight-1.0.6" @@ -54691,10 +56032,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.0.1.tgz"; - sha512 = "hYWjRN7U96zHDvgQxGyYaMF469Uzx0iZo2ej1VMUSaOULUFI9ue7dDku29AOf/E0+5Zd9zFs0qE0Tuq5Zsrk0A=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.1.0.tgz"; + sha512 = "+Ywkb2rg5uX6/CppRBFmefrQn8EiXK8H0ntRoWHuQAzLErrVXtbyuRKhWMUG5ewr9raQUOACou/uaThE9jzhwA=="; }; buildInputs = globalBuildInputs; meta = { @@ -54732,8 +56073,8 @@ in (sources."@babel/helper-call-delegate-7.4.0" // { dependencies = [ sources."@babel/generator-7.4.0" - sources."@babel/parser-7.4.2" - sources."@babel/traverse-7.4.0" + sources."@babel/parser-7.4.3" + sources."@babel/traverse-7.4.3" sources."@babel/types-7.4.0" sources."source-map-0.5.7" ]; @@ -54753,16 +56094,16 @@ in }) sources."@babel/helper-member-expression-to-functions-7.0.0" sources."@babel/helper-module-imports-7.0.0" - sources."@babel/helper-module-transforms-7.2.2" + sources."@babel/helper-module-transforms-7.4.3" sources."@babel/helper-optimise-call-expression-7.0.0" sources."@babel/helper-plugin-utils-7.0.0" - sources."@babel/helper-regex-7.0.0" + sources."@babel/helper-regex-7.4.3" sources."@babel/helper-remap-async-to-generator-7.1.0" (sources."@babel/helper-replace-supers-7.4.0" // { dependencies = [ sources."@babel/generator-7.4.0" - sources."@babel/parser-7.4.2" - sources."@babel/traverse-7.4.0" + sources."@babel/parser-7.4.3" + sources."@babel/traverse-7.4.3" sources."@babel/types-7.4.0" sources."source-map-0.5.7" ]; @@ -54774,12 +56115,12 @@ in ]; }) sources."@babel/helper-wrap-function-7.2.0" - (sources."@babel/helpers-7.4.2" // { + (sources."@babel/helpers-7.4.3" // { dependencies = [ sources."@babel/generator-7.4.0" - sources."@babel/parser-7.4.2" + sources."@babel/parser-7.4.3" sources."@babel/template-7.4.0" - sources."@babel/traverse-7.4.0" + sources."@babel/traverse-7.4.3" sources."@babel/types-7.4.0" sources."source-map-0.5.7" ]; @@ -54788,7 +56129,7 @@ in sources."@babel/parser-7.3.4" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.4.0" + sources."@babel/plugin-proposal-object-rest-spread-7.4.3" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.4.0" sources."@babel/plugin-syntax-async-generators-7.2.0" @@ -54801,15 +56142,15 @@ in sources."@babel/plugin-transform-async-to-generator-7.4.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" sources."@babel/plugin-transform-block-scoping-7.4.0" - sources."@babel/plugin-transform-classes-7.4.0" + sources."@babel/plugin-transform-classes-7.4.3" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.4.0" - sources."@babel/plugin-transform-dotall-regex-7.2.0" + sources."@babel/plugin-transform-destructuring-7.4.3" + sources."@babel/plugin-transform-dotall-regex-7.4.3" sources."@babel/plugin-transform-duplicate-keys-7.2.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" sources."@babel/plugin-transform-flow-strip-types-7.3.4" - sources."@babel/plugin-transform-for-of-7.4.0" - sources."@babel/plugin-transform-function-name-7.2.0" + sources."@babel/plugin-transform-for-of-7.4.3" + sources."@babel/plugin-transform-function-name-7.4.3" sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.2.0" sources."@babel/plugin-transform-modules-commonjs-7.2.0" @@ -54818,15 +56159,15 @@ in sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.2" sources."@babel/plugin-transform-new-target-7.4.0" sources."@babel/plugin-transform-object-super-7.2.0" - sources."@babel/plugin-transform-parameters-7.4.0" + sources."@babel/plugin-transform-parameters-7.4.3" sources."@babel/plugin-transform-react-jsx-7.3.0" - sources."@babel/plugin-transform-regenerator-7.4.0" + sources."@babel/plugin-transform-regenerator-7.4.3" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.2.0" sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-unicode-regex-7.2.0" + sources."@babel/plugin-transform-unicode-regex-7.4.3" sources."@babel/preset-env-7.3.4" sources."@babel/runtime-7.3.4" sources."@babel/template-7.2.2" @@ -54901,7 +56242,7 @@ in }) sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."bindings-1.2.1" sources."bn.js-4.11.8" sources."boolbase-1.0.0" @@ -54920,7 +56261,7 @@ in sources."pako-1.0.10" ]; }) - sources."browserslist-4.5.2" + sources."browserslist-4.5.4" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -54936,10 +56277,10 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30000951" + sources."caniuse-lite-1.0.30000957" sources."caseless-0.12.0" sources."chalk-2.4.2" - sources."chokidar-2.1.2" + sources."chokidar-2.1.5" sources."cipher-base-1.0.4" sources."class-utils-0.3.6" sources."cli-cursor-2.1.0" @@ -54954,7 +56295,7 @@ in sources."color-string-1.5.3" sources."combined-stream-1.0.7" sources."command-exists-1.2.8" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -54965,7 +56306,7 @@ in sources."copy-descriptor-0.1.1" sources."core-js-2.6.5" sources."core-util-is-1.0.2" - sources."cosmiconfig-5.1.0" + sources."cosmiconfig-5.2.0" sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" @@ -55021,7 +56362,7 @@ in ]; }) sources."cssom-0.3.6" - sources."cssstyle-1.2.1" + sources."cssstyle-1.2.2" sources."dashdash-1.14.1" (sources."data-urls-1.1.0" // { dependencies = [ @@ -55073,7 +56414,7 @@ in sources."ecc-jsbn-0.1.2" sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.118" + sources."electron-to-chromium-1.3.124" sources."elliptic-6.4.1" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -55161,7 +56502,7 @@ in sources."htmlnano-0.2.3" (sources."htmlparser2-3.10.1" // { dependencies = [ - sources."readable-stream-3.2.0" + sources."readable-stream-3.3.0" ]; }) sources."http-errors-1.6.3" @@ -55169,7 +56510,7 @@ in sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" sources."icss-replace-symbols-1.1.0" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."import-fresh-2.0.0" sources."indexes-of-1.0.1" sources."indexof-0.0.1" @@ -55202,7 +56543,7 @@ in sources."is-directory-0.3.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" sources."is-html-1.1.0" sources."is-number-3.0.0" sources."is-obj-1.0.1" @@ -55219,10 +56560,10 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."js-beautify-1.9.0" + sources."js-beautify-1.9.1" sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" - (sources."js-yaml-3.13.0" // { + (sources."js-yaml-3.13.1" // { dependencies = [ sources."esprima-4.0.1" ]; @@ -55241,7 +56582,6 @@ in sources."levn-0.3.0" sources."lodash-4.17.11" sources."lodash.clone-4.5.0" - sources."lodash.get-4.4.2" sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" @@ -55287,7 +56627,7 @@ in ]; }) sources."ms-2.1.1" - sources."nan-2.13.1" + sources."nan-2.13.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -55297,25 +56637,25 @@ in ]; }) sources."nice-try-1.0.5" - sources."node-addon-api-1.6.2" + sources."node-addon-api-1.6.3" sources."node-forge-0.7.6" (sources."node-libs-browser-2.2.0" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.11" + sources."node-releases-1.1.13" sources."nopt-4.0.1" sources."normalize-html-whitespace-0.2.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" - sources."nwsapi-2.1.1" + sources."nwsapi-2.1.3" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-copy-0.1.0" sources."object-inspect-1.4.1" - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.getownpropertydescriptors-2.0.3" sources."object.pick-1.3.0" @@ -55487,7 +56827,7 @@ in sources."safer-buffer-2.1.2" sources."safer-eval-1.3.2" sources."sax-1.2.4" - sources."semver-5.6.0" + sources."semver-5.7.0" (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" @@ -55551,7 +56891,7 @@ in ]; }) sources."supports-color-5.5.0" - sources."svgo-1.2.0" + sources."svgo-1.2.1" sources."symbol-tree-3.2.2" sources."terser-3.17.0" sources."through2-2.0.5" @@ -55709,7 +57049,7 @@ in ]; }) sources."base64-js-1.3.0" - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -55754,7 +57094,7 @@ in sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" - sources."chokidar-2.1.2" + sources."chokidar-2.1.5" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -55867,7 +57207,7 @@ in sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -55880,7 +57220,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -55933,7 +57273,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanomatch-1.2.13" sources."neo-async-2.6.0" sources."node-static-0.7.11" @@ -56151,7 +57491,7 @@ in sources."balanced-match-1.0.0" sources."base62-0.1.1" sources."brace-expansion-1.1.11" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -56233,7 +57573,7 @@ in sources."read-1.0.7" sources."revalidator-0.1.8" sources."rimraf-2.6.3" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."stack-trace-0.0.10" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" @@ -56257,10 +57597,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-3.7.0.tgz"; - sha512 = "HTOTNhF5mQAw6fcsptk4oql/DEEUwTG0YHk/LzTNNx0/3IgvOQZqKzvlK/zNpqqKMLlhn1gH9Nvp+FFoc/e5/w=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-3.8.0.tgz"; + sha512 = "MQ+UBXIIL9IyBXhkLZWb/AG5h5/BedmnHXHIEavMBawNLVfAayvTrwNlDjGn4tf/CQ2CTJR8jSyIdu4RpfoLpg=="; }; buildInputs = globalBuildInputs; meta = { @@ -56416,7 +57756,12 @@ in }; dependencies = [ sources."abstract-leveldown-5.0.0" - sources."aligned-block-file-1.1.5" + (sources."aligned-block-file-1.2.0" // { + dependencies = [ + sources."int53-1.0.0" + sources."uint48be-2.0.1" + ]; + }) sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -56446,9 +57791,9 @@ in sources."isobject-3.0.1" ]; }) - sources."base64-url-2.2.0" + sources."base64-url-2.2.1" sources."bash-color-0.0.4" - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."binary-search-1.3.5" sources."bindings-1.3.1" sources."bl-1.2.2" @@ -56475,7 +57820,7 @@ in sources."character-entities-legacy-1.1.2" sources."character-reference-invalid-1.1.2" sources."charwise-3.0.1" - sources."chloride-2.2.12" + sources."chloride-2.2.14" sources."chloride-test-1.2.4" sources."chokidar-1.7.0" sources."chownr-1.1.1" @@ -56502,7 +57847,7 @@ in sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.4" sources."collection-visit-1.0.0" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."compare-at-paths-1.0.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" @@ -56588,7 +57933,16 @@ in sources."map-filter-reduce-3.2.2" ]; }) - sources."flumeview-reduce-1.3.15" + (sources."flumeview-reduce-1.3.16" // { + dependencies = [ + (sources."atomic-file-2.0.0" // { + dependencies = [ + sources."flumecodec-0.0.1" + ]; + }) + sources."level-codec-6.2.0" + ]; + }) sources."for-each-0.3.3" sources."for-in-1.0.2" sources."for-own-0.1.5" @@ -56629,6 +57983,7 @@ in sources."he-0.5.0" sources."heap-0.2.6" sources."hoox-0.0.1" + sources."idb-kv-store-4.4.0" sources."increment-buffer-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -56686,8 +58041,8 @@ in sources."kind-of-3.2.2" sources."layered-graph-1.1.3" sources."level-4.0.0" - sources."level-codec-9.0.0" - sources."level-errors-2.0.0" + sources."level-codec-9.0.1" + sources."level-errors-2.0.1" sources."level-iterator-stream-3.0.1" sources."level-packager-3.1.0" sources."level-post-1.0.7" @@ -56779,7 +58134,7 @@ in sources."rimraf-2.4.5" ]; }) - sources."nan-2.13.1" + sources."nan-2.13.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -56814,7 +58169,7 @@ in ]; }) sources."object-inspect-1.6.0" - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -56855,6 +58210,7 @@ in sources."preserve-0.2.0" sources."private-box-0.3.0" sources."process-nextick-args-2.0.0" + sources."promisize-1.1.2" sources."prr-1.0.1" sources."pull-abortable-4.0.0" sources."pull-box-stream-1.0.13" @@ -57015,7 +58371,7 @@ in sources."ms-2.1.1" ]; }) - sources."semver-5.6.0" + sources."semver-5.7.0" sources."separator-escape-0.0.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { @@ -57057,7 +58413,7 @@ in }) sources."snapdragon-util-3.0.1" sources."socks-2.3.2" - sources."sodium-browserify-1.2.5" + sources."sodium-browserify-1.2.7" (sources."sodium-browserify-tweetnacl-0.2.5" // { dependencies = [ sources."sha.js-2.4.11" @@ -57080,7 +58436,7 @@ in sources."ssb-client-4.7.1" sources."ssb-config-2.3.9" sources."ssb-db-18.6.5" - sources."ssb-ebt-5.5.3" + sources."ssb-ebt-5.5.5" sources."ssb-friends-3.1.13" sources."ssb-keys-7.1.5" sources."ssb-links-3.0.4" @@ -57213,10 +58569,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "5.6.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz"; - sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="; + url = "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz"; + sha512 = "0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -57230,10 +58586,10 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "10.1.2"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-10.1.2.tgz"; - sha512 = "TVH35uwndRlCqSeX3grR3Ntrjx2aBTeu6sx+zTD2CzN2N/rHuEDTvxiBwWbrellJNyWiQFz2xZmoW+UxV+Zahg=="; + url = "https://registry.npmjs.org/serve/-/serve-11.0.0.tgz"; + sha512 = "Gnyyp3JAtRUo0dRH1/YWPKbnaXHfzQBiVh9+qSUi6tyVcVA8twUP2c+GnOwsoe9Ss7dfOHJUTSA4fdWP//Y4gQ=="; }; dependencies = [ sources."@zeit/schemas-2.6.0" @@ -57301,7 +58657,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" - (sources."serve-handler-5.0.8" // { + (sources."serve-handler-6.0.0" // { dependencies = [ sources."mime-db-1.33.0" sources."mime-types-2.1.18" @@ -57365,7 +58721,7 @@ in sources."caseless-0.12.0" sources."cheerio-0.17.0" sources."combined-stream-1.0.7" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -57850,7 +59206,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."mv-2.1.1" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -57943,26 +59299,28 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.143.0"; + version = "1.147.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.143.0.tgz"; - sha512 = "3hndcJH+fxQoC2Bg8YN/RqFBuQo+goZJnFlBm3PoQAaCg2zIWIfCuuzmn+6E/Ssy7LhJb0KbYmhxawS1Ib4rJg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.147.4.tgz"; + sha512 = "siFpP8+DaX9KX5M10g3IjR7c68fC780PlVIT6uymi0ZgQkR3QvU2NiR+Y6v1hBF5JH9sT6RDXoZBXVAH/CfkSw=="; }; dependencies = [ - sources."@snyk/dep-graph-1.4.0" + sources."@snyk/dep-graph-1.4.1" sources."@snyk/gemfile-1.2.0" + sources."@types/node-8.10.45" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.2.1" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.2.0" + sources."ansi-escapes-4.1.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" sources."archy-1.0.0" + sources."arg-4.1.0" sources."argparse-1.0.10" sources."asap-2.0.6" - sources."ast-types-0.12.2" + sources."ast-types-0.12.3" sources."async-1.5.2" sources."balanced-match-1.0.0" (sources."boxen-1.3.0" // { @@ -57976,7 +59334,7 @@ in sources."camelcase-2.1.1" sources."capture-stack-trace-1.0.1" sources."chalk-2.4.2" - sources."chardet-0.4.2" + sources."chardet-0.7.0" sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" @@ -57998,9 +59356,13 @@ in sources."configstore-3.1.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."crypto-random-string-1.0.0" - sources."data-uri-to-buffer-1.2.0" + sources."data-uri-to-buffer-2.0.1" sources."debug-3.2.6" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" @@ -58012,6 +59374,7 @@ in sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."email-validator-2.0.4" + sources."end-of-stream-1.4.1" sources."es6-promise-4.2.6" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" @@ -58019,28 +59382,33 @@ in sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."execa-0.10.0" + sources."execa-1.0.0" sources."extend-3.0.2" - sources."external-editor-2.2.0" + sources."external-editor-3.0.3" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" sources."for-in-1.0.2" sources."for-own-1.0.0" + sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { dependencies = [ sources."readable-stream-1.1.14" ]; }) - sources."get-stream-3.0.0" - (sources."get-uri-2.0.2" // { + sources."get-stream-4.1.0" + (sources."get-uri-2.0.3" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."debug-4.1.1" ]; }) + sources."glob-7.1.3" sources."global-dirs-0.1.1" - sources."got-6.7.1" + (sources."got-6.7.1" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) sources."graceful-fs-4.1.15" sources."graphlib-2.1.7" sources."has-flag-3.0.0" @@ -58057,9 +59425,14 @@ in sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-3.3.0" + (sources."inquirer-6.2.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + ]; + }) sources."invert-kv-1.0.0" sources."ip-1.1.5" sources."is-buffer-1.1.6" @@ -58079,12 +59452,18 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-yaml-3.13.0" // { + (sources."js-yaml-3.13.1" // { dependencies = [ sources."esprima-4.0.1" ]; }) - sources."jszip-3.2.0" + (sources."jszip-3.2.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) sources."kind-of-3.2.2" sources."latest-version-3.1.0" sources."lazy-cache-0.2.7" @@ -58101,8 +59480,9 @@ in sources."lodash.set-4.3.2" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-2.1.0" + sources."macos-release-2.2.0" sources."make-dir-1.3.0" + sources."make-error-1.3.5" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -58124,17 +59504,23 @@ in sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" + sources."once-1.4.0" sources."onetime-2.0.1" sources."opn-5.5.0" sources."optionator-0.8.2" sources."os-locale-1.4.0" - sources."os-name-3.0.0" + sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" - sources."pac-proxy-agent-2.0.2" + sources."pac-proxy-agent-3.0.0" sources."pac-resolver-3.0.0" - sources."package-json-4.0.1" + (sources."package-json-4.0.1" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."pako-1.0.10" + sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."pify-3.0.0" @@ -58142,34 +59528,36 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" sources."promise-7.3.1" - sources."proxy-agent-2.3.1" + sources."proxy-agent-3.1.0" sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" + sources."pump-3.0.0" (sources."raw-body-2.3.3" // { dependencies = [ sources."iconv-lite-0.4.23" ]; }) sources."rc-1.2.8" - (sources."readable-stream-2.3.6" // { + (sources."readable-stream-3.3.0" // { dependencies = [ - sources."isarray-1.0.0" - sources."string_decoder-1.1.1" + sources."string_decoder-1.2.0" ]; }) - sources."recursive-readdir-2.2.2" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."secure-keys-1.0.0" - sources."semver-5.6.0" - sources."semver-diff-2.1.0" + sources."semver-6.0.0" + (sources."semver-diff-2.1.0" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.1.0" (sources."shallow-clone-0.1.2" // { @@ -58180,33 +59568,49 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."smart-buffer-1.1.15" + sources."smart-buffer-4.0.2" sources."snyk-config-2.2.1" - sources."snyk-docker-plugin-1.22.0" + (sources."snyk-docker-plugin-1.22.1" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."snyk-go-plugin-1.6.1" - sources."snyk-gradle-plugin-2.3.0" + sources."snyk-gradle-plugin-2.5.0" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.0.1" - sources."snyk-nodejs-lockfile-parser-1.11.0" - sources."snyk-nuget-plugin-1.7.2" + sources."snyk-nodejs-lockfile-parser-1.12.0" + sources."snyk-nuget-plugin-1.9.0" sources."snyk-paket-parser-1.4.3" sources."snyk-php-plugin-1.5.2" - sources."snyk-policy-1.13.3" + sources."snyk-policy-1.13.4" sources."snyk-python-plugin-1.9.1" sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-4.0.3" + (sources."snyk-resolve-deps-4.0.3" // { + dependencies = [ + sources."semver-5.7.0" + ]; + }) sources."snyk-sbt-plugin-2.0.1" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.3.1" - sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" + sources."socks-2.3.2" + sources."socks-proxy-agent-4.0.2" sources."source-map-0.6.1" sources."source-map-support-0.5.11" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" - sources."string-width-2.1.1" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) sources."string_decoder-0.10.31" - sources."strip-ansi-4.0.0" + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" @@ -58216,6 +59620,7 @@ in dependencies = [ sources."cross-spawn-5.1.0" sources."execa-0.7.0" + sources."get-stream-3.0.0" ]; }) sources."then-fs-2.0.0" @@ -58224,8 +59629,14 @@ in sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."toml-2.3.6" + (sources."ts-node-8.0.3" // { + dependencies = [ + sources."diff-3.5.0" + ]; + }) sources."tslib-1.9.3" sources."type-check-0.3.2" + sources."type-fest-0.3.0" sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" @@ -58237,7 +59648,7 @@ in sources."which-1.3.1" sources."widest-line-2.0.1" sources."window-size-0.1.4" - sources."windows-release-3.1.0" + sources."windows-release-3.2.0" sources."wordwrap-1.0.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ @@ -58247,6 +59658,7 @@ in sources."strip-ansi-3.0.1" ]; }) + sources."wrappy-1.0.2" sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" @@ -58262,6 +59674,7 @@ in sources."strip-ansi-3.0.1" ]; }) + sources."yn-3.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -58367,10 +59780,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz"; - sha512 = "xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw=="; + url = "https://registry.npmjs.org/svgo/-/svgo-1.2.1.tgz"; + sha512 = "Y1+LyT4/y1ms4/0yxPMSlvx6dIbgklE9w8CIOnfeoFGB74MEkq8inSfEr6NhocTaFbyYp0a1dvNgRKGRmEBlzA=="; }; dependencies = [ sources."@types/q-1.5.2" @@ -58408,12 +59821,12 @@ in sources."is-date-object-1.0.1" sources."is-regex-1.0.4" sources."is-symbol-1.0.2" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."mdn-data-1.1.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."nth-check-1.0.2" - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."object.getownpropertydescriptors-2.0.3" sources."object.values-1.1.0" sources."q-1.5.1" @@ -58471,7 +59884,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" (sources."body-parser-1.12.4" // { dependencies = [ sources."debug-2.2.0" @@ -58510,7 +59923,7 @@ in sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."charenc-0.0.2" - sources."chokidar-2.1.2" + sources."chokidar-2.1.5" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -58538,7 +59951,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -58679,7 +60092,7 @@ in sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" (sources."is-invalid-path-0.1.0" // { dependencies = [ @@ -58711,7 +60124,7 @@ in ]; }) sources."js-string-escape-1.0.1" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.3.4" // { dependencies = [ @@ -58784,7 +60197,7 @@ in sources."ms-2.0.0" sources."multer-1.4.1" sources."mute-stream-0.0.5" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."neo-async-2.6.0" @@ -58827,11 +60240,11 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - (sources."path-loader-1.0.9" // { + (sources."path-loader-1.0.10" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" - sources."qs-6.6.0" + sources."qs-6.7.0" sources."superagent-3.8.3" ]; }) @@ -58878,7 +60291,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."sanitize-filename-1.6.1" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" (sources."send-0.16.2" // { dependencies = [ @@ -59002,8 +60415,9 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.16" sources."typedarray-0.0.6" - (sources."uglify-js-3.5.1" // { + (sources."uglify-js-3.5.3" // { dependencies = [ + sources."commander-2.19.0" sources."source-map-0.6.1" ]; }) @@ -59142,7 +60556,7 @@ in sources."argparse-1.0.10" sources."bail-1.0.3" sources."balanced-match-1.0.0" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" sources."boundary-1.0.1" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" @@ -59205,7 +60619,7 @@ in sources."is-whitespace-character-1.0.2" sources."is-word-character-1.0.2" sources."isarray-1.0.0" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" (sources."json5-1.0.1" // { @@ -59229,7 +60643,7 @@ in sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."once-1.4.0" sources."optionator-0.8.2" sources."p-limit-1.3.0" @@ -59273,12 +60687,12 @@ in sources."resolve-1.10.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."slice-ansi-0.0.4" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."sprintf-js-1.0.3" sources."state-toggle-1.0.1" sources."string-width-1.0.2" @@ -59336,10 +60750,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.102.1"; + version = "0.103.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.102.1.tgz"; - sha512 = "btHBdww/Es4vdBkB2GjTE9mpj0vy8tgtxkX7ne7uxySXV8zoGxWJv1N88BydxnCqvAfmD4ZUTqPeESO7oDgeOQ=="; + url = "https://registry.npmjs.org/three/-/three-0.103.0.tgz"; + sha512 = "4WKRHTMt96sp+lX+Hx/eHtN9CWFyejDqr1ikgxZUJIkKEHVglSE7FY8n81NC6yWXqVSjUIQQppaxsoUe26Zi9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -59446,7 +60860,7 @@ in sources."mooremachine-2.2.1" sources."mute-stream-0.0.8" sources."mv-2.1.1" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."ncp-2.0.0" sources."once-1.3.2" sources."path-is-absolute-1.0.1" @@ -59553,10 +60967,10 @@ in tsun = nodeEnv.buildNodePackage { name = "tsun"; packageName = "tsun"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsun/-/tsun-0.4.0.tgz"; - sha512 = "DM9diPumksx/2837NoyRXq97PxSpqt9zhCnHaoeqmX2ItgksNE+QCXO6bczNAEtVVbQYML9LAxl/iawYKyMZng=="; + url = "https://registry.npmjs.org/tsun/-/tsun-0.5.0.tgz"; + sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ sources."@types/node-6.14.4" @@ -59613,10 +61027,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.3.4000"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz"; - sha512 = "jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.4.2.tgz"; + sha512 = "Og2Vn6Mk7JAuWA1hQdDQN/Ekm/SchX80VzLhjKN9ETYrIepBFAd8PkOdOTK2nKt0FCkmMZKBJvQ1dV1gIxPu/A=="; }; buildInputs = globalBuildInputs; meta = { @@ -59630,10 +61044,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.5.1"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.1.tgz"; - sha512 = "kI+3c+KphOAKIikQsZoT2oDsVYH5qvhpTtFObfMCdhPAYnjSvmW4oTWMhvDD4jtAGHJwztlBXQgozGcq3Xw9oQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; + sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; }; dependencies = [ sources."commander-2.19.0" @@ -59651,10 +61065,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.42"; + version = "1.4.43"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.42.tgz"; - sha512 = "7fPkV5B5V9uiXBwRHJHLctvCR5FgdfVBoHw0qcuxk0mvYLB9zKITztViOCr4ilKDFVpGGZ95+r8VfvKLTCnXRg=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.43.tgz"; + sha512 = "KD8EZhx9BsBql0zEZy+TOlkEEfv6Lnd3ryUxKtUS3vQGbzl46toLTDXA0NLcPx4DHEWheiu1FfKO/me7deWTiw=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -59680,7 +61094,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.5" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" sources."blueimp-md5-2.10.0" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" @@ -59688,7 +61102,7 @@ in sources."builtins-1.0.3" sources."bytes-3.0.0" sources."callsite-1.0.0" - sources."camelcase-5.2.0" + sources."camelcase-5.3.1" sources."caseless-0.12.0" (sources."cliui-4.1.0" // { dependencies = [ @@ -59700,7 +61114,7 @@ in }) sources."clone-2.1.2" sources."code-point-at-1.1.0" - sources."color-3.0.0" + sources."color-3.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" @@ -59733,7 +61147,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-3.5.0" - sources."diff2html-2.4.0" + sources."diff2html-2.7.0" sources."dnd-page-scroll-0.0.4" (sources."eachr-3.2.0" // { dependencies = [ @@ -59741,20 +61155,17 @@ in ]; }) sources."ecc-jsbn-0.1.2" - (sources."editions-2.1.3" // { - dependencies = [ - sources."semver-5.6.0" - ]; - }) + sources."editions-2.1.3" sources."ee-first-1.1.1" + sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" - (sources."engine.io-3.2.1" // { + (sources."engine.io-3.3.2" // { dependencies = [ sources."debug-3.1.0" ]; }) - (sources."engine.io-client-3.2.1" // { + (sources."engine.io-client-3.3.2" // { dependencies = [ sources."debug-3.1.0" ]; @@ -59794,7 +61205,7 @@ in sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."get-caller-file-1.0.3" + sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."getmac-1.4.6" sources."getpass-0.1.7" @@ -59847,10 +61258,11 @@ in sources."locate-path-3.0.0" sources."locks-0.2.2" sources."lodash-4.17.11" + sources."lodash.merge-4.6.1" sources."lru-cache-4.1.5" sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" - sources."mem-4.2.0" + sources."mem-4.3.0" (sources."memorystore-1.6.1" // { dependencies = [ sources."debug-3.1.0" @@ -59861,18 +61273,18 @@ in sources."mime-1.4.1" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - sources."mimic-fn-2.0.0" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.2" + sources."moment-2.24.0" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."nice-try-1.0.5" sources."node-cache-4.2.0" sources."nopt-1.0.10" sources."normalize-package-data-2.5.0" - sources."npm-6.4.1" + sources."npm-6.9.1-next.0" sources."npm-package-arg-6.1.0" sources."npm-registry-client-8.6.0" sources."npm-run-path-2.0.2" @@ -59886,17 +61298,21 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."opn-5.4.0" - sources."os-homedir-1.0.2" + sources."opn-5.5.0" + sources."os-homedir-2.0.0" sources."os-locale-3.1.0" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" + (sources."osenv-0.1.5" // { + dependencies = [ + sources."os-homedir-1.0.2" + ]; + }) sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.2" @@ -59929,13 +61345,13 @@ in sources."readable-stream-2.3.6" sources."request-2.88.0" sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" + sources."require-main-filename-2.0.0" sources."resolve-1.10.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" (sources."send-0.16.2" // { dependencies = [ sources."statuses-1.4.0" @@ -59951,18 +61367,19 @@ in sources."simple-swizzle-0.2.2" sources."slide-1.1.6" sources."snapsvg-0.5.1" - (sources."socket.io-2.1.1" // { + (sources."socket.io-2.2.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.1.1" + sources."ms-2.1.1" ]; }) sources."socket.io-adapter-1.1.1" - (sources."socket.io-client-2.1.1" // { + (sources."socket.io-client-2.2.0" // { dependencies = [ sources."debug-3.1.0" ]; }) - (sources."socket.io-parser-3.2.0" // { + (sources."socket.io-parser-3.3.0" // { dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" @@ -59971,7 +61388,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."stack-trace-0.0.10" @@ -59981,19 +61398,16 @@ in sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - (sources."superagent-4.0.0" // { + (sources."superagent-4.1.0" // { dependencies = [ sources."debug-4.1.1" - sources."mime-2.4.0" + sources."mime-2.4.1" sources."ms-2.1.1" - sources."readable-stream-3.2.0" - ]; - }) - (sources."temp-0.8.3" // { - dependencies = [ - sources."rimraf-2.2.8" + sources."qs-6.7.0" + sources."readable-stream-3.3.0" ]; }) + sources."temp-0.9.0" sources."to-array-0.1.4" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -60006,7 +61420,6 @@ in sources."typechecker-4.7.0" sources."typedarray-0.0.6" sources."uid-safe-2.1.5" - sources."ultron-1.1.1" sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" @@ -60016,26 +61429,26 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."whatwg-fetch-2.0.4" + sources."whatwg-fetch-3.0.0" sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" sources."winston-2.4.4" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" - sources."ws-3.3.3" + sources."ws-6.1.4" sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-12.0.5" // { + (sources."yargs-13.2.2" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-4.1.0" sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) - sources."yargs-parser-11.1.1" + sources."yargs-parser-13.0.0" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -60078,7 +61491,7 @@ in sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" - sources."bluebird-3.5.3" + sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" @@ -60103,7 +61516,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."consolidate-0.14.5" @@ -60172,7 +61585,7 @@ in sources."has-to-string-tag-x-1.4.1" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -60191,7 +61604,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."isurl-1.0.0" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -60265,7 +61678,7 @@ in sources."commander-2.8.1" ]; }) - sources."semver-5.6.0" + sources."semver-5.7.0" sources."signal-exit-3.0.2" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" @@ -60303,7 +61716,11 @@ in sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.5.1" + (sources."uglify-js-3.5.3" // { + dependencies = [ + sources."commander-2.19.0" + ]; + }) sources."uid-0.0.2" sources."unbzip2-stream-1.3.3" sources."unyield-0.0.1" @@ -60337,10 +61754,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.5.1"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.5.1.tgz"; - sha512 = "BRRwPBetZ5Nj7P9fjq0YpextHuv/Fa7rq6RnNxfY5sgnvM+9lzLKJkaqt6x5FXW2vuPWKVOfQrp3EL6QvIBGeg=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.5.5.tgz"; + sha512 = "x1zsH1HfThnFEVpUohwp1b94eu9QcPdlyVR48sQdBkqc5D6B0I7yQK9dshhN1ZY4dJAZpED3UklstUQ+knVoCA=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -60369,19 +61786,19 @@ in sources."@types/long-4.0.0" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-11.11.4" + sources."@types/node-11.13.0" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" sources."@types/ws-6.0.1" sources."@types/zen-observable-0.8.0" sources."@vue/cli-shared-utils-3.5.1" - (sources."@vue/cli-ui-3.5.1" // { + (sources."@vue/cli-ui-3.5.5" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.5.1" - sources."@vue/cli-ui-addon-widgets-3.5.1" + sources."@vue/cli-ui-addon-webpack-3.5.5" + sources."@vue/cli-ui-addon-widgets-3.5.5" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."aggregate-error-1.0.0" @@ -60452,7 +61869,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.12.2" + sources."ast-types-0.12.3" sources."async-1.5.2" sources."async-each-1.0.2" sources."async-limiter-1.0.0" @@ -60470,7 +61887,7 @@ in }) sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" sources."bl-1.2.2" (sources."body-parser-1.18.3" // { dependencies = [ @@ -60489,7 +61906,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."builtins-1.0.3" - sources."busboy-0.3.0" + sources."busboy-0.3.1" sources."bytes-3.0.0" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" @@ -60499,7 +61916,7 @@ in sources."caw-2.0.1" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chokidar-2.1.2" + sources."chokidar-2.1.5" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -60521,7 +61938,7 @@ in sources."clean-stack-1.3.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.0.0" + sources."cli-spinners-2.1.0" sources."cli-width-2.2.0" sources."clipboard-2.0.4" sources."clone-1.0.4" @@ -60530,7 +61947,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."config-chain-1.1.12" @@ -60612,7 +62029,7 @@ in sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esm-3.2.19" + sources."esm-3.2.22" sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-pubsub-4.3.0" @@ -60715,7 +62132,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - (sources."globby-9.1.0" // { + (sources."globby-9.2.0" // { dependencies = [ sources."pify-4.0.1" ]; @@ -60724,14 +62141,14 @@ in sources."got-6.7.1" sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" - sources."graphql-14.1.1" + sources."graphql-14.2.1" sources."graphql-anywhere-4.2.1" sources."graphql-extensions-0.5.7" - sources."graphql-subscriptions-1.0.0" + sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.4" - sources."graphql-type-json-0.2.2" - sources."graphql-upload-8.0.4" + sources."graphql-type-json-0.2.4" + sources."graphql-upload-8.0.5" sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -60747,12 +62164,12 @@ in ]; }) sources."hash.js-1.1.7" - sources."hoek-6.1.2" + sources."hoek-6.1.3" sources."homedir-polyfill-1.0.3" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."ignore-4.0.6" sources."ignore-by-default-1.0.1" sources."immutable-tuple-0.4.10" @@ -60777,7 +62194,7 @@ in sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-natural-number-4.0.1" sources."is-npm-1.0.0" @@ -60812,7 +62229,7 @@ in sources."joi-14.3.1" sources."js-message-1.0.5" sources."js-queue-2.0.0" - sources."js-yaml-3.13.0" + sources."js-yaml-3.13.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -60866,7 +62283,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanoid-2.0.1" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -60910,7 +62327,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.1.0" + sources."object-keys-1.1.1" sources."object-path-0.11.4" sources."object-visit-1.0.1" sources."object.getownpropertydescriptors-2.0.3" @@ -60920,7 +62337,7 @@ in sources."onetime-2.0.1" sources."opn-5.5.0" sources."optimism-0.6.9" - sources."ora-3.2.0" + sources."ora-3.4.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" @@ -60955,14 +62372,14 @@ in }) sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."prismjs-1.15.0" + sources."prismjs-1.16.0" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.14.1" + sources."@types/node-10.14.4" ]; }) sources."proxy-addr-2.0.4" @@ -60983,7 +62400,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" - (sources."recast-0.17.4" // { + (sources."recast-0.17.5" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61022,7 +62439,7 @@ in ]; }) sources."select-1.1.2" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" (sources."send-0.16.2" // { dependencies = [ @@ -61227,7 +62644,7 @@ in sources."widest-line-2.0.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.2" - sources."ws-6.2.0" + sources."ws-6.2.1" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -61239,7 +62656,7 @@ in ]; }) sources."yauzl-2.10.0" - sources."yn-3.0.0" + sources."yn-3.1.0" sources."zen-observable-0.8.13" sources."zen-observable-ts-0.8.18" ]; @@ -61376,7 +62793,7 @@ in sources."@babel/code-frame-7.0.0" sources."@babel/generator-7.4.0" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.4.2" + sources."@babel/parser-7.4.3" sources."@babel/template-7.4.0" sources."@babel/types-7.4.0" sources."@webassemblyjs/ast-1.8.5" @@ -61398,7 +62815,7 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."escape-string-regexp-1.0.5" sources."esutils-2.0.2" sources."has-flag-3.0.0" @@ -61510,8 +62927,8 @@ in }) sources."base64-js-1.3.0" sources."big.js-5.2.2" - sources."binary-extensions-1.13.0" - sources."bluebird-3.5.3" + sources."binary-extensions-1.13.1" + sources."bluebird-3.5.4" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -61532,7 +62949,7 @@ in sources."builtin-status-codes-3.0.0" sources."cacache-11.3.2" sources."cache-base-1.0.1" - sources."chokidar-2.1.2" + sources."chokidar-2.1.5" sources."chownr-1.1.1" sources."chrome-trace-event-1.0.0" sources."cipher-base-1.0.4" @@ -61554,7 +62971,7 @@ in ]; }) sources."collection-visit-1.0.0" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."commondir-1.0.1" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" @@ -61651,7 +63068,7 @@ in sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."iferr-0.1.5" sources."imurmurhash-0.1.4" sources."indexof-0.0.1" @@ -61664,7 +63081,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -61707,7 +63124,7 @@ in }) sources."move-concurrently-1.0.1" sources."ms-2.0.0" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanomatch-1.2.13" sources."neo-async-2.6.0" (sources."node-libs-browser-2.2.0" // { @@ -61735,7 +63152,7 @@ in sources."os-browserify-0.3.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" sources."pako-1.0.10" sources."parallel-transform-1.1.0" sources."parse-asn1-5.1.4" @@ -61778,7 +63195,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."schema-utils-1.0.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."serialize-javascript-1.6.1" (sources."set-value-2.0.0" // { dependencies = [ @@ -61952,7 +63369,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."camelcase-5.2.0" + sources."camelcase-5.3.1" sources."chalk-2.4.2" (sources."class-utils-0.3.6" // { dependencies = [ @@ -62076,10 +63493,10 @@ in sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."mem-4.2.0" + sources."mem-4.3.0" sources."memory-fs-0.4.1" sources."micromatch-3.1.10" - sources."mimic-fn-2.0.0" + sources."mimic-fn-2.1.0" sources."minimist-1.2.0" (sources."mixin-deep-1.3.1" // { dependencies = [ @@ -62110,10 +63527,10 @@ in sources."os-locale-3.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-exists-3.0.0" @@ -62136,7 +63553,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { dependencies = [ @@ -62400,7 +63817,7 @@ in sources."mdns-js-packet-0.2.0" sources."mediasource-2.3.0" sources."memory-chunk-store-1.3.0" - sources."mime-2.4.0" + sources."mime-2.4.1" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -62462,7 +63879,7 @@ in sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."range-slice-stream-2.0.0" - sources."readable-stream-3.2.0" + sources."readable-stream-3.3.0" sources."record-cache-1.1.0" (sources."render-media-3.1.3" // { dependencies = [ @@ -62480,7 +63897,7 @@ in sources."semver-5.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-9.2.1" // { + (sources."simple-peer-9.3.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" @@ -62541,7 +63958,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-6.2.0" + sources."ws-6.2.1" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -62571,7 +63988,7 @@ in sources."@babel/runtime-7.3.1" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-11.11.4" + sources."@types/node-11.13.0" sources."JSONSelect-0.2.1" sources."acorn-5.7.3" (sources."acorn-jsx-3.0.1" // { @@ -62585,7 +64002,7 @@ in (sources."addons-linter-1.6.1" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."camelcase-5.2.0" + sources."camelcase-5.3.1" sources."decamelize-1.2.0" sources."es6-promisify-6.0.1" sources."get-caller-file-2.0.5" @@ -62671,7 +64088,7 @@ in }) sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.13.0" + sources."binary-extensions-1.13.1" (sources."bl-1.2.2" // { dependencies = [ sources."readable-stream-2.3.6" @@ -62702,17 +64119,18 @@ in sources."callsites-0.2.0" ]; }) - sources."callsites-3.0.0" + sources."callsites-3.1.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.2" - (sources."chokidar-2.1.2" // { + (sources."chokidar-2.1.5" // { dependencies = [ sources."fsevents-1.2.7" sources."normalize-path-3.0.0" + sources."upath-1.1.2" ]; }) sources."circular-json-0.3.3" @@ -62751,7 +64169,7 @@ in sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.7" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."common-tags-1.8.0" sources."component-emitter-1.2.1" (sources."compress-commons-1.2.2" // { @@ -62923,7 +64341,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-patch-2.0.7" + sources."fast-json-patch-2.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-1.5.0" @@ -63012,7 +64430,7 @@ in sources."htmlparser2-3.10.1" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."ignore-4.0.6" sources."import-fresh-3.0.0" sources."import-lazy-2.1.0" @@ -63038,7 +64456,7 @@ in sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-mergeable-object-1.1.0" sources."is-my-ip-valid-1.0.0" @@ -63071,7 +64489,7 @@ in sources."jetpack-id-1.0.0" sources."js-select-0.6.0" sources."js-tokens-4.0.0" - (sources."js-yaml-3.13.0" // { + (sources."js-yaml-3.13.1" // { dependencies = [ sources."esprima-4.0.1" ]; @@ -63130,9 +64548,9 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."mdn-browser-compat-data-0.0.66" - (sources."mem-4.2.0" // { + (sources."mem-4.3.0" // { dependencies = [ - sources."mimic-fn-2.0.0" + sources."mimic-fn-2.1.0" ]; }) sources."micromatch-3.1.10" @@ -63158,7 +64576,7 @@ in ]; }) sources."mz-2.7.0" - sources."nan-2.13.1" + sources."nan-2.13.2" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -63207,13 +64625,13 @@ in sources."os-tmpdir-1.0.2" sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" sources."package-json-4.0.1" sources."pako-1.0.10" - sources."parent-module-1.0.0" + sources."parent-module-1.0.1" sources."parse-json-4.0.0" sources."parse5-3.0.3" sources."pascalcase-0.1.1" @@ -63234,7 +64652,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pino-5.11.1" - sources."pino-std-serializers-2.3.0" + sources."pino-std-serializers-2.4.0" sources."pluralize-1.2.1" sources."po2json-0.4.5" sources."posix-character-classes-0.1.1" @@ -63266,7 +64684,7 @@ in sources."path-exists-2.1.0" ]; }) - sources."readable-stream-3.2.0" + sources."readable-stream-3.3.0" (sources."readdirp-2.2.1" // { dependencies = [ sources."readable-stream-2.3.6" @@ -63392,7 +64810,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."split-0.3.3" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -63559,7 +64977,7 @@ in }) (sources."yargs-parser-11.1.1" // { dependencies = [ - sources."camelcase-5.2.0" + sources."camelcase-5.3.1" sources."decamelize-1.2.0" ]; }) @@ -63605,10 +65023,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.13.0"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.13.0.tgz"; - sha512 = "Unfw2eefv8imt4ZMPhvFVP44WCz38huDxkHs+Yqrx4wBTK75Tr0mh3V4rh+2Nw5iQq0rcM/VafotCZo9qTb5DA=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.15.2.tgz"; + sha512 = "DhqaGe2FcYKduO42d2hByXk7y8k2k42H3uzYdWBMTvcNcgWKx7xCkJWsVAQikXvaEQN2GyJNrz8CboqUmaBRrw=="; }; buildInputs = globalBuildInputs; meta = { @@ -63897,7 +65315,7 @@ in sources."is-extglob-2.1.1" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" (sources."is-number-3.0.0" // { @@ -64092,7 +65510,7 @@ in sources."locate-path-3.0.0" sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.1.0" + sources."p-try-2.2.0" sources."parse-json-4.0.0" sources."path-type-3.0.0" sources."read-pkg-3.0.0" @@ -64131,7 +65549,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."scoped-regex-1.0.0" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" sources."semver-regex-1.0.0" sources."semver-truncate-1.1.2" @@ -64182,7 +65600,7 @@ in sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" + sources."spdx-license-ids-3.0.4" sources."split-string-3.1.0" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 4f90525ea56..e33d9539247 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1714,13 +1714,13 @@ let sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; }; - "semver-5.6.0" = { + "semver-5.7.0" = { name = "semver"; packageName = "semver"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz"; - sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="; + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; "set-blocking-2.0.0" = { @@ -2581,7 +2581,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -2606,10 +2606,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.0.1.tgz"; - sha512 = "hYWjRN7U96zHDvgQxGyYaMF469Uzx0iZo2ej1VMUSaOULUFI9ue7dDku29AOf/E0+5Zd9zFs0qE0Tuq5Zsrk0A=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.1.0.tgz"; + sha512 = "+Ywkb2rg5uX6/CppRBFmefrQn8EiXK8H0ntRoWHuQAzLErrVXtbyuRKhWMUG5ewr9raQUOACou/uaThE9jzhwA=="; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index eca37615dbd..7ad77dc3444 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -4,13 +4,13 @@ let sources = { - "@types/node-8.10.44" = { + "@types/node-8.10.45" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.44"; + version = "8.10.45"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.44.tgz"; - sha512 = "HY3SK7egERHGUfY8p6ztXIEQWcIPHouYhCGcLAPQin7gE2G/fALFz+epnMwcxKUS6aKqTVoAFdi+t1llQd3xcw=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz"; + sha512 = "tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ=="; }; }; "JSV-4.0.2" = { @@ -1075,6 +1075,15 @@ let sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; }; }; + "commander-2.20.0" = { + name = "commander"; + packageName = "commander"; + version = "2.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"; + sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; + }; + }; "component-emitter-1.2.1" = { name = "component-emitter"; packageName = "component-emitter"; @@ -3613,6 +3622,15 @@ let sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="; }; }; + "semver-5.7.0" = { + name = "semver"; + packageName = "semver"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; + }; + }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -4518,7 +4536,7 @@ in sources."chalk-1.1.3" sources."chmodr-1.2.0" sources."colors-1.3.3" - sources."commander-2.19.0" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" sources."core-js-2.6.5" @@ -4623,7 +4641,7 @@ in sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ=="; }; dependencies = [ - sources."@types/node-8.10.44" + sources."@types/node-8.10.45" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-6.10.0" @@ -4810,7 +4828,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-2.0.6" // { dependencies = [ - sources."commander-2.19.0" + sources."commander-2.20.0" ]; }) sources."has-ansi-2.0.0" @@ -5521,7 +5539,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.6.0" + sources."semver-5.7.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -5546,10 +5564,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-3.0.1.tgz"; - sha512 = "hYWjRN7U96zHDvgQxGyYaMF469Uzx0iZo2ej1VMUSaOULUFI9ue7dDku29AOf/E0+5Zd9zFs0qE0Tuq5Zsrk0A=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.1.0.tgz"; + sha512 = "+Ywkb2rg5uX6/CppRBFmefrQn8EiXK8H0ntRoWHuQAzLErrVXtbyuRKhWMUG5ewr9raQUOACou/uaThE9jzhwA=="; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index f5dd92422cc..13cc4b02b06 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = { - homepage = http://erratique.ch/software/astring; + homepage = https://erratique.ch/software/astring; description = "Alternative String module for OCaml"; longDescription = '' Astring exposes an alternative String module for OCaml. This module tries diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index 97434811665..47e9d7febf8 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Basic OS interaction for OCaml"; - homepage = http://erratique.ch/software/bos; + homepage = https://erratique.ch/software/bos; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index c11aa41a493..003ce57cc8a 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = http://erratique.ch/software/cmdliner; + homepage = https://erratique.ch/software/cmdliner; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 922f85996e1..a171a672eca 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; meta = { - homepage = http://erratique.ch/software/fmt; + homepage = https://erratique.ch/software/fmt; license = stdenv.lib.licenses.isc; description = "OCaml Format pretty-printer combinators"; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index 9317f50717e..f8b7eda3a4f 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml module for handling file system paths with POSIX and Windows conventions"; - homepage = http://erratique.ch/software/fpath; + homepage = https://erratique.ch/software/fpath; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index ca286ee36f8..739daeddee5 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format"; - homepage = http://erratique.ch/software/jsonm; + homepage = https://erratique.ch/software/jsonm; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index b067fd99ded..715f97ebb6c 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Monotonic wall-clock time for OCaml"; - homepage = http://erratique.ch/software/mtime; + homepage = https://erratique.ch/software/mtime; inherit (ocaml.meta) platforms; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 4ac473fef00..6562edc1278 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit (topkg) installPhase; meta = { - homepage = http://erratique.ch/software/ptime; + homepage = https://erratique.ch/software/ptime; description = "POSIX time for OCaml"; longDescription = '' Ptime has platform independent POSIX time support in pure OCaml. diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 9d070b962b4..eb098061812 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = http://erratique.ch/software/react; + homepage = https://erratique.ch/software/react; description = "Applicative events and signals for OCaml"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 270432b86e9..caff9fa9632 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.isc; - homepage = http://erratique.ch/software/rresult; + homepage = https://erratique.ch/software/rresult; description = "Result value combinators for OCaml"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index e28a86907bb..e10cdd2d9c1 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { passthru = { inherit run; }; meta = { - homepage = http://erratique.ch/software/topkg; + homepage = https://erratique.ch/software/topkg; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; description = "A packager for distributing OCaml software"; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 0c45e6c8af1..bb6ef649e59 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; - homepage = http://erratique.ch/software/uuidm; + homepage = https://erratique.ch/software/uuidm; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 99da64268ee..e7c5595fe08 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.1.5"; + version = "1.1.6"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "13250y53mr0pki93sqscy2bx01fxh6b6wvvj6m95ky0wqrrbmg39"; + sha256 = "1hmagwh2k61r90a9xgp3xj24wb97ckllvgn82vsin9kvhhj1459i"; }; meta = { diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index b7855bee72d..0afaa65e40c 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bitstring ifaddr ]; meta = with lib; { - homepage = http://github.com/frawau/aiolifx; + homepage = https://github.com/frawau/aiolifx; license = licenses.mit; description = "API for local communication with LIFX devices over a LAN with asyncio"; maintainers = with maintainers; [ netixx ]; diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix new file mode 100644 index 00000000000..f07f05b9884 --- /dev/null +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -0,0 +1,34 @@ +{ lib +, isPy3k +, buildPythonPackage +, fetchFromGitHub +, future +, mock +, nose +}: + +buildPythonPackage rec { + pname = "annexremote"; + version = "1.3.1"; + + # use fetchFromGitHub instead of fetchPypi because the test suite of + # the package is not included into the PyPI tarball + src = fetchFromGitHub { + rev = "v${version}"; + owner = "Lykos153"; + repo = "AnnexRemote"; + sha256 = "13ny7h41430pi9393dw3qgwxvzcxacapjsw0d3vjm7lc4h566alq"; + }; + + propagatedBuildInputs = [ future ]; + + checkInputs = [ nose ] ++ lib.optional (!isPy3k) mock; + checkPhase = "nosetests -v"; + + meta = with lib; { + description = "Helper module to easily develop git-annex remotes"; + homepage = https://github.com/Lykos153/AnnexRemote; + license = licenses.gpl3; + maintainers = with maintainers; [ montag451 ]; + }; +} diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index ef21a3f871d..8c6afb099f9 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/neithere/argh/; + homepage = https://github.com/neithere/argh/; description = "An unobtrusive argparse wrapper with natural syntax"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index d8e9e7eb179..63457d6f542 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -15,12 +15,6 @@ buildPythonPackage rec { sha256 = "cef9bf5d36700966e52f7cea86e29c622bc5bbb92d0ce7a75420e29fb0e75f45"; }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py - ''; - postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix index 60d9fe2aef1..5d3b80aeb16 100644 --- a/pkgs/development/python-modules/casttube/default.nix +++ b/pkgs/development/python-modules/casttube/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Interact with the Youtube Chromecast api"; - homepage = http://github.com/ur1katz/casttube; + homepage = https://github.com/ur1katz/casttube; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index ec241fb9f6c..73705d9982a 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/dask/dask-glm/; + homepage = https://github.com/dask/dask-glm/; description = "Generalized Linear Models with Dask"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index 4cff6f2a69b..6b8aac33139 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/ghickman/django-cache-url; + homepage = https://github.com/ghickman/django-cache-url; description = "Use Cache URLs in your Django application"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix index d25d9e79947..82895f76473 100644 --- a/pkgs/development/python-modules/django-discover-runner/default.nix +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/jezdez/django-discover-runner; + homepage = https://github.com/jezdez/django-discover-runner; description = "A Django test runner based on unittest2's test discovery"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index 9887580b0fd..68fa0dce615 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "URLs with authentication tokens for automatic login"; - homepage = http://github.com/aaugustin/django-sesame; + homepage = https://github.com/aaugustin/django-sesame; license = licenses.bsd3; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index e4675274c09..019f4be91c8 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Find a website's favicon"; - homepage = http://github.com/scottwernervt/favicon; + homepage = https://github.com/scottwernervt/favicon; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index c2f7caf1b81..b97fc2430be 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Socket.IO integration for Flask applications"; - homepage = http://github.com/miguelgrinberg/Flask-SocketIO/; + homepage = https://github.com/miguelgrinberg/Flask-SocketIO/; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index 45906c3c434..af2f99289a3 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/kerrickstaley/genanki; + homepage = https://github.com/kerrickstaley/genanki; description = "Generate Anki decks programmatically"; license = licenses.mit; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 8c7b96e66dd..2bd1bfce6f9 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.7.1"; + version = "3.7.2"; src = fetchPypi { inherit pname version; - sha256 = "ed845ac585f724ae1f40fdb517ed8ade822531f9bbcd1be4a599c2e86aff48a8"; + sha256 = "1la4y935sdah8ywa7krwy80hcl4n2k8cdx4ncy3dg3y2mdg3vq24"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index b690faccf06..967fc1c5745 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The standard Python readline extension statically linked against the GNU readline library"; - homepage = http://github.com/ludwigschwardt/python-gnureadline; + homepage = https://github.com/ludwigschwardt/python-gnureadline; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 76d5921487e..3a573f69c70 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/daleroberts/hdmedians; + homepage = https://github.com/daleroberts/hdmedians; description = "High-dimensional medians"; license = licenses.gpl3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix new file mode 100644 index 00000000000..bef32f947c3 --- /dev/null +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -0,0 +1,30 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchPypi +, monotonic +}: + +buildPythonPackage rec { + pname = "humanfriendly"; + version = "4.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "33ee8ceb63f1db61cce8b5c800c531e1a61023ac5488ccde2ba574a85be00a85"; + }; + + propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic; + + # humanfriendly tests depends on coloredlogs which itself depends on + # humanfriendly. This lead to infinite recursion when trying to + # build this package so we have to disable the test suite :( + doCheck = false; + + meta = with lib; { + description = "Human friendly output for text interfaces using Python"; + homepage = https://humanfriendly.readthedocs.io/; + license = licenses.mit; + maintainers = with maintainers; [ montag451 ]; + }; +} diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix index 402361a6c74..b092a9fa2ae 100644 --- a/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/pkgs/development/python-modules/ipdbplugin/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ipython ]; meta = with stdenv.lib; { - homepage = http://github.com/flavioamieiro/nose-ipdb/tree/master; + homepage = https://github.com/flavioamieiro/nose-ipdb/tree/master; description = "Nose plugin to use iPdb instead of Pdb when tests fail"; license = licenses.lgpl2; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 551614409db..bbe72befb6d 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "1778c9vabn9a7b7lbirwclswnqmzqm00slklvnhqacbbdf4rp417"; + sha256 = "0jnkh1nin1lwnx32ak6sv8gzmpnkvcy6vm23wzm1ymzfndxk6rnm"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 6eb84043d78..0fe3a11ae26 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , click , watchdog , exifread @@ -12,35 +12,47 @@ , flask , pyopenssl , ndg-httpsclient -, pkgs +, pytest +, pytestcov +, pytest-mock +, pytest-pylint +, pytest-click +, isPy27 +, functools32 }: buildPythonPackage rec { pname = "lektor"; - version = "2.3"; + version = "3.1.3"; - src = fetchgit { - url = "https://github.com/lektor/lektor"; - rev = "refs/tags/${version}"; - sha256 = "1n0ylh1sbpvi9li3g6a7j7m28njfibn10y6s2gayjxwm6fpphqxy"; + src = fetchFromGitHub { + owner = "lektor"; + repo = "lektor"; + rev = version; + sha256 = "16qw68rz5q77w84lwyhjpfd3bm4mfrhcjrnxwwnz3vmi610h68hx"; }; - buildInputs = [ pkgs.glibcLocales ]; propagatedBuildInputs = [ click watchdog exifread requests mistune inifile Babel jinja2 flask pyopenssl ndg-httpsclient + ] ++ lib.optionals isPy27 [ functools32 ]; + + checkInputs = [ + pytest pytestcov pytest-mock pytest-pylint pytest-click ]; - LC_ALL="en_US.UTF-8"; + checkPhase = '' + pytest + ''; - # No tests included in archive + # many errors -- tests assume inside of git repo, linting errors 13/317 fail doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A static content management system"; homepage = "https://www.getlektor.com/"; license = licenses.bsd0; - maintainers = with maintainers; [ vozz ]; + maintainers = with maintainers; [ vozz costrouc ]; }; } diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index bfd2476c8ca..ea0a359a49c 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; - homepage = http://github.com/t184256/nixpkgs-python-importer; + homepage = https://github.com/t184256/nixpkgs-python-importer; license = licenses.mit; maintainers = with maintainers; [ t184256 ]; }; diff --git a/pkgs/development/python-modules/pagerduty/default.nix b/pkgs/development/python-modules/pagerduty/default.nix index 634de3947a6..d3f47dad3ca 100644 --- a/pkgs/development/python-modules/pagerduty/default.nix +++ b/pkgs/development/python-modules/pagerduty/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://github.com/samuel/python-pagerduty; + homepage = https://github.com/samuel/python-pagerduty; description = "Library for the PagerDuty service API"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 1944e23f4b4..7416717585f 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "0.24.1"; + version = "0.24.2"; src = fetchPypi { inherit pname version; - sha256 = "435821cb2501eabbcee7e83614bd710940dc0cf28b5afbc4bdb816c31cec71af"; + sha256 = "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 344f52d245f..08c908e0aa5 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.9.2"; + version = "3.9.3"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "0rmjr90555s1n6caqbncvilx6v30cksmcr4bjzylapsl3a5aw9aa"; + sha256 = "1frwwqkk0y1bkcm7bdzbyv2119vv640ncgs4d55zhbs70fxm2ylj"; }; diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 2f4f4b264ce..0f2a2bb4a8b 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { buildInputs = [ pillow nose_progressive nose mock blessings ]; meta = with stdenv.lib; { - homepage = http://github.com/matthewwithanm/pilkit/; + homepage = https://github.com/matthewwithanm/pilkit/; description = "A collection of utilities and processors for the Python Imaging Libary"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 676f6b22990..2a886c4cf91 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.5.0"; + version = "0.6.1"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "09mv7hcczayzjbd4dsrph16ab21slaiamgph9lwr1kjdw7ri5cpg"; + sha256 = "1j2pkynqdqrxf86qyzrjj76i33ylxfsrqxv4j2x9bkd0hk6x0pa6"; }; buildInputs = [ exiv2 boost ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index d8f3c01bbd4..8cca405f7bf 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.16"; + version = "3.18"; src = fetchPypi { inherit pname version; - sha256 = "1xrfph277bgjln3jbpzpgkhxad04fjvj7s3xfil42q1sxi4s3q3g"; + sha256 = "053znyl68sjmlp3r4br5jxhqqswjfbb1rb8k6f9qpzcym37439r0"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pychef/default.nix b/pkgs/development/python-modules/pychef/default.nix index f3c4109dd93..51ce6241bb9 100644 --- a/pkgs/development/python-modules/pychef/default.nix +++ b/pkgs/development/python-modules/pychef/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/coderanger/pychef; + homepage = https://github.com/coderanger/pychef; description = "Python implementation of a Chef API client"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 04d0d1c34a5..9512fce4f45 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "4.6.5"; + version = "4.7.0"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "0xlbr52vzx1j9sg65jhqv01vp4a49afjy03lc2zb0ggx0xxzngvb"; + sha256 = "1bpfvy2xd3aqf79ihglmxlxnv7406184p99h5mn5h9ifs54vvhhl"; }; patches = [ diff --git a/pkgs/development/python-modules/pyschedule/default.nix b/pkgs/development/python-modules/pyschedule/default.nix new file mode 100644 index 00000000000..5fbabdc0988 --- /dev/null +++ b/pkgs/development/python-modules/pyschedule/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pulp +}: + +buildPythonPackage rec { + pname = "pyschedule"; + version = "0.2.34"; + + src = fetchPypi { + inherit pname version; + sha256 = "6bba9e9ea07906ce2dfe3cd847c1822b137f6b13e9f975c50b347312fd98e110"; + }; + + propagatedBuildInputs = [ + pulp + ]; + + # tests not included with pypi release (in examples) + doCheck = false; + + meta = with lib; { + description = "Formulate and solve resource-constrained scheduling problems"; + homepage = https://github.com/timnon/pyschedule; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 77ea742387e..e37fa07f272 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/jlaska/pytest-ansible; + homepage = https://github.com/jlaska/pytest-ansible; description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix new file mode 100644 index 00000000000..e20ebc77ad1 --- /dev/null +++ b/pkgs/development/python-modules/pytest-click/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, click +, pytestcov +, isPy27 +, mock +}: + +buildPythonPackage rec { + pname = "pytest-click"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "Stranger6667"; + repo = "pytest-click"; + rev = version; + sha256 = "1cd15anw8d4rq6qs03j6ag38199rqw7vp0w0w0fm41mvdzr0lwvz"; + }; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "mock==1.0.1" "mock" + ''; + + propagatedBuildInputs = [ + pytest + click + ]; + + checkInputs = [ pytestcov ] ++ lib.optionals isPy27 [ mock ]; + + meta = with lib; { + description = "pytest plugin for click"; + homepage = https://github.com/Stranger6667/pytest-click; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix new file mode 100644 index 00000000000..8943f220fe6 --- /dev/null +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pylint +, six +, pytestrunner +}: + +buildPythonPackage rec { + pname = "pytest-pylint"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7bfbb66fc6dc160193a9e813a7c55e5ae32028f18660deeb90e1cb7e980cbbac"; + }; + + buildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ + pytest + pylint + six + ]; + + # tests not included with release + doCheck = false; + + meta = with lib; { + description = "pytest plugin to check source code with pylint"; + homepage = https://github.com/carsongee/pytest-pylint; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 7e5be24efaa..adb6d71fb40 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Engine.IO server"; - homepage = http://github.com/miguelgrinberg/python-engineio/; + homepage = https://github.com/miguelgrinberg/python-engineio/; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 381d54677d0..8dfea69a233 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; meta = with stdenv.lib; { - homepage = http://github.com/madzak/python-json-logger; + homepage = https://github.com/madzak/python-json-logger; description = "A python library adding a json log formatter"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 121a98335b6..09ded676b74 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -21,13 +21,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.25.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "10la48m10j4alfnpw0xw359fb833scf5kv7kjvh7djf6ij7cfsvq"; + sha256 = "003fy8bbvwibnsnyxw1qwg2rxnhbfylqs67ixr6fdnw6mmrzd6fg"; }; # The tests require all the providers, disable otherwise. diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index 4615bfcccce..fd84c587bdc 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the snappy compression library from Google"; - homepage = http://github.com/andrix/python-snappy; + homepage = https://github.com/andrix/python-snappy; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 368b26f2fb5..5dff7189e66 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Socket.IO server"; - homepage = http://github.com/miguelgrinberg/python-socketio/; + homepage = https://github.com/miguelgrinberg/python-socketio/; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 6f85280979b..baf26c2437b 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension for Read the Docs overrides"; - homepage = http://github.com/rtfd/readthedocs-sphinx-ext; + homepage = https://github.com/rtfd/readthedocs-sphinx-ext; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index c1791db9fbc..707a79e1055 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "116r78nhw74rh857kv9l614xjr6k89919s6l8b14hlvy8fz8rg51"; + sha256 = "1q7kws7w4x2hji3g7y0ni9ddk4sd676ylrb3db54gbpys6xj6nwq"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index bf57b9846ee..586edd766cd 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.11.1"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0kjcyw3xmps3maf4vzn1pypc6i60q8b67xj78v4gbv4yx2cp2fzr"; + sha256 = "0fd68yaqhpay7jxhyc6xkdrak88wdblxs0phgdkngbakx2yaw2y3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index 6af7fafdddf..af17780909e 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/soft-matter/slicerator; + homepage = https://github.com/soft-matter/slicerator; description = "A lazy-loading, fancy-sliceable iterable"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 9d4df113599..7504d527ca7 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "a52206bb69c38c5f08709ec2ee5704b0f86fc0a770935b5dad9b5841bfd5f502"; + sha256 = "0a38mwlz92mlaxz8f8z4yyacpgykiysbcwfykrgr74vlic8x4m5i"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index f06138b4c25..f41452b4b61 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/DinoTools/python-ssdeep; + homepage = https://github.com/DinoTools/python-ssdeep; description = "Python wrapper for the ssdeep library"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index b23853a9bae..592ce28b7a5 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pipelines to manage continuous streams of data"; - homepage = http://github.com/mrocklin/streamz/; + homepage = https://github.com/mrocklin/streamz/; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 1bf7511d2bb..c09267662c1 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,25 +8,25 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.3"; # Upgrades may break sage. Please test or ping @timokau. + version = "1.4"; # Upgrades may break sage. Please test or ping @timokau. src = fetchPypi { inherit pname version; - sha256 = "0m0vhyv15zszn19mk5xq3py4iijjbr7f3fpy1s57b8q7c9arncg1"; + sha256 = "1q937csy8rd18pk2fz1ssj7jyj7l3rjx4nzbiz5vcymfhrb1x8bi"; }; checkInputs = [ glibcLocales ]; propagatedBuildInputs = [ mpmath ]; - # some tests fail: https://github.com/sympy/sympy/issues/15149 + # tests take ~1h doCheck = false; patches = [ # to be fixed by https://github.com/sympy/sympy/pull/13476 (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1mh2va1rlgizgvx8yzqwgvbf5wvswarn511002b361mc8yy0bnhr"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=3277ba76d0ba7174608a31a0c6623e9210c63e3d"; + sha256 = "0xcp1qafvqnivvvi0byh51mbgqicjhmswwvqvamjz9rxfzm5f7d7"; }) ]; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index d34231ca9a9..3540bebd196 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "5.0.3"; + version = "5.0.4"; src = fetchPypi { inherit pname version; - sha256 = "12z36fq6qfn9sgd1snsfwrk5j2cw29bsb7mkb0g818fal41g7dr4"; + sha256 = "06sp12cn8zcb7rqklq91f6mxhvrdq5cs0p3pdiazacqcmvvwbhx0"; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 21f89e31f37..894d4f737fb 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -1,19 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, webencodings, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi +, webencodings +, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: buildPythonPackage rec { pname = "tinycss2"; - version = "0.6.1"; + version = "1.0.2"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7c53c2c0e914c7711c295b3101bcc78e0b7eda23ff20228a936efe11cdcc7136"; + sha256 = "1kw84y09lggji4krkc58jyhsfj31w8npwhznr7lf19d0zbix09v4"; }; - propagatedBuildInputs = [ webencodings ]; + patches = [ ./remove-redundant-dependency.patch ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; + propagatedBuildInputs = [ webencodings ]; - LC_ALL = "en_US.UTF-8"; + checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; meta = with lib; { description = "Low-level CSS parser for Python"; diff --git a/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch b/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch new file mode 100644 index 00000000000..27ec511c55f --- /dev/null +++ b/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch @@ -0,0 +1,12 @@ +diff --git a/setup.cfg b/setup.cfg +index b3b3c2d..480f3e6 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -33,7 +33,6 @@ project_urls = + + [options] + packages = find: +-setup_requires = pytest-runner + install_requires = + setuptools >= 39.2.0 + webencodings >= 0.4 diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 2b04fdc20c9..9c20226fea0 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.26.0"; + version = "6.26.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0l50n5hljkp7w2l4c36arxf4dxhkfhs7ywwck9y1gvcgsnvccmss"; + sha256 = "1ly22ah487jkq0my1l3c6hbx24fgganjhxrlrcw5jfc80qmgd3hd"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index f9062c18584..ca9872bfbf0 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,12 +1,12 @@ -{ buildPythonPackage, fetchPypi, h11, enum34, pytest }: +{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }: buildPythonPackage rec { pname = "wsproto"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "fd6020d825022247053400306448e161d8740bdd52e328e5553cd9eee089f705"; + sha256 = "1p24dmym6pfsqsyxps6m2cxfl36cmkri0kdy5y5q7s300j3xmhsm"; }; propagatedBuildInputs = [ h11 enum34 ]; @@ -17,4 +17,9 @@ buildPythonPackage rec { py.test ''; + meta = with lib; { + description = "Pure Python, pure state-machine WebSocket implementation"; + homepage = https://github.com/python-hyper/wsproto/; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 8591e7d01b2..c8940b54c46 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/xattr/xattr; + homepage = https://github.com/xattr/xattr; description = "Python wrapper for extended filesystem attributes"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 79f0fb13d70..8ad249a4c1a 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "xdot"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "18a2ri8vggaxy7im1x9hki34v519y5jy4n07zpqq5br9syb7h1ky"; + sha256 = "0cr4rh7dz4dfzyxrk5pzhm0d15gkrgkfp3i5lw178xy81pc56p71"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 69ce7a360b0..78e97014189 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.26.0"; + version = "0.27.0"; src = fetchPypi { inherit pname version; - sha256 = "edb47be90a56ca6f3075fe24f119a22225fbd62c66777b5d3916a7e9e793891b"; + sha256 = "18a7n85xv0qrab2ck94kw92ncjq2l8vl0k34pm22rjvd8h6gixil"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 65ca0cc1ea9..f447d29f280 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allows you to perform imports names that will only be resolved when used in the code"; - homepage = http://github.com/zopefoundation/zope.deferredimport; + homepage = https://github.com/zopefoundation/zope.deferredimport; license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index de99386560b..0b7bc80bf3a 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; - homepage = http://github.com/zopefoundation/zope.hookable; + homepage = https://github.com/zopefoundation/zope.hookable; license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index f310042976c..9dac64907be 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.contenttype; + homepage = https://github.com/zopefoundation/zope.contenttype; description = "A utility module for content-type (MIME type) handling"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix index f6c5f51b626..3a2040cf008 100644 --- a/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/pkgs/development/python-modules/zope_deprecation/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ zope_testing ]; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.deprecation; + homepage = https://github.com/zopefoundation/zope.deprecation; description = "Zope Deprecation Infrastructure"; license = licenses.zpl20; maintainers = with maintainers; [ garbas domenkozar ]; diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix index c72eeeb921d..738b30c489f 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_event zope_component ]; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.lifecycleevent; + homepage = https://github.com/zopefoundation/zope.lifecycleevent; description = "Object life-cycle events"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index 70ba9a8e88a..7c0df16f775 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.location/; + homepage = https://github.com/zopefoundation/zope.location/; description = "Zope Location"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 7c4b5d89ea3..08932c1cba1 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.proxy; + homepage = https://github.com/zopefoundation/zope.proxy; description = "Generic Transparent Proxies"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index de1a34a3f79..8651e2d6822 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.size; + homepage = https://github.com/zopefoundation/zope.size; description = "Interfaces and simple adapter that give the size of an object"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 92f14114cf1..d6a8f3ddbc6 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -6,13 +6,13 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "manveru"; repo = "bundix"; rev = version; - sha256 = "175qmv7dj7v50v71b78dzn5pb4a35ml6p15asks9q1rrlkz0n4gn"; + sha256 = "03jhj1dy0ljrymjnpi6mcxn36a29qxr835l1lc11879jjzvnr2ax"; }; buildInputs = [ ruby bundler ]; diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index d0ad56538b9..a269e719564 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -12,8 +12,9 @@ { # use the name of the name in question; its version will be picked up from the gemset pname - # gemdir is the location of the Gemfile{,.lock} and gemset.nix; usually ./. -, gemdir + # Gemdir is the location of the Gemfile{,.lock} and gemset.nix; usually ./. + # This is required unless gemfile, lockfile, and gemset are all provided +, gemdir ? null # Exes is the list of executables provided by the gems in the Gemfile , exes ? [] # Scripts are ruby programs depend on gems in the Gemfile (e.g. scripts/rails) diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index c48954a6aaa..cde6ea2f7a8 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.6.0"; in +let version = "3.6.1"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "0ds61yy6hs7jgmld64b65ss6kpn5cwb186hw3i4il7vaydm386va"; + sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index d9dc59ee72d..380ba4803bd 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { }; inherit jdk; - + builder = ./builder.sh; propagatedBuildInputs = [ jdk ]; meta = with stdenv.lib; { description = "Build tooling for Clojure"; - homepage = http://boot-clj.com/; + homepage = https://boot-clj.com/; license = licenses.epl10; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ragge ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index aa262fd5495..c75baf454b3 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.9.0"; + version = "11.9.2"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1la4pkf8xp5h75dlvb6w7ijczrnci3bmbl77h3y4jicz555jjir3"; + sha256 = "10zmaywq1vzch4a6zdvnm9kgil9ankc9napix9s9fw45wc0lw01p"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1axn34aqa17yk2c2vy73fb8ab3nc3021dzj0vk95qificlmj3par"; + sha256 = "0845ylhb3i3jmi5q6aaix4hw9zdb83v5fhvif0xvvi2m7irg06lf"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1b4r83glx0n3l060k33s397dw5dpajlxb880yzwsb11hvc6cs39h"; + sha256 = "00k4myca2djd6h3i83vjndahm5q1rnlkq0p69dhl5jbldwy614ph"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index e559f714bd1..1c12a8bc81c 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Bulk, parallel insert of CSV records into PostgreSQL"; - homepage = http://github.com/timescale/timescaledb-parallel-copy; + homepage = https://github.com/timescale/timescaledb-parallel-copy; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix index 84efaf2a4b6..ec0e565eabd 100644 --- a/pkgs/development/tools/go-langserver/default.nix +++ b/pkgs/development/tools/go-langserver/default.nix @@ -1,18 +1,17 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-langserver-${version}"; - version = "unstable-2018-03-05"; - rev = "5d7a5dd74738978d635f709669241f164c120ebd"; + pname = "go-langserver"; + version = "2.0.0"; goPackagePath = "github.com/sourcegraph/go-langserver"; subPackages = [ "." ]; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "sourcegraph"; repo = "go-langserver"; - sha256 = "0aih0akk3wk3332znkhr2bzxcc3parijq7n089mdahnf20k69xyz"; + sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index b149703241e..b70fcc6f392 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -11,13 +11,13 @@ in stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2019.02.23"; + version = "2019.03.11"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "3a2bfee5cbc0558641668114260d3f644d6b7c83"; - sha256 = "1avc9b6w3xbmpq4y4lf9b5mym6aygh5hngzyasa9jyj0cx8mxcpf"; + rev = "fa1c932452e8efe1dfcc6ff095e3f7130a7906b1"; + sha256 = "06rc1sfpdb2682dr1df3hk4m9padjnhjn0p35xq872kil276gnsk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 70f09d467f6..ccfa62c0b0d 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "1v42y8lc1akpnzad0gf89jywbxa74mmzimfsbvkdi7101z5q5qlp"; + sha256 = "0l35pri5m5k5j12zd42kr5pdx97q1xq1r0shif7hs768if0n8ihm"; }; - cargoSha256 = "1kgkcl7qffh6vbjdpvrkw8ih1v8zrxs3f0a20mg6z97gdym6mm8g"; + cargoSha256 = "0wqjk2zxkd6lwki7blsdsbdnr250zs4d0ivjxc2w3i3xivlsjbw8"; checkInputs = [ coreutils bash dash ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index e35a310b100..14f42ed9d40 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = http://www.minizinc.org/; + homepage = https://www.minizinc.org/; description = "MiniZinc is a medium-level constraint modelling language."; longDescription = '' @@ -31,4 +31,3 @@ stdenv.mkDerivation { maintainers = [ maintainers.sheenobu ]; }; } - diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 6919b03d47c..8f425a92959 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { summary of the build status, after reading the manual. ''; - homepage = http://josefsson.org/autobuild/; + homepage = https://josefsson.org/autobuild/; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/6.x.nix index b7e9dd0aaef..b7e9dd0aaef 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix new file mode 100644 index 00000000000..19590239caf --- /dev/null +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -0,0 +1,64 @@ +{ elk7Version +, enableUnfree ? true +, stdenv +, makeWrapper +, fetchzip +, fetchurl +, nodejs-10_x +, coreutils +, which +}: + +with stdenv.lib; +let + nodejs = nodejs-10_x; + inherit (builtins) elemAt; + info = splitString "-" stdenv.hostPlatform.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = + if enableUnfree + then { + "x86_64-linux" = "0awkbnbrffv2m6n9zqv8k4m23g4mril69rmj84ndqpdnv7shrk4l"; + "x86_64-darwin" = "0mbaya0xq99vfl8bn1wgi4m43c8qjp910bxf26z436km64311pip"; + } + else { + "x86_64-linux" = "0fy8vh0x2p8n2r3n5f67h1r5z75qfx5q4fghgqwnqymray5798v4"; + "x86_64-darwin" = "0zyhvbwvdj95v2nswx5b83n4cw3zy5a6bkrvypw6k1i833c6v5g7"; + }; + +in stdenv.mkDerivation rec { + name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; + version = elk7Version; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; + sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + }; + + patches = [ + # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. + # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just + # disable the version check. + ./disable-nodejs-version-check.patch + ]; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/libexec/kibana $out/bin + mv * $out/libexec/kibana/ + rm -r $out/libexec/kibana/node + makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ + --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" + sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + ''; + + meta = { + description = "Visualize logs and time-stamped data"; + homepage = http://www.elasticsearch.org/overview/kibana; + license = if enableUnfree then licenses.elastic else licenses.asl20; + maintainers = with maintainers; [ offline rickynils basvandijk ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index acd25a12f81..a449c28ea28 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Object and executable file converter, modifier and disassembler"; - homepage = http://www.agner.org/optimize/; + homepage = https://www.agner.org/optimize/; license = licenses.gpl2; maintainers = with maintainers; [ orivej vrthra ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 9ea595da334..632fe9fff32 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dune-${version}"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "18j5afg54bww9az05wc7m5ixzvvq38wfnwq6ni09pi2n848m21ca"; + sha256 = "0z4jnj0a5vxjqlwksplhag9b3s3iqdcpcpjjzfazv5jdl5cf58f9"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index a7f06e73453..1e1f7fade25 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -55,13 +55,13 @@ let sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.2.zip"; - sha256 = "0hxf0ns3si03rl7dxix7i30limbl50ffyvdyk9bqqms4ir8dcza6"; + url = "https://github.com/ocaml/opam/archive/2.0.4.zip"; + sha256 = "1312nc9s4h0vksiimz7jsv3zw17fa05p6mdx23s5sii0qspvnx8c"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "2.0.2"; + version = "2.0.4"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -117,4 +117,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.2 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.0.4 -p opam-shebangs.patch diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 0c67baa9601..a054bc82d45 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = http://www.antlr.org/; + homepage = https://www.antlr.org/; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index 8074b7c35ad..ad0ebbdebba 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = http://www.antlr.org/; + homepage = https://www.antlr.org/; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 35179b33602..cf37287beff 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = http://www.antlr.org/; + homepage = https://www.antlr.org/; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index 1ebf7d7dfe2..cee2033665d 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -73,7 +73,7 @@ let frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = http://www.antlr.org/; + homepage = https://www.antlr.org/; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index fc0c6c9ed8a..ba1b8f27e7c 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Berkeley YACC"; - homepage = http://invisible-island.net/byacc/byacc.html; + homepage = https://invisible-island.net/byacc/byacc.html; license = licenses.publicDomain; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index eeef99991db..d8fc3770e34 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,14 +8,14 @@ let in stdenv.mkDerivation rec { name = "trellis-${version}"; - version = "2019.02.21"; + version = "2019.04.02"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "90910577671cdd950e56df6cb29d848dadea9467"; - sha256 = "0j5gnkqfkp8k01wmzsplg713dmw1zvg04hsy33bzbyxaqviybdip"; + rev = "7848ab8db85194cb822bc27af5b50a6fe2db55c6"; + sha256 = "1c9085idsnpw279ddshh58yv920vpcnymzznzj2n5z5vcnkbrr3v"; name = "trellis"; }) (fetchFromGitHub { diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix index 5f2931e9b27..4026a1b02bb 100644 --- a/pkgs/development/web/nodejs/v11.nix +++ b/pkgs/development/web/nodejs/v11.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "11.13.0"; - sha256 = "12n3bm21q8nm6wn116c0af8fpmxhaa7xd4srrba36q0zl4nra4bl"; + version = "11.14.0"; + sha256 = "1rvdyvlvh8ddm9y2razshly5kb87kw0js287i0a5dzb5ay41vxlx"; } diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 461a81db857..7537c2795d2 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Front-end framework for faster and easier web development"; - homepage = http://getbootstrap.com/; + homepage = https://getbootstrap.com/; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index d0e880f5f2c..80a66d31b80 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "http://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz"; - sha256 = "06blx844q6a248jwzqlgi82692vvkmvb00bfdx4jhcwp9mayvza5"; + sha256 = "1r8i6yzgww7aw8iibqagahg1gqgw7305g07agy0dpszzvp0mi0gz"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 4661cf7d803..598ddc48563 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -35,6 +35,10 @@ let ldPath = map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); + setupSh = writeScript "setup.sh" '' + #!${runtimeShell} + ''; + runSh = writeScript "run.sh" '' #!${runtimeShell} runtime_paths="${lib.concatStringsSep ":" ldPath}" @@ -168,6 +172,7 @@ in buildFHSUserEnv rec { ln -s ../lib32/steam-runtime steamrt/${steam-runtime-wrapped-i686.arch} ''} ln -s ${runSh} steamrt/run.sh + ln -s ${setupSh} steamrt/setup.sh '' else '' ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0 ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 137b0e0b608..bf9e1cdd635 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.6"; + version = "1.14.7"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0aw3czw3nq8ffakhw2libhvrhnllj61xc5lxpjqv0ig1419s1lj5"; + sha256 = "0j2yvkcggj5k0r2cqk8ndnj77m37a00srfd9qg7pdpqffbinqpj7"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index e57c3854926..d44560b4ddf 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,13 +20,13 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2019-02-16"; + version = "5.0-9976"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "286aafd4ed2949f0b93230fee969c6a32fe75f07"; - sha256 = "0l0cpq8s7wnng7mhbnzf4v84zggqsqdykrzfyz5avvbv9pla7jwp"; + rev = "63f30cc44da248b0226e1c8724b3e53ecf4c768f"; + sha256 = "0lkf571kzmw26fybl1lqpvhc81jkbh4hcvi3766bb7mvvzapkybd"; }; enableParallelBuilding = true; @@ -47,6 +47,9 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SHARED_ENET=ON" "-DENABLE_LTO=ON" + "-DDOLPHIN_WC_REVISION=${src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${version}" + "-DDOLPHIN_WC_BRANCH=master" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ]; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index 4f40c10b037..01785bd9a27 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; - homepage = http://www.carpeludum.com/kega-fusion/; + homepage = https://www.carpeludum.com/kega-fusion/; maintainers = with maintainers; [ abbradar ]; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" ]; diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index 65867de61a2..fc63bf705f4 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -18,7 +18,7 @@ let in -stdenv.mkDerivation { +stdenv.mkDerivation { name = "mess-0.${version}"; unpackPhase = @@ -37,11 +37,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - cp mess* $out/bin/mess + cp mess* $out/bin/mess ''; meta = { - homepage = http://www.mess.org/; + homepage = https://www.mess.org/; license = "non-commercial"; description = "Multi Emulator Super System, an emulator of many game consoles and computer systems"; broken = true; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index b8a896d8683..cfb4e35c2b5 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -31,24 +31,24 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.7.5"; + version = "4.8.0"; url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "0gsb03dc97hqdkw8kpl5ky53bygfnpxkgn2ry5bfzvfdfva6hk8m"; + sha256 = "0y47mfjkb2viraqrvi8qpjn2935sra81h3l4bvaag737s7zmj0c9"; }; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.2"; + version = "4.5"; url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; - sha256 = "1ysvq2jyvh7r27iwpsrlrwzj672jnrihry91bx3m3fysz3sl3ld1"; + sha256 = "1dy1v27cw9vp2xnr8y4bdcvvw5ivcgpk2375jgn536csbwaxgwjz"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1dhv6y60g64bj3kgfknbfzxfzmy686dh7svxlvi4lfis2faikxmk"; + sha256 = "18xpha7nl3jg7c24cgbncciyyqqb6svsyfp1xk81993wnl6r8abs"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20181203"; - sha256 = "1as5h5xibpplm619b1i73g974p96q2jnd7fqm28xj3zkqy7qjdm3"; + version = "20190310"; + sha256 = "0mqzl7k9q7lfkmk8fk9dfzi2dm45h31mrid9265qh2d56nk28ali"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix new file mode 100644 index 00000000000..6d00b02d80e --- /dev/null +++ b/pkgs/misc/logging/beats/7.x.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: + +let beat = package : extraArgs : buildGoPackage (rec { + name = "${package}-${version}"; + version = elk7Version; + + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "0n1sjngc82b7wysw5aaiqvllq4c8rx2jj7khw4vrypc40f8ahjs5"; + }; + + goPackagePath = "github.com/elastic/beats"; + + subPackages = [ package ]; + + meta = with stdenv.lib; { + homepage = https://www.elastic.co/products/beats; + license = licenses.asl20; + maintainers = with maintainers; [ fadenb basvandijk ]; + platforms = platforms.linux; + }; + } // extraArgs); +in { + filebeat7 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; + heartbeat7 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + metricbeat7 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + packetbeat7 = beat "packetbeat" { + buildInputs = [ libpcap ]; + meta.description = "Network packet analyzer that ships data to Elasticsearch"; + meta.longDescription = '' + Packetbeat is an open source network packet analyzer that ships the + data to Elasticsearch. + + Think of it like a distributed real-time Wireshark with a lot more + analytics features. The Packetbeat shippers sniff the traffic between + your application processes, parse on the fly protocols like HTTP, MySQL, + PostgreSQL, Redis or Thrift and correlate the messages into transactions. + ''; + }; + journalbeat7 = beat "journalbeat" { + meta.description = '' + Journalbeat is an open source data collector to read and forward + journal entries from Linuxes with systemd. + ''; + buildInputs = [ systemd.dev ]; + }; +} diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 5b660908238..da12255e91e 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20190213"; + version = "20190330"; src = fetchFromGitHub { owner = "NicoHood"; repo = pname; rev = version; - sha256 = "1qalf61xh6a8yz2a98z3ih0w9ky12v3wc61gdczbfnyfasgzc254"; + sha256 = "16n5svgkpa8azxgyy64zwjjc04r57wfzkdq9igqvbvwkbvx8aa89"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/busybox/clang-cross.patch b/pkgs/os-specific/linux/busybox/clang-cross.patch new file mode 100644 index 00000000000..b2d696bfd73 --- /dev/null +++ b/pkgs/os-specific/linux/busybox/clang-cross.patch @@ -0,0 +1,37 @@ +diff --git a/Makefile b/Makefile +index 6fedcffba..3385836c4 100644 +--- a/Makefile ++++ b/Makefile +@@ -271,8 +271,8 @@ export quiet Q KBUILD_VERBOSE + # Look for make include files relative to root of kernel src + MAKEFLAGS += --include-dir=$(srctree) + +-HOSTCC = gcc +-HOSTCXX = g++ ++HOSTCC = cc ++HOSTCXX = c++ + HOSTCFLAGS := + HOSTCXXFLAGS := + # We need some generic definitions +@@ -289,7 +289,7 @@ MAKEFLAGS += -rR + # Make variables (CC, etc...) + + AS = $(CROSS_COMPILE)as +-CC = $(CROSS_COMPILE)gcc ++CC = $(CROSS_COMPILE)cc + LD = $(CC) -nostdlib + CPP = $(CC) -E + AR = $(CROSS_COMPILE)ar +diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA +index f155108d7..185257064 100644 +--- a/scripts/Makefile.IMA ++++ b/scripts/Makefile.IMA +@@ -39,7 +39,7 @@ ifndef HOSTCC + HOSTCC = cc + endif + AS = $(CROSS_COMPILE)as +-CC = $(CROSS_COMPILE)gcc ++CC = $(CROSS_COMPILE)cc + LD = $(CC) -nostdlib + CPP = $(CC) -E + AR = $(CROSS_COMPILE)ar diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 4b287725082..a0f0a4c47e3 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch - ]; + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.targetPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 0c4df18afb3..0d7ce559c66 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.4.2"; - sha256Hash = "1w39fkasq9314qx141xb8v5qqcfvqbpr3higc4vv8y4b4i58fapi"; + version = "3.5.0"; + sha256Hash = "01gs25pk58nm5il91lgwiivphk38009ihfk5l956zyzmgr9wa9a5"; }; } diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index df9a628f83d..5a086612925 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -33,6 +33,10 @@ # NixOS to implement kernel-specific behaviour. features ? {} +, # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is + # automatically extended with extra per-version and per-config values. + randstructSeed ? "" + , # A list of patches to apply to the kernel. Each element of this list # should be an attribute set {name, patch} where `name' is a # symbolic name and `patch' is the actual patch. The patch may @@ -162,7 +166,7 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { - inherit version modDirVersion src kernelPatches stdenv extraMeta configfile; + inherit version modDirVersion src kernelPatches randstructSeed stdenv extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index f49d7de1a53..768d06bb053 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.111"; + version = "4.14.112"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "1s56819kkr7h48njk708f9gapy2hr97vxawp5qflv1izamb7s6gq"; + sha256 = "0wp40cr3gpj8g2hghcvhz669qshd7zkfjkq78gkdg840rki02q9j"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 85a8ff54df4..9bdbdf4558f 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.34"; + version = "4.19.35"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "1k5qhyh7nwfs5pkbrjpxyj6w17424qcmmd9v7jqfbgnx3wm5wyfx"; + sha256 = "1q2742sbi9vgk791xr1rbi5mr3ra4k1bdzq9dr610870y1hfb9rg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 8923cb158b5..afeaac91ba8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.168"; + version = "4.9.169"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07h9xwxpdxb6gm1fy0d8s6p1zalmw3mbzjgd4gipvmzsxwhiqiad"; + sha256 = "1c6nz27q0m6nbb7v7kba6zrhzav5bqqllvwzzqf9cmd5cdn66xmp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index a418e4b4bcc..11a7287fdb8 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.7"; + version = "5.0.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "1v2lxwamnfm879a9qi9fwp5zyvlzjw9qa0aizidjbiwz5dk7gq8n"; + sha256 = "0dalr3vym2ixmblnlrw10dfx0icdf2aab38z2j9y1qfcx128140i"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index d9b342ac14a..9b1369351e0 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.1-rc4"; - modDirVersion = "5.1.0-rc4"; + version = "5.1-rc5"; + modDirVersion = "5.1.0-rc5"; extraMeta.branch = "5.1"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1cqr80b3jfr4g48fpni0pj2p5zs9930q6k6m9xjjdnsrhax1isr6"; + sha256 = "171caaf8zrjx124431a94sv25c0ka6b3ni194l7fpisn4n3x8y47"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4b570c1fe94..1512f47ade4 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -30,6 +30,9 @@ in { # Manually specified nixexpr representing the config # If unspecified, this will be autodetected from the .config config ? stdenv.lib.optionalAttrs allowImportFromDerivation (readConfig configfile), + # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is + # automatically extended with extra per-version and per-config values. + randstructSeed ? "", # Use defaultMeta // extraMeta extraMeta ? {}, # Whether to utilize the controversial import-from-derivation feature to parse the config @@ -111,7 +114,7 @@ let if [ -f scripts/gcc-plugins/gen-random-seed.sh ]; then substituteInPlace scripts/gcc-plugins/gen-random-seed.sh \ --replace NIXOS_RANDSTRUCT_SEED \ - $(echo ${src} ${configfile} | sha256sum | cut -d ' ' -f 1 | tr -d '\n') + $(echo ${randstructSeed}${src} ${configfile} | sha256sum | cut -d ' ' -f 1 | tr -d '\n') fi ''; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 9835a0c96db..91e1ae36f70 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "musl"; - version = "1.1.21"; + version = "1.1.22"; src = fetchurl { url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0i2z52zgc86af1n1gjiz43hgd85mxjgvgn345zsybja9dxpvchn7"; + sha256 = "1qr9xqdzziy5bsyyqlh6k8yz056ll55d5yvc0gbhz61ginj422cb"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index 3ec0dc45e16..bb00db9868e 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nmon-${version}"; - version = "16i"; + version = "16j"; src = fetchurl { url = "mirror://sourceforge/nmon/lmon${version}.c"; - sha256 = "0k52nvkfhwq7125gbrz7p56gid4rik59am8w22ja8ihiribdfrmg"; + sha256 = "05a6yc1w421r30qg32a8j0wajjv2ff1mwwsrariv3fz3ng4phf5s"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix new file mode 100644 index 00000000000..80f14b568ed --- /dev/null +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, numactl, ncurses, check }: + +stdenv.mkDerivation rec { + pname = "numatop"; + version = "2.1"; + src = fetchurl { + url = "https://github.com/intel/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; + sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ numactl ncurses ]; + checkInputs = [ check ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Tool for runtime memory locality characterization and analysis of processes and threads on a NUMA system"; + homepage = https://01.org/numatop; + license = licenses.bsd3; + maintainers = with maintainers; [ dtzWill ]; + platforms = [ + { kernel.name = "linux"; cpu.family = "x86"; } + { kernel.name = "linux"; cpu.family = "power"; } + ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 1a08a89dc23..4bbb9d92930 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -86,7 +86,7 @@ let }; meta = with stdenv.lib; { - homepage = http://www.nvidia.com/object/unix.html; + homepage = https://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index c6993d146f1..38f808cee3f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.nvidia.com/object/unix.html; + homepage = https://www.nvidia.com/object/unix.html; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index e2ef51da380..7106550c39e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.nvidia.com/object/unix.html; + homepage = https://www.nvidia.com/object/unix.html; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; diff --git a/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch b/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch new file mode 100644 index 00000000000..ff2c6e2e150 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch @@ -0,0 +1,36 @@ +From b323e7a7ebb2327943851fa3fd139399eb24d3dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Mon, 13 Aug 2018 22:58:21 +0200 +Subject: [PATCH] build fixes needed for nixos + +--- + module/Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/module/Makefile.in b/module/Makefile.in +index 935bd2663..afb08df81 100644 +--- a/module/Makefile.in ++++ b/module/Makefile.in +@@ -44,15 +44,15 @@ clean: + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \ +- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ ++ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ + KERNELRELEASE=@LINUX_VERSION@ + @# Remove extraneous build products when packaging +- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ +- if [ -n "$(DESTDIR)" ]; then \ ++ kmoddir=@prefix@$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ ++ if [ -n "@prefix@" ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ ++ sysmap=@prefix@$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi +-- +2.19.2 + diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 28a4836bf00..81143032c91 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -182,17 +182,14 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.0-rc3"; + version = "0.8.0-rc4"; - sha256 = "0wmkis0q2gbj7sgx3ipxngbgzjcf7ay353v3mglf2ay50q4da5i7"; + sha256 = "02cdxf62758smbqy723yqv8lkch1043alvcwhdnvya21ygcgycnw"; isUnstable = true; extraPatches = [ # in case this gets out of date, just send Mic92 a pull request! - (fetchpatch { - url = "https://github.com/Mic92/zfs/commit/bc29b5783da0af2c80c85126a1831ce1d52bfb69.patch"; - sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw"; - }) + ./build-fixes-unstable.patch ]; spl = null; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index b34a44715a5..37a2e6369d4 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.12"; + version = "3.7.14"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "14w7czxqdxgmsqxrvphzpyha1nq3yfhka4vy8wyzwixindgj493q"; + sha256 = "12lx4ij89khg9nfiq5l9bijgm7yjrw9kh7y09wqjhv2ws0mq3437"; }; buildInputs = diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 0c21c475abd..ad15db070f4 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./pure-configure.patch ]; meta = with stdenv.lib; { - homepage = http://coturn.net/; + homepage = https://coturn.net/; license = with licenses; [ bsd3 ]; description = "A TURN server"; platforms = platforms.all; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 0183d745990..39589b3698f 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { doCheck = false; # requires root and the net meta = { - homepage = http://www.isc.org/software/bind; + homepage = https://www.isc.org/downloads/bind/; description = "Domain name server"; license = stdenv.lib.licenses.mpl20; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d027cf185e6..48fa3793d9a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.91.3"; + version = "0.91.4"; components = { "abode" = ps: with ps; [ ]; "abode.alarm_control_panel" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index eacfa707ebd..112c1f57a91 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -111,7 +111,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.91.3"; + hassVersion = "0.91.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -126,7 +126,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "00zzb466xbyz8sxjszkjsgks4smj94qw40agwyfn75ciiib2p8fw"; + sha256 = "195pif8lz0qxjsannpi39gxphfb6dkj9lkpah0vjw0pgx753sflv"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 897c061c918..fb2fd42dd7d 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lidarr-${version}"; - version = "0.5.0.583"; + version = "0.6.0.815"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz"; - sha256 = "0vqnx8vd7mv4lsl7ffsjanl9pm107bk3ndvfka2ky74qisrqcyz7"; + sha256 = "08aa286y71pzn8wxjiag1bn5303i05jznqwmgrbqfb4jwz94pyjs"; }; buildInputs = [ diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index a8c09945fa9..756796d6201 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "0n5abzs2i3mz65p5dwbph5bdamqv28wc1iw4gc4f84m0cda1vs0r"; + sha256 = "120944v0n2qh30ri5604h4xz38jm94f6s00gwhsjvs1sfm6csapz"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 0f2f291318c..f8a5ae31ffe 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.30.4"; + version = "0.32.2"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "0mvyl5v798qwdydqsjjq94ihfwi62kq4gprxjg3rcckmjdyx2ycs"; + sha256 = "1df2cvlqm0pz7w5094fv20308m0d2z4szlv46dzsfdw03hny50xn"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 6fd416baae8..ba5ba8725bc 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.1.3"; + version = "6.1.4"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0svg1q3h8m3i6snznsx0lwzb7lrv532v0nvpbwr6ydg2gd3aqwih"; + sha256 = "0a0k66vbsi2704pb5vr8mjr7n3v5dapnfhqxkrw6biicj8ahka30"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0a7160lmi67pa32q5d6ib14vp5rx7850w0vvfxchmdm08dv3hm7k"; + sha256 = "1wamnvv2jiyi6cyw9p65j2hm3si345asfwl7kjg7drx0vn08ks6g"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 4c6cc694243..3c383591386 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "pushgateway-${version}"; - version = "0.7.0"; + version = "0.8.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "1sczg6vrpxv0jlqhkif8443v7mhbp3lp40g71ndqkf1s669m1pl4"; + sha256 = "1mzwkxnznv6wzy7dc8rksa8gr7z92plrzls8gb8rk432zfqcbv6a"; }; buildUser = "nix@nixpkgs"; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index d3ddfe26d4a..ee3b9d818ce 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.9.2"; + version = "1.10.2"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1416nx7mxa0b3bmnkarksicgvw6wja6s8xrf22yzak38qmmrpz2m"; + sha256 = "0g27yczb49xf8nbhkzx7lv8378613afq9qx1gr5yhlpfrl4sgb69"; }; buildFlagsArray = [ ''-ldflags= diff --git a/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix b/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix index f65115a8622..2655595ee69 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix @@ -91,15 +91,6 @@ }; } { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { goPackagePath = "github.com/alecthomas/units"; fetch = { type = "git"; @@ -154,6 +145,15 @@ }; } { + goPackagePath = "github.com/caio/go-tdigest"; + fetch = { + type = "git"; + url = "https://github.com/caio/go-tdigest"; + rev = "f3c8d94f65d3096ac96eda54ffcd10c0fe1477f1"; + sha256 = "0w3imv58rhb34x63w8m0k18yr6bnc2bf2rpz23dh82yvdg57nl6r"; + }; + } + { goPackagePath = "github.com/cenkalti/backoff"; fetch = { type = "git"; @@ -316,6 +316,15 @@ }; } { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "25d852aebe32c875e9c044af3eef9c7dc6bc777f"; + sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz"; + }; + } + { goPackagePath = "github.com/go-ini/ini"; fetch = { type = "git"; @@ -329,8 +338,8 @@ fetch = { type = "git"; url = "https://github.com/go-logfmt/logfmt"; - rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + rev = "07c9b44f60d7ffdfb7d8efe1ad539965737836dc"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; }; } { @@ -451,6 +460,15 @@ }; } { + goPackagePath = "github.com/harlow/kinesis-consumer"; + fetch = { + type = "git"; + url = "https://github.com/harlow/kinesis-consumer"; + rev = "2f58b136fee036f5de256b81a8461cc724fdf9df"; + sha256 = "1m8ns5gipxxs2fkln494gqy1axhz8393cjan5wkdxc6xfchd0wa5"; + }; + } + { goPackagePath = "github.com/hashicorp/consul"; fetch = { type = "git"; @@ -559,6 +577,15 @@ }; } { + goPackagePath = "github.com/karrick/godirwalk"; + fetch = { + type = "git"; + url = "https://github.com/karrick/godirwalk"; + rev = "2de2192f9e35ce981c152a873ed943b93b79ced4"; + sha256 = "014n3pq9b4m2gx7h3ncf5xk7kw8g89yhbvnfc6dqg006r9q26w4w"; + }; + } + { goPackagePath = "github.com/kballard/go-shellquote"; fetch = { type = "git"; @@ -577,6 +604,15 @@ }; } { + goPackagePath = "github.com/kubernetes/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "d41becfba9ee9bf8e55cec1dd3934cd7cfc04b99"; + sha256 = "0d7akj020fahqgmicig39vfbs1nvkxachwbyw8wk2w90pfsicff1"; + }; + } + { goPackagePath = "github.com/leodido/ragel-machinery"; fetch = { type = "git"; @@ -761,8 +797,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + rev = "505eaef017263e299324067d40ca2c48f6a2cf50"; + sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; }; } { @@ -824,8 +860,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "8048a2e9c5773235122027dd585cf821b2af1249"; - sha256 = "17ri1ijhvg6gxscaw4sy0r5pkcyiqdsf6nn2d4q36hd0nrswvk29"; + rev = "071446942108a03a13cf0717275ad3bdbcb691b4"; + sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp"; }; } { @@ -932,8 +968,17 @@ fetch = { type = "git"; url = "https://github.com/vmware/govmomi"; - rev = "e3a01f9611c32b2362366434bcd671516e78955d"; - sha256 = "0cicd4m8ll7y1n0c97drmvmqwsqaspwpzc6nfp73f887m8ff1xis"; + rev = "3617f28d167d448f93f282a867870f109516d2a5"; + sha256 = "1a82g4vzfgzp8ppcq3dhgv8van85am467ckx788yqk7rj4c3i5ir"; + }; + } + { + goPackagePath = "github.com/wavefronthq/wavefront-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/wavefronthq/wavefront-sdk-go"; + rev = "fa87530cd02a8ad08bd179e1c39fb319a0cc0dae"; + sha256 = "000ynkkpg2m4xynkmdx47asydw66nzp94f276gifws1a90yacay0"; }; } { @@ -976,7 +1021,7 @@ goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; - url = "https://go.googlesource.com/crypto"; + url = "https://github.com/golang/crypto.git"; rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; }; @@ -1000,19 +1045,28 @@ }; } { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://github.com/golang/sync.git"; + rev = "42b317875d0fa942474b76e1b46a6060d720ae6e"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } + { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; - sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; + rev = "7c4c994c65f702f41ed7d6620a2cb34107576a77"; + sha256 = "19ss1k6id7dc0i61vw9arz03vpvwc2mxwdn99qq2galy0z3b8hbi"; }; } { goPackagePath = "golang.org/x/text"; fetch = { type = "git"; - url = "https://go.googlesource.com/text"; + url = "https://github.com/golang/text.git"; rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; @@ -1054,15 +1108,6 @@ }; } { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { goPackagePath = "gopkg.in/asn1-ber.v1"; fetch = { type = "git"; @@ -1099,6 +1144,15 @@ }; } { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://github.com/go-inf/inf"; + rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } + { goPackagePath = "gopkg.in/ldap.v2"; fetch = { type = "git"; @@ -1143,4 +1197,4 @@ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } -] +] \ No newline at end of file diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 0781e66f006..73ec5038fe3 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1shkffikl9mrjg1kq2s2ylgf4691f9fv53d3x4qk2a6m4y1y9dnl"; + sha256 = "0fqp3k0gr5qb2a7ck093fw581db9fmfvhsich740d588ik749jbh"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 685e856644e..4d8f034c51e 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "018djad7ygfl9c9f2l2j42qkg31ml3hs2f01f0dk361zckwk77n4"; + sha256 = "1b91amcpzb7935hpm67iqw92bl5r1a0rkfrc8gfm8w9sngzv8vbj"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index 4653946270c..b2e40a8ede0 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { name = "rt-${version}"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; - sha256 = "1cddgp3j7qm7r3v5j1l1hl6i6laxa64f4nalaarj094hmhyb92kk"; + sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl"; }; patches = [ ./override-generated.patch ]; diff --git a/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch b/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch new file mode 100644 index 00000000000..7c973e5bd26 --- /dev/null +++ b/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch @@ -0,0 +1,11 @@ +--- a/buildtools/wafsamba/samba_utils.py 2019-04-08 01:13:47.525306574 +0000 ++++ b/buildtools/wafsamba/samba_utils.py 2019-04-08 01:14:34.805245676 +0000 +@@ -495,7 +495,7 @@ + Logs.zones = ['runner'] + if Logs.verbose > 2: + Logs.zones = ['*'] +- elif opt[0].isupper() and opt.find('=') != -1: ++ elif opt[0] and opt.find('=') != -1: + # this allows us to set waf options on the make command line + # for example, if you do "make FOO=blah", then we set the + # option 'FOO' in Options.options, to blah. If you look in wafsamba/wscript diff --git a/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch b/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch index 7e3652dbe7b..6576a43322e 100644 --- a/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch +++ b/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch @@ -1,15 +1,18 @@ -diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript ---- samba-4.4.6/dynconfig/wscript 2016-01-26 14:45:46.000000000 +0300 -+++ samba-4.4.6-new/dynconfig/wscript 2016-10-15 22:21:18.159705132 +0300 -@@ -416,11 +416,3 @@ +--- a/dynconfig/wscript 2018-12-23 20:28:42.908832206 -0800 ++++ b/dynconfig/wscript 2018-12-23 20:31:55.568835627 -0800 +@@ -419,15 +419,3 @@ public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir), header_path='samba', cflags=cflags) - - # install some extra empty directories -- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}"); -- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}") -- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}"); +- bld.INSTALL_DIR("${CONFIGDIR}") +- bld.INSTALL_DIR("${LOGFILEBASE}") +- bld.INSTALL_DIR("${PRIVILEGED_SOCKET_DIR}") +- bld.INSTALL_DIR("${PRIVATE_DIR}", 0o700) +- bld.INSTALL_DIR("${BINDDNS_DIR}", 0o770) +- bld.INSTALL_DIR("${STATEDIR}") +- bld.INSTALL_DIR("${CACHEDIR}") - - # these might be on non persistent storage - bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}") diff --git a/pkgs/servers/samba/4.x-no-persistent-install.patch b/pkgs/servers/samba/4.x-no-persistent-install.patch index 1c360f6b2c7..820470f939e 100644 --- a/pkgs/servers/samba/4.x-no-persistent-install.patch +++ b/pkgs/servers/samba/4.x-no-persistent-install.patch @@ -1,7 +1,6 @@ -diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript ---- samba-4.4.6/ctdb/wscript 2016-09-22 09:42:48.000000000 +0300 -+++ samba-4.4.6-new/ctdb/wscript 2016-10-15 23:31:13.932088237 +0300 -@@ -581,7 +581,7 @@ +--- a/ctdb/wscript 2019-01-15 02:07:00.000000000 -0800 ++++ b/ctdb/wscript 2019-01-20 20:21:08.800187459 -0800 +@@ -814,7 +814,7 @@ for t in etc_subdirs: files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir) for fmode in files: @@ -9,14 +8,14 @@ diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript + bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0], destname=fmode[0], chmod=fmode[1]) - bld.SAMBA_GENERATOR('ctdb-functions', -@@ -601,23 +601,19 @@ + # If this is a direct install and there are no event scripts +@@ -852,24 +852,20 @@ ] for t in etc_scripts: - bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t, + bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t, - destname=t, chmod=0755) + destname=t, chmod=MODE_755) bld.SAMBA_GENERATOR('ctdb-sudoers', source='config/ctdb.sudoers', @@ -26,14 +25,15 @@ diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript + bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers', destname='ctdb') -- bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README', -+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/notify.d', 'config/notify.d.README', +- bld.INSTALL_FILES('${CTDB_ETCDIR}/events/notification', ++ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/events/notification', + 'config/notification.README', destname='README') -- bld.install_dir(bld.env.CTDB_LOGDIR) -- bld.install_dir(bld.env.CTDB_RUNDIR) -- bld.install_dir(bld.env.CTDB_VARDIR) +- bld.INSTALL_DIR(bld.env.CTDB_LOGDIR) +- bld.INSTALL_DIR(bld.env.CTDB_RUNDIR) +- bld.INSTALL_DIR(bld.env.CTDB_VARDIR) - - # Unit tests - ctdb_unit_tests = [ - 'db_hash_test', + for d in ['volatile', 'persistent', 'state']: + bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d)) + diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 53bfa6df8dc..7d1289ffdea 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl , fetchpatch -, docbook_xml_dtd_42, readline, talloc +, docbook_xml_dtd_42, readline , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs -, gnutls, ncurses, libunwind, systemd +, gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme , enableLDAP ? false , enablePrinting ? false @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.7.12"; + version = "4.10.2"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0jmg39xigrh48j39r4f1390kmr1p3xbfxzfabln4b0r9qdmki70f"; + sha256 = "112yizx9cpjhi8c7mh9znqg0c9dkj3383hwr8dhgpykl3g2zv347"; }; outputs = [ "out" "dev" "man" ]; @@ -33,30 +33,19 @@ stdenv.mkDerivation rec { [ ./4.x-no-persistent-install.patch ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch - - # conditionall disable MacOS incompatible tests - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/samba-team/samba/pull/107.patch"; - sha256 = "0r6q34vjj0bdzmcbnrkad9rww58k4krbwicv4gs1g3dj49skpvd6"; - }) - - (fetchpatch { - name = "CVE-2019-3824.patch"; - url = "https://attachments.samba.org/attachment.cgi?id=14859"; - sha256 = "02qf3zr55mzbimqdv01k3b22jjb084vfr5zabapyr5h1f588mw0q"; - }) + ./4.x-fix-makeflags-parsing.patch ]; buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* - docbook_xml_dtd_45 */ readline talloc popt iniparser + docbook_xml_dtd_45 */ readline popt iniparser jansson libbsd libarchive zlib fam libiconv gettext libunwind krb5Full ] ++ optionals stdenv.isLinux [ libaio systemd ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi - ++ optional enableDomainController gnutls + ++ optionals enableDomainController [ gnutls gpgme lmdb ] ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph ++ optional (enableGlusterFS && stdenv.isLinux) glusterfs @@ -69,6 +58,8 @@ stdenv.mkDerivation rec { # Fix the XML Catalog Paths sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py + + patchShebangs ./buildtools/bin ''; configureFlags = @@ -87,8 +78,9 @@ stdenv.mkDerivation rec { ++ optional (!enableAcl) "--without-acl-support" ++ optional (!enablePam) "--without-pam"; - # To build in parallel. - buildPhase = "python buildtools/bin/waf build -j $NIX_BUILD_CORES"; + preBuild = '' + export MAKEFLAGS="-j $NIX_BUILD_CORES" + ''; # Some libraries don't have /lib/samba in RPATH but need it. # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \; @@ -111,5 +103,6 @@ stdenv.mkDerivation rec { description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; platforms = platforms.unix; + maintainers = with maintainers; [ aneeshusa ]; }; } diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/6.x.nix index df7324a73f4..df7324a73f4 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix new file mode 100644 index 00000000000..7ea33935faa --- /dev/null +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -0,0 +1,83 @@ +{ elk7Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre_headless +, utillinux +, autoPatchelfHook +, zlib +}: + +with stdenv.lib; +let + info = splitString "-" stdenv.hostPlatform.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = + if enableUnfree + then { + "x86_64-linux" = "1fi57xqwgxx0ivjyfvaybzz2k457qw59fn9qr26d86lnkigfxpk8"; + "x86_64-darwin" = "06hj96d4vl9q24dfx8ffydfs7qd440ys29654jgqp8sp7js7hjxp"; + } + else { + "x86_64-linux" = "1jrcdxm1swf8ahkv3h7kyzzhdq9nwwfhimpflzdq2d831fx525y8"; + "x86_64-darwin" = "119ym2d5fqwba3aq2izh5qj8vxawb7hf183cgg00s1sm1mm8lviv"; + }; +in +stdenv.mkDerivation (rec { + version = elk7Version; + name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; + sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + }; + + patches = [ ./es-home-6.x.patch ]; + + postPatch = '' + substituteInPlace bin/elasticsearch-env --replace \ + "ES_CLASSPATH=\"\$ES_HOME/lib/*\"" \ + "ES_CLASSPATH=\"$out/lib/*\"" + + substituteInPlace bin/elasticsearch-cli --replace \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/*\"" \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" + ''; + + buildInputs = [ makeWrapper jre_headless utillinux ] + ++ optional enableUnfree zlib; + + installPhase = '' + mkdir -p $out + cp -R bin config lib modules plugins $out + + chmod +x $out/bin/* + + wrapProgram $out/bin/elasticsearch \ + --prefix PATH : "${utillinux}/bin/" \ + --set JAVA_HOME "${jre_headless}" + + wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" + ''; + + passthru = { inherit enableUnfree; }; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + license = if enableUnfree then licenses.elastic else licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ apeschar basvandijk ]; + }; +} // optionalAttrs enableUnfree { + dontPatchELF = true; + nativeBuildInputs = [ autoPatchelfHook ]; + runtimeDependencies = [ zlib ]; + postFixup = '' + for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do + echo "patching $exe..." + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe" + done + ''; +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 99dd8be4e9f..494e6dbac4f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -1,19 +1,20 @@ { stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { - name = "pg_cron-${version}"; - version = "1.1.3"; + pname = "pg_cron"; + version = "1.1.4"; buildInputs = [ postgresql ]; src = fetchFromGitHub { owner = "citusdata"; - repo = "pg_cron"; + repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0r33b0c9gdx2lfhrp7lpkif3j8qbzxmnywkcs2rcxwf9qzrb4vnj"; + sha256 = "0wkqgrm3v999hjcc82h24jv1pib6f6bw8jsv83hgk6g3iv6xsjg9"; }; installPhase = '' + mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 mkdir -p $out/{lib,share/extension} cp *.so $out/lib @@ -23,9 +24,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Run Cron jobs through PostgreSQL"; - homepage = https://www.citusdata.com/; + homepage = https://github.com/citusdata/pg_cron; maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.postgresql; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix new file mode 100644 index 00000000000..722c70b2e89 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, postgresql, perl, cmake, boost, gmp, cgal, mpfr }: + +stdenv.mkDerivation rec { + pname = "pgrouting"; + version = "2.6.2"; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ postgresql boost gmp cgal mpfr ]; + + src = fetchFromGitHub { + owner = "pgRouting"; + repo = pname; + rev = "v${version}"; + sha256 = "09xy5pmiwq0lxf2m8p4q5r892mfmn32vf8m75p84jnz4707z1l0j"; + }; + + installPhase = '' + mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653 + install -D lib/*.so -t $out/lib + install -D sql/pgrouting--${version}.sql -t $out/share/extension + install -D sql/common/pgrouting.control -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality"; + homepage = https://pgrouting.org/; + maintainers = [ maintainers.steve-chavez ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 2d0c699c12e..70579ee292a 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -36,4 +36,6 @@ self: super: { tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; tds_fdw = super.callPackage ./ext/tds_fdw.nix { }; + + pgrouting = super.callPackage ./ext/pgrouting.nix { }; } diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 5848c0a453c..3d55dcc2f9b 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,31 +2,36 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.8.3"; + version = "0.8.12"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = "refs/tags/${version}"; - sha256 = "1qnghqswvqlwv9121r4maibmn2dvqmbr3fhsnngsj3q7plfp7yb2"; + sha256 = "1p8slx8nk15vyyzwc9ic50py0amk9p9nggp1973wfas0fxsg1r4f"; }; LC_ALL = "en_US.UTF-8"; postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py - sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh + sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py + sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' tests/test_integrations.py + sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh + find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' patchShebangs . ''; + doCheck = !stdenv.isDarwin; + checkPhase = '' - HOME=$TMPDIR \ - pytest \ - -k 'not test_man_completion and not test_indir and not test_xonsh_party and not test_foreign_bash_data and not test_script and not test_single_command_no_windows and not test_redirect_out_to_file and not test_sourcefile and not test_printname and not test_printfile' + HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight' + HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5 + HOME=$TMPDIR pytest -k 'test_ptk_highlight' ''; - checkInputs = [ python3Packages.pytest glibcLocales git ]; + checkInputs = [ python3Packages.pytest python3Packages.pytest-rerunfailures glibcLocales git ]; propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ]; diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index c9eec01d0b7..dc8c88b77cb 100644 --- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "zsh-autosuggestions-${version}"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-autosuggestions"; rev = "v${version}"; - sha256 = "0l5n4bjalz2nmbf50j56aq82r2lc784l21n3k5fx2khxckdb89p2"; + sha256 = "1xhrdv6cgmq9qslb476rcs8ifw8i2vf43yvmmscjcmpz0jac4sbx"; }; buildInputs = [ zsh ]; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 4dfc06aa436..e9cd04ecd1c 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.6.2"; + version = "0.7.0"; doCheck = false; @@ -12,11 +12,11 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "1ca29rw1w2ldahp9f1v9kfrjycbjwx3mab3m25lr82084kaa6lsh"; + sha256 = "0dl4rnh4l3rhga5pfxmkc9syn6vx05zxdf8xcv0gw9h60y1smp6v"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "1sy7q875gg6as98lp6m15x9b3lhdikm9326lmqcs5fv3hhzvdlvy"; + cargoSha256 = "148p7r9xmc0nc0d4qyxhh29xqcb5axwqwcxcrkgd41f32c3g44dc"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf ]; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index 0d8bdad2c65..c6135e8d143 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.c-amie.co.uk/software/analog/; + homepage = https://www.c-amie.co.uk/software/analog/; license = stdenv.lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix index f9021c5a3aa..083bae24d60 100644 --- a/pkgs/tools/filesystems/ifuse/default.nix +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "ifuse"; - version = "1.1.3"; + version = "2018-10-08"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = version; - sha256 = "0p01rds3vc5864v48swgqw5dv0h937nqnxggryixg9pkvzhc6cx5"; + rev = "e75d32c34d0e8b80320f0a007d5ecbb3f55ef7f0"; + sha256 = "1b9w2i0sliswlkkb890l9i0rxrf631xywxf8ihygfmjdsfw47h1m"; }; nativeBuildInputs = [ autoreconfHook pkgconfig fuse usbmuxd libimobiledevice ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 03966533e3a..0d58e8007ef 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.103"; + version = "3.0.104"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0pqralv57ci4zwd75hz4pxmd4l9d4nib2mcsvrb6jndxqkaqcvns"; + sha256 = "057xg7zy872w4hczk9b9ckmqyah3qhgysvxddqizr204cyadicxh"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 93a6652eafb..a3cefddeb41 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { glm freetype ]; meta = with stdenv.lib; { - homepage = http://logstalgia.io/; + homepage = https://logstalgia.io/; description = "Website traffic visualization tool"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index bd5645fe721..f9d3c53854b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the anthy input method"; - homepage = http://wiki.github.com/fujiwarat/ibus-anthy; + homepage = https://github.com/fujiwarat/ibus-anthy; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 5f86dbadfa3..ca4dde7a450 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "autojump-${version}"; - version = "22.5.1"; + version = "22.5.3"; src = fetchFromGitHub { owner = "wting"; repo = "autojump"; rev = "release-v${version}"; - sha256 = "1l1278g3k1qfrz41pkpjdhsabassb9si2d1bfbcmvbv5h3wmlqk9"; + sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws"; }; buildInputs = [ python bash ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { Autojump supports tab-completion. ''; - homepage = http://wiki.github.com/wting/autojump; + homepage = https://github.com/wting/autojump; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ domenkozar yurrriq ]; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index dff98f23603..550b0ad9067 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.8"; + version = "1.8.1"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -48,7 +48,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "0yhn3gvvkgmfqf3yl3kqlj0biinw0qvli6s88sxa0pybca3j8nll"; + sha256 = "1bp1cqkrpg77rjyh4lq1agc719fmxn92jkiicf6nbhfl8kf3l3vy"; }; meta = { diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index 00b04c2112f..6edcefb11d5 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "doitlive"; - version = "4.2.1"; + version = "4.3.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0sffr78h0hdrlpamg6v0iw2cgrkv7wy82mvrbzri0w1jqd29s526"; + sha256 = "03qrs032x206xrl0x3z0fpvxgjivzz9rkmb11bqlk1id10707cac"; }; propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ]; diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index 957267ae10e..15af413a999 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/pkgs/tools/misc/ideviceinstaller/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "ideviceinstaller"; - version = "2018-06-01"; + version = "2018-10-01"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "f7988de8279051f3d2d7973b8d7f2116aa5d9317"; - sha256 = "1vmdvbwnjz3f90b9bqq7jg04q7awsbi9pmkvgwal8xdpp6jcwkwx"; + rev = "f14def7cd9303a0fe622732fae9830ae702fdd7c"; + sha256 = "1biwhbldvgdhn8ygp7w79ca0rivzdjpykr76pyhy7r2fa56mrwq8"; }; nativeBuildInputs = [ autoreconfHook pkgconfig usbmuxd libimobiledevice libzip ]; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { homepage = https://github.com/libimobiledevice/ideviceinstaller; description = "List/modify installed apps of iOS devices"; longDescription = '' - ideviceinstaller is a tool to interact with the installation_proxy + ideviceinstaller is a tool to interact with the installation_proxy of an iOS device allowing to install, upgrade, uninstall, archive, restore and enumerate installed or archived apps. ''; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ aristid ]; + maintainers = with maintainers; [ aristid infinisil ]; }; } diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index f2fac5e3d0f..b06a1c47786 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -3,8 +3,8 @@ }: let - date = "20190310"; - rev = "b6ffe28a21c53a0946d95751c905d9e0b6c3b630"; + date = "20190318"; + rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218"; in stdenv.mkDerivation { @@ -13,8 +13,8 @@ stdenv.mkDerivation { buildInputs = [ perl cdrkit syslinux xz openssl ]; src = fetchgit { - url = git://git.ipxe.org/ipxe.git; - sha256 = "1s8sy75lpx8zq60wc0i35d8c1wwm1rq3scxpkq31623d097mch59"; + url = https://git.ipxe.org/ipxe.git; + sha256 = "0if3m8h1nfxy4n37cwlfbc5kand52290v80m4zvjppc81im3nr5g"; inherit rev; }; diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/6.x.nix index 359c714228e..359c714228e 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/6.x.nix diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix new file mode 100644 index 00000000000..bb4a6b1436b --- /dev/null +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -0,0 +1,53 @@ +{ elk7Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = elk7Version; + name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + sha256 = + if enableUnfree + then "1dzk9amg23vbkj92wx529i1m2rrfjc0gzkbg6w3f6xaix5zch0vp" + else "07q2gbd3xidcklid5ny22zpb3q5v0z3k2kva6g214k7rnkr9bhyy"; + }; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + + buildInputs = [ + makeWrapper jre + ]; + + installPhase = '' + mkdir -p $out + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + + patchShebangs $out/bin/logstash + patchShebangs $out/bin/logstash-plugin + + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" + + wrapProgram $out/bin/logstash-plugin \ + --set JAVA_HOME "${jre}" + ''; + + meta = with stdenv.lib; { + description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; + homepage = https://www.elastic.co/products/logstash; + license = if enableUnfree then licenses.elastic else licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ wjlroe offline basvandijk ]; + }; +} diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index da595e0591a..f94d2cc2737 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pdd"; - version = "1.3.1"; + version = "1.4"; src = fetchFromGitHub { owner = "jarun"; repo = "pdd"; rev = "v${version}"; - sha256 = "0kl6d9nivf6jj1j70alz64iwbp3ip9rg4x506nannii2cfmmx5wr"; + sha256 = "1cirb8mmxxadks7az6a3a4sp8djv45cwa9dx0zrarzfmw0x7xb9g"; }; format = "other"; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index dd9b6d0b260..4619d05c4c6 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.2019.2"; + version = "1.2019.4"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "17b9nwj0r4nbajql611lhy1kkgzigq8p8hkyv90psm7avwyd7fk2"; + sha256 = "0kd0f7kknl6x1dibh4gsx3pl58bzylx42lxwmh9zv4d53gm6a93r"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 4cbb2943d3c..eed527da416 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "1.8.2"; + version = "1.8.3"; name = "ttfautohint-${version}"; src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.gz"; - sha256 = "19w9g1ksr0vyblgcirppj0279gfj5s902jblzgav5a4n2mq42rrq"; + sha256 = "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7"; }; postAutoreconf = '' diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 2dfd4752f07..9b94d003706 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "usbmuxd"; - version = "2018-10-10"; + version = "2019-03-05"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "96e4aabe0b9a46ea9da4955a10c774a8e58fe677"; - sha256 = "03xnj4y606adbhl829vv46qa78f6w2ik4mjz19a34x9lhkcrqxqi"; + rev = "b1b0bf390363fa36aff1bc09443ff751943b9c34"; + sha256 = "176hapckx98h4x0ni947qpkv2s95f8xfwz00wi2w7rgbr6cviwjq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index ddfdf0f492f..b3f5e90c3f4 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, CoreServices, CoreFoundation }: +{ stdenv, rustPlatform, fetchFromGitHub, CoreServices, darwin }: rustPlatform.buildRustPackage rec { name = "watchexec-${version}"; @@ -13,13 +13,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1xlcfr2q2pw47sav9iryjva7w9chv90g18hszq8s0q0w71sccv6j"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - - # FIXME: Use impure version of CoreFoundation because of missing symbols. - # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" - ''; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + CoreServices + # This is needed to avoid an undefined symbol error "_CFURLResourceIsReachable" + darwin.cf-private + ]; meta = with stdenv.lib; { description = "Executes commands in response to file modifications"; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d3cca59bf19..55ee6287e8e 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.04.07"; + version = "2019.04.17"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1krx4y8nzpaqpq9qs8dnv2y988jpdccyfl9sdx9wrb0baycl119k"; + sha256 = "0dznw06qbb75glzirhnsbsd5xqix08jxdngbd21wndxcj1yq5y8a"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 3ff06960156..55b464607b1 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.harding.motd.ca/autossh/; + homepage = https://www.harding.motd.ca/autossh/; description = "Automatically restart SSH sessions and tunnels"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 80ea61249c6..830d27fa6ce 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,23 +1,45 @@ -{fetchurl, fetchpatch, stdenv, meson, ninja, gupnp, gssdp, pkgconfig, gtk3, libuuid, gettext, gupnp-av, gtksourceview4, gnome3, wrapGAppsHook}: +{ stdenv +, fetchurl +, meson +, ninja +, gupnp +, gssdp +, pkgconfig +, gtk3 +, libuuid +, gettext +, gupnp-av +, gtksourceview4 +, gnome3 +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "gupnp-tools"; - version = "0.8.15"; + version = "0.10.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1awpqjs08cf6aimvzldnlnz5zmdyw8aq4k2rl5239j4zkfhg8vik"; + sha256 = "13d1qr1avz9r76989nvgxhhclmqzr025xjk4rfnja94fpbspznj1"; }; - patches = [ - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gupnp-tools/commit/2845d07b1584789a23a0e691ceff476e5d82ccb7.patch; - sha256 = "1a8bhsz41s27kbaxp9jbmbisabin6lz2ln87012syvi6f2s332hv"; - }) + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + wrapGAppsHook ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ]; - buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.adwaita-icon-theme ]; + buildInputs = [ + gupnp + libuuid + gssdp + gtk3 + gupnp-av + gtksourceview4 + gnome3.adwaita-icon-theme + ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 1d2bfdc9118..612e3ec0f83 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -11,9 +11,21 @@ stdenv.mkDerivation rec { patches = [ ./whois-Update-Canadian-TLD-server.patch ./service-name.patch + # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 + ./inetutils-1_9-PATH_PROCNET_DEV.patch ]; - buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ]; + nativeBuildInputs = [ help2man perl /* for `whois' */ ]; + buildInputs = [ ncurses /* for `talk' */ ]; + + # Don't use help2man if cross-compiling + # https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html + # https://git.congatec.com/yocto/meta-openembedded/blob/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb#L44 + preConfigure = let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; + in lib.optionalString isCross '' + export HELP2MAN=true + ''; configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd diff --git a/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch b/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch new file mode 100644 index 00000000000..2592989a90a --- /dev/null +++ b/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch @@ -0,0 +1,26 @@ +inetutils: define PATH_PROCNET_DEV if not already defined + +this prevents the following compilation error : +system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function) + +this patch comes from : + http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/ + +Upstream-Status: Inappropriate [not author] + +Signed-of-by: Eric Bénard <eric@eukrea.com> +--- +diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c +--- inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000 -0500 ++++ inetutils-1.9/ifconfig/system/linux.c 2012-01-04 16:40:53.000000000 -0500 +@@ -49,6 +49,10 @@ + #include "../ifconfig.h" + + ++#ifndef PATH_PROCNET_DEV ++ #define PATH_PROCNET_DEV "/proc/net/dev" ++#endif ++ + /* ARPHRD stuff. */ + + static void diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index 00a3f7f3b6b..3c2e7f53bee 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { weather, MCC, MNC, mobile brand name, elevation and usage type of any IP address or host name in the IP2Location databases. ''; - homepage = http://www.ip2location.com/free/applications; + homepage = https://www.ip2location.com/free/applications; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index d38ff60f706..43d0944a415 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://keepalived.org; + homepage = https://keepalived.org; description = "Routing software written in C"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix index 26bcc8f803f..d0aec7889ef 100644 --- a/pkgs/tools/networking/ngrok-1/default.nix +++ b/pkgs/tools/networking/ngrok-1/default.nix @@ -28,4 +28,8 @@ buildGoPackage rec { ''; buildFlags = [ "-tags release" ]; + + meta = { + homepage = https://ngrok.com/; + }; } diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 20a448b0ded..3575cc65b2b 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://nzbget.net; + homepage = https://nzbget.net; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 37fe3398ae8..834ea1bd873 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, readline, which, nettools }: stdenv.mkDerivation rec { - name = "socat-1.7.3.2"; + name = "socat-1.7.3.3"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3"; + sha256 = "0jnhjijyq74g3wa4ph0am83z6vq7qna7ac0xqjma8s4197z3zmhd"; }; postPatch = '' diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix index 4685143c934..89af381d0d6 100644 --- a/pkgs/tools/networking/stubby/default.nix +++ b/pkgs/tools/networking/stubby/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stubby"; name = "${pname}-${version}"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "getdnsapi"; repo = pname; rev = "v${version}"; - sha256 = "034y783dvh43v5ajxlgn4y9y7mdk1lwy87d7isaxpkigs1jqbrma"; + sha256 = "164gm5cbnq785s78bqmbsgxrxkq8hw930xwkxxzi1f6jgz928dnf"; }; nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ]; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index e00b5335d35..b85e146971b 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.50"; + version = "5.53"; src = fetchurl { url = "https://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "0j811iakljjxw39qchmqf235jdkwixb0i4xxjyi55f08558947cm"; + sha256 = "119560alb8k0qz2zkjb2i80ikmn76fa6dg681fvrw9hlxsb9hhw0"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index e1e19609d51..9f3075b374e 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -2,7 +2,7 @@ , docbook_xsl }: let - version = "1.0.75"; + version = "1.0.76"; in stdenv.mkDerivation rec { name = "tgt-${version}"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { owner = "fujita"; repo = "tgt"; rev = "v${version}"; - sha256 = "008x7xz49fnqi91hw4nim4f25gp5qyjgzxfikmj7gz81mh4hhamj"; + sha256 = "1q01ay0zn5gmy6df1iw1ic11p8zygxlp0r3nd887vvvjvlp3xrvc"; }; buildInputs = [ libxslt systemd libaio docbook_xsl ]; diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index c20169d3913..f41aa35df90 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { pname = "pyunbound"; name = "${pname}-${version}"; - version = "1.7.3"; + version = "1.9.0"; src = fetchurl { url = "http://unbound.net/downloads/unbound-${version}.tar.gz"; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index fc77846efc3..3e572a10da0 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.16"; + version = "2.17"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1bkwr151bnv72aka2r9jwaq8lkz1p6031wr5pss4sij978qn5xld"; + sha256 = "1865p3yczgpq8gvgh4cpgbx2ibc1fwycd7pagga9sj8r3q0giqyk"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 0d59864154d..2f71ea7a421 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20190227"; + version = "0.0.20190406"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1kaq0mjcdr4hxr3rx8z11rvlh4ycjsn5654fjw1gh1fdbjgczax5"; + sha256 = "1rqyyyx7j41vpp4jigagqs2qdyfngh15y48ghdqfrkv7v93vwdak"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d725692f405..7590a37a8e3 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -167,10 +167,10 @@ in rec { }; nixStable = callPackage common rec { - name = "nix-2.2"; + name = "nix-2.2.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "63238d00d290b8a93925891fc9164439d3941e2ccc569bf7f7ca32f53c3ec0c7"; + sha256 = "f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 73e8c90d4e4..7cd7935d155 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,24 +1,9 @@ { callPackage, newScope, pkgs, fetchurl }: callPackage ./generic.nix (rec { - version = "1.6.1"; + version = "1.7"; src = fetchurl { - url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; - }; -# nixops is incompatible with the most recent versions of listed -# azure-mgmt-* packages, therefore we are pinning them to -# package-private versions, so that they don't get trampled by -# updates. -# see -# https://github.com/NixOS/nixops/issues/1065 - python2Packages = pkgs.python2Packages.override { - overrides = (self: super: let callPackage = newScope self; in { - azure-mgmt-compute = callPackage ./azure-mgmt-compute { }; - azure-mgmt-network = callPackage ./azure-mgmt-network { }; - azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; - azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; - azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; - }); + url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; + sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3"; }; }) diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 813ae64bef5..79400a8e5ea 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -1,4 +1,4 @@ -{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert +{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? [] # version args , src, version , meta ? {} @@ -16,11 +16,6 @@ python2Packages.buildPythonApplication { boto3 hetzner libcloud - azure-storage - azure-mgmt-compute - azure-mgmt-network - azure-mgmt-resource - azure-mgmt-storage adal # Go back to sqlite once Python 2.7.13 is released pysqlite @@ -28,7 +23,7 @@ python2Packages.buildPythonApplication { digital-ocean libvirt typing - ]; + ] ++ nixopsAzurePackages; checkPhase = # Ensure, that there are no (python) import errors @@ -53,7 +48,7 @@ python2Packages.buildPythonApplication { meta = { homepage = https://github.com/NixOS/nixops; description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ eelco rob domenkozar ]; + maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; platforms = lib.platforms.unix; license = lib.licenses.lgpl3; } // meta; diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix new file mode 100644 index 00000000000..d9ba324dce7 --- /dev/null +++ b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix @@ -0,0 +1,31 @@ +{ callPackage, newScope, pkgs, fetchurl }: + +callPackage ./generic.nix (rec { + version = "1.6.1"; + src = fetchurl { + url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; + sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; + }; + nixopsAzurePackages = with python2Packages; [ + azure-storage + azure-mgmt-compute + azure-mgmt-network + azure-mgmt-resource + azure-mgmt-storage + ]; + # nixops is incompatible with the most recent versions of listed + # azure-mgmt-* packages, therefore we are pinning them to + # package-private versions, so that they don't get trampled by + # updates. + # see + # https://github.com/NixOS/nixops/issues/1065 + python2Packages = pkgs.python2Packages.override { + overrides = (self: super: let callPackage = newScope self; in { + azure-mgmt-compute = callPackage ./azure-mgmt-compute { }; + azure-mgmt-network = callPackage ./azure-mgmt-network { }; + azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; + azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; + azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; + }); + }; +}) diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index 88d9d0c94be..94975807dea 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -5,26 +5,9 @@ # Then copy the URL to the tarball. callPackage ./generic.nix (rec { - version = "1.6.1pre2728_8ed39f9"; + version = "1.7pre2764_932bf43"; src = fetchurl { - url = "https://hydra.nixos.org/build/88329589/download/2/nixops-${version}.tar.bz2"; - sha256 = "1ppnhqmsbiijm6r77h86abv3fjny5iq35yvj207s520kjwzaj7kc"; + url = "https://hydra.nixos.org/build/92372343/download/2/nixops-${version}.tar.bz2"; + sha256 = "f35bf81bf2805473ea54248d0ee92d163d00a1992f3f75d17e8cf430db1f9919"; }; - # # Marking unstable as broken, instead of using the pinned version, - # # like stable does You might be able to use the following code (as - # # in stable), to run unstable against the pinned packages - # python2Packages = pkgs.python2Packages.override { - # overrides = (self: super: let callPackage = newScope self; in { - # azure-mgmt-compute = callPackage ./azure-mgmt-compute { }; - # azure-mgmt-network = callPackage ./azure-mgmt-network { }; - # azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; - # azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; - # azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; - # }); - # }; - # # otherwise - # # see https://github.com/NixOS/nixpkgs/pull/52550 - # # see https://github.com/NixOS/nixops/issues/1065 - # # see https://github.com/NixOS/nixpkgs/issues/52547 - meta.broken = true; }) diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index c1c9e679f22..055444d5566 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -8,13 +8,13 @@ let v2 = callPackage ./2.nix {}; in buildGoPackage rec { pname = "browserpass"; - version = "3.0.1"; + version = "3.0.6"; src = fetchFromGitHub { owner = "browserpass"; repo = "browserpass-native"; rev = version; - sha256 = "1i3xxysiiapz9y2v0gp13inx7j0d7n0khpmcsy9k95pzn53526dx"; + sha256 = "0q3bsla07zjl6i69nj1axbkg2ia89pvh0jg6nlqgbm2kpzzbn0pz"; }; nativeBuildInputs = [ makeWrapper ]; @@ -27,6 +27,8 @@ in buildGoPackage rec { # variables to be valid by default substituteInPlace Makefile \ --replace "PREFIX ?= /usr" "" + sed -i -e 's/SED :=.*/SED := sed/' Makefile + sed -i -e 's/INSTALL :=.*/INSTALL := install/' Makefile ''; DESTDIR = placeholder "bin"; diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 0415b10b25d..37da2022520 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "lastpass-cli"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "lastpass"; repo = pname; rev = "v${version}"; - sha256 = "12qjqvqzi3pq7hrdpq59bcxqy6yj1mhx145g9rky1jm2ipzpfayq"; + sha256 = "168jg8kjbylfgalhicn0llbykd7kdc9id2989gg0nxlgmnvzl58a"; }; nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index ceff23911c7..dfbda2b5e07 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.7.2"; + version = "2.7.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "0dbbfk47dpxx7zpb98n4w3ls3z5di57qnr2nsgxjvp49gk9j3f6k"; + sha256 = "0md1w86i3fy9l78i98ijr5136nbhdiik2dxyw9qnzmvdlvkqmw70"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix index c15d9bf2528..c0b7a72d18e 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/tools/security/nmap/qt.nix @@ -1,33 +1,35 @@ -{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper , dnsutils, nmap -, qtbase, qtscript, qtwebkit }: +, qtbase, qtscript, qtwebengine }: stdenv.mkDerivation rec { name = "nmapsi4-${version}"; - version = "0.5-alpha1"; + version = "0.4.80-20180430"; - src = fetchurl { - url = "mirror://sourceforge/nmapsi/${name}.tar.xz"; - sha256 = "18v9a3l2nmij3gb4flscigxr5c44nphkjfmk07qpyy73fy61mzrs"; + src = fetchFromGitHub { + owner = "nmapsi4"; + repo = "nmapsi4"; + rev = "d7f18e4c1e38dcf9c29cb4496fe14f9ff172861a"; + sha256 = "10wqyrjzmad1g7lqa65rymbkna028xbp4xcpj442skw8gyrs3994"; }; nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - buildInputs = [ qtbase qtscript qtwebkit ]; + buildInputs = [ qtbase qtscript qtwebengine ]; enableParallelBuilding = true; postPatch = '' + substituteInPlace src/platform/digmanager.cpp \ + --replace '"dig"' '"${dnsutils}/bin/dig"' + substituteInPlace src/platform/discover.cpp \ + --replace '"nping"' '"${nmap}/bin/nping"' for f in \ - src/platform/digmanager.cpp \ - src/platform/discover.cpp \ src/platform/monitor/monitor.cpp \ src/platform/nsemanager.cpp ; do substituteInPlace $f \ - --replace '"dig"' '"${dnsutils}/bin/dig"'\ - --replace '"nmap"' '"${nmap}/bin/nmap"' \ - --replace '"nping"' '"${nmap}/bin/nping"' + --replace '"nmap"' '"${nmap}/bin/nmap"' done ''; @@ -45,9 +47,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt frontend for nmap"; - homepage = https://www.nmapsi4.org/; license = licenses.gpl2; - platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; + inherit (src.meta) homepage; }; } diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index d775df98aac..899d9aa795a 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { - sha256 = "1sqj8777vwb2izm86y74sivbpyxcx95sflgjn0pbqni311ck972v"; + sha256 = "1cj56s3gghkja4zrcyzhrwq5ac0r7zjfgj7jzp0i56vdv8a1mihr"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix index ead7970da86..ad7715f0fe6 100644 --- a/pkgs/tools/system/ior/default.nix +++ b/pkgs/tools/system/ior/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; meta = with stdenv.lib; { - homepage = http://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/; + homepage = https://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/; description = "Parallel file system I/O performance test"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 8237a4928a0..a31ce8f65e4 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "stress-ng-${version}"; - version = "0.09.54"; + version = "0.09.57"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.xz"; - sha256 = "0qbgabrxm8aj4a6bgf55mi7rv9sqcgl3kkm7j3qhkqjfn9rqzslb"; + sha256 = "0xp55m1kif8hcjdcdhgaarghqf1gz5fa24qwl6zpmxkzl6bn002x"; }; # All platforms inputs then Linux-only ones diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 1ff9cee241c..f581e44bcc8 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "csvkit"; - version = "1.0.3"; + version = "1.0.4"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "a6c859c1321d4697dc41252877249091681297f093e08d9c1e1828a6d52c260c"; + sha256 = "1830lb95rh1iyi3drlwxzb6y3pqkii0qiyzd40c1kvhvaf1s6lqk"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 36368e172a2..ea7602a6002 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, CoreServices }: +{ stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }: rustPlatform.buildRustPackage rec { name = "mdbook-${version}"; @@ -13,7 +13,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0kcc0b2644qbalz7dnqwxsjdmw1h57k0rjrvwqh8apj2sgl64gyv"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + CoreServices + # This is needed to avoid an undefined symbol error for "_CFURLResourceIsReachable" + darwin.cf-private + ]; meta = with stdenv.lib; { description = "Create books from MarkDown"; @@ -21,9 +25,5 @@ rustPlatform.buildRustPackage rec { license = [ licenses.asl20 licenses.mit ]; maintainers = [ maintainers.havvy ]; platforms = platforms.all; - - # Because CoreServices needs to be updated, - # but Apple won't release the source. - broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 81c88ecad9e..00a16abb70a 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -4,17 +4,17 @@ }: rustPlatform.buildRustPackage rec { - name = "ripgrep-${version}"; - version = "0.10.0"; + pname = "ripgrep"; + version = "11.0.1"; src = fetchFromGitHub { owner = "BurntSushi"; - repo = "ripgrep"; + repo = pname; rev = version; - sha256 = "017fz5kv1kv9jz7mb7vcxrklf5vybvfz2x61g6myzshqz4z1v1yb"; + sha256 = "0vak82d4vyw0w8agswbyxa6g3zs2h9mxm2xjw0xs9qccvmi7whbb"; }; - cargoSha256 = "0k2b2vbklfdjk2zdc8ip480drc12gy1whlwj94p44hr3402azcgr"; + cargoSha256 = "0i31d0m145dsjfix589p5pfp83qp3a5wvz1v9sp4bxn3rggmw734"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 3c2b4f5e885..f764a2fac07 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "A RELAX NG validator in Java"; # The homepage is www.thaiopensource.com, but it links to googlecode.com # for downloads and call it the "project site". - homepage = "http://www.thaiopensource.com/relaxng/trang.html"; + homepage = https://www.thaiopensource.com/relaxng/trang.html; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 7001b6e3642..8c4b93ab265 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -47,7 +47,7 @@ bundlerApp { meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; - homepage = http://asciidoctor.org/; + homepage = https://asciidoctor.org/; license = licenses.mit; maintainers = with maintainers; [ gpyh ]; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ff5a02d631..f98ee30b72b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -945,6 +945,16 @@ in bchunk = callPackage ../tools/cd-dvd/bchunk { }; + inherit (callPackages ../misc/logging/beats/5.x.nix { + # XXX: this is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }) + filebeat5 + heartbeat5 + metricbeat5 + packetbeat5; + inherit (callPackages ../misc/logging/beats/6.x.nix { # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. @@ -956,20 +966,21 @@ in packetbeat6 journalbeat6; - filebeat = filebeat6; - heartbeat = heartbeat6; - metricbeat = metricbeat6; - packetbeat = packetbeat6; - - inherit (callPackages ../misc/logging/beats/5.x.nix { + inherit (callPackages ../misc/logging/beats/7.x.nix { # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }) - filebeat5 - heartbeat5 - metricbeat5 - packetbeat5; + filebeat7 + heartbeat7 + metricbeat7 + packetbeat7 + journalbeat7; + + filebeat = filebeat6; + heartbeat = heartbeat6; + metricbeat = metricbeat6; + packetbeat = packetbeat6; bfr = callPackage ../tools/misc/bfr { }; @@ -979,6 +990,8 @@ in bibtex2html = callPackage ../tools/misc/bibtex2html { }; + bicon = callPackage ../applications/misc/bicon { }; + bindfs = callPackage ../tools/filesystems/bindfs { }; bitbucket-cli = python2Packages.bitbucket-cli; @@ -1594,6 +1607,8 @@ in long-shebang = callPackage ../misc/long-shebang {}; + numatop = callPackage ../os-specific/linux/numatop { }; + iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; @@ -2114,7 +2129,7 @@ in mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { @@ -2187,6 +2202,8 @@ in cocoapods = callPackage ../development/mobile/cocoapods { }; + cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; }); + compass = callPackage ../development/tools/compass { }; conda = callPackage ../tools/package-management/conda { }; @@ -2284,7 +2301,9 @@ in davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { }; + dbeaver = callPackage ../applications/misc/dbeaver { + jdk = jdk11; + }; dbench = callPackage ../development/tools/misc/dbench { }; @@ -2573,10 +2592,15 @@ in # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.9"; elk6Version = "6.7.1"; + elk7Version = "7.0.0"; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; - elasticsearch6 = callPackage ../servers/search/elasticsearch { }; - elasticsearch6-oss = callPackage ../servers/search/elasticsearch { + elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; + elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { + enableUnfree = false; + }; + elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { }; + elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; }; elasticsearch = elasticsearch6; @@ -3696,6 +3720,8 @@ in john = callPackage ../tools/security/john { }; + joplin = nodePackages.joplin; + joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; journalbeat = callPackage ../tools/system/journalbeat { }; @@ -3781,8 +3807,12 @@ in keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; - kibana6 = callPackage ../development/tools/misc/kibana/default.nix { }; - kibana6-oss = callPackage ../development/tools/misc/kibana/default.nix { + kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; + kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { + enableUnfree = false; + }; + kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; + kibana7-oss = callPackage ../development/tools/misc/kibana/7.x.nix { enableUnfree = false; }; kibana = kibana6; @@ -3871,8 +3901,12 @@ in lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; - logstash6 = callPackage ../tools/misc/logstash { }; - logstash6-oss = callPackage ../tools/misc/logstash { + logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; + logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { + enableUnfree = false; + }; + logstash7 = callPackage ../tools/misc/logstash/7.x.nix { }; + logstash7-oss = callPackage ../tools/misc/logstash/7.x.nix { enableUnfree = false; }; logstash = logstash6; @@ -6254,7 +6288,7 @@ in wal_e = callPackage ../tools/backup/wal-e { }; watchexec = callPackage ../tools/misc/watchexec { - inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation; + inherit (darwin.apple_sdk.frameworks) CoreServices; }; watchman = callPackage ../development/tools/watchman { @@ -10425,6 +10459,8 @@ in glib-networking = callPackage ../development/libraries/glib-networking {}; + gom = callPackage ../development/libraries/gom { }; + ace = callPackage ../development/libraries/ace { }; atk = callPackage ../development/libraries/atk { }; @@ -10763,6 +10799,8 @@ in lcms2 = callPackage ../development/libraries/lcms2 { }; + ldacbt = callPackage ../development/libraries/ldacbt { }; + ldb = callPackage ../development/libraries/ldb { python = python2; }; @@ -13260,6 +13298,8 @@ in wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; + waylandpp = callPackage ../development/libraries/waylandpp { }; + wcslib = callPackage ../development/libraries/wcslib { }; webkitgtk = callPackage ../development/libraries/webkitgtk { @@ -14331,7 +14371,7 @@ in samba3 = callPackage ../servers/samba/3.x.nix { }; samba4 = callPackage ../servers/samba/4.x.nix { - python = python2; + python = python3; }; sambaMaster = callPackage ../servers/samba/master.nix { }; @@ -15353,9 +15393,7 @@ in gomodifytags = callPackage ../development/tools/gomodifytags { }; - go-langserver = callPackage ../development/tools/go-langserver { - buildGoPackage = buildGo110Package; - }; + go-langserver = callPackage ../development/tools/go-langserver { }; gotests = callPackage ../development/tools/gotests { }; @@ -16407,7 +16445,6 @@ in androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { }); android-studio = androidStudioPackages.stable; - android-studio-preview = androidStudioPackages.preview; animbar = callPackage ../applications/graphics/animbar { }; @@ -16715,8 +16752,6 @@ in amdappsdk = amdappsdk28; }; - chatzilla = callPackage ../applications/networking/irc/chatzilla { }; - chirp = callPackage ../applications/radio/chirp { inherit (pythonPackages) pyserial pygtk; }; @@ -16958,6 +16993,10 @@ in dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; + drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { + buildClient = false; + buildServerGui = false; + }; droopy = callPackage ../applications/networking/droopy { inherit (python3Packages) wrapPython; @@ -19720,6 +19759,8 @@ in peru = callPackage ../applications/version-management/peru {}; + petrinizer = haskellPackages.callPackage ../applications/science/logic/petrinizer {}; + pmidi = callPackage ../applications/audio/pmidi { }; printrun = callPackage ../applications/misc/printrun { }; @@ -19800,6 +19841,10 @@ in bison = bison2; }; + stretchly = callPackage ../applications/misc/stretchly { + inherit (gnome2) GConf; + }; + stumpish = callPackage ../applications/window-managers/stumpish {}; stumpwm = callPackage ../applications/window-managers/stumpwm { @@ -20520,12 +20565,18 @@ in kodiPlain = callPackage ../applications/video/kodi { }; + kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; }; + kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); kodi = wrapKodi { kodi = kodiPlain; }; + kodi-wayland = wrapKodi { + kodi = kodiPlainWayland; + }; + kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = @@ -21824,6 +21875,8 @@ in ecopcr = callPackage ../applications/science/biology/ecopcr { }; + eggnog-mapper = callPackage ../applications/science/biology/eggnog-mapper { }; + emboss = callPackage ../applications/science/biology/emboss { }; ezminc = callPackage ../applications/science/biology/EZminc { }; @@ -22860,6 +22913,8 @@ in nixops = callPackage ../tools/package-management/nixops { }; + nixops_1_6_1 = callPackage ../tools/package-management/nixops/nixops-v1_6_1.nix {}; + nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { }); nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index f08f2eacc23..2659a330202 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -2,8 +2,9 @@ let mkCoqPackages' = self: coq: - let callPackage = newScope self ; in rec { - inherit callPackage coq; + let newScope = self.newScope; + callPackage = self.callPackage; in { + inherit coq; coqPackages = self; contribs = recurseIntoAttrs @@ -75,7 +76,7 @@ in rec { * a `dontFilter` attribute into the Coq derivation. */ mkCoqPackages = coq: - let self = mkCoqPackages' self coq; in + let self = lib.makeScope newScope (lib.flip mkCoqPackages' coq); in if coq.dontFilter or false then self else filterCoqPackages coq self; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c8e9bde708e..5c9e8f288a6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -81,7 +81,7 @@ let propagatedBuildInputs = [ FileNext ]; meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; - homepage = http://betterthangrep.com/; + homepage = https://beyondgrep.com; license = licenses.artistic2; maintainers = with maintainers; [ lovek323 ]; }; @@ -11046,7 +11046,7 @@ let sha256 = "5f5f1142185a67b87406a3fb31f221564f61838a70ef4c07284a66c55e82ad05"; }; meta = { - homepage = http://wiki.github.com/toddr/Net-Ident/; + homepage = https://github.com/toddr/Net-Ident; description = "Lookup the username on the remote end of a TCP/IP connection"; license = stdenv.lib.licenses.mit; }; @@ -13242,7 +13242,7 @@ let sha256 = "d6d3c711657a380f1cb24d8b54a1cd20f725f7f54665189e9e67bb0b877109a3"; }; meta = { - homepage = http://wiki.github.com/toddr/Regexp-Parser; + homepage = https://github.com/toddr/Regexp-Parser; description = "Base class for parsing regexes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 934aa1cb1c9..1572eb7f654 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -730,6 +730,8 @@ in { pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + pyschedule = callPackage ../development/python-modules/pyschedule { }; + pyside = callPackage ../development/python-modules/pyside { }; pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { @@ -748,8 +750,12 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; + pytest-click = callPackage ../development/python-modules/pytest-click { }; + pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; + pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; + pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; python-binance = callPackage ../development/python-modules/python-binance { }; @@ -954,6 +960,8 @@ in { allpairspy = callPackage ../development/python-modules/allpairspy { }; + annexremote = callPackage ../development/python-modules/annexremote { }; + ansible = callPackage ../development/python-modules/ansible { }; ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; @@ -1975,6 +1983,8 @@ in { humanize = callPackage ../development/python-modules/humanize { }; + humanfriendly = callPackage ../development/python-modules/humanfriendly { }; + hupper = callPackage ../development/python-modules/hupper {}; hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; |