diff options
Diffstat (limited to 'pkgs')
256 files changed, 4779 insertions, 2909 deletions
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix index 62e72592874..58ab367c020 100644 --- a/pkgs/applications/altcoins/nano-wallet/default.nix +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "nano-wallet-${version}"; - version = "16.3"; + version = "18.0"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "raiblocks"; rev = "V${version}"; - sha256 = "1rhq7qzfd8li33pmzcjxrhbbgdklxlcijam62s385f8yqjwy80dz"; + sha256 = "03f9g1x7rs7vic9yzsjxsh5ddx9ys78rssbfghbccfw9qrwylh3y"; fetchSubmodules = true; }; diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index 591f6ffa86c..19ab52ebc22 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.3.1"; - sha256 = "13y3gczqb0rb6v17j63j1zp11cnykbv9c674hrk1i6jb3y4am4lv"; + version = "2.3.2"; + sha256 = "1063n7lkcfkywi0a06pxkw0wkq3qyq4lr53fv584mlbnh2hj8gpm"; cargoSha256 = "1pj5hzy7k1l9bbw1qpz80vvk89qz4qz4rnnkcvn2rkbmq382gxwy"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index f62e3d5cfdd..b8b67836f06 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.2.8"; - sha256 = "1l2bxra4fkbh8gnph9wnc24ddmzfdclsgcjbx8q6fflhcg6r9hf1"; + version = "2.2.9"; + sha256 = "0n9zk25ni4asfdqc4xh0gqp2446vxacqz7qcrmsngf8swvayvi16"; cargoSha256 = "10lg0vzikzlj927hpn59x1dz9dvhcaqsl8nz14vj2iz42vfkcm7p"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 247db721664..a90eaea7b56 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, meson, ninja, pkgconfig , python3, gtk3, gst_all_1, libsecret, libsoup , appstream-glib, desktop-file-utils, totem-pl-parser -, gobject-introspection, wrapGAppsHook }: +, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "lollypop"; @@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-ugly gstreamer gtk3 + hicolor-icon-theme libsecret libsoup totem-pl-parser diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 9e0abac5ce4..9ba225e8c58 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,21 +1,24 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, gtk2, libjack2 +{ alsaLib, autoconf, automake, dssi, fetchurl, libjack2 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile -, libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd +, libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd , sord, sratom, stdenv, suil }: stdenv.mkDerivation rec { - version = "0.6.7"; - name = "qtractor-${version}"; + pname = "qtractor"; + version = "0.9.4"; src = fetchurl { - url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "0h5nblfkl4s412c9f02b40nb8c8jq8ypz67z2qn3hkvhx6i9yxsg"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "05xrzr48b19mghbpbzjqw5fy6pl9140bm5m929lrsi4rq5hp3xgg"; }; + nativeBuildInputs = [ + autoconf automake libtool pkgconfig qttools + ]; buildInputs = - [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH + [ alsaLib dssi libjack2 ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool - libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom + libvorbis lilv lv2 qtbase rubberband serd sord sratom suil ]; diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix index f22340b6941..64ae9491535 100644 --- a/pkgs/applications/audio/spotifywm/default.nix +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, spotify, xorg }: +{ stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: stdenv.mkDerivation rec { name = "spotifywm-unstable-${version}"; version = "2016-11-28"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ spotify ]; installPhase = '' - echo "#!${stdenv.shell}" > spotifywm + echo "#!${runtimeShell}" > spotifywm echo "LD_PRELOAD="$out/lib/spotifywm.so" ${spotify}/bin/spotify \$*" >> spotifywm install -Dm644 spotifywm.so $out/lib/spotifywm.so install -Dm755 spotifywm $out/bin/spotifywm diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 91abf2128a8..6c68c705b02 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0np8600qvqpw9kcmgp04i1nak1339ck1iidkzr75kigp5rgdl2bq"; }; latestVersion = { # canary & dev - version = "3.5.0.4"; # "Android Studio 3.5 Canary 5" - build = "183.5320907"; - sha256Hash = "1i56r58kcwrllx3a85dhsz9m0amb7xj9ybqfkdf1a8ipv1hdqs1g"; + version = "3.5.0.5"; # "Android Studio 3.5 Canary 6" + build = "183.5326993"; + sha256Hash = "06d43qw0p6zpy6vmriiihql5vgc6c4darplc2148y616hx0whrql"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index a95ced76371..6a3f581c4e8 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) - neovim (0.7.0) - msgpack (~> 1.0) + neovim (0.8.0) + msgpack (~> 1.1) multi_json (~> 1.0) PLATFORMS @@ -14,4 +14,4 @@ DEPENDENCIES neovim BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index af887161ea6..28a53cc590f 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,10 +2,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; }; multi_json = { source = { @@ -19,9 +19,9 @@ dependencies = ["msgpack" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4"; + sha256 = "07scrdfk7pyn5jgx5m2yajdqpbdv42833vbw568qqag6xp99j3yk"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; } diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 5b0560e5831..454b7ad554b 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appimage-run, fetchurl }: +{ stdenv, appimage-run, fetchurl, runtimeShell }: let version = "3.0.6"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,share} cp $src $out/share/standardNotes.AppImage - echo "#!${stdenv.shell}" > $out/bin/standardnotes + echo "#!${runtimeShell}" > $out/bin/standardnotes echo "${appimage-run}/bin/appimage-run $out/share/standardNotes.AppImage" >> $out/bin/standardnotes chmod +x $out/bin/standardnotes $out/share/standardNotes.AppImage ''; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 71bd3544feb..937764f0ab8 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -1,6 +1,6 @@ {buildVersion, x32sha256, x64sha256}: -{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell, pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, gksuSupport ? false, gksu, unzip, zip, bash}: @@ -115,7 +115,7 @@ in stdenv.mkDerivation (rec { mkdir -p $out/bin cat > $out/bin/subl <<-EOF - #!${stdenv.shell} + #!${runtimeShell} exec $sublime/sublime_text "\$@" EOF chmod +x $out/bin/subl diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 7ee28adfa47..3b75d08787e 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -7,6 +7,7 @@ , vimPlugins , makeWrapper , wrapGAppsHook +, runtimeShell # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private @@ -157,22 +158,22 @@ in stdenv.mkDerivation rec { rewrap () { rm -f "$out/bin/$1" - echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" + echo -e '#!${runtimeShell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" chmod a+x "$out/bin/$1" } - rewrap ex -e - rewrap view -R - rewrap gvim -g - rewrap gex -eg - rewrap gview -Rg - rewrap rvim -Z - rewrap rview -RZ - rewrap rgvim -gZ + rewrap ex -e + rewrap view -R + rewrap gvim -g + rewrap gex -eg + rewrap gview -Rg + rewrap rvim -Z + rewrap rview -RZ + rewrap rgvim -gZ rewrap rgview -RgZ rewrap evim -y rewrap eview -yR - rewrap vimdiff -d + rewrap vimdiff -d rewrap gvimdiff -gd ''; diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 30223658f53..09664889f35 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre}: +{ stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { name = "alchemy-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share cp -a . $out/share/alchemy cat >> $out/bin/alchemy << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/alchemy ${jre}/bin/java -jar Alchemy.jar "$@" EOF diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 7af7c8986f2..cc08dce906c 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, callPackage, libpng12, imagemagick, - autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin }: +{ stdenv, fetchurl, callPackage, libpng12, imagemagick +, autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin +, runtimeShell }: # TODO: Figure out why the resultant binary is somehow linked against # libpng16.so.16 rather than libpng12. @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { # pstoedit-config no longer exists, it was replaced with pkg-config mkdir wrappers cat >wrappers/pstoedit-config <<'EOF' - #!${stdenv.shell} + #!${runtimeShell} # replace --version with --modversion for pkg-config args=''${@/--version/--modversion} exec pkg-config pstoedit "''${args[@]}" diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index ac3de4a4e14..d0f2a48c589 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, unzip, jre }: +{ stdenv, fetchurl, makeDesktopItem, unzip, jre, runtimeShell }: stdenv.mkDerivation rec { name = "swingsane-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = let execWrapper = '' - #!${stdenv.shell} + #!${runtimeShell} exec ${jre}/bin/java -jar $out/share/java/swingsane/swingsane-${version}.jar "$@" ''; diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index e27f074b21b..891f3586fa5 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, erlang, cl, libGL, libGLU }: +{ fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { name = "wings-2.2.1"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp ebin/* $out/lib/${name}/ebin cp -R textures shaders plugins $out/lib/$name cat << EOF > $out/bin/wings - #!${stdenv.shell} + #!${runtimeShell} ${erlang}/bin/erl \ -pa $out/lib/${name}/ebin -run wings_start start_halt "$@" EOF @@ -43,4 +43,3 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index c60d4b7b904..ac3d303a7a6 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre, unzip}: +{ stdenv, fetchurl, jre, unzip, runtimeShell }: stdenv.mkDerivation rec { version = "0.9.0"; pname = "zgrviewer"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -r target/* "$out/share/java/zvtm/" - echo '#!${stdenv.shell}' > "$out/bin/zgrviewer" + echo '#!${runtimeShell}' > "$out/bin/zgrviewer" echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer" chmod a+x "$out/bin/zgrviewer" ''; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 1144d515284..4227b4155ac 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: +{ stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation rec { name = "avrdudess-2.2.20140102"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { unzip "$src" -d "$out/avrdudess" cat >> "$out/bin/avrdudess" << __EOF__ - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix index 1ea106d6a18..4e620425d5c 100644 --- a/pkgs/applications/misc/curabydagoma/default.nix +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, python, pythonPackages, unzip }: +{ stdenv, runtimeShell, lib, fetchurl, python, pythonPackages, unzip }: # This package uses a precompiled "binary" distribution of CuraByDagoma, # distributed by the editor. @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { mkdir $out/bin cat > $out/bin/curabydago <<EOF - #!${stdenv.shell} + #!${runtimeShell} export PYTHONPATH=$PYTHONPATH ${python.out}/bin/python $out/curabydago/cura.py EOF diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index f05514f3fc5..739df59b31c 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gammu-${version}"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; rev = version; - sha256 = "1hr053z2l5mjgip83fsxnd1rqsp5gwywzagzrgdg243apn1nz0gs"; + sha256 = "1jjaa9r3x6i8gv3yn1ngg815s6gsxblsw4wb5ddm77kamn2qyvpf"; }; patches = [ ./bashcomp-dir.patch ./systemd.patch ]; diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 0cac0e6fd3f..8432ddee007 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -1,12 +1,12 @@ { stdenv, writeScript, fetchFromGitHub , libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite -, enableGlfw ? false, glfw }: +, enableGlfw ? false, glfw, runtimeShell }: let inherit (stdenv.lib) optional makeLibraryPath; wrapperScript = writeScript "glava" '' - #!${stdenv.shell} + #!${runtimeShell} case "$1" in --copy-config) # The binary would symlink it, which won't work in Nix because the diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix index c055bddec69..1647a09edfd 100644 --- a/pkgs/applications/misc/hello-unfree/default.nix +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ stdenv, runtimeShell }: stdenv.mkDerivation rec { name = "example-unfree-package-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cat > $out/bin/hello-unfree << EOF - #!${stdenv.shell} + #!${runtimeShell} echo "Hello, you are running an unfree system!" EOF chmod +x $out/bin/hello-unfree diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 2c46ea3ac9a..72a24026a89 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, java }: +{ stdenv, fetchurl, java, runtimeShell }: stdenv.mkDerivation rec { pname = "jbidwatcher"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" - echo > "$out/bin/${pname}" "#!${stdenv.shell}" + echo > "$out/bin/${pname}" "#!${runtimeShell}" echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}" chmod +x "$out/bin/${pname}" install -D -m644 ${src} ${jarfile} diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 88a7b94897d..a2678d6067f 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }: +{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5, runtimeShell }: python36Packages.buildPythonApplication rec { pname = "multibootusb"; name = "${pname}-${version}"; @@ -40,7 +40,7 @@ python36Packages.buildPythonApplication rec { mkdir "$out/bin" cat > "$out/bin/${pname}" <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd "$share" export PYTHONPATH="$PYTHONPATH:$share" export PATH="$PATH:${parted}/bin:${procps}/bin" diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 7e5a3a7840d..1cc7f419aa2 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, electron } : +{ stdenv, fetchgit, electron, runtimeShell } : stdenv.mkDerivation rec { name = "nix-tour-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share cp -R * $out/share chmod 0755 $out/share/ -R - echo "#!${stdenv.shell}" > $out/bin/nix-tour + echo "#!${runtimeShell}" > $out/bin/nix-tour echo "cd $out/share/" >> $out/bin/nix-tour echo "${electron}/bin/electron $out/share/electron-main.js" >> $out/bin/nix-tour chmod 0755 $out/bin/nix-tour diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 09ec3433862..c98defee57a 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip, runtimeShell }: stdenv.mkDerivation { name = "openjump-1.3.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { s=$out/bin/OpenJump dir=$(echo $out/openjump-*) cat >> $s << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $dir/bin exec ${stdenv.shell} openjump.sh EOF diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index c31d442d2d6..3cb9bc8c979 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -19,6 +19,7 @@ , pkgsi686Linux , which , curl +, jq }: let @@ -41,6 +42,7 @@ let xterm which curl + jq ]; ld32 = diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index b05c8a80399..3599bd0030b 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip }: +{ stdenv, runtimeShell, lib, fetchzip }: stdenv.mkDerivation rec { name = "terminal-notifier-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r terminal-notifier.app $out/Applications cat >$out/bin/terminal-notifier <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/Applications/terminal-notifier.app exec ./Contents/MacOS/terminal-notifier "\$@" EOF diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index ab9611326ca..c057fde95d7 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, runtimeShell }: stdenv.mkDerivation { name = "thinkingrock-binary-2.2.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { /* it would be a really bad idea to put thinkingrock tr executable in PATH! the tr.sh script does use the coreutils tr itself That's why I've renamed the wrapper and called it thinkingrock - However you may not rename the bin/tr script cause it will notice and throw an + However you may not rename the bin/tr script cause it will notice and throw an "java.lang.IllegalArgumentException: Malformed branding token: thinkingrock" exception. I hope that's fine */ @@ -24,15 +24,15 @@ stdenv.mkDerivation { mkdir -p $out/{nix-support/tr-files,bin} cp -r . $out/nix-support/tr-files cat >> $out/bin/thinkingrock << EOF - #!${stdenv.shell} + #!${runtimeShell} exec $out/nix-support/tr-files/bin/tr "$@" EOF chmod +x $out/bin/thinkingrock ''; - + installPhase = ":"; - meta = { + meta = { description = "Task management system"; homepage = http://www.thinkingrock.com.au/; license = "CDDL"; # Common Development and Distribution License diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index a448d35485a..1feec9e4550 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { name = "vue-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{share/vue,bin} cp ${src} "$out/share/vue/vue.jar" - echo '#!${stdenv.shell}' >> "$out/bin/vue" + echo '#!${runtimeShell}' >> "$out/bin/vue" echo '${jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" chmod a+x "$out/bin/vue" ''; diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index dec861009eb..6b3a4f747f4 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonApplication, dateutil, - sqlalchemy, setproctitle, icalendar, pycrypto }: + sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { pname = "yokadi"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2"; - sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17"; + url = "https://yokadi.github.io/download/${pname}-${version}.tar.gz"; + sha256 = "681c8aa52b2e4b5255e1311e76b4b81dcb63ee7f6ca3a47178e684c06baf330f"; }; propagatedBuildInputs = [ @@ -15,7 +15,6 @@ buildPythonApplication rec { sqlalchemy setproctitle icalendar - pycrypto ]; # Yokadi doesn't have any tests diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 62858904ffc..db74d1cc4ee 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0gd426a9xcgs8a9286gavziysq6fw1ilaifsna396dbdm8b571wi"; - sha256bin64 = "05p20l0969rppbyn7965k78ccynng47rg7d7h7piqiwnm6ffg9yx"; - version = "73.0.3683.39"; + sha256 = "1176qg1a5d5lgy80xsywkz4gq0khfj5hgxykci00j827pryfpajh"; + sha256bin64 = "1dqxm82nrabdfwn20j94vs9zgif1jhkqibpx7c1ihq90nw7p17qb"; + version = "73.0.3683.46"; }; dev = { - sha256 = "1yyzhw5zv803ysdj7zf0imdw9cf0mdlw30vphcb59a93nnvhkbb7"; - sha256bin64 = "1a1dswkfc4x2rslkb899fgywv5mfrmcp1d8wxy7h034504r8gy87"; - version = "74.0.3702.0"; + sha256 = "0ji6ps97hkwsy9525cdqd3k3k9nyh217h0gfjdkfb7phg6lf46q5"; + sha256bin64 = "0dg1qljc2gk8qkwckikq1q5wv7g00blc86nxkaqsr3i12rzy3n8g"; + version = "74.0.3710.0"; }; stable = { - sha256 = "0bcc0iksk2v30drwd5zbw7v6sfbw16jqllc12ks2nifrvh058jjp"; - sha256bin64 = "0azyhnmdg3grladpkpsv67zxqiqf5a3x9qjfj8h831kh7i7m3gy8"; - version = "72.0.3626.109"; + sha256 = "0ylig933xzn6c0018nxq95xhl0wkxcm95fdiy2c7s4a4h3hkr5dk"; + sha256bin64 = "04rsgqrr696mq0yr0kmcyslklfnvrnkzf46d479qb2w55q7zh4s5"; + version = "72.0.3626.119"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index ee022e329f9..97163ffa762 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -8,6 +8,7 @@ , gnugrep , curl , gnupg +, runtimeShell , baseName ? "firefox" , basePath ? "pkgs/applications/networking/browsers/firefox-bin" , baseUrl @@ -18,7 +19,7 @@ let channel != "release"; in writeScript "update-${name}" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin set -eux pushd ${basePath} diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 07ae2c040e6..b03720f988a 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -8,13 +8,14 @@ , gnugrep , curl , attrPath +, runtimeShell , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" , versionSuffix ? "" , versionKey ? "version" }: writeScript "update-${attrPath}" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]} url=${baseUrl} diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix index 6a83ac34f3f..cd0ef728f83 100644 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "heptio-ark-${version}"; - version = "0.9.6"; + version = "0.10.0"; goPackagePath = "github.com/heptio/ark"; @@ -10,10 +10,10 @@ buildGoPackage rec { rev = "v${version}"; owner = "heptio"; repo = "ark"; - sha256 = "0q353a6f3hvg1gr6rmg8pbqnkrbgjchdr7f6f9503l1qbyyf95fz"; + sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; }; - postInstall = "rm $bin/bin/generate"; + postInstall = "rm $bin/bin/issue-template-gen"; meta = with stdenv.lib; { description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index a7cfc605824..8d55d529b71 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,44 +1,34 @@ -{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3 -, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook -, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 +, appstream-glib, desktop-file-utils, wrapGAppsHook, curl, gnome3, gst_all_1 +, json-glib, libnotify, libsecret, sqlite, gumbo, glib, gtk3, libgee, libpeas +, libsoup, librest, webkitgtk, gsettings-desktop-schemas, gdk_pixbuf, libxml2 +, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "feedreader"; - version = "2.6.2"; + version = "2.8.2"; src = fetchFromGitHub { owner = "jangernert"; repo = pname; rev = "v${version}"; - sha256 = "1x5milynfa27zyv2jkzyi7ikkszrvzki1hlzv8c2wvcmw60jqb8n"; + sha256 = "1qm7scrz8xm68zizcfn13ll4ksdd004fahki7gbwqagsr1fg62y8"; }; - patches = [ - # See: https://github.com/jangernert/FeedReader/pull/842 - (fetchpatch { - url = "https://github.com/jangernert/FeedReader/commit/f4ce70932c4ddc91783309708402c7c42d627455.patch"; - sha256 = "076fpjn973xg2m35lc6z4h7g5x8nb08sghg94glsqa8wh1ig2311"; - }) - ]; - nativeBuildInputs = [ - meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils - python3 glibcLocales wrapGAppsHook + meson ninja pkgconfig vala gettext appstream-glib desktop-file-utils + libxml2 python3 wrapGAppsHook ]; buildInputs = [ - curl glib json-glib libnotify libsecret sqlite gumbo - ] ++ (with gnome3; [ - gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts - gsettings-desktop-schemas - ]) ++ (with gst_all_1; [ + curl glib json-glib libnotify libsecret sqlite gumbo gtk3 + libgee libpeas libsoup librest webkitgtk gsettings-desktop-schemas + gdk_pixbuf gnome3.gnome-online-accounts hicolor-icon-theme + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); - # vcs_tag function fails with UnicodeDecodeError - LC_ALL = "en_US.UTF-8"; - postPatch = '' patchShebangs meson_post_install.py ''; @@ -47,7 +37,7 @@ stdenv.mkDerivation rec { description = "A modern desktop application designed to complement existing web-based RSS accounts"; homepage = https://jangernert.github.io/FeedReader/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo worldofpeace ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index fcaa1b2c1e8..2b603ed4fa3 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.12"; + stableVersion = "2.1.13"; previewVersion = "2.2.0a1"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -9,8 +9,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "19kk1nc8h6ljczhizkgszw6xma31p0fmh6vkygpmrfwb8975d1s6"; - serverSrcHash = "1rs3l33jf33y02xri0b7chy02cjzd8v7l20ccjw2in8mw08mpc99"; + guiSrcHash = "1hr651s6gqjy5shyy3ysk4fz4hs3p72wiqm4fbpgcs4hyxxd4fi8"; + serverSrcHash = "1dgy5s3dvg4mpyx1zn1qp6wf3vgkymj34ymx4pn1sak45ixij9kz"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 109893850de..e8c28dc3e53 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchurl, gnome2, gtk2, pango, atk, cairo, gdk_pixbuf, glib, +{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk_pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }: let - rpath = lib.makeLibraryPath [ + rpath = stdenv.lib.makeLibraryPath [ alsaLib atk cairo @@ -15,7 +15,7 @@ let gdk_pixbuf glib gnome2.GConf - gtk2 + gtk3 pango libX11 libXScrnSaver @@ -38,44 +38,51 @@ let in stdenv.mkDerivation rec { name = "mattermost-desktop-${version}"; - version = "4.1.2"; + version = "4.2.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz"; - sha256 = "16dn6870bs1nfl2082ym9gwvmqb3i5sli48qprap80p7riph6k9s"; + sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz"; - sha256 = "145zb1l37fa2slfrrlprlwzcc5km3plxs374yhgix25mlg2afkqr"; + sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80"; } else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; + dontConfigure = true; + dontPatchELF = true; + installPhase = '' - mkdir -p $out - cp -R . $out + mkdir -p $out/share/mattermost-desktop + cp -R . $out/share/mattermost-desktop - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${rpath}:$out $out/mattermost-desktop + mkdir -p "$out/bin" + ln -s $out/share/mattermost-desktop/mattermost-desktop \ + $out/bin/mattermost-desktop - patchShebangs $out/create_desktop_file.sh - $out/create_desktop_file.sh + patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh + $out/share/mattermost-desktop/create_desktop_file.sh + rm $out/share/mattermost-desktop/create_desktop_file.sh + mkdir -p $out/share/applications + mv Mattermost.desktop $out/share/applications/Mattermost.desktop - mkdir -p $out/{bin,share/applications} - cp Mattermost.desktop $out/share/applications/Mattermost.desktop - ln -s $out/mattermost-desktop $out/bin/mattermost-desktop + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}:$out/share/mattermost-desktop" \ + $out/share/mattermost-desktop/mattermost-desktop ''; - meta = { + meta = with stdenv.lib; { description = "Mattermost Desktop client"; homepage = https://about.mattermost.com/; - license = lib.licenses.asl20; - platforms = [ - "x86_64-linux" "i686-linux" - ]; + license = licenses.asl20; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.joko ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix index 3c9157081d3..2b744c61ccb 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchgit, bash, libconfig, libevent, openssl, - readline, zlib, lua5_2, python, pkgconfig, jansson +{ stdenv, fetchgit, bash, libconfig, libevent, openssl +, readline, zlib, lua5_2, python, pkgconfig, jansson +, runtimeShell }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { cp ./bin/telegram-cli $out/bin/telegram-wo-key cp ./tg-server.pub $out/ cat > $out/bin/telegram-cli <<EOF - #!${stdenv.shell} + #!${runtimeShell} $out/bin/telegram-wo-key -k $out/tg-server.pub "\$@" EOF chmod +x $out/bin/telegram-cli diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index faf069cebf1..81073222c2b 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, runCommand, writeScriptBin, buildEnv -, pythonPackages, perlPackages +, pythonPackages, perlPackages, runtimeShell }: weechat: @@ -60,7 +60,7 @@ let in "${scripts};${init}"; mkWeechat = bin: (writeScriptBin bin '' - #!${stdenv.shell} + #!${runtimeShell} export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init} diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 6e2e8d58c67..88e573f6cf4 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, unzip, jre }: +{ stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }: let version = "1.9"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { mv $dir/${uname}/* $dir rmdir $dir/${uname} cat <<_EOF > $out/bin/msgviewer - #!${stdenv.shell} -eu + #!${runtimeShell} -eu exec ${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" _EOF chmod 755 $out/bin/msgviewer diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index a8c322b42b8..0da451ed51e 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl -, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell }: let muttWrapper = writeScript "mutt" '' - #!${stdenv.shell} -eu + #!${runtimeShell} -eu echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.' echo "" diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 9c4c22dabe9..892ebcee99f 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -32,6 +32,7 @@ , autorunLinkHandler ? true # Update script , writeScript +, runtimeShell }: let @@ -130,7 +131,7 @@ stdenv.mkDerivation { dontStrip = true; dontPatchElf = true; - updateScript = import ./update.nix { inherit stdenv writeScript; }; + updateScript = import ./update.nix { inherit stdenv writeScript runtimeShell; }; meta = with stdenv.lib; { homepage = http://www.mendeley.com; diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix index 147c95b8e7b..c174e7dc668 100644 --- a/pkgs/applications/office/mendeley/update.nix +++ b/pkgs/applications/office/mendeley/update.nix @@ -1,7 +1,7 @@ -{ stdenv, writeScript }: +{ stdenv, writeScript, runtimeShell }: writeScript "update-mendeley" '' - #!${stdenv.shell} + #!${runtimeShell} function follow() { local URL=$1 while true; do diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 9f4ed80e6d8..ad621303d7d 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, patchelf, coreutils, pcsclite -, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }: +, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl +, runtimeShell }: let libPath = stdenv.lib.makeLibraryPath [ @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { mkdir "$out/bin" cat > $out/bin/moneyplex <<EOF - #!${stdenv.shell} + #!${runtimeShell} if [ -z "\$XDG_DATA_HOME" ]; then MDIR=\$HOME/.local/share/moneyplex diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index 57e1e219b9a..63bc0911d25 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , xorgproto, motif, libX11, libXt, libXpm, bison -, flex, automake, autoconf, libtool +, flex, automake, autoconf, libtool, runtimeShell }: stdenv.mkDerivation rec { @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { ''; allianceInstaller = '' - #!${stdenv.shell} + #!${runtimeShell} cp -v -r -n --no-preserve=mode $out/etc/* /etc/ > /etc/alliance-install.log ''; allianceUnInstaller = '' - #!${stdenv.shell} + #!${runtimeShell} awk '{print \$3}' /etc/alliance-install.log | xargs rm awk '{print \$3}' /etc/alliance-install.log | xargs rmdir rm /etc/alliance-install.log diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index d5720440f7c..69b111562ab 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig , openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi -, libxcb, cups, xkeyboardconfig +, libxcb, cups, xkeyboardconfig, runtimeShell }: let @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)" mkdir -p "$out"/bin cat > "$out"/bin/eagle << EOF - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:${libPath}" export LD_PRELOAD="$out/lib/eagle_fixer.so" export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix new file mode 100644 index 00000000000..b6ebce68193 --- /dev/null +++ b/pkgs/applications/science/logic/clprover/clprover.nix @@ -0,0 +1,27 @@ +{ stdenv, pkgs, fetchzip }: + +stdenv.mkDerivation rec { + name = "clprover-${version}"; + version = "1.0.3"; + + src = fetchzip { + url = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip"; + sha256 = "10kmlg4m572qwfzi6hkyb0ypb643xw8sfb55xx7866lyh37w1q3s"; + stripRoot = false; + }; + + installPhase = '' + mkdir $out + cp -r bin $out/bin + mkdir -p $out/share/clprover + cp -r examples $out/share/clprover/examples + ''; + + meta = with stdenv.lib; { + description = "Resolution-based theorem prover for Coalition Logic implemented in C++"; + homepage = http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/; + license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3 + maintainers = with maintainers; [ mgttlinger ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index ffd25b6238b..099e2102c51 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, num, camlp5 }: +{ stdenv, runtimeShell, fetchFromGitHub, ocaml, num, camlp5 }: let load_num = @@ -11,7 +11,7 @@ let start_script = '' - #!${stdenv.shell} + #!${runtimeShell} cd $out/lib/hol_light exec ${ocaml}/bin/ocaml \ -I \`${camlp5}/bin/camlp5 -where\` \ diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index a3834dc70b6..dcea9c27acb 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openjdk}: +{stdenv, fetchurl, openjdk, runtimeShell}: stdenv.mkDerivation rec { pname = "leo3"; version = "1.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{bin,lib/java/leo3} cp "${jar}" "$out/lib/java/leo3/leo3.jar" - echo "#!${stdenv.shell}" > "$out/bin/leo3" + echo "#!${runtimeShell}" > "$out/bin/leo3" echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3" chmod a+x "$out/bin/leo3" ''; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index c22c15b3a4b..a3b369ad54a 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37842/why3-1.1.1.tar.gz; - sha256 = "065ix1ill009bxg7w27s8wq47vn03vbr63hsaa79arv31d96izny"; + url = https://gforge.inria.fr/frs/download.php/file/37903/why3-1.2.0.tar.gz; + sha256 = "0xz001jhi71ja8vqrjz27v63bidrzj4qvg1yqarq6p4dmpxhk348"; }; buildInputs = (with ocamlPackages; [ diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index c71099ad6a7..b4ff9fc1821 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -12,7 +12,7 @@ in melee = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip"; - sha256 = "0w050yah5rybx3m5zvpr09jv01r0xsazpyrc76338b2sd8pdxv3y"; + sha256 = "0z44pgy10jklsvgpr0kcn4c2mz3hw7nlcmvsy6a6lzpi3dvzf33i"; stripRoot = false; }; ladder2017season1 = fetchzip' { diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index b9d0a9ef448..7302b5e337d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -1,6 +1,7 @@ { stdenv , fetchFromGitHub , fetchpatch +, runtimeShell }: # This file is responsible for fetching the sage source and adding necessary patches. @@ -121,7 +122,7 @@ stdenv.mkDerivation rec { -e 's/sage-python23/python/g' \ -i {} \; - echo '#!${stdenv.shell} + echo '#!${runtimeShell} python "$@"' > build/bin/sage-python23 # Do not use sage-env-config (generated by ./configure). diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e7199543ad7..0797d75a837 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -82,6 +82,8 @@ let git-hub = callPackage ./git-hub { }; + git-ignore = callPackage ./git-ignore { }; + git-imerge = callPackage ./git-imerge { }; git-octopus = callPackage ./git-octopus { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix new file mode 100644 index 00000000000..9edcf4c3ac4 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: + +with rustPlatform; + +buildRustPackage rec { + name = "git-ignore-${version}"; + version = "0.2.0"; + + cargoSha256 = "1fqfy8lnvpn5sd3l73x2p359zq4303vsrdgw3aphvy6580yjb84d"; + + src = fetchFromGitHub { + owner = "sondr3"; + repo = "git-ignore"; + rev = "v${version}"; + sha256 = "1nihh5inh46r8jg9z7d6g9gqfyhrznmkn15nmzpbnzf0653dl629"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with stdenv.lib; { + description = "Quickly and easily fetch .gitignore templates from gitignore.io"; + homepage = https://github.com/sondr3/git-ignore; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.sondr3 ]; + }; +} 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 331b020d8ca..b5edd256256 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,11 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { - pname = "pre_commit"; - version = "1.11.1"; + pname = "pre-commit"; + version = "1.14.2"; src = fetchPypi { - inherit pname version; - sha256 = "1kjrq8z78b6aqhyyw07dlwf6cqls88kik6f5l07hs71fj5ddvs9w"; + inherit version; + pname = "pre_commit"; + sha256 = "010fwih91gbc20hm2hmkyicm2a2xwrjjg4r4wv24x3n7zn4abdrc"; }; propagatedBuildInputs = [ @@ -17,7 +18,9 @@ with python3Packages; buildPythonApplication rec { six toml virtualenv - ]; + importlib-metadata + ] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources + ++ stdenv.lib.optional (pythonOlder "3.2") futures; # Tests fail due to a missing windll dependency doCheck = false; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 664ef62be54..b27ade204ed 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,8 +1,8 @@ { stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib -, libXfixes, atk, gtk3, libXrender, pango, gnome2, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus -, dpkg, makeDesktopItem, openssl +, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme }: with stdenv.lib; @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "07f9h3276bs7m22vwpxrxmlwnq7l5inr2l67nmpiaz1569yabwsg"; + sha256 = "0zbnw2x15688hjdj10kpp2ipka3j7b2p945a4mzwlsc8a245ljgb"; }; libPath = makeLibraryPath [ @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { comment = "Graphical Git client from Axosoft"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ dpkg ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ dpkg gtk3 gnome3.adwaita-icon-theme hicolor-icon-theme ]; unpackCmd = '' mkdir out @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { rm -rf bin/gitkraken share/lintian cp -av share bin $out/ popd + ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken ''; diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index a329321b70c..344c47eb934 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }: +{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }: let binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; wrapper = writeScript "dvd-slideshow.sh" '' - #!${stdenv.shell} + #!${runtimeShell} # wrapper script for dvd-slideshow programs export PATH=${binPath}:$PATH diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 1fed92764c1..b44aa73bc5a 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -3,7 +3,7 @@ python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 - version = "unstable-2018-04-11"; + version = "unstable-2019-02-10"; pname = "i3pystatus"; disabled = !python3Packages.isPy3k; @@ -11,8 +11,8 @@ python3Packages.buildPythonApplication rec { { owner = "enkore"; repo = "i3pystatus"; - rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc"; - sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b"; + rev = "bcd8f12b18d491029fdd5bd0f433b4500fcdc68e"; + sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ @@ -44,4 +44,3 @@ python3Packages.buildPythonApplication rec { maintainers = [ maintainers.igsha ]; }; } - diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix index 155b26e0987..a887016782e 100644 --- a/pkgs/applications/window-managers/sway/beta.nix +++ b/pkgs/applications/window-managers/sway/beta.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "sway"; - version = "1.0-rc3"; + version = "1.0-rc4"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "1ixwc1bg725x68qr84s8a5i4rlzc4svc52jgdw1yl5bgr6l1k5zc"; + sha256 = "1f0mvf48dvsivdd850r1gd2h90cbn62qflwiff6x2addn868bvxa"; }; postPatch = '' @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; mesonFlags = [ - "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" - "-Dtray=enabled" + "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Dtray=enabled" ] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled"; meta = with stdenv.lib; { @@ -45,6 +44,6 @@ stdenv.mkDerivation rec { homepage = https://swaywm.org; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date. + maintainers = with maintainers; [ primeos synthetica ]; }; } diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 4b20c562460..011ff368509 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -23,7 +23,8 @@ writeScript, writeText, closureInfo, - substituteAll + substituteAll, + runtimeShell }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. @@ -119,7 +120,7 @@ rec { export PATH=${shadow}/bin:$PATH mkdir -p /etc/pam.d if [[ ! -f /etc/passwd ]]; then - echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd + echo "root:x:0:0::/root:${runtimeShell}" > /etc/passwd echo "root:!x:::::::" > /etc/shadow fi if [[ ! -f /etc/group ]]; then @@ -261,7 +262,7 @@ rec { # things like `ls` or `echo` will be missing. shellScript = name: text: writeScript name '' - #!${stdenv.shell} + #!${runtimeShell} set -e export PATH=${coreutils}/bin:/bin ${text} diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 5ab24132290..2d24d5bd704 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation ( mkdir -p $out/bin cat >> $out/bin/${w.name} <<EOF - #!${stdenv.shell} + #!${pkgs.runtimeShell} export JAVA_HOME=$jre $jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@ EOF diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 252a0ff521f..0978f7e1756 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -8,11 +8,11 @@ let deps = makeDeps dependencies; - rustcOpts = - lib.lists.foldl' (opts: opt: opts + " " + opt) - (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=1"] ++ extraRustcOpts); - rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; + rustcOpts = + lib.lists.foldl' (opts: opt: opts + " " + opt) + (if release then "-C opt-level=3" else "-C debuginfo=2") + (["-C codegen-units=1"] ++ extraRustcOpts); + rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; # Some platforms have different names for rustc. rustPlatform = diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 7630c6471dc..9f499e4f5e7 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -1,9 +1,28 @@ { lib, stdenv, echo_build_heading, noisily, makeDeps }: -{ build, buildDependencies, colors, completeBuildDeps, completeDeps, crateAuthors, crateFeatures, crateName, crateVersion, extraLinkFlags, libName, libPath, release, target_os, verbose, workspace_member }: +{ build +, buildDependencies +, colors +, completeBuildDeps +, completeDeps +, crateAuthors +, crateDescription +, crateFeatures +, crateName +, crateVersion +, extraLinkFlags +, extraRustcOpts +, libName +, libPath +, release +, target_os +, verbose +, workspace_member }: let version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; version = lib.splitString "." (lib.head version_); - rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2"); + rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) + (if release then "-C opt-level=3" else "-C debuginfo=2") + (["-C codegen-units=1"] ++ extraRustcOpts); buildDeps = makeDeps buildDependencies; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; @@ -51,6 +70,7 @@ in '' export CARGO_PKG_NAME=${crateName} export CARGO_PKG_VERSION=${crateVersion} export CARGO_PKG_AUTHORS="${authors}" + export CARGO_PKG_DESCRIPTION="${crateDescription}" export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name} export CARGO_CFG_TARGET_OS=${target_os} diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index dbb2f1b80cc..81e8a7ca0af 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -71,7 +71,7 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr processedAttrs = [ "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath" "buildDependencies" "dependencies" "features" - "crateName" "version" "build" "authors" "colors" + "crateName" "version" "build" "authors" "colors" "edition" ]; extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate; buildInputs_ = buildInputs; @@ -129,6 +129,7 @@ stdenv.mkDerivation (rec { build = crate.build or ""; workspace_member = crate.workspace_member or "."; crateVersion = crate.version; + crateDescription = crate.description or ""; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; crateType = if lib.attrByPath ["procMacro"] false crate then ["proc-macro"] else @@ -136,13 +137,15 @@ stdenv.mkDerivation (rec { (crate.type or ["lib"]); colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); + edition = crate.edition or null; + extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_ ++ (lib.optional (edition != null) "--edition ${edition}"); + configurePhase = configureCrate { - inherit crateName buildDependencies completeDeps completeBuildDeps + inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription crateFeatures libName build workspace_member release libPath crateVersion - extraLinkFlags + extraLinkFlags extraRustcOpts crateAuthors verbose colors target_os; }; - extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_; buildPhase = buildCrate { inherit crateName dependencies crateFeatures libName release libPath crateType diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index dd44fed623e..ef69f90c366 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,12 +1,12 @@ -# Generated by carnix 0.9.1: carnix generate-nix +# Generated by carnix 0.9.8: carnix generate-nix { lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: with buildRustCrateHelpers; let inherit (lib.lists) fold; inherit (lib.attrsets) recursiveUpdate; in -let crates = cratesIO; in rec { - carnix = crates.crates.carnix."0.9.2" deps; + crates = cratesIO; + carnix = crates.crates.carnix."0.9.8" deps; __all = [ (carnix {}) ]; deps.aho_corasick."0.6.8" = { memchr = "2.1.0"; @@ -42,7 +42,7 @@ rec { arrayvec = "0.4.7"; constant_time_eq = "0.1.3"; }; - deps.carnix."0.9.2" = { + deps.carnix."0.9.8" = { clap = "2.32.0"; dirs = "1.0.4"; env_logger = "0.5.13"; @@ -56,6 +56,7 @@ rec { serde_json = "1.0.32"; tempdir = "0.3.7"; toml = "0.4.8"; + url = "1.7.2"; }; deps.cc."1.0.25" = {}; deps.cfg_if."0.1.6" = {}; @@ -103,6 +104,11 @@ rec { deps.humantime."1.1.1" = { quick_error = "1.2.2"; }; + deps.idna."0.1.5" = { + matches = "0.1.8"; + unicode_bidi = "0.3.4"; + unicode_normalization = "0.1.7"; + }; deps.itertools."0.7.8" = { either = "1.5.0"; }; @@ -114,6 +120,7 @@ rec { deps.log."0.4.5" = { cfg_if = "0.1.6"; }; + deps.matches."0.1.8" = {}; deps.memchr."1.0.2" = { libc = "0.2.43"; }; @@ -126,6 +133,7 @@ rec { deps.nom."3.2.1" = { memchr = "1.0.2"; }; + deps.percent_encoding."1.0.1" = {}; deps.proc_macro2."0.4.20" = { unicode_xid = "0.1.0"; }; @@ -209,8 +217,17 @@ rec { serde = "1.0.80"; }; deps.ucd_util."0.1.1" = {}; + deps.unicode_bidi."0.3.4" = { + matches = "0.1.8"; + }; + deps.unicode_normalization."0.1.7" = {}; deps.unicode_width."0.1.5" = {}; deps.unicode_xid."0.1.0" = {}; + deps.url."1.7.2" = { + idna = "0.1.5"; + matches = "0.1.8"; + percent_encoding = "1.0.1"; + }; deps.utf8_ranges."1.0.1" = {}; deps.vec_map."0.8.1" = {}; deps.version_check."0.1.5" = {}; diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix index f312cd6e490..3521f0997bd 100644 --- a/pkgs/build-support/rust/crates-io.nix +++ b/pkgs/build-support/rust/crates-io.nix @@ -338,6 +338,65 @@ rec { # end +# carnix-0.9.1 + + crates.carnix."0.9.1" = deps: { features?(features_.carnix."0.9.1" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.9.1"; + authors = [ "pe@pijul.org <pe@pijul.org>" ]; + sha256 = "0dn292d4mjlxif0kclrljzff8rm35cd9d92vycjbzklyhz5d62wi"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.9.1"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.9.1"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.9.1"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.9.1"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.9.1"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.9.1"."log"}" deps) + (crates."nom"."${deps."carnix"."0.9.1"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.9.1"."regex"}" deps) + (crates."serde"."${deps."carnix"."0.9.1"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.9.1"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.9.1"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.9.1"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.9.1"."toml"}" deps) + ]); + }; + features_.carnix."0.9.1" = deps: f: updateFeatures f (rec { + carnix."0.9.1".default = (f.carnix."0.9.1".default or true); + clap."${deps.carnix."0.9.1".clap}".default = true; + dirs."${deps.carnix."0.9.1".dirs}".default = true; + env_logger."${deps.carnix."0.9.1".env_logger}".default = true; + error_chain."${deps.carnix."0.9.1".error_chain}".default = true; + itertools."${deps.carnix."0.9.1".itertools}".default = true; + log."${deps.carnix."0.9.1".log}".default = true; + nom."${deps.carnix."0.9.1".nom}".default = true; + regex."${deps.carnix."0.9.1".regex}".default = true; + serde."${deps.carnix."0.9.1".serde}".default = true; + serde_derive."${deps.carnix."0.9.1".serde_derive}".default = true; + serde_json."${deps.carnix."0.9.1".serde_json}".default = true; + tempdir."${deps.carnix."0.9.1".tempdir}".default = true; + toml."${deps.carnix."0.9.1".toml}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.9.1"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.9.1"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.9.1"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.9.1"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.9.1"."itertools"}" deps) + (features_.log."${deps."carnix"."0.9.1"."log"}" deps) + (features_.nom."${deps."carnix"."0.9.1"."nom"}" deps) + (features_.regex."${deps."carnix"."0.9.1"."regex"}" deps) + (features_.serde."${deps."carnix"."0.9.1"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.9.1"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.9.1"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.9.1"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.9.1"."toml"}" deps) + ]; + + +# end # carnix-0.9.2 crates.carnix."0.9.2" = deps: { features?(features_.carnix."0.9.2" deps {}) }: buildRustCrate { @@ -397,6 +456,68 @@ rec { # end +# carnix-0.9.8 + + crates.carnix."0.9.8" = deps: { features?(features_.carnix."0.9.8" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.9.8"; + authors = [ "pe@pijul.org <pe@pijul.org>" ]; + sha256 = "0c2k98qjm1yyx5wl0wqs0rrjczp6h62ri1x8a99442clxsyvp4n9"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.9.8"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.9.8"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.9.8"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.9.8"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.9.8"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.9.8"."log"}" deps) + (crates."nom"."${deps."carnix"."0.9.8"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.9.8"."regex"}" deps) + (crates."serde"."${deps."carnix"."0.9.8"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.9.8"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.9.8"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.9.8"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.9.8"."toml"}" deps) + (crates."url"."${deps."carnix"."0.9.8"."url"}" deps) + ]); + }; + features_.carnix."0.9.8" = deps: f: updateFeatures f (rec { + carnix."0.9.8".default = (f.carnix."0.9.8".default or true); + clap."${deps.carnix."0.9.8".clap}".default = true; + dirs."${deps.carnix."0.9.8".dirs}".default = true; + env_logger."${deps.carnix."0.9.8".env_logger}".default = true; + error_chain."${deps.carnix."0.9.8".error_chain}".default = true; + itertools."${deps.carnix."0.9.8".itertools}".default = true; + log."${deps.carnix."0.9.8".log}".default = true; + nom."${deps.carnix."0.9.8".nom}".default = true; + regex."${deps.carnix."0.9.8".regex}".default = true; + serde."${deps.carnix."0.9.8".serde}".default = true; + serde_derive."${deps.carnix."0.9.8".serde_derive}".default = true; + serde_json."${deps.carnix."0.9.8".serde_json}".default = true; + tempdir."${deps.carnix."0.9.8".tempdir}".default = true; + toml."${deps.carnix."0.9.8".toml}".default = true; + url."${deps.carnix."0.9.8".url}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.9.8"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.9.8"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.9.8"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.9.8"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.9.8"."itertools"}" deps) + (features_.log."${deps."carnix"."0.9.8"."log"}" deps) + (features_.nom."${deps."carnix"."0.9.8"."nom"}" deps) + (features_.regex."${deps."carnix"."0.9.8"."regex"}" deps) + (features_.serde."${deps."carnix"."0.9.8"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.9.8"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.9.8"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.9.8"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.9.8"."toml"}" deps) + (features_.url."${deps."carnix"."0.9.8"."url"}" deps) + ]; + + +# end # cc-1.0.25 crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate { @@ -802,6 +923,32 @@ rec { # end +# idna-0.1.5 + + crates.idna."0.1.5" = deps: { features?(features_.idna."0.1.5" deps {}) }: buildRustCrate { + crateName = "idna"; + version = "0.1.5"; + authors = [ "The rust-url developers" ]; + sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy"; + dependencies = mapFeatures features ([ + (crates."matches"."${deps."idna"."0.1.5"."matches"}" deps) + (crates."unicode_bidi"."${deps."idna"."0.1.5"."unicode_bidi"}" deps) + (crates."unicode_normalization"."${deps."idna"."0.1.5"."unicode_normalization"}" deps) + ]); + }; + features_.idna."0.1.5" = deps: f: updateFeatures f (rec { + idna."0.1.5".default = (f.idna."0.1.5".default or true); + matches."${deps.idna."0.1.5".matches}".default = true; + unicode_bidi."${deps.idna."0.1.5".unicode_bidi}".default = true; + unicode_normalization."${deps.idna."0.1.5".unicode_normalization}".default = true; + }) [ + (features_.matches."${deps."idna"."0.1.5"."matches"}" deps) + (features_.unicode_bidi."${deps."idna"."0.1.5"."unicode_bidi"}" deps) + (features_.unicode_normalization."${deps."idna"."0.1.5"."unicode_normalization"}" deps) + ]; + + +# end # itertools-0.7.8 crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate { @@ -927,6 +1074,21 @@ rec { # end +# matches-0.1.8 + + crates.matches."0.1.8" = deps: { features?(features_.matches."0.1.8" deps {}) }: buildRustCrate { + crateName = "matches"; + version = "0.1.8"; + authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; + sha256 = "03hl636fg6xggy0a26200xs74amk3k9n0908rga2szn68agyz3cv"; + libPath = "lib.rs"; + }; + features_.matches."0.1.8" = deps: f: updateFeatures f (rec { + matches."0.1.8".default = (f.matches."0.1.8".default or true); + }) []; + + +# end # memchr-1.0.2 crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate { @@ -1094,6 +1256,21 @@ rec { # end +# percent-encoding-1.0.1 + + crates.percent_encoding."1.0.1" = deps: { features?(features_.percent_encoding."1.0.1" deps {}) }: buildRustCrate { + crateName = "percent-encoding"; + version = "1.0.1"; + authors = [ "The rust-url developers" ]; + sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; + libPath = "lib.rs"; + }; + features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec { + percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); + }) []; + + +# end # proc-macro2-0.4.20 crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate { @@ -1850,6 +2027,56 @@ rec { # end +# unicode-bidi-0.3.4 + + crates.unicode_bidi."0.3.4" = deps: { features?(features_.unicode_bidi."0.3.4" deps {}) }: buildRustCrate { + crateName = "unicode-bidi"; + version = "0.3.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; + libName = "unicode_bidi"; + dependencies = mapFeatures features ([ + (crates."matches"."${deps."unicode_bidi"."0.3.4"."matches"}" deps) + ]); + features = mkFeatures (features."unicode_bidi"."0.3.4" or {}); + }; + features_.unicode_bidi."0.3.4" = deps: f: updateFeatures f (rec { + matches."${deps.unicode_bidi."0.3.4".matches}".default = true; + unicode_bidi = fold recursiveUpdate {} [ + { "0.3.4".default = (f.unicode_bidi."0.3.4".default or true); } + { "0.3.4".flame = + (f.unicode_bidi."0.3.4".flame or false) || + (f.unicode_bidi."0.3.4".flame_it or false) || + (unicode_bidi."0.3.4"."flame_it" or false); } + { "0.3.4".flamer = + (f.unicode_bidi."0.3.4".flamer or false) || + (f.unicode_bidi."0.3.4".flame_it or false) || + (unicode_bidi."0.3.4"."flame_it" or false); } + { "0.3.4".serde = + (f.unicode_bidi."0.3.4".serde or false) || + (f.unicode_bidi."0.3.4".with_serde or false) || + (unicode_bidi."0.3.4"."with_serde" or false); } + ]; + }) [ + (features_.matches."${deps."unicode_bidi"."0.3.4"."matches"}" deps) + ]; + + +# end +# unicode-normalization-0.1.7 + + crates.unicode_normalization."0.1.7" = deps: { features?(features_.unicode_normalization."0.1.7" deps {}) }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.7"; + authors = [ "kwantam <kwantam@gmail.com>" ]; + sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; + }; + features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f (rec { + unicode_normalization."0.1.7".default = (f.unicode_normalization."0.1.7".default or true); + }) []; + + +# end # unicode-width-0.1.5 crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate { @@ -1880,6 +2107,43 @@ rec { # end +# url-1.7.2 + + crates.url."1.7.2" = deps: { features?(features_.url."1.7.2" deps {}) }: buildRustCrate { + crateName = "url"; + version = "1.7.2"; + authors = [ "The rust-url developers" ]; + sha256 = "0qzrjzd9r1niv7037x4cgnv98fs1vj0k18lpxx890ipc47x5gc09"; + dependencies = mapFeatures features ([ + (crates."idna"."${deps."url"."1.7.2"."idna"}" deps) + (crates."matches"."${deps."url"."1.7.2"."matches"}" deps) + (crates."percent_encoding"."${deps."url"."1.7.2"."percent_encoding"}" deps) + ]); + features = mkFeatures (features."url"."1.7.2" or {}); + }; + features_.url."1.7.2" = deps: f: updateFeatures f (rec { + idna."${deps.url."1.7.2".idna}".default = true; + matches."${deps.url."1.7.2".matches}".default = true; + percent_encoding."${deps.url."1.7.2".percent_encoding}".default = true; + url = fold recursiveUpdate {} [ + { "1.7.2".default = (f.url."1.7.2".default or true); } + { "1.7.2".encoding = + (f.url."1.7.2".encoding or false) || + (f.url."1.7.2".query_encoding or false) || + (url."1.7.2"."query_encoding" or false); } + { "1.7.2".heapsize = + (f.url."1.7.2".heapsize or false) || + (f.url."1.7.2".heap_size or false) || + (url."1.7.2"."heap_size" or false); } + ]; + }) [ + (features_.idna."${deps."url"."1.7.2"."idna"}" deps) + (features_.matches."${deps."url"."1.7.2"."matches"}" deps) + (features_.percent_encoding."${deps."url"."1.7.2"."percent_encoding"}" deps) + ]; + + +# end # utf8-ranges-1.0.1 crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate { diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 4206b0f33ff..3fc10c8b0b4 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -8,12 +8,13 @@ , vmTools , gawk , utillinux +, runtimeShell , e2fsprogs }: rec { shellScript = name: text: writeScript name '' - #!${stdenv.shell} + #!${runtimeShell} set -e ${text} ''; diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 5ae8985e3ab..e4712a5ef22 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeScript, file }: +{ stdenv, callPackage, cleanPackaging, fetchurl, writeScript, file }: let lib = stdenv.lib; in { # : string @@ -54,25 +54,6 @@ let "README.*" ]; - globWith = stdenv.lib.concatMapStringsSep "\n"; - rmNoise = globWith (f: - ''rm -rf ${f}'') commonNoiseFiles; - mvMeta = globWith - (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') - commonMetaFiles; - - # Move & remove actions, taking the package doc directory - commonFileActions = writeScript "common-file-actions.sh" '' - #!${stdenv.shell} - set -e - DOCDIR="$1" - shopt -s globstar extglob nullglob - ${rmNoise} - mkdir -p "$DOCDIR" - ${mvMeta} - ''; - - in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -105,21 +86,16 @@ in stdenv.mkDerivation { # TODO(Profpatsch): ensure that there is always a $doc output! postInstall = '' echo "Cleaning & moving common files" - mkdir -p $doc/share/doc/${pname} - ${commonFileActions} $doc/share/doc/${pname} + ${cleanPackaging.commonFileActions { + noiseFiles = commonNoiseFiles; + docFiles = commonMetaFiles; + }} $doc/share/doc/${pname} ${postInstall} ''; postFixup = '' - echo "Checking for remaining source files" - rem=$(find -mindepth 1 -xtype f -print0 \ - | tee $TMP/remaining-files) - if [[ "$rem" != "" ]]; then - echo "ERROR: These files should be either moved or deleted:" - cat $TMP/remaining-files | xargs -0 ${file}/bin/file - exit 1 - fi + ${cleanPackaging.checkForRemainingFiles} ''; meta = { diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix new file mode 100644 index 00000000000..16bae04b21e --- /dev/null +++ b/pkgs/build-support/skaware/clean-packaging.nix @@ -0,0 +1,53 @@ +# set of utilities that assure the cwd of a build +# is completely clean after the build, meaning all +# files were either discarded or moved to outputs. +# This ensures nothing is forgotten and new files +# are correctly handled on update. +{ stdenv, file, writeScript }: + +let + globWith = stdenv.lib.concatMapStringsSep "\n"; + rmNoise = noiseGlobs: globWith (f: + ''rm -rf ${f}'') noiseGlobs; + mvDoc = docGlobs: globWith + (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') + docGlobs; + + # Shell script that implements common move & remove actions + # $1 is the doc directory (will be created). + # Best used in conjunction with checkForRemainingFiles + commonFileActions = + { # list of fileglobs that are removed from the source dir + noiseFiles + # files that are moved to the doc directory ($1) + # TODO(Profpatsch): allow to set target dir with + # { glob = …; to = "html" } (relative to docdir) + , docFiles }: + writeScript "common-file-actions.sh" '' + #!${stdenv.shell} + set -e + DOCDIR="$1" + shopt -s globstar extglob nullglob + ${rmNoise noiseFiles} + mkdir -p "$DOCDIR" + ${mvDoc docFiles} + ''; + + # Shell script to check whether the build directory is empty. + # If there are still files remaining, exit 1 with a helpful + # listing of all remaining files and their types. + checkForRemainingFiles = writeScript "check-for-remaining-files.sh" '' + #!${stdenv.shell} + echo "Checking for remaining source files" + rem=$(find -mindepth 1 -xtype f -print0 \ + | tee $TMP/remaining-files) + if [[ "$rem" != "" ]]; then + echo "ERROR: These files should be either moved or deleted:" + cat $TMP/remaining-files | xargs -0 ${file}/bin/file + exit 1 + fi + ''; + +in { + inherit commonFileActions checkForRemainingFiles; +} diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 454ef8912b3..58bc7147ede 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, stdenvNoCC, lndir }: +{ lib, stdenv, stdenvNoCC, lndir, runtimeShell }: let @@ -15,12 +15,12 @@ rec { /* Run the shell command `buildCommand' to produce a store path named * `name'. The attributes in `env' are added to the environment * prior to running the command. By default `runCommand' runs using - * stdenv with no compiler environment. `runCommandCC` + * stdenv with no compiler environment. `runCommandCC` * * Examples: * runCommand "name" {envVariable = true;} ''echo hello'' * runCommandNoCC "name" {envVariable = true;} ''echo hello'' # equivalent to prior - * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; + * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; */ runCommand = runCommandNoCC; runCommandNoCC = runCommand' stdenvNoCC; @@ -145,11 +145,11 @@ rec { executable = true; destination = "/bin/${name}"; text = '' - #!${stdenv.shell} + #!${runtimeShell} ${text} ''; checkPhase = '' - ${stdenv.shell} -n $out/bin/${name} + ${runtimeShell} -n $out/bin/${name} ''; }; @@ -215,7 +215,7 @@ rec { * myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh; * * # wrotes a setup hook where @bash@ myscript.sh is substituted for the - * # bash interpreter. + * # bash interpreter. * myhellohookSub = makeSetupHook { * deps = [ hello ]; * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; @@ -278,7 +278,7 @@ rec { * packages that cannot be built automatically. * * Examples: - * + * * requireFile { * name = "my-file"; * url = "http://example.com/download/"; diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index e000308bed8..08b93aaf117 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -1,5 +1,6 @@ { stdenv, writeScript, vmTools, makeInitrd , samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip +, runtimeShell }: { sshKey @@ -74,7 +75,7 @@ let loopForever = "while :; do ${coreutils}/bin/sleep 1; done"; initScript = writeScript "init.sh" ('' - #!${stdenv.shell} + #!${runtimeShell} ${coreutils}/bin/cp -L "${sshKey}" /ssh.key ${coreutils}/bin/chmod 600 /ssh.key '' + (if installMode then '' diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix new file mode 100644 index 00000000000..bad78e3433e --- /dev/null +++ b/pkgs/data/fonts/creep/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, fontforge }: + +stdenv.mkDerivation rec { + pname = "creep"; + version = "0.31"; + + src = fetchFromGitHub { + owner = "romeovs"; + repo = pname; + rev = version; + sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n"; + }; + + nativeBuildInputs = [ fontforge ]; + + dontBuild = true; + + installPhase = '' + install -D -m644 creep.bdf "$out/usr/share/fonts/misc/creep.bdf" + ''; + + meta = with stdenv.lib; { + description = "A pretty sweet 4px wide pixel font"; + homepage = https://github.com/romeovs/creep; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ buffet ]; + }; +} diff --git a/pkgs/data/fonts/font-awesome-4/default.nix b/pkgs/data/fonts/font-awesome-4/default.nix deleted file mode 100644 index 34548b97244..00000000000 --- a/pkgs/data/fonts/font-awesome-4/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchzip }: - -let - version = "4.7.0"; -in fetchzip rec { - name = "font-awesome-${version}"; - - url = "https://github.com/FortAwesome/Font-Awesome/archive/v${version}.zip"; - - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile Font-Awesome-${version}/fonts/fontawesome-webfont.ttf -d $out/share/fonts/truetype - ''; - - sha256 = "0w8y7gxbqiy444phg4jl89kc5hq3jffbkhab8p110qy9jx8s106s"; - - meta = with stdenv.lib; { - description = "Font Awesome - TTF font"; - longDescription = '' - Font Awesome gives you scalable vector icons that can instantly be customized. - This package includes only the TTF font. For full CSS etc. see the project website. - ''; - homepage = http://fortawesome.github.io/Font-Awesome/; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ abaldeau ]; - }; -} diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index c1eda7e6a56..595a1c0d37f 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "5.6.3"; + version = "5.7.2"; in fetchzip rec { name = "font-awesome-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "0y3zar7hyx5pj8rpyk2kz3sx6zgrfif2ka2h4rg0b8h8qbja0al6"; + sha256 = "0b3syzz8baxmwzjgz09dnamm4nzmyvb2yddlrm94ww5j9bjk25al"; meta = with stdenv.lib; { description = "Font Awesome - OTF font"; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 4ad03627870..98a98cfa7c8 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "19.01.24"; + version = "19.02.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "18asihcv41jlysb2ynbvbk6fn0lnj7ckaz1nyx1w25a7nk413dnm"; + sha256 = "10jh633rllp9yjfkjjyf8455n84q7ppxw1kk9dp1rsg4dq327ks7"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 967c629324c..ddec15e5f31 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "19.01.24"; + version = "19.02.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0x3d21snfp4v9ippny1jmf2hw5dcscwrlasxvr5bgxhff1idf81c"; + sha256 = "0qn0s7cd795pm0hbx85gxd1s272zxrzf3r9r6da54h149v3wkgzw"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch index 175118ac5ff..57eb4b3d44a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -1,16 +1,15 @@ --- a/libgnome-desktop/gnome-desktop-thumbnail-script.c +++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -536,10 +536,9 @@ add_bwrap (GPtrArray *array, +@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", -- NULL); -+ "@bubblewrap_bin@", -+ "--ro-bind", "/nix/store", "/nix/store", -+ NULL); ++ "@bubblewrap_bin@", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", + NULL); /* These directories might be symlinks into /usr/... */ - for (i = 0; i < G_N_ELEMENTS (usrmerged_dirs); i++) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 6161ccde675..bac8504eeec 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland +, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland, fetchpatch , libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }: stdenv.mkDerivation rec { @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { (substituteAll { src = ./bubblewrap-paths.patch; bubblewrap_bin = "${bubblewrap}/bin/bwrap"; + inherit (builtins) storeDir; + }) + (fetchpatch { + name = "fix-missing-font-cache"; + url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch; + sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb"; }) ]; diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch index 051b7618612..e3ad75b869c 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch @@ -1,6 +1,6 @@ --- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c +++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -514,14 +514,10 @@ add_bwrap (GPtrArray *array, +@@ -514,14 +514,11 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, @@ -8,8 +8,9 @@ - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/lib", "/lib", - "--ro-bind", "/lib64", "/lib64", -+ "@bubblewrap_bin@", -+ "--ro-bind", "@storeDir@", "@storeDir@", ++ "@bubblewrap_bin@", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", "--proc", "/proc", "--dev", "/dev", - "--symlink", "usr/bin", "/bin", diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 8bca7b3b6b5..7b374236a12 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "music"; - version = "5.0.2"; + version = "5.0.3"; name = "elementary-${pname}-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "06mpikzdm01r9j7g15b7fgi4lcnp8cc0wmj17dfli5nmncxghx89"; + sha256 = "0qbny4484kr7lihg54rbhfwah9k43iivk3rivfvn7i5w66vn5spl"; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index fddd4143616..a6ec70a6b58 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeTextFile, writeShellScriptBin, elementary-settings-daemon }: +{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeTextFile, writeShellScriptBin, elementary-settings-daemon, runtimeShell }: let @@ -15,7 +15,7 @@ let # dockitems-script = writeScript "dockitems-script" '' - #!${stdenv.shell} + #!${runtimeShell} elementary_default_settings="${elementary-default-settings}" dock_items="$elementary_default_settings/share/elementary/config/plank/dock1/launchers"/* @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir -p $out/share - cp -avr applications $out/share/ + mkdir -p $out/share/applications + cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list mkdir -p $out/etc/xdg/autostart cp -av ${gnome-keyring}/etc/xdg/autostart/* $out/etc/xdg/autostart diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list b/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list new file mode 100644 index 00000000000..3b5e3b0e77a --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list @@ -0,0 +1,168 @@ +[Default Applications] +application/ogg=io.elementary.music.desktop +application/oxps=org.gnome.Evince.desktop +application/pdf=org.gnome.Evince.desktop +application/postscript=org.gnome.Evince.desktop +application/vnd.ms-xpsdocument=org.gnome.Evince.desktop +application/vnd.rn-realmedia=io.elementary.videos.desktop +application/x-ar=org.gnome.FileRoller.desktop +application/x-arj=org.gnome.FileRoller.desktop +application/x-bzdvi=org.gnome.Evince.desktop +application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop +application/x-bzip=org.gnome.FileRoller.desktop +application/x-bzpdf=org.gnome.Evince.desktop +application/x-bzpostscript=org.gnome.Evince.desktop +application/x-cbr=org.gnome.Evince.desktop +application/x-cbt=org.gnome.Evince.desktop +application/x-cbz=org.gnome.Evince.desktop +application/x-compress=org.gnome.FileRoller.desktop +application/x-compressed-tar=org.gnome.FileRoller.desktop +application/x-dvi=org.gnome.Evince.desktop +application/x-ear=org.gnome.FileRoller.desktop +application/x-extension-m4a=io.elementary.videos.desktop +application/x-extension-mp4=io.elementary.videos.desktop +application/x-flac=io.elementary.music.desktop +application/x-gtar=org.gnome.FileRoller.desktop +application/x-gzdvi=org.gnome.Evince.desktop +application/x-gzip=org.gnome.FileRoller.desktop +application/x-gzpdf=org.gnome.Evince.desktop +application/x-gzpostscript=org.gnome.Evince.desktop +application/x-lha=org.gnome.FileRoller.desktop +application/x-lhz=org.gnome.FileRoller.desktop +application/x-lzop=org.gnome.FileRoller.desktop +application/x-matroska=io.elementary.videos.desktop +application/x-ogg=io.elementary.music.desktop +application/x-perl=io.elementary.code.desktop +application/x-rar-compressed=org.gnome.FileRoller.desktop +application/x-rar=org.gnome.FileRoller.desktop +application/x-rpm=org.gnome.FileRoller.desktop +application/x-tar=org.gnome.FileRoller.desktop +application/x-war=org.gnome.FileRoller.desktop +application/x-xz-compressed-tar=org.gnome.FileRoller.desktop +application/x-xz=org.gnome.FileRoller.desktop +application/x-xzpdf=org.gnome.Evince.desktop +application/x-zip-compressed=org.gnome.FileRoller.desktop +application/x-zip=org.gnome.FileRoller.desktop +application/x-zoo=org.gnome.FileRoller.desktop +application/xhtml+xml=org.gnome.Epiphany.desktop +application/zip=org.gnome.FileRoller.desktop +audio/3gpp=io.elementary.music.desktop +audio/ac3=io.elementary.music.desktop +audio/AMR-WB=io.elementary.music.desktop +audio/AMR=io.elementary.music.desktop +audio/basic=io.elementary.music.desktop +audio/flac=io.elementary.music.desktop +audio/midi=io.elementary.music.desktop +audio/mp4=io.elementary.music.desktop +audio/mpeg=io.elementary.music.desktop +audio/mpegurl=io.elementary.music.desktop +audio/ogg=io.elementary.music.desktop +audio/prs.sid=io.elementary.music.desktop +audio/vnd.rn-realaudio=io.elementary.music.desktop +audio/x-ape=io.elementary.music.desktop +audio/x-flac=io.elementary.music.desktop +audio/x-gsm=io.elementary.music.desktop +audio/x-it=io.elementary.music.desktop +audio/x-m4a=io.elementary.music.desktop +audio/x-matroska=io.elementary.music.desktop +audio/x-mod=io.elementary.music.desktop +audio/x-mp3=io.elementary.music.desktop +audio/x-mpeg=io.elementary.music.desktop +audio/x-mpegurl=io.elementary.music.desktop +audio/x-ms-asf=io.elementary.music.desktop +audio/x-ms-asx=io.elementary.music.desktop +audio/x-ms-wax=io.elementary.music.desktop +audio/x-ms-wma=io.elementary.music.desktop +audio/x-musepack=io.elementary.music.desktop +audio/x-pn-aiff=io.elementary.music.desktop +audio/x-pn-au=io.elementary.music.desktop +audio/x-pn-realaudio-plugin=io.elementary.music.desktop +audio/x-pn-realaudio=io.elementary.music.desktop +audio/x-pn-wav=io.elementary.music.desktop +audio/x-pn-windows-acm=io.elementary.music.desktop +audio/x-real-audio=io.elementary.music.desktop +audio/x-realaudio=io.elementary.music.desktop +audio/x-sbc=io.elementary.music.desktop +audio/x-scpls=io.elementary.music.desktop +audio/x-speex=io.elementary.music.desktop +audio/x-tta=io.elementary.music.desktop +audio/x-vorbis+ogg=io.elementary.music.desktop +audio/x-vorbis=io.elementary.music.desktop +audio/x-wav=io.elementary.music.desktop +audio/x-wavpack=io.elementary.music.desktop +audio/x-xm=io.elementary.music.desktop +image/bmp=io.elementary.photos-viewer.desktop +image/gif=io.elementary.photos-viewer.desktop +image/jpeg=io.elementary.photos-viewer.desktop +image/jpg=io.elementary.photos-viewer.desktop +image/pjpeg=io.elementary.photos-viewer.desktop +image/png=io.elementary.photos-viewer.desktop +image/tiff=io.elementary.photos-viewer.desktop +image/vnd.djvu=org.gnome.Evince.desktop +image/vnd.rn-realpix=io.elementary.videos.desktop +image/webp=io.elementary.photos-viewer.desktop +image/x-bmp=io.elementary.photos-viewer.desktop +image/x-bzeps=org.gnome.Evince.desktop +image/x-eps=org.gnome.Evince.desktop +image/x-gzeps=org.gnome.Evince.desktop +image/x-png=io.elementary.photos-viewer.desktop +inode/directory=io.elementary.files.desktop +misc/ultravox=io.elementary.videos.desktop +multipart/x-zip=org.gnome.FileRoller.desktop +text/calendar=io.elementary.calendar.desktop +text/html=org.gnome.Epiphany.desktop +text/mathml=io.elementary.code.desktop +text/plain=io.elementary.code.desktop +text/x-chdr=io.elementary.code.desktop +text/x-csrc=io.elementary.code.desktop +text/x-dtd=io.elementary.code.desktop +text/x-java=io.elementary.code.desktop +text/x-python=io.elementary.code.desktop +text/x-sql=io.elementary.code.desktop +text/xml=io.elementary.code.desktop +video/3gpp=io.elementary.videos.desktop +video/dv=io.elementary.videos.desktop +video/fli=io.elementary.videos.desktop +video/flv=io.elementary.videos.desktop +video/mp2t=io.elementary.videos.desktop +video/mp4=io.elementary.videos.desktop +video/mp4v-es=io.elementary.videos.desktop +video/mpeg=io.elementary.videos.desktop +video/msvideo=io.elementary.videos.desktop +video/ogg=io.elementary.videos.desktop +video/quicktime=io.elementary.videos.desktop +video/vivo=io.elementary.videos.desktop +video/vnd.divx=io.elementary.videos.desktop +video/vnd.rn-realvideo=io.elementary.videos.desktop +video/vnd.vivo=io.elementary.videos.desktop +video/webm=io.elementary.videos.desktop +video/x-anim=io.elementary.videos.desktop +video/x-avi=io.elementary.videos.desktop +video/x-flc=io.elementary.videos.desktop +video/x-fli=io.elementary.videos.desktop +video/x-flic=io.elementary.videos.desktop +video/x-flv=io.elementary.videos.desktop +video/x-m4v=io.elementary.videos.desktop +video/x-matroska=io.elementary.videos.desktop +video/x-mpeg=io.elementary.videos.desktop +video/x-ms-asf=io.elementary.videos.desktop +video/x-ms-asx=io.elementary.videos.desktop +video/x-ms-wm=io.elementary.videos.desktop +video/x-ms-wmv=io.elementary.videos.desktop +video/x-ms-wmx=io.elementary.videos.desktop +video/x-ms-wvx=io.elementary.videos.desktop +video/x-msvideo=io.elementary.videos.desktop +video/x-nsv=io.elementary.videos.desktop +video/x-ogm+ogg=io.elementary.videos.desktop +video/x-theora+ogg=io.elementary.videos.desktop +video/x-totem-stream=io.elementary.videos.desktop +x-content/image-dcf=io.elementary.photos.desktop +x-content/image-picturecd=io.elementary.photos.desktop +x-content/video-dvd=io.elementary.videos.desktop +x-content/video-svcd=io.elementary.videos.desktop +x-content/video-vcd=io.elementary.videos.desktop +x-scheme-handler/http=org.gnome.Epiphany.desktop +x-scheme-handler/https=org.gnome.Epiphany.desktop +x-scheme-handler/mailto=org.gnome.Evolution.desktop +x-scheme-handler/trash=io.elementary.files.desktop + diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 97acc2c791b..ba14621e8bd 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "unstable-2018-12-16"; + version = "unstable-2019-02-09"; # Is tracking https://github.com/elementary/gala/commits/stable/juno src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = "7f1e392e03000df0bd47e7832bb3adab81f39ae5"; - sha256 = "1syqq0xfyg5nbnnmy0wp5d66k1bvq9qn27lvr37abxxqig9acpc8"; + rev = "1a96644c6aac405927499dacb308dea13512e919"; + sha256 = "1zi7xyzhsypf52zzfwf7dwcxgd0skxbsssv1vsxgmswszg23p7i3"; }; passthru = { diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index fc77e163e8f..ae1ee50a121 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gettext, kdoctools, python, - kcoreaddons, knotifications, kwayland, kwidgetsaddons, + kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, cups, pcre, pipewire }: @@ -10,6 +10,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ cups pcre pipewire - kcoreaddons knotifications kwayland kwidgetsaddons + kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem ]; } diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 9e160acf2d4..abe3c9e5122 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -61,8 +61,9 @@ let export HEX_OFFLINE=1 export HEX_HOME=`pwd` export MIX_ENV=prod + export MIX_NO_DEPS=1 - MIX_ENV=prod mix compile ${debugInfoFlag} --no-deps-check + mix compile ${debugInfoFlag} runHook postBuild '' diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index ae6af8dd4b4..646963eedbc 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4 }: +{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: let options = rec { @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { cp -r . "$out/share/ccl-installation" mkdir -p "$out/bin" - echo -e '#!${stdenv.shell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" + echo -e '#!${runtimeShell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" chmod a+x "$out"/bin/"${CCL_RUNTIME}" ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl ''; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 3d9fe3a59cf..960a54489da 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, python, runtimeShell }: stdenv.mkDerivation rec { name = "cmdstan-2.17.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary cat > $out/bin/stan <<EOF - #!${stdenv.shell} + #!${runtimeShell} make -C $out/opt/cmdstan "\$(realpath "\$1")" EOF chmod a+x $out/bin/stan diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 1c9bc0a3009..db3731c2fca 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation -, mailcap +, mailcap, runtimeShell , buildPackages, targetPackages }: let @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # This source produces shell script at run time, # and thus it is not corrected by patchShebangs. substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' # Patch the mimetype database location which is missing on NixOS. substituteInPlace src/mime/type_unix.go \ @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isAarch32 '' - echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index ca6723172d7..261a1d0f94c 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -79,8 +79,8 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 678ec759425..6c935fd88de 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -120,8 +120,8 @@ in stdenv.mkDerivation rec { "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index aac9c4275ad..5cd7901fe22 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -100,8 +100,8 @@ in stdenv.mkDerivation (rec { "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index f16f3f72137..16a716d32fa 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" ] ++ optionals enableSharedLibraries [ diff --git a/pkgs/development/compilers/llvm/7/bintools.nix b/pkgs/development/compilers/llvm/7/bintools.nix new file mode 100644 index 00000000000..72a2a733193 --- /dev/null +++ b/pkgs/development/compilers/llvm/7/bintools.nix @@ -0,0 +1,19 @@ +{ runCommand, stdenv, llvm, lld, version }: + +let + prefix = + if stdenv.hostPlatform != stdenv.targetPlatform + then "${stdenv.targetPlatform.config}-" + else ""; +in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/${prefix}$(basename $prog) + done + for prog in ${llvm}/bin/*; do + ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||") + ln -sf $prog $out/bin/${prefix}$(basename $prog) + done + rm -f $out/bin/${prefix}cat + ln -s ${lld}/bin/lld $out/bin/${prefix}ld +'' diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index bc6767e8766..e4252647ce6 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -1,10 +1,10 @@ { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false +, enablePolly ? false # TODO: get this info from llvm (passthru?) }: let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; self = stdenv.mkDerivation ({ name = "clang-${version}"; @@ -30,6 +30,9 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ stdenv.lib.optionals enablePolly [ + "-DWITH_POLLY=ON" + "-DLINK_POLLY_INTO_TOOLS=ON" ]; patches = [ ./purity.patch ]; @@ -77,8 +80,8 @@ let passthru = { isClang = true; inherit llvm; - } // stdenv.lib.optionalAttrs stdenv.targetPlatform.isLinux { - inherit gcc; + } // stdenv.lib.optionalAttrs (stdenv.targetPlatform.isLinux || (stdenv.cc.isGNU && stdenv.cc.cc ? gcc)) { + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; }; meta = { diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index dff9cb9c49c..1c5d647a226 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -7,8 +7,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - configureFlags = [ + cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_C_FLAGS=-nodefaultlibs" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" ]; outputs = [ "out" "dev" ]; @@ -16,7 +27,8 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch; + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra @@ -26,11 +38,23 @@ stdenv.mkDerivation rec { postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include <stdlib.h>" "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include <assert.h>" "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include <assert.h>" "" ''; # Hack around weird upsream RPATH bug postInstall = stdenv.lib.optionalString stdenv.isDarwin '' ln -s "$out/lib"/*/* "$out/lib" + '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o + ln -s $out/lib/*/cclang_rt.crtend-*.o $out/lib/linux/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o ''; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch b/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch new file mode 100644 index 00000000000..032b04708d1 --- /dev/null +++ b/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch @@ -0,0 +1,595 @@ +Get crtbegin and crtend without compiler GCC! PR is at https://reviews.llvm.org/D28791 + +Index: compiler-rt/CMakeLists.txt +=================================================================== +--- compiler-rt/CMakeLists.txt ++++ compiler-rt/CMakeLists.txt +@@ -29,6 +29,8 @@ + + option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON) + mark_as_advanced(COMPILER_RT_BUILD_BUILTINS) ++option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON) ++mark_as_advanced(COMPILER_RT_BUILD_CRT) + option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON) + mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS) + option(COMPILER_RT_BUILD_XRAY "Build xray" ON) +Index: compiler-rt/cmake/Modules/AddCompilerRT.cmake +=================================================================== +--- compiler-rt/cmake/Modules/AddCompilerRT.cmake ++++ compiler-rt/cmake/Modules/AddCompilerRT.cmake +@@ -132,7 +132,7 @@ + # Adds static or shared runtime for a list of architectures and operating + # systems and puts it in the proper directory in the build and install trees. + # add_compiler_rt_runtime(<name> +-# {STATIC|SHARED} ++# {OBJECT|STATIC|SHARED} + # ARCHS <architectures> + # OS <os list> + # SOURCES <source files> +@@ -144,8 +144,8 @@ + # PARENT_TARGET <convenience parent target> + # ADDITIONAL_HEADERS <header files>) + function(add_compiler_rt_runtime name type) +- if(NOT type MATCHES "^(STATIC|SHARED)$") +- message(FATAL_ERROR "type argument must be STATIC or SHARED") ++ if(NOT type MATCHES "^(OBJECT|STATIC|SHARED)$") ++ message(FATAL_ERROR "type argument must be OBJECT, STATIC or SHARED") + return() + endif() + cmake_parse_arguments(LIB +@@ -204,7 +204,10 @@ + message(FATAL_ERROR "Architecture ${arch} can't be targeted") + return() + endif() +- if(type STREQUAL "STATIC") ++ if(type STREQUAL "OBJECT") ++ set(libname "${name}-${arch}") ++ set(output_name_${libname} ${libname}${COMPILER_RT_OS_SUFFIX}) ++ elseif(type STREQUAL "STATIC") + set(libname "${name}-${arch}") + set_output_name(output_name_${libname} ${name} ${arch}) + else() +@@ -270,12 +273,34 @@ + set(COMPONENT_OPTION COMPONENT ${libname}) + endif() + +- add_library(${libname} ${type} ${sources_${libname}}) +- set_target_compile_flags(${libname} ${extra_cflags_${libname}}) +- set_target_link_flags(${libname} ${extra_link_flags_${libname}}) +- set_property(TARGET ${libname} APPEND PROPERTY +- COMPILE_DEFINITIONS ${LIB_DEFS}) +- set_target_output_directories(${libname} ${output_dir_${libname}}) ++ if(type STREQUAL "OBJECT") ++ string(TOUPPER ${CMAKE_BUILD_TYPE} config) ++ get_property(cflags SOURCE ${sources_${libname}} PROPERTY COMPILE_FLAGS) ++ separate_arguments(cflags) ++ add_custom_command( ++ OUTPUT ${output_dir_${libname}}/${libname}.o ++ COMMAND ${CMAKE_C_COMPILER} ${sources_${libname}} ${cflags} ${extra_cflags_${libname}} -c -o ${output_dir_${libname}}/${libname}.o ++ DEPENDS ${sources_${libname}} ++ COMMENT "Building C object ${libname}.o") ++ add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${libname}.o) ++ install(FILES ${output_dir_${libname}}/${libname}.o ++ DESTINATION ${install_dir_${libname}} ++ ${COMPONENT_OPTION}) ++ else() ++ add_library(${libname} ${type} ${sources_${libname}}) ++ set_target_compile_flags(${libname} ${extra_cflags_${libname}}) ++ set_target_link_flags(${libname} ${extra_link_flags_${libname}}) ++ set_property(TARGET ${libname} APPEND PROPERTY ++ COMPILE_DEFINITIONS ${LIB_DEFS}) ++ set_target_output_directories(${libname} ${output_dir_${libname}}) ++ install(TARGETS ${libname} ++ ARCHIVE DESTINATION ${install_dir_${libname}} ++ ${COMPONENT_OPTION} ++ LIBRARY DESTINATION ${install_dir_${libname}} ++ ${COMPONENT_OPTION} ++ RUNTIME DESTINATION ${install_dir_${libname}} ++ ${COMPONENT_OPTION}) ++ endif() + set_target_properties(${libname} PROPERTIES + OUTPUT_NAME ${output_name_${libname}}) + set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime") +@@ -299,13 +324,6 @@ + ) + endif() + endif() +- install(TARGETS ${libname} +- ARCHIVE DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION} +- LIBRARY DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION} +- RUNTIME DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION}) + + # We only want to generate per-library install targets if you aren't using + # an IDE because the extra targets get cluttered in IDEs. +Index: compiler-rt/cmake/config-ix.cmake +=================================================================== +--- compiler-rt/cmake/config-ix.cmake ++++ compiler-rt/cmake/config-ix.cmake +@@ -227,6 +227,7 @@ + ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X}) + set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} + ${MIPS32} ${MIPS64} ${PPC64} ${S390X}) ++set(ALL_CRT_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}) + set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64}) + set(ALL_FUZZER_SUPPORTED_ARCH ${X86_64} ${ARM64}) + +@@ -474,6 +475,7 @@ + SANITIZER_COMMON_SUPPORTED_ARCH) + + else() ++ filter_available_targets(CRT_SUPPORTED_ARCH ${ALL_CRT_SUPPORTED_ARCH}) + # Architectures supported by compiler-rt libraries. + filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH + ${ALL_SANITIZER_COMMON_SUPPORTED_ARCH}) +@@ -563,6 +565,12 @@ + + # TODO: Add builtins support. + ++if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux") ++ set(COMPILER_RT_HAS_CRT TRUE) ++else() ++ set(COMPILER_RT_HAS_CRT FALSE) ++endif() ++ + if (COMPILER_RT_HAS_SANITIZER_COMMON AND DFSAN_SUPPORTED_ARCH AND + OS_NAME MATCHES "Linux") + set(COMPILER_RT_HAS_DFSAN TRUE) +Index: compiler-rt/lib/CMakeLists.txt +=================================================================== +--- compiler-rt/lib/CMakeLists.txt ++++ compiler-rt/lib/CMakeLists.txt +@@ -17,6 +17,10 @@ + add_subdirectory(builtins) + endif() + ++if(COMPILER_RT_BUILD_CRT) ++ add_subdirectory(crt) ++endif() ++ + function(compiler_rt_build_runtime runtime) + string(TOUPPER ${runtime} runtime_uppercase) + if(COMPILER_RT_HAS_${runtime_uppercase}) +Index: compiler-rt/lib/crt/CMakeLists.txt +=================================================================== +--- /dev/null ++++ compiler-rt/lib/crt/CMakeLists.txt +@@ -0,0 +1,101 @@ ++add_compiler_rt_component(crt) ++ ++function(check_cxx_section_exists section output) ++ cmake_parse_arguments(ARG "" "" "SOURCE;FLAGS" ${ARGN}) ++ if(NOT ARG_SOURCE) ++ set(ARG_SOURCE "int main() { return 0; }\n") ++ endif() ++ ++ string(RANDOM TARGET_NAME) ++ set(TARGET_NAME "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmTC_${TARGET_NAME}.dir") ++ file(MAKE_DIRECTORY ${TARGET_NAME}) ++ ++ file(WRITE "${TARGET_NAME}/CheckSectionExists.c" "${ARG_SOURCE}\n") ++ ++ string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions ++ ${CMAKE_C_COMPILE_OBJECT}) ++ ++ set(try_compile_flags "${ARG_FLAGS}") ++ if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET) ++ list(APPEND try_compile_flags "-target ${CMAKE_C_COMPILER_TARGET}") ++ endif() ++ ++ string(REPLACE ";" " " extra_flags "${try_compile_flags}") ++ ++ set(test_compile_command "${CMAKE_C_COMPILE_OBJECT}") ++ foreach(substitution ${substitutions}) ++ if(substitution STREQUAL "<CMAKE_C_COMPILER>") ++ string(REPLACE "<CMAKE_C_COMPILER>" ++ "${CMAKE_C_COMPILER}" test_compile_command ${test_compile_command}) ++ elseif(substitution STREQUAL "<OBJECT>") ++ string(REPLACE "<OBJECT>" "${TARGET_NAME}/CheckSectionExists.o" ++ test_compile_command ${test_compile_command}) ++ elseif(substitution STREQUAL "<SOURCE>") ++ string(REPLACE "<SOURCE>" "${TARGET_NAME}/CheckSectionExists.c" ++ test_compile_command ${test_compile_command}) ++ elseif(substitution STREQUAL "<FLAGS>") ++ string(REPLACE "<FLAGS>" "${CMAKE_C_FLAGS} ${extra_flags}" ++ test_compile_command ${test_compile_command}) ++ else() ++ string(REPLACE "${substitution}" "" test_compile_command ++ ${test_compile_command}) ++ endif() ++ endforeach() ++ ++ string(REPLACE " " ";" test_compile_command "${test_compile_command}") ++ ++ execute_process( ++ COMMAND ${test_compile_command} ++ RESULT_VARIABLE TEST_RESULT ++ OUTPUT_VARIABLE TEST_OUTPUT ++ ERROR_VARIABLE TEST_ERROR ++ ) ++ ++ execute_process( ++ COMMAND ${CMAKE_OBJDUMP} -h "${TARGET_NAME}/CheckSectionExists.o" ++ RESULT_VARIABLE CHECK_RESULT ++ OUTPUT_VARIABLE CHECK_OUTPUT ++ ERROR_VARIABLE CHECK_ERROR ++ ) ++ string(FIND ${CHECK_OUTPUT} ${section} SECTION_FOUND) ++ ++ if(NOT SECTION_FOUND EQUAL -1) ++ set(${output} TRUE PARENT_SCOPE) ++ else() ++ set(${output} FALSE PARENT_SCOPE) ++ endif() ++ ++ file(REMOVE_RECURSE ${TARGET_NAME}) ++endfunction() ++ ++check_cxx_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY ++ SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n") ++ ++append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS) ++ ++foreach(arch ${CRT_SUPPORTED_ARCH}) ++ add_compiler_rt_runtime(clang_rt.crtbegin ++ OBJECT ++ ARCHS ${arch} ++ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c ++ CFLAGS ${CRT_CFLAGS} ++ PARENT_TARGET crt) ++ add_compiler_rt_runtime(clang_rt.crtbegin_shared ++ OBJECT ++ ARCHS ${arch} ++ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c ++ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -fPIC ++ PARENT_TARGET crt) ++ add_compiler_rt_runtime(clang_rt.crtend ++ OBJECT ++ ARCHS ${arch} ++ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c ++ CFLAGS ${CRT_CFLAGS} ++ PARENT_TARGET crt) ++ add_compiler_rt_runtime(clang_rt.crtend_shared ++ OBJECT ++ ARCHS ${arch} ++ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c ++ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -fPIC ++ PARENT_TARGET crt) ++endforeach() +Index: compiler-rt/lib/crt/crtbegin.c +=================================================================== +--- /dev/null ++++ compiler-rt/lib/crt/crtbegin.c +@@ -0,0 +1,110 @@ ++/* ===-- crtbegin.c - Start of constructors and destructors ----------------=== ++ * ++ * The LLVM Compiler Infrastructure ++ * ++ * This file is dual licensed under the MIT and the University of Illinois Open ++ * Source Licenses. See LICENSE.TXT for details. ++ * ++ * ===----------------------------------------------------------------------=== ++ */ ++ ++#include <stddef.h> ++ ++__attribute__((visibility("hidden"))) ++#ifdef CRT_SHARED ++void *__dso_handle = &__dso_handle; ++#else ++void *__dso_handle = (void *)0; ++#endif ++ ++static long __EH_FRAME_LIST__[] __attribute__(( ++ section(".eh_frame"), aligned(sizeof(void *)), visibility("hidden"))) = {}; ++ ++extern void __register_frame_info(const void *, void *) __attribute__((weak)); ++extern void *__deregister_frame_info(const void *) __attribute__((weak)); ++ ++#ifndef CRT_HAS_INITFINI_ARRAY ++typedef void (*fp)(void); ++ ++static fp __CTOR_LIST__[] ++ __attribute__((section(".ctors"), aligned(sizeof(fp)), visibility("hidden"), ++ used)) = {(fp)-1}; ++extern fp __CTOR_LIST_END__[] __attribute__((visibility("hidden"))); ++#endif ++ ++#ifdef CRT_SHARED ++extern void __cxa_finalize(void *) __attribute__((weak)); ++#endif ++ ++static void __attribute__((used)) __do_init() { ++ static _Bool __initialized; ++ if (__builtin_expect(__initialized, 0)) ++ return; ++ __initialized = 1; ++ ++ static struct { void *p[8]; } __object; ++ if (__register_frame_info) ++ __register_frame_info(__EH_FRAME_LIST__, &__object); ++ ++#ifndef CRT_HAS_INITFINI_ARRAY ++ const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1; ++ for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i](); ++#endif ++} ++ ++#ifdef CRT_HAS_INITFINI_ARRAY ++__attribute__((section(".init_array"), ++ used)) static void (*__init)(void) = __do_init; ++#else // CRT_HAS_INITFINI_ARRAY ++#if defined(__i386__) || defined(__x86_64__) ++asm(".pushsection .init,\"ax\",@progbits\n\t" ++ "call " __USER_LABEL_PREFIX__ "__do_init\n\t" ++ ".popsection"); ++#elif defined(__arm__) ++asm(".pushsection .init,\"ax\",%progbits\n\t" ++ "bl " __USER_LABEL_PREFIX__ "__do_init\n\t" ++ ".popsection"); ++#endif // CRT_HAS_INITFINI_ARRAY ++#endif ++ ++#ifndef CRT_HAS_INITFINI_ARRAY ++static fp __DTOR_LIST__[] ++ __attribute__((section(".dtors"), aligned(sizeof(fp)), visibility("hidden"), ++ used)) = {(fp)-1}; ++extern fp __DTOR_LIST_END__[] __attribute__((visibility("hidden"))); ++#endif ++ ++static void __attribute__((used)) __do_fini() { ++ static _Bool __finalized; ++ if (__builtin_expect(__finalized, 0)) ++ return; ++ __finalized = 1; ++ ++#ifdef CRT_SHARED ++ if (__cxa_finalize) ++ __cxa_finalize(__dso_handle); ++#endif ++ ++#ifndef CRT_HAS_INITFINI_ARRAY ++ if (__deregister_frame_info) ++ __deregister_frame_info(__EH_FRAME_LIST__); ++ ++ const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1; ++ for (size_t i = 1; i < n; i++) __DTOR_LIST__[i](); ++#endif ++} ++ ++#ifdef CRT_HAS_INITFINI_ARRAY ++__attribute__((section(".fini_array"), ++ used)) static void (*__fini)(void) = __do_fini; ++#else // CRT_HAS_INITFINI_ARRAY ++#if defined(__i386__) || defined(__x86_64__) ++asm(".pushsection .fini,\"ax\",@progbits\n\t" ++ "call " __USER_LABEL_PREFIX__ "__do_fini\n\t" ++ ".popsection"); ++#elif defined(__arm__) ++asm(".pushsection .fini,\"ax\",%progbits\n\t" ++ "bl " __USER_LABEL_PREFIX__ "__do_fini\n\t" ++ ".popsection"); ++#endif ++#endif // CRT_HAS_INIT_FINI_ARRAY +Index: compiler-rt/lib/crt/crtend.c +=================================================================== +--- /dev/null ++++ compiler-rt/lib/crt/crtend.c +@@ -0,0 +1,23 @@ ++/* ===-- crtend.c - End of constructors and destructors --------------------=== ++ * ++ * The LLVM Compiler Infrastructure ++ * ++ * This file is dual licensed under the MIT and the University of Illinois Open ++ * Source Licenses. See LICENSE.TXT for details. ++ * ++ * ===----------------------------------------------------------------------=== ++ */ ++ ++#include <stdint.h> ++ ++// Put 4-byte zero which is the length field in FDE at the end as a terminator. ++const int32_t __EH_FRAME_LIST_END__[] ++ __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)), used)) = {0}; ++ ++#ifndef CRT_HAS_INITFINI_ARRAY ++typedef void (*fp)(void); ++fp __CTOR_LIST_END__[] ++ __attribute__((section(".ctors"), visibility("hidden"), used)) = {0}; ++fp __DTOR_LIST_END__[] ++ __attribute__((section(".dtors"), visibility("hidden"), used)) = {0}; ++#endif +Index: compiler-rt/test/CMakeLists.txt +=================================================================== +--- compiler-rt/test/CMakeLists.txt ++++ compiler-rt/test/CMakeLists.txt +@@ -73,6 +73,9 @@ + if(COMPILER_RT_BUILD_XRAY) + compiler_rt_test_runtime(xray) + endif() ++ if(COMPILER_RT_HAS_CRT) ++ add_subdirectory(crt) ++ endif() + # ShadowCallStack does not yet provide a runtime with compiler-rt, the tests + # include their own minimal runtime + add_subdirectory(shadowcallstack) +Index: compiler-rt/test/crt/CMakeLists.txt +=================================================================== +--- /dev/null ++++ compiler-rt/test/crt/CMakeLists.txt +@@ -0,0 +1,31 @@ ++set(CRT_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) ++ ++set(CRT_TESTSUITES) ++ ++set(CRT_TEST_DEPS "") ++ ++if(NOT COMPILER_RT_STANDALONE_BUILD AND COMPILER_RT_BUILD_CRT AND ++ COMPILER_RT_HAS_CRT) ++ list(APPEND CRT_TEST_DEPS crt) ++endif() ++ ++set(CRT_TEST_ARCH ${CRT_SUPPORTED_ARCH}) ++if (COMPILER_RT_BUILD_CRT AND COMPILER_RT_HAS_CRT) ++ foreach(arch ${CRT_TEST_ARCH}) ++ set(CRT_TEST_TARGET_ARCH ${arch}) ++ string(TOLOWER "-${arch}-${OS_NAME}" CRT_TEST_CONFIG_SUFFIX) ++ get_test_cc_for_arch(${arch} CRT_TEST_TARGET_CC CRT_TEST_TARGET_CFLAGS) ++ string(TOUPPER ${arch} ARCH_UPPER_CASE) ++ set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) ++ ++ configure_lit_site_cfg( ++ ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in ++ ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) ++ list(APPEND CRT_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) ++ endforeach() ++endif() ++ ++add_lit_testsuite(check-crt "Running the CRT tests" ++ ${CRT_TESTSUITES} ++ DEPENDS ${CRT_TEST_DEPS}) ++set_target_properties(check-crt PROPERTIES FOLDER "Compiler-RT Misc") +Index: compiler-rt/test/crt/dso_handle.cpp +=================================================================== +--- /dev/null ++++ compiler-rt/test/crt/dso_handle.cpp +@@ -0,0 +1,33 @@ ++// RUN: %clangxx -g -DCRT_SHARED -c %s -fPIC -o %tshared.o ++// RUN: %clangxx -g -c %s -fPIC -o %t.o ++// RUN: %clangxx -g -shared -o %t.so -nostdlib %crti %shared_crtbegin %tshared.o %libstdcxx -lc -lm -lgcc_s %shared_crtend %crtn ++// RUN: %clangxx -g -o %t -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn ++// RUN: %run %t 2>&1 | FileCheck %s ++ ++#include <stdio.h> ++ ++// CHECK: 1 ++// CHECK-NEXT: ~A() ++ ++#ifdef CRT_SHARED ++bool G; ++void C() { ++ printf("%d\n", G); ++} ++ ++struct A { ++ A() { G = true; } ++ ~A() { ++ printf("~A()\n"); ++ } ++}; ++ ++A a; ++#else ++void C(); ++ ++int main() { ++ C(); ++ return 0; ++} ++#endif +Index: compiler-rt/test/crt/lit.cfg +=================================================================== +--- /dev/null ++++ compiler-rt/test/crt/lit.cfg +@@ -0,0 +1,80 @@ ++# -*- Python -*- ++ ++import os ++import subprocess ++ ++# Setup config name. ++config.name = 'CRT' + config.name_suffix ++ ++# Setup source root. ++config.test_source_root = os.path.dirname(__file__) ++ ++ ++def get_library_path(file): ++ cmd = subprocess.Popen([config.clang.strip(), ++ config.target_cflags.strip(), ++ '-print-file-name=%s' % file], ++ stdout=subprocess.PIPE, ++ env=config.environment) ++ if not cmd.stdout: ++ lit_config.fatal("Couldn't find the library path for '%s'" % file) ++ dir = cmd.stdout.read().strip() ++ if sys.platform in ['win32'] and execute_external: ++ # Don't pass dosish path separator to msys bash.exe. ++ dir = dir.replace('\\', '/') ++ # Ensure the result is an ascii string, across Python2.5+ - Python3. ++ return str(dir.decode('ascii')) ++ ++ ++def get_libgcc_file_name(): ++ cmd = subprocess.Popen([config.clang.strip(), ++ config.target_cflags.strip(), ++ '-print-libgcc-file-name'], ++ stdout=subprocess.PIPE, ++ env=config.environment) ++ if not cmd.stdout: ++ lit_config.fatal("Couldn't find the library path for '%s'" % file) ++ dir = cmd.stdout.read().strip() ++ if sys.platform in ['win32'] and execute_external: ++ # Don't pass dosish path separator to msys bash.exe. ++ dir = dir.replace('\\', '/') ++ # Ensure the result is an ascii string, across Python2.5+ - Python3. ++ return str(dir.decode('ascii')) ++ ++ ++def build_invocation(compile_flags): ++ return ' ' + ' '.join([config.clang] + compile_flags) + ' ' ++ ++ ++# Setup substitutions. ++config.substitutions.append( ++ ('%clang ', build_invocation([config.target_cflags]))) ++config.substitutions.append( ++ ('%clangxx ', ++ build_invocation(config.cxx_mode_flags + [config.target_cflags]))) ++ ++base_lib = os.path.join( ++ config.compiler_rt_libdir, "clang_rt.%%s-%s.o" % config.target_arch) ++config.substitutions.append(('%crtbegin', base_lib % "crtbegin")) ++config.substitutions.append(('%shared_crtbegin', base_lib % "crtbegin_shared")) ++config.substitutions.append(('%crtend', base_lib % "crtend")) ++config.substitutions.append(('%shared_crtend', base_lib % "crtend_shared")) ++ ++config.substitutions.append( ++ ('%crt1', get_library_path('crt1.o'))) ++config.substitutions.append( ++ ('%crti', get_library_path('crti.o'))) ++config.substitutions.append( ++ ('%crtn', get_library_path('crtn.o'))) ++ ++config.substitutions.append( ++ ('%libgcc', get_libgcc_file_name())) ++ ++config.substitutions.append( ++ ('%libstdcxx', '-l' + config.sanitizer_cxx_lib.lstrip('lib'))) ++ ++# Default test suffixes. ++config.suffixes = ['.c', '.cc', '.cpp'] ++ ++if config.host_os not in ['Linux']: ++ config.unsupported = True +Index: compiler-rt/test/crt/lit.site.cfg.in +=================================================================== +--- /dev/null ++++ compiler-rt/test/crt/lit.site.cfg.in +@@ -0,0 +1,14 @@ ++@LIT_SITE_CFG_IN_HEADER@ ++ ++# Tool-specific config options. ++config.name_suffix = "@CRT_TEST_CONFIG_SUFFIX@" ++config.crt_lit_source_dir = "@CRT_LIT_SOURCE_DIR@" ++config.target_cflags = "@CRT_TEST_TARGET_CFLAGS@" ++config.target_arch = "@CRT_TEST_TARGET_ARCH@" ++config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@" ++ ++# Load common config for all compiler-rt lit tests ++lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") ++ ++# Load tool-specific config that would do the real work. ++lit_config.load_config(config, "@CRT_LIT_SOURCE_DIR@/lit.cfg") diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 3f1192d9626..060bef69bc1 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook -, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith +, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -23,16 +23,22 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc) '' echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags ''; in { llvm = callPackage ./llvm.nix { }; + llvm-polly = callPackage ./llvm.nix { enablePolly = true; }; clang-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; }; + clang-polly-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src; + llvm = tools.llvm-polly; + enablePolly = true; + }; llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; @@ -71,13 +77,63 @@ let lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; + + bintools = callPackage ./bintools.nix {}; + + lldClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + }; + extraPackages = [ + # targetLlvmLibraries.libcxx + # targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + libc = null; + }; + extraPackages = [ + # targetLlvmLibraries.libcxx + # targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoCompilerRt = wrapCCWith rec { + cc = tools.clang-unwrapped; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + libc = null; + }; + extraPackages = [ ]; + extraBuildCommands = '' + echo "-nostartfiles -target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + ''; + }; + }); libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); in { - compiler-rt = callPackage ./compiler-rt.nix {}; + compiler-rt = callPackage ./compiler-rt.nix { + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt + else stdenv; + }; stdenv = overrideCC stdenv buildLlvmTools.clang; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 5bb629931fd..34f8a5478d1 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -16,12 +16,14 @@ , enableManpages ? false , enableSharedLibraries ? true , enablePFM ? !stdenv.isDarwin +, enablePolly ? false }: let inherit (stdenv.lib) optional optionals optionalString; src = fetch "llvm" "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3"; + polly_src = fetch "polly" "0wgvayfilgb530bq51l7szxfb13l24nnrmyji2f6ncq95a24dw8v"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -34,6 +36,9 @@ in stdenv.mkDerivation (rec { unpackFile ${src} mv llvm-${version}* llvm sourceRoot=$PWD/llvm + '' + optionalString enablePolly '' + unpackFile ${polly_src} + mv polly-* $sourceRoot/tools/polly ''; outputs = [ "out" "python" ] @@ -101,7 +106,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" ] ++ optionals enableSharedLibraries [ diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 80ca6ade845..bca50616988 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.16"; + version = "1.5.0"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1myg4wkxnbfn5nz38xy62r1jhjy07x3h0b04vg858n41chdsv4wd"; + sha256 = "1a4c84b6qqi4w4l1zzhnhnywk73j3wb0gjgghzcw0h5syqbqzy8z"; }; buildInputs = [texinfo]; diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index a2a03328b6d..b0ca96f23ac 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -1,32 +1,32 @@ { stdenv, fetchurl, darwin }: let - version = "110.84"; + version = "110.85"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; sources = map fetchurl [ - { url = "${baseurl}/config.tgz"; sha256 = "0cpqrvixqwf64fa94wzwf59p0lnnmwxgkwm3qwhf28l2fv5d640q"; } - { url = "${baseurl}/cm.tgz"; sha256 = "0qq6kdi8xqi3w1rsmi4rgjdbjr9m4crizb1ma5xg51x8h42ccmbh"; } - { url = "${baseurl}/compiler.tgz"; sha256 = "11zfdwr7a10ylzvap2j0c1py11zi500hfnmhd5lvy9spwzray8vd"; } - { url = "${baseurl}/runtime.tgz"; sha256 = "0v2dv0hh0gxnzzxz8vzqn5avxh7mynaj4g9kkbv4gcnxxaylpksz"; } - { url = "${baseurl}/system.tgz"; sha256 = "0612a6qls202l6wbckcd6dklh7nb75fk4c4qmbs9h2h0j3kisszl"; } - { url = "${baseurl}/MLRISC.tgz"; sha256 = "0wnhvy677p2f7pxlk8mmk3gi605nawy1zzn2cf4619wg04v54g6s"; } - { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1pg9y0lcp18fc91y45yb2lysnrzml00xdhcilkc1cx17am394mik"; } - { url = "${baseurl}/old-basis.tgz"; sha256 = "14zdkzfri4a7mj7zck2c43aqkg0y7kppp2nkbihg069g4ifgw5fg"; } - { url = "${baseurl}/ckit.tgz"; sha256 = "0dlccmnchs38www0a3ibrjxipf8xi03d7pgriynjqdyjjgik89by"; } - { url = "${baseurl}/nlffi.tgz"; sha256 = "0c9z2fq8d7ln4flzc5pkfym9rkjhjymjm60v1avh1c337lmai5lb"; } - { url = "${baseurl}/cml.tgz"; sha256 = "16jn5fn8khxnjj0kwjzavx2ms3kv16zy35wamh8k51nv8v3i0qam"; } - { url = "${baseurl}/eXene.tgz"; sha256 = "1701l155aiprzxh5p5whb9qbg368cqq0bzdwkwsxgrrllfhwdq9z"; } - { url = "${baseurl}/ml-lpt.tgz"; sha256 = "19dk9yqq6f5ayqlf7p95aakc4swj6x1j8m0ka2slzzb9g93f2q1g"; } - { url = "${baseurl}/ml-lex.tgz"; sha256 = "0w20w17rd67n6zgxzwq89k9ywc78l3ydxcax0pniwzv6m5d08znc"; } - { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1fdxhy4f2dgs19p20vg7yysi9gxp6hc1ggs97k4zq448y2ssxsyg"; } - { url = "${baseurl}/ml-burg.tgz"; sha256 = "066r0zy5rc60y8kzh2c06hy1b217lh6qffvxlwz8w1w86yqkgsk2"; } - { url = "${baseurl}/pgraph.tgz"; sha256 = "1jy1g9xiv14jj9svb5wgbdm520qbdhamfmxlf31xnh552gg18bxa"; } - { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0nkawi2mdmsw24a1pkwp2brixrvxyqgxzsylp7w7ak35p20l5igc"; } - { url = "${baseurl}/heap2asm.tgz"; sha256 = "159y8c8xnim7p4pyynjirqhwi73lkrq0fksk8wnpcdh5clmwacrx"; } - { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1sgfdnvkqa6wmwg027wg8lvg7zxq36p83bkymy8qkjdlxhxm2nhl"; } - { url = "${baseurl}/doc.tgz"; sha256 = "083h5h937gkhfq3xk982vmng903c83d98yh5fps53f62wib99mhf"; } - { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "10nf79jzmv64ag8c11fxd9ggw21a9kdn9shqkiz1kni3lq63p7m2"; } - { url = "${baseurl}/asdl.tgz"; sha256 = "13jvdgv63h4s8p9q563hyisbz464y88y2flvwyxvi1n11lh15rwb"; } + { url = "${baseurl}/config.tgz"; sha256 = "1qlir3q0vi7f1wyz2jyaiqy3z72d0xngsa122ks5g0b7b0hcdgm1"; } + { url = "${baseurl}/cm.tgz"; sha256 = "0330jkmaxgy085hsgajqikm242gms650rks24mfxhgk11r4ks105"; } + { url = "${baseurl}/compiler.tgz"; sha256 = "1zrqqvi9332g3clrh01z19sl06g3zlnp6zzz5z8rvsfwbiqp929m"; } + { url = "${baseurl}/runtime.tgz"; sha256 = "1n9hd99s2i834yihx4n59gl1cnh7hiiz8im735bmifmv50vzfdf4"; } + { url = "${baseurl}/system.tgz"; sha256 = "17samia4lzcz3mk73i330bspap2ks937arx35n9dr7bws0appfm8"; } + { url = "${baseurl}/MLRISC.tgz"; sha256 = "039g6dwxy96bkvw1z19vwn8q150h7s8jlcmsg851bgz3j3h6vs18"; } + { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1wk4w1npipm6qqgwis2xrbdjamwmiwv6ci4y40nzryhb37yxfj6d"; } + { url = "${baseurl}/old-basis.tgz"; sha256 = "0lkhbkkglz7lk1c93hc1y1di5dx20fgfhybvsqjp1bcwz8jsd70y"; } + { url = "${baseurl}/ckit.tgz"; sha256 = "14qxgw2vhq4dfiv5zl2gdhvjp75s10dqw97mqxffmh3vayyad1fi"; } + { url = "${baseurl}/nlffi.tgz"; sha256 = "16l8iszkyh34dqdbplsxycipvbw61yjamgxllcq8axiq4h7spy7w"; } + { url = "${baseurl}/cml.tgz"; sha256 = "05dlqz4r3qa3rpqgjlx91fsfx7j6gk3dkw28zcgg5g32irmd1la3"; } + { url = "${baseurl}/eXene.tgz"; sha256 = "07mahzxns26hkfax9gc8cq4s8sfzj531wwnm47b8qkhd72d3ncn2"; } + { url = "${baseurl}/ml-lpt.tgz"; sha256 = "0073hfn98l61ryshhqw9855fb49vs9qcz9nplbg2pa2f7manqbk0"; } + { url = "${baseurl}/ml-lex.tgz"; sha256 = "106km17f4wyvhzkx62cfq2gp4ihya8l234550laqb50zf8vxyklq"; } + { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1r0k7lz8xnir271pykbs4agadysbs35kkmg1p816kzfyz5bsrrq9"; } + { url = "${baseurl}/ml-burg.tgz"; sha256 = "10jqasplbxp50ryq74aazbnyaz8l492rhdij5mr1kzyfj79fysh9"; } + { url = "${baseurl}/pgraph.tgz"; sha256 = "1pxqddbrb7y9kp89gz8v8vfjmw4wajfy6757gb8c6x499jarxa60"; } + { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0fkalpdzdrm1gmafn33ck4dw8s92p9iwm4fav4m9jcqyha9az3g7"; } + { url = "${baseurl}/heap2asm.tgz"; sha256 = "056gkmrylyrf0q0r3cpx76zx8mc62033jkn1bnjn0f8r31yhbipc"; } + { url = "${baseurl}/smlnj-c.tgz"; sha256 = "04c4jnylj5dnd4sjywzwnqlv9g7dkrilq6d4cy543dw03yhjdykw"; } + { url = "${baseurl}/doc.tgz"; sha256 = "1rpk9g1nhjpc2b4pmzmj8v80knrhljn17ghiwznnljv53hka7jzx"; } + { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "05rh1y74jvp6zs96mb7nkwbgwwbss0zy2iw4gicdkyf6in0nk4la"; } + { url = "${baseurl}/asdl.tgz"; sha256 = "1d465bncgy92ni6430dbq6isvnysfhvykjrxm98dz82iih7a6vqb"; } ]; in stdenv.mkDerivation { name = "smlnj-${version}"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index feaf5507d1f..28022fdf41c 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.8 + # LTS Haskell 13.9 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -234,7 +234,7 @@ default-package-overrides: - authenticate-oauth ==1.6 - auto ==0.4.3.1 - autoexporter ==1.1.13 - - auto-update ==0.1.4 + - auto-update ==0.1.4.1 - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 @@ -447,7 +447,7 @@ default-package-overrides: - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - conduit-connection ==0.1.0.4 - - conduit-extra ==1.3.0 + - conduit-extra ==1.3.1 - conduit-iconv ==0.1.1.3 - conduit-parse ==0.2.1.0 - conduit-throttle ==0.3.1.0 @@ -644,7 +644,7 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.29 - eliminators ==0.5 - - elm2nix ==0.1.0 + - elm2nix ==0.1.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - emacs-module ==0.1.1 @@ -664,6 +664,7 @@ default-package-overrides: - errors-ext ==0.4.2 - error-util ==0.0.1.2 - ersatz ==0.4.4 + - esqueleto ==2.6.0 - etc ==0.4.1.0 - eventful-core ==0.2.0 - eventful-memory ==0.2.0 @@ -698,7 +699,7 @@ default-package-overrides: - fb ==1.2.1 - fclabels ==2.0.3.3 - feature-flags ==0.1.0.1 - - fedora-dists ==1.0.0.2 + - fedora-dists ==1.0.1 - fedora-haskell-tools ==0.6 - feed ==1.0.1.0 - FenwickTree ==0.1.2.1 @@ -710,6 +711,7 @@ default-package-overrides: - filelock ==0.1.1.2 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 + - filepattern ==0.1.1 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 @@ -784,7 +786,7 @@ default-package-overrides: - generics-mrsop ==1.2.2 - generics-sop ==0.4.0.1 - generics-sop-lens ==0.1.2.1 - - genvalidity ==0.7.0.0 + - genvalidity ==0.7.0.1 - genvalidity-aeson ==0.2.0.2 - genvalidity-bytestring ==0.3.0.1 - genvalidity-containers ==0.5.1.1 @@ -865,9 +867,11 @@ default-package-overrides: - greskell-websocket ==0.1.1.2 - groom ==0.1.2.1 - groundhog ==0.10.0 + - groundhog-inspector ==0.10.0 - groundhog-mysql ==0.10 - groundhog-postgresql ==0.10 - groundhog-sqlite ==0.10.0 + - groundhog-th ==0.10.2 - groups ==0.4.1.0 - guarded-allocation ==0.0.1 - gym-http-api ==0.1.0.1 @@ -901,7 +905,7 @@ default-package-overrides: - haskell-src ==1.0.3.0 - haskell-src-exts ==1.20.3 - haskell-src-exts-util ==0.2.4 - - haskell-src-meta ==0.8.0.3 + - haskell-src-meta ==0.8.1 - haskey-btree ==0.3.0.0 - haskoin-core ==0.8.4 - hasql ==1.3.0.3 @@ -922,7 +926,7 @@ default-package-overrides: - hedgehog ==0.6.1 - hedgehog-corpus ==0.1.0 - hedis ==0.10.10 - - hedn ==0.2.0.0 + - hedn ==0.2.0.1 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.3 @@ -977,8 +981,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.6 - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 @@ -1103,7 +1107,7 @@ default-package-overrides: - inline-c-cpp ==0.3.0.1 - inliterate ==0.1.0 - insert-ordered-containers ==0.2.1.0 - - inspection-testing ==0.4.1.1 + - inspection-testing ==0.4.1.2 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2.2 - integration ==0.2.1 @@ -1184,7 +1188,7 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - language-puppet ==1.4.2 + - language-puppet ==1.4.3 - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.2 - largeword ==1.2.5 @@ -1614,7 +1618,7 @@ default-package-overrides: - proto-lens-runtime ==0.4.0.2 - proto-lens-setup ==0.4.0.2 - protolude ==0.2.3 - - proxied ==0.3 + - proxied ==0.3.1 - psql-helpers ==0.1.0.0 - psqueues ==0.2.7.1 - pureMD5 ==2.1.3 @@ -1825,11 +1829,12 @@ default-package-overrides: - shortcut-links ==0.4.2.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.1.1.0 - - show-prettyprint ==0.2.2 + - show-prettyprint ==0.2.3 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 - - simple-cmd ==0.1.2 + - simple-cmd ==0.1.3 + - simple-cmd-args ==0.1.0.1 - simple-log ==0.9.11 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.28 @@ -2038,6 +2043,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-utilities ==0.2.1.0 - thyme ==0.3.5.5 + - tidal ==1.0.7 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2147,7 +2153,7 @@ default-package-overrides: - uuid ==1.3.13 - uuid-types ==1.0.3 - validation ==1 - - validity ==0.9.0.0 + - validity ==0.9.0.1 - validity-aeson ==0.2.0.2 - validity-bytestring ==0.4.0.0 - validity-containers ==0.3.1.0 @@ -2221,7 +2227,7 @@ default-package-overrides: - websockets-snap ==0.10.3.0 - weigh ==0.0.13 - wide-word ==0.1.0.8 - - wikicfp-scraper ==0.1.0.9 + - wikicfp-scraper ==0.1.0.10 - wild-bind ==0.1.2.3 - wild-bind-x11 ==0.2.0.6 - Win32-notify ==0.3.0.3 @@ -2305,7 +2311,7 @@ default-package-overrides: - yesod-form ==1.6.4 - yesod-form-bootstrap4 ==2.1.0 - yesod-gitrepo ==0.3.0 - - yesod-gitrev ==0.2.0.0 + - yesod-gitrev ==0.2.1 - yesod-markdown ==0.12.6.1 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.1 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ca3b3b54501..f2e842bfdaa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4621,6 +4621,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Earley_0_13_0_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, ListLike, parsec + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "Earley"; + version = "0.13.0.1"; + sha256 = "169qjicjj09wg879vp86ali4rrqpw0ikazvdi3i1qi6pl3yvqq0y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ListLike ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq ListLike parsec + ]; + description = "Parsing all context-free grammars using Earley's algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Ebnf2ps" = callPackage ({ mkDerivation, array, base, containers, directory, happy , old-time, unix @@ -23515,10 +23537,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "alist"; - version = "0.1.0.5"; - sha256 = "19771h6vxzxn0zj0r59qgc6lclks3ysxli21dziavmr784z2dbgn"; - revision = "1"; - editedCabalFile = "1lc1x072g6vkfifh11cfpw95wb0ly9ifs8xg3y1yrpqv4fyl8y0b"; + version = "0.1.0.6"; + sha256 = "19r7g8ghpiklam6pv081sh60d7lrlznpwbp5yqlm5h7ah1m284jh"; libraryHaskellDepends = [ base ]; description = "lists with O(1) append"; license = stdenv.lib.licenses.bsd3; @@ -27254,14 +27274,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_6_3_0" = callPackage + "antiope-athena_6_4_0" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "6.3.0"; - sha256 = "0yzvzhwl92k1v50w1jzlz2zq5rp7n6x1j51fpqrqq97vj7vqzfsq"; + version = "6.4.0"; + sha256 = "0537hjh070l6z5wylbzr41qka3j75q2sbshqcmaazarzllsr5mxk"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -27278,8 +27298,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "6.3.0"; - sha256 = "1d9z3vm7ab6fn0b1v0795v36x36j7lczjgkn2krx7zxq7srzf77l"; + version = "6.4.0"; + sha256 = "1l6a80plff3f9yd2iaw7hpqvas177xbkprz9maxk2xlf7klzpvcd"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -27310,15 +27330,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-core_6_3_0" = callPackage + "antiope-core_6_4_0" = callPackage ({ mkDerivation, amazonka, amazonka-core, base, bytestring , exceptions, generic-lens, http-client, http-types, lens , monad-logger, mtl, resourcet, text, transformers, unliftio-core }: mkDerivation { pname = "antiope-core"; - version = "6.3.0"; - sha256 = "001qkmiild396pg9hnw776djygjm692k1w9bmckn6l9ahiz8yah0"; + version = "6.4.0"; + sha256 = "0snfalkpv9ckh3mkffx96zql3vnr479kkxxdyl2f2iad616a5wss"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens monad-logger mtl resourcet text @@ -27354,15 +27374,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-dynamodb_6_3_0" = callPackage + "antiope-dynamodb_6_4_0" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.3.0"; - sha256 = "0912726sm6g2ssrzni3ldiavb506wa51ib07n4gm8vapzhnwxxlb"; + version = "6.4.0"; + sha256 = "10kdvmfy7aya2yv77048mrkr9xdms5rq4gdip9ssidasib0fxcai"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -27398,15 +27418,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-messages_6_3_0" = callPackage + "antiope-messages_6_4_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson , monad-loops, network-uri, text, unliftio-core }: mkDerivation { pname = "antiope-messages"; - version = "6.3.0"; - sha256 = "0yg38mayxzm7awgn0jczyh3vkyvhm3nmi47vry7knws916xrpr4x"; + version = "6.4.0"; + sha256 = "0m7sag2pk0sba1v14xpc60b7h5pk6s807yi0n5h6xrfsvslp09k9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -27447,27 +27467,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-s3_6_3_0" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core - , attoparsec, base, bytestring, conduit, conduit-extra, exceptions - , generic-lens, hedgehog, hspec, http-types, hw-hspec-hedgehog - , lens, monad-logger, mtl, network-uri, resourcet, text - , unliftio-core + "antiope-s3_6_4_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , antiope-core, attoparsec, base, bytestring, conduit + , conduit-extra, exceptions, generic-lens, hedgehog, hspec + , http-types, hw-hspec-hedgehog, lens, monad-logger, mtl + , network-uri, resourcet, text, time, unliftio-core }: mkDerivation { pname = "antiope-s3"; - version = "6.3.0"; - sha256 = "00szjn9vbb6xndzs0wpq2hw9a529ldy5y0pckfm3xkd6ap5ifx41"; + version = "6.4.0"; + sha256 = "019j8n0rmv4cmkaa8lc69r02lrwbk267y99qbwy3fx2wqdicdij2"; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 antiope-core attoparsec base - bytestring conduit conduit-extra exceptions generic-lens http-types - lens monad-logger mtl network-uri resourcet text unliftio-core + aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec + base bytestring conduit conduit-extra exceptions generic-lens + http-types lens monad-logger mtl network-uri resourcet text time + unliftio-core ]; testHaskellDepends = [ - amazonka amazonka-core amazonka-s3 antiope-core attoparsec base - bytestring conduit conduit-extra exceptions generic-lens hedgehog - hspec http-types hw-hspec-hedgehog lens monad-logger mtl - network-uri resourcet text unliftio-core + aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec + base bytestring conduit conduit-extra exceptions generic-lens + hedgehog hspec http-types hw-hspec-hedgehog lens monad-logger mtl + network-uri resourcet text time unliftio-core ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -27493,21 +27514,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-sns_6_3_0" = callPackage + "antiope-sns_6_4_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base - , generic-lens, lens, text, unliftio-core + , generic-lens, lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "6.3.0"; - sha256 = "0fr51vp8ihlv7pnlrl73knd8wwck1rsw5v4yzm2b8299m7gqd86v"; + version = "6.4.0"; + sha256 = "0ghr37p0k8pgch42cksfdinz7h7q7brvknj7flj1bgkh03j3gw03"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text unliftio-core + text time unliftio-core ]; testHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text unliftio-core + text time unliftio-core ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -27536,7 +27557,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-sqs_6_3_0" = callPackage + "antiope-sqs_6_4_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-sqs, antiope-messages, antiope-s3, base, conduit , generic-lens, lens, lens-aeson, monad-loops, mtl, network-uri @@ -27544,8 +27565,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "6.3.0"; - sha256 = "0a1kkzy9nldhwgh8xvnp4lqv49gpm6q9prnv2bgwlp00izy2r5s1"; + version = "6.4.0"; + sha256 = "067c29virlmi3lizhr9kmakr23ipc6sy2wwhg7wgf1wbmwcszs8j"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base conduit generic-lens lens @@ -31625,23 +31646,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "auto-update"; - version = "0.1.4"; - sha256 = "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy"; - libraryHaskellDepends = [ base ]; - description = "Efficiently run periodic, on-demand actions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "auto-update_0_1_4_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "auto-update"; version = "0.1.4.1"; sha256 = "1jfgxwicd0r31dcbcd83sj99v1w9mbg873xp7v7z21gmxhalpzrm"; libraryHaskellDepends = [ base ]; description = "Efficiently run periodic, on-demand actions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autoexporter" = callPackage @@ -32981,30 +32990,31 @@ self: { "b9" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bifunctors , binary, boxes, bytestring, conduit, conduit-extra, ConfigFile - , directory, filepath, free, hashable, hspec, hspec-expectations - , lens, mtl, optparse-applicative, parallel, parsec, pretty - , pretty-show, process, QuickCheck, random, shake, syb, template - , text, time, transformers, unordered-containers, vector, yaml + , directory, exceptions, extensible-effects, filepath, free + , hashable, hspec, hspec-expectations, lens, mtl + , optparse-applicative, parallel, parsec, pretty, pretty-show + , process, QuickCheck, random, shake, syb, tagged, template, text + , time, transformers, unordered-containers, vector, yaml }: mkDerivation { pname = "b9"; - version = "0.5.61"; - sha256 = "0yr29ynxiwc2qr000c5h1w3k373qvbr5p8z451r3q24i4c6rcrid"; + version = "0.5.63"; + sha256 = "04ni56gqwa8rr8wl00sck2zjyj3nrb5hpf320719ixlj23m4cj4y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bifunctors binary boxes - bytestring conduit conduit-extra ConfigFile directory filepath free - hashable lens mtl parallel parsec pretty pretty-show process - QuickCheck random shake syb template text time transformers - unordered-containers vector yaml + bytestring conduit conduit-extra ConfigFile directory exceptions + extensible-effects filepath free hashable lens mtl parallel parsec + pretty pretty-show process QuickCheck random shake syb tagged + template text time transformers unordered-containers vector yaml ]; executableHaskellDepends = [ - base bytestring directory lens optparse-applicative + base bytestring directory lens optparse-applicative text ]; testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations QuickCheck text - unordered-containers vector yaml + aeson base binary bytestring hspec hspec-expectations QuickCheck + text unordered-containers vector yaml ]; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; @@ -33407,6 +33417,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "barbies_1_1_1_0" = callPackage + ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "barbies"; + version = "1.1.1.0"; + sha256 = "1rlrsxddnlrhx15ki3pwh2hpvcawl5gd6x6i8n9n716ra2p6ca90"; + libraryHaskellDepends = [ base bifunctors ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Classes for working with types that can change clothes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "barchart" = callPackage ({ mkDerivation, base, cmdargs, csv, diagrams, filepath }: mkDerivation { @@ -41704,10 +41731,8 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "bytestring-trie"; - version = "0.2.4.1"; - sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g"; - revision = "1"; - editedCabalFile = "0f56pb1k1va7bs9rpn0b8hclxhn5pcjln857k50myhyzrwz8qg7r"; + version = "0.2.5.0"; + sha256 = "1jpynpyarikxhlc4ifdswvkj0ph9fd5d0vcxhjv0lrv0zwqvv488"; libraryHaskellDepends = [ base binary bytestring ]; description = "An efficient finite map from (byte)strings to values"; license = stdenv.lib.licenses.bsd3; @@ -42673,15 +42698,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "cabal-rpm_0_13" = callPackage + "cabal-rpm_0_13_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , http-client, http-client-tls, http-conduit, process, simple-cmd , time, unix }: mkDerivation { pname = "cabal-rpm"; - version = "0.13"; - sha256 = "063y8f18zsw7slvmjr0w6r2ssvn3p1jb0cs81sihp4fw8371bd50"; + version = "0.13.1"; + sha256 = "1k61jknk99hrw1h4kfkpl0905lgybidvlqn5ny6d54kr5f7fn9d3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -49786,8 +49811,8 @@ self: { }: mkDerivation { pname = "codeworld-api"; - version = "0.2.5"; - sha256 = "0gc1c0hc2sssiksii927kcg5rhalrw1fv3sr4zf4xvzj3nrd0k3m"; + version = "0.3"; + sha256 = "0yxqk74qrbi7rfkwi3p4jnp711s8l6asn1pfvi1n06b5j2fkv24j"; libraryHaskellDepends = [ base blank-canvas cereal cereal-text containers ghc-prim hashable mtl random random-shuffle text time @@ -50971,6 +50996,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compact-mutable-vector" = callPackage + ({ mkDerivation, base, compact, ghc-prim, hspec, primitive, vector + }: + mkDerivation { + pname = "compact-mutable-vector"; + version = "0.0.0.1"; + sha256 = "1plz7rwn66r3b03hn60gsh8w5wk8hgzj0g3hdnc36f2rrav4n7mj"; + libraryHaskellDepends = [ base compact ghc-prim primitive vector ]; + testHaskellDepends = [ base compact hspec ]; + description = "Mutable vector with different GC characteristics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compact-socket" = callPackage ({ mkDerivation, base, binary, bytestring, compact, deepseq , directory, filepath, network, unix @@ -52542,34 +52580,6 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.3.0"; - sha256 = "1bi2b6kdzy5f9glq46jzsk02has95jkxqz0cchpbmnakzhjwjh9c"; - libraryHaskellDepends = [ - async attoparsec base bytestring conduit directory filepath network - primitive process resourcet stm streaming-commons text transformers - typed-process unliftio-core - ]; - testHaskellDepends = [ - async attoparsec base bytestring bytestring-builder conduit - directory exceptions hspec process QuickCheck resourcet stm - streaming-commons text transformers transformers-base - ]; - benchmarkHaskellDepends = [ - base bytestring bytestring-builder conduit gauge transformers - ]; - description = "Batteries included conduit: adapters for common libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-extra_1_3_1" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring - , bytestring-builder, conduit, directory, exceptions, filepath - , gauge, hspec, network, primitive, process, QuickCheck, resourcet - , stm, streaming-commons, text, transformers, transformers-base - , typed-process, unliftio-core - }: - mkDerivation { - pname = "conduit-extra"; version = "1.3.1"; sha256 = "0zfdrpdc86kw2c3gzq5lxdy1qmy069qy7xcjjbnf4359igjyq69v"; libraryHaskellDepends = [ @@ -52587,7 +52597,6 @@ self: { ]; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-find" = callPackage @@ -52843,7 +52852,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "confcrypt_0_2_0_0" = callPackage + "confcrypt_0_2_3_0" = callPackage ({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring , bytestring, conduit, containers, crypto-pubkey-openssh , crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec @@ -52852,8 +52861,8 @@ self: { }: mkDerivation { pname = "confcrypt"; - version = "0.2.0.0"; - sha256 = "0gg1p06lmv7rs143am5kak6n7777f1ccf36xlscxwsyza5j1gi57"; + version = "0.2.3.0"; + sha256 = "1pqgh5jhnf18mfhhq8z39l2kv5pn11zw9zqxb30r75l5qhqvjjic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70720,6 +70729,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm-street" = callPackage + ({ mkDerivation, aeson, base, directory, filepath, prettyprinter + , servant, servant-server, text, time, wai, warp + }: + mkDerivation { + pname = "elm-street"; + version = "0.0.0"; + sha256 = "0my3f08h019rhmyvcbf5xz87wnrd52fsqpiqj6jv1544psczc2sq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory filepath prettyprinter text time + ]; + executableHaskellDepends = [ + base servant servant-server wai warp + ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "Crossing the road between Haskell and Elm"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "elm-websocket" = callPackage ({ mkDerivation, aeson, base, bytestring, concurrent-extra , containers, directory, formatting, hspec, http-types, lens, mtl @@ -70773,31 +70804,6 @@ self: { }: mkDerivation { pname = "elm2nix"; - version = "0.1.0"; - sha256 = "140qv6zvq4860fd5pglhwgd9pnxv6nha3ah3pmp4d2x3jkvg3hcy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base binary bytestring containers data-default - directory filepath here mtl process req text transformers - unordered-containers - ]; - executableHaskellDepends = [ - ansi-wl-pprint base directory here optparse-applicative - ]; - testHaskellDepends = [ base ]; - description = "Turn your Elm project into buildable Nix project"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "elm2nix_0_1_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary - , bytestring, containers, data-default, directory, filepath, here - , mtl, optparse-applicative, process, req, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "elm2nix"; version = "0.1.1"; sha256 = "16b7vv7ndn8mpkg05rhljpmld2dazsgl9yqg8j3mza1f5x4f6jwp"; isLibrary = true; @@ -70813,7 +70819,6 @@ self: { testHaskellDepends = [ base ]; description = "Turn your Elm project into buildable Nix project"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elo" = callPackage @@ -76063,23 +76068,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fedora-dists"; - version = "1.0.0.2"; - sha256 = "0jc7kv2zflxwfbidc4wm6wad8hpwfxw7w2ri1zghk3970dkl7lnl"; - libraryHaskellDepends = [ base ]; - description = "Library for Fedora distribution versions"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "fedora-dists_1_0_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "fedora-dists"; version = "1.0.1"; sha256 = "107ykp3f1f35ghlxfv53mxl0wmj1jyr7xnil16gyg6gcyi0shbll"; libraryHaskellDepends = [ base ]; description = "Library for Fedora distribution versions"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fedora-haskell-tools" = callPackage @@ -78266,12 +78259,12 @@ self: { ({ mkDerivation, base, directory, parsec }: mkDerivation { pname = "flat-tex"; - version = "0.3.1"; - sha256 = "1msf49m61lswj9nplxm22v7xl0vhbj7m3rz5k41mlzdcii28hksp"; + version = "0.6.1"; + sha256 = "1g116pdjlxx8mz3w2bapbcfd4jgk8jl24fg7fck3j2gyh8282zbm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory parsec ]; - description = "flatten a latex multi-file latex document"; + description = "flatten a latex multi-file latex document and remove all comments"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -78767,8 +78760,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.7.0.2"; - sha256 = "025249sdh8w5v1rhykyrm0k3w5ci4lk34fhjr0bgws8gmimvk86f"; + version = "0.7.0.3"; + sha256 = "0lazr0g7hqqxyskyw10jcqdi5l4kgd6hpsrizv7h6g5h6fgqdi1j"; configureFlags = [ "-fopengl" ]; isLibrary = true; isExecutable = true; @@ -78850,8 +78843,8 @@ self: { }: mkDerivation { pname = "fltkhs-themes"; - version = "0.1.0.4"; - sha256 = "0hjx7v02w6dlizb16jpdndy12kp2cxp9y1fbl8asjybhwvqid5sc"; + version = "0.1.0.5"; + sha256 = "1bdcrpc3202a3bgkrfsynvr4a55hx421fw8chg94w9zb23f660qh"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -81211,6 +81204,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "front" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, fay + , text + }: + mkDerivation { + pname = "front"; + version = "0.0.0.1"; + sha256 = "1iaabr2cfvgismar58w7nazi4mckcvxv37qrkjqnxm82zhnv2fgc"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring fay text + ]; + description = "A reactive frontend web framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "frontmatter" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, QuickCheck , text, yaml @@ -82215,6 +82223,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fused-effects_0_2_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, hspec + , MonadRandom, QuickCheck, random + }: + mkDerivation { + pname = "fused-effects"; + version = "0.2.0.0"; + sha256 = "0aarlciyiz57c75nhpbzs2lc5fkm51nmlm5mf2ih9byid5j2ra5f"; + libraryHaskellDepends = [ base deepseq MonadRandom random ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "A fast, flexible, fused effect system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fused-effects-lens" = callPackage ({ mkDerivation, base, fused-effects, hspec, lens }: mkDerivation { @@ -84058,25 +84082,12 @@ self: { ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.7.0.0"; - sha256 = "1bjsqqyr1n306icfdl8sh3amqq95zpr5hawwbv46nbf0rxci88w1"; - libraryHaskellDepends = [ base QuickCheck validity ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck ]; - description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity_0_7_0_1" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: - mkDerivation { - pname = "genvalidity"; version = "0.7.0.1"; sha256 = "1fgd551nv6y5qs2ya9576yl3dfwnb38z6pg2pg9fbdjnk18wikzz"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage @@ -101269,28 +101280,6 @@ self: { }) {}; "haskell-src-meta" = callPackage - ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb - , template-haskell, test-framework, test-framework-hunit - , th-orphans - }: - mkDerivation { - pname = "haskell-src-meta"; - version = "0.8.0.3"; - sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4"; - revision = "2"; - editedCabalFile = "0dp5v0yd0wgijzaggr22glgjswpa65hy84h8awdzd9d78g2fjz6c"; - libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans - ]; - testHaskellDepends = [ - base haskell-src-exts HUnit pretty template-haskell test-framework - test-framework-hunit - ]; - description = "Parse source to template-haskell abstract syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-meta_0_8_1" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty , syb, template-haskell, test-framework, test-framework-hunit , th-orphans @@ -101308,7 +101297,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -105844,27 +105832,6 @@ self: { "hedn" = callPackage ({ mkDerivation, base, containers, deepseq, deriving-compat , hedgehog, megaparsec, parser-combinators, prettyprinter - , scientific, template-haskell, text, time, uuid, vector - }: - mkDerivation { - pname = "hedn"; - version = "0.2.0.0"; - sha256 = "1yi7j2ikpd1lv32hzgv38v1r4wzh7ffq71js2648d4j1v9jhq1sj"; - libraryHaskellDepends = [ - base containers deepseq deriving-compat megaparsec - parser-combinators prettyprinter scientific template-haskell text - time uuid vector - ]; - testHaskellDepends = [ - base containers hedgehog megaparsec text time uuid vector - ]; - description = "EDN parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedn_0_2_0_1" = callPackage - ({ mkDerivation, base, containers, deepseq, deriving-compat - , hedgehog, megaparsec, parser-combinators, prettyprinter , scientific, template-haskell, text, time, uuid-types, vector }: mkDerivation { @@ -105881,7 +105848,6 @@ self: { ]; description = "EDN parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedra" = callPackage @@ -118988,6 +118954,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-types_0_12_3" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive, doctest + , hspec, QuickCheck, quickcheck-instances, text + }: + mkDerivation { + pname = "http-types"; + version = "0.12.3"; + sha256 = "05j00b9nqmwh9zaq9y9x50k81v2pd3j7a71kd91zlnbl8xk4m2jf"; + libraryHaskellDepends = [ + array base bytestring case-insensitive text + ]; + testHaskellDepends = [ + base bytestring doctest hspec QuickCheck quickcheck-instances text + ]; + description = "Generic HTTP types for Haskell (for both client and server code)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-wget" = callPackage ({ mkDerivation, base, failure, process, transformers }: mkDerivation { @@ -124601,22 +124586,6 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.4.1.1"; - sha256 = "1liysxim5lhf0a09asvv7j9hin60bljhp1p642j5j1j0hh2jax4l"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_1_2" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; version = "0.4.1.2"; sha256 = "1rh744nswl7i6wk2gv9qx5rbz74ndd1j5ynmfzdhw3i4jjr99q4v"; libraryHaskellDepends = [ @@ -124625,7 +124594,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -133870,50 +133838,6 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.4.2"; - sha256 = "0bdi51cjl8m48clkqj6lb9vyxdagx2a4q6f48a1q4b50mpinx5qq"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory filecache filepath - formatting hashable hruby hslogger http-api-data http-client lens - lens-aeson megaparsec memory mtl operational parsec - parser-combinators pcre-utils protolude random regex-pcre-builtin - scientific servant servant-client split stm strict-base-types text - time transformers unix unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint async base bytestring containers Glob hslogger - http-client lens mtl optparse-applicative regex-pcre-builtin - strict-base-types text transformers unordered-containers vector - yaml - ]; - testHaskellDepends = [ - base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl - pcre-utils scientific strict-base-types temporary text transformers - unordered-containers vector - ]; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "language-puppet_1_4_3" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, filecache, filepath, formatting, Glob - , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data - , http-client, lens, lens-aeson, megaparsec, memory, mtl - , operational, optparse-applicative, parsec, parser-combinators - , pcre-utils, protolude, random, regex-pcre-builtin, scientific - , servant, servant-client, split, stm, strict-base-types, temporary - , text, time, transformers, unix, unordered-containers, vector - , yaml - }: - mkDerivation { - pname = "language-puppet"; version = "1.4.3"; sha256 = "1sh0i487w7mz5c0scly1s11xzha4dbp2wdiwdks3203c5yrjdfq7"; isLibrary = true; @@ -137474,8 +137398,8 @@ self: { }: mkDerivation { pname = "line-bot-sdk"; - version = "0.1.0.0"; - sha256 = "0kcnxldqks6nvifzsdlkrkfypmj2yzavs675bw96x721mxb63czp"; + version = "0.2.0.0"; + sha256 = "14bznfpdv30aiq2n79h8nv831gpk0q5dm52ad0nbb55ivl3jl3l6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167027,6 +166951,17 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "pipeline" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "pipeline"; + version = "0.1.0"; + sha256 = "1bz7pfyfgc1cps5pwy31m5z3r6kxi5c4661qa60q333y0rd2y2j1"; + libraryHaskellDepends = [ base transformers ]; + description = "Continuation patterns"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, semigroups, test-framework @@ -174489,23 +174424,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "proxied"; - version = "0.3"; - sha256 = "09pbvf40qykrzmg4lrk5krhx30gzsldk1bz2i6bb6d18bx14skak"; - libraryHaskellDepends = [ base ]; - description = "Make functions consume Proxy instead of undefined"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proxied_0_3_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "proxied"; version = "0.3.1"; sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r"; libraryHaskellDepends = [ base ]; description = "Make functions consume Proxy instead of undefined"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proxy" = callPackage @@ -175248,8 +175171,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.12.2"; - sha256 = "1y7bcfj6fdlwmisdd75xcdkz7grch0pcmb9xsh6zwyvi6c40a3g2"; + version = "0.12.3"; + sha256 = "0h4216x80cgqdvl7l0glw9xxhnpakh8272p65yc2d5zwbvvfra6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184376,27 +184299,29 @@ self: { "ribosome" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , data-default-class, deepseq, directory, either, filepath - , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs - , pretty-terminal, prettyprinter, process, resourcet, safe, split - , stm, strings, text, time, transformers, unliftio, utf8-string + , data-default, deepseq, directory, either, filepath, hslogger, HTF + , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal + , prettyprinter, prettyprinter-ansi-terminal, process, resourcet + , safe, split, stm, text, time, transformers, typed-process, unix + , unliftio, unliftio-core, utf8-string }: mkDerivation { pname = "ribosome"; - version = "0.1.2.0"; - sha256 = "0sx4c7inv7dgy68wjnl13wmx6ybfjwl6flf2x9wz5aw1v5ssaw8z"; + version = "0.2.2.0"; + sha256 = "0cz0ksrxin9k8pnzfhvv6ihskba7kmrwn6np3bdg6rq2g9745v9d"; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default-class - deepseq directory either filepath hslogger lens messagepack - MissingH mtl nvim-hs pretty-terminal prettyprinter process - resourcet safe split stm strings text time transformers unliftio - utf8-string + aeson ansi-terminal base bytestring containers data-default deepseq + directory either filepath hslogger lens messagepack MissingH mtl + nvim-hs pretty-terminal prettyprinter prettyprinter-ansi-terminal + process resourcet safe split stm text time transformers + typed-process unix unliftio unliftio-core utf8-string ]; testHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default-class - deepseq directory either filepath hslogger HTF lens messagepack - MissingH mtl nvim-hs pretty-terminal prettyprinter process - resourcet safe split stm strings text time transformers unliftio + aeson ansi-terminal base bytestring containers data-default deepseq + directory either filepath hslogger HTF lens messagepack MissingH + mtl nvim-hs pretty-terminal prettyprinter + prettyprinter-ansi-terminal process resourcet safe split stm text + time transformers typed-process unix unliftio unliftio-core utf8-string ]; description = "api extensions for nvim-hs"; @@ -184511,6 +184436,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rigel-viz" = callPackage + ({ mkDerivation, aeson, base, bytestring, colour, containers, hspec + , QuickCheck, text + }: + mkDerivation { + pname = "rigel-viz"; + version = "0.2.0.0"; + sha256 = "0z6c6hynisf5165c4izh31bfr4zcdik13ww5c4ylpqzxsig2z5xs"; + libraryHaskellDepends = [ + aeson base bytestring colour containers text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A mid-level wrapper for vega-lite"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ring-buffer" = callPackage ({ mkDerivation, base, exceptions, HUnit, mtl, primitive , QuickCheck, vector @@ -191396,10 +191337,8 @@ self: { }: mkDerivation { pname = "servant-client-namedargs"; - version = "0.1.0.0"; - sha256 = "0smf6ahmzkbsnvgkji5jzj99sy8bgqz0zxx5k1y1ar82pd6m4qnd"; - revision = "1"; - editedCabalFile = "0kfhrikja6rvrn3m4c6w7dg28l17f2jx8rwswxiwzvmg2zmwbc1n"; + version = "0.1.1.0"; + sha256 = "11638zddkdna50lxiyk8ya1hakkriymlyvz6l6zli94ri5a3lprg"; libraryHaskellDepends = [ base named servant servant-client-core servant-namedargs text ]; @@ -192091,10 +192030,8 @@ self: { ({ mkDerivation, base, hspec, named, QuickCheck, servant, text }: mkDerivation { pname = "servant-namedargs"; - version = "0.1.0.1"; - sha256 = "0ylxcl11wmi3il5bpl7qc32qh2s210xfp37vfhhvnlxzgdzj84vh"; - revision = "1"; - editedCabalFile = "0nr11syaq0l04qdwh5ac0gnpfcgi9vakfjgv5i6p6kraag8za5k7"; + version = "0.1.1.0"; + sha256 = "10y1a9cr5fb794nqck1dmdr4dr6yl2x32zwsk1l2k4zfwy9bwyj1"; libraryHaskellDepends = [ base named servant text ]; testHaskellDepends = [ base hspec named QuickCheck servant ]; description = "Combinators for servant providing named parameters"; @@ -192375,6 +192312,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-reflex" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , data-default, exceptions, ghcjs-dom, http-api-data, http-media + , jsaddle, mtl, network-uri, reflex, reflex-dom-core, safe, servant + , servant-auth, string-conversions, text, transformers + }: + mkDerivation { + pname = "servant-reflex"; + version = "0.3.4"; + sha256 = "1k7dkzs2lsdjj94ai7p225zm09l9sgbxpb4av14xgy9m54rih5kk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers data-default exceptions + ghcjs-dom http-api-data http-media jsaddle mtl network-uri reflex + reflex-dom-core safe servant servant-auth string-conversions text + transformers + ]; + description = "servant API generator for reflex apps"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-response" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -192479,18 +192438,17 @@ self: { }) {}; "servant-server-namedargs" = callPackage - ({ mkDerivation, base, http-api-data, http-types, named, servant - , servant-namedargs, servant-server, string-conversions, text, wai + ({ mkDerivation, base, bytestring, http-api-data, http-types, named + , servant, servant-namedargs, servant-server, string-conversions + , text, wai }: mkDerivation { pname = "servant-server-namedargs"; - version = "0.1.0.0"; - sha256 = "0ncrrl91b8bcih4qf7gwl7m2qqmx6glwgvwcd4rvi1kdjrry8w0y"; - revision = "1"; - editedCabalFile = "1yf69y0w8miwcgdq9f88c2vabmqbn85rqsr8pqhijz24byyxnnl7"; + version = "0.1.1.0"; + sha256 = "1i810rw4kncpfyh2q67bqyiw6mh9pbhl4m40x2clwfsxqqpnkyda"; libraryHaskellDepends = [ - base http-api-data http-types named servant servant-namedargs - servant-server string-conversions text wai + base bytestring http-api-data http-types named servant + servant-namedargs servant-server string-conversions text wai ]; description = "Automatically derive API server functions with named and optional parameters"; license = stdenv.lib.licenses.bsd3; @@ -194855,26 +194813,29 @@ self: { }) {}; "shh" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, mtl - , process, split, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, unix + ({ mkDerivation, async, base, coreutils, deepseq, directory + , filepath, mtl, perl, process, split, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, unix, vault, vim }: mkDerivation { pname = "shh"; - version = "0.2.0.0"; - sha256 = "1r3giir4l1l2pn4kamgmdqsw1j8qz9aaw741lq761yk1s3lciwim"; + version = "0.2.0.1"; + sha256 = "0nm7ga2cd562369zm5xs8wg5lmiian5zzj4sz4g4hiip8nr35sqw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base deepseq directory filepath mtl process split template-haskell unix ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ async base ]; + executableToolDepends = [ coreutils vault vim ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + testToolDepends = [ perl vim ]; description = "Simple shell scripting from Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) coreutils; inherit (pkgs) perl; + inherit (pkgs) vim;}; "shift" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring @@ -195122,22 +195083,6 @@ self: { }: mkDerivation { pname = "show-prettyprint"; - version = "0.2.2"; - sha256 = "0mdgx484vgf2lif4a58vm8yl8zghxh0533038r76l5xlkc5qczgh"; - libraryHaskellDepends = [ - ansi-wl-pprint base prettyprinter trifecta - ]; - testHaskellDepends = [ base doctest ]; - description = "Robust prettyprinter for output of auto-generated Show instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "show-prettyprint_0_2_3" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter - , trifecta - }: - mkDerivation { - pname = "show-prettyprint"; version = "0.2.3"; sha256 = "01wg1bzp6dylysbm9rfq8n0ci7yzg3gw6jkzy8kzmsydgs5c54pd"; libraryHaskellDepends = [ @@ -195146,7 +195091,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Robust prettyprinter for output of auto-generated Show instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "show-type" = callPackage @@ -195665,23 +195609,11 @@ self: { ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "simple-cmd"; - version = "0.1.2"; - sha256 = "10jdyl1ghzczxw5bi8s1694fla42s1aknmj5grxndidwzf95b8g6"; - libraryHaskellDepends = [ base directory filepath process ]; - description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_1_3" = callPackage - ({ mkDerivation, base, directory, filepath, process }: - mkDerivation { - pname = "simple-cmd"; version = "0.1.3"; sha256 = "04bbdfmfy08fl07f0pqzp31jy4fdky4d9hazyxpqla8m3rs49xa9"; libraryHaskellDepends = [ base directory filepath process ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -196792,17 +196724,17 @@ self: { ({ mkDerivation, aeson, base, bytestring, containers, directory , exceptions, filepath, Glob, lens, lens-aeson, megaparsec , MissingH, mtl, mustache, optparse-applicative, pandoc, parsec - , shelly, text, unordered-containers, yaml + , shelly, text, transformers, unordered-containers, yaml }: mkDerivation { pname = "sitepipe"; - version = "0.3.0.2"; - sha256 = "0f26sqpf8rjrbpk6q9hp0q705hhmhyp71jyj5w9jgq6mnj34rxy8"; + version = "0.4.0.0"; + sha256 = "0y8llic3imc1zs53glig24vjm59f2dnw4sw32gzkvlzq33689s7s"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache - optparse-applicative pandoc parsec shelly text unordered-containers - yaml + optparse-applicative pandoc parsec shelly text transformers + unordered-containers yaml ]; description = "A simple to understand static site generator"; license = stdenv.lib.licenses.bsd3; @@ -198207,6 +198139,8 @@ self: { pname = "snap"; version = "1.1.2.0"; sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps"; + revision = "1"; + editedCabalFile = "07k5sq44w09cq7w8y128ifkm7837nyklgp9i1ydnavnhf044ah2n"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist fail filepath hashable @@ -206276,6 +206210,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strongswan-sql" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base + , bytestring, data-default, failable, haskeline, io-streams + , iproute, lens, mtl, mysql-haskell, network, structured-cli, text + , transformers + }: + mkDerivation { + pname = "strongswan-sql"; + version = "1.0.0.0"; + sha256 = "1bahs8lga0chfzb0sidgp7kgisc21v6h8rp86hnvjcm9gmwq1n6c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + asn1-encoding asn1-types attoparsec base bytestring data-default + failable haskeline io-streams iproute lens mtl mysql-haskell + network structured-cli text transformers + ]; + executableHaskellDepends = [ + asn1-encoding asn1-types attoparsec base bytestring data-default + failable haskeline io-streams iproute lens mtl mysql-haskell + network structured-cli text transformers + ]; + testHaskellDepends = [ + asn1-encoding asn1-types attoparsec base bytestring data-default + failable haskeline io-streams iproute lens mtl mysql-haskell + network structured-cli text transformers + ]; + description = "Interface library for strongSwan SQL backend"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -207365,8 +207330,8 @@ self: { }: mkDerivation { pname = "sv"; - version = "1.3"; - sha256 = "19mf3sf3smza4yk21k98wb39mk3jg0nxr93nl924ivsyv514flgx"; + version = "1.3.0.1"; + sha256 = "0h6qibvkmslil9jvbzminhpxgz7z95qak3zv5dxj8sfpc3p3lk7g"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -214013,6 +213978,21 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "th-abstraction_0_2_11_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.2.11.0"; + sha256 = "0340w34cqa42m0b9hdys9bfphi13swdp7xc8cwzbj9fq6764p22i"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + description = "Nicer interface for reified information about data types"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -225467,25 +225447,12 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.9.0.0"; - sha256 = "1rm0gw049v7f9i5rqn8f8ps4ksawmmggmhw9yclgh4qhhql7gz3q"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "Validity typeclass"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity_0_9_0_1" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "validity"; version = "0.9.0.1"; sha256 = "112wchq5l39fi9bkfkljic7bh1rd5gvz4lwjjw9pajg0zj51pyib"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-aeson" = callPackage @@ -231374,22 +231341,6 @@ self: { }: mkDerivation { pname = "wikicfp-scraper"; - version = "0.1.0.9"; - sha256 = "1qj28a53shcr4dq8i1fhyjbr4ybiyfb0kz3w0g439736mrnzsg4y"; - libraryHaskellDepends = [ - attoparsec base bytestring scalpel-core text time - ]; - testHaskellDepends = [ base bytestring filepath hspec time ]; - description = "Scrape WikiCFP web site"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wikicfp-scraper_0_1_0_10" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec - , scalpel-core, text, time - }: - mkDerivation { - pname = "wikicfp-scraper"; version = "0.1.0.10"; sha256 = "1j6aizgsf387pm6ajr6zjj1l4nnaq8mryq4vr09jji91ix9zhnw7"; libraryHaskellDepends = [ @@ -231398,7 +231349,6 @@ self: { testHaskellDepends = [ base bytestring filepath hspec time ]; description = "Scrape WikiCFP web site"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wikipedia4epub" = callPackage @@ -236165,8 +236115,8 @@ self: { ({ mkDerivation, base, gloss, Yampa }: mkDerivation { pname = "yampa-gloss"; - version = "0.1.0.0"; - sha256 = "1h9x76swrq64add2v6935542gh5l5rpf5nqdy1nl2q78ksk6r04g"; + version = "0.2"; + sha256 = "0dbp5a4mvqvdc6pq9qdaw3656n0pspmjjg5z4a1b5q8s6dbv62zx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gloss Yampa ]; @@ -237700,22 +237650,6 @@ self: { }) {}; "yesod-gitrev" = callPackage - ({ mkDerivation, aeson, base, gitrev, template-haskell, yesod-core - }: - mkDerivation { - pname = "yesod-gitrev"; - version = "0.2.0.0"; - sha256 = "0lp0zraj6015bl8pcgi9b9w4d1yf0lb4awy25jv5xrcrc173g7yz"; - revision = "1"; - editedCabalFile = "1b0df34lz569gnwbbz0p20dml6bi2nbva9wfdsxyvva0dhvxjaz5"; - libraryHaskellDepends = [ - aeson base gitrev template-haskell yesod-core - ]; - description = "A subsite for displaying git information"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yesod-gitrev_0_2_1" = callPackage ({ mkDerivation, aeson, base, githash, template-haskell, yesod-core }: mkDerivation { @@ -237728,7 +237662,6 @@ self: { testHaskellDepends = [ base yesod-core ]; description = "A subsite for displaying git information"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-goodies" = callPackage diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index c95b9e8b8e3..abd1fda47cb 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, buildPackages , name ? "luajit-${version}" , isStable , sha256 @@ -20,24 +20,23 @@ stdenv.mkDerivation rec { luaversion = "5.1"; - patchPhase = '' - substituteInPlace Makefile \ - --replace /usr/local "$out" - - substituteInPlace src/Makefile --replace gcc cc - '' + stdenv.lib.optionalString (stdenv.cc.libc != null) - '' - substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig + postPatch = '' + substituteInPlace Makefile --replace ldconfig : ''; configurePhase = false; + makeFlags = [ + "PREFIX=$(out)" + "DEFAULT_CC=cc" + "CROSS=${stdenv.cc.targetPrefix}" + # TODO: when pointer size differs, we would need e.g. -m32 + "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + ]; buildFlags = [ "amalg" ]; # Build highly optimized version enableParallelBuilding = true; - installPhase = '' - make install PREFIX="$out" + postInstall = '' ( cd "$out/include"; ln -s luajit-*/* . ) ln -s "$out"/bin/luajit-* "$out"/bin/lua '' diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 19f39217fd0..4c311f07e01 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "cdk-${version}"; - version ="5.0-20171209"; + version ="5.0-20190224"; buildInputs = [ ncurses @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" ]; - sha256 = "0jq0dx7gm7gl6lv5mhlfkxhw5362g9dxqdlpjlrag069nns8xdc8"; + sha256 = "0767xqwm377ak909c589vqm0v83slsnkm2ycq7bg545xx5nycncs"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index ebf55dcd194..1c4b6ea8c72 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.1.3"; + version = "1.2.3"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "12xqhszx50pmw2nx7n1pym7n47z95ddwwkyx35bfgmxsd9hjpmh2"; + sha256 = "0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv"; }; patches = [ diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 561f8d255ce..444d6c458fb 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -59,7 +59,7 @@ callPackage ./common.nix { inherit stdenv; } { postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales - '' else '' + '' else stdenv.lib.optionalString stdenv.buildPlatform.isLinux '' # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html # Instead of using their patch to build a build-native localedef, # we simply use the one from buildPackages diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 07c0f8cb1b4..e3d7741ba86 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -85,6 +85,5 @@ stdenv.mkDerivation rec { homepage = http://libguestfs.org/; maintainers = with maintainers; [offline]; platforms = platforms.linux; - hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index d64591273bc..bf1d26cf90d 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "LDCONFIG=true" - "ARCH=${stdenv.targetPlatform.uname.processor}" - "SYS=${stdenv.targetPlatform.uname.system}" + "ARCH=${stdenv.hostPlatform.uname.processor}" + "SYS=${stdenv.hostPlatform.uname.system}" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 047a74f0840..9d57d472182 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - makeFlags = [ "prefix=$(out)" "CC=cc" ] + makeFlags = [ + "prefix=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ] ++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; doCheck = true; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 1730f9b733c..19d1328d6bf 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"} -DBUILD_PKGCONFIG=ON" ]; preConfigure = '' # Enable long long support (required for filezilla) diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index d09e45a2d1e..daa499061c5 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, path }: +{ stdenv, fetchurl, path, runtimeShell }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "safefile"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} cd ${toString ./.} ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix ''; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 6e7090a9c5b..fb571cc5da5 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,7 +6,7 @@ let pname = "wlroots"; - version = "0.3"; + version = "0.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1iz5lxpiba1lcmkz3hz56r8j6ra3535zgckazqshi4c364nx94zs"; + sha256 = "1gwdwdyfnsn65bxn1yyy15f1q2gagakkl9k89zz8wv72sgniwxri"; }; # $out for the library, $bin for rootston, and $examples for the example diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index f48320148da..28fa6a9ebd9 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1djgsp3n10w6lamwwjn64p9722lvxpalj26h19zscbspnhfldb4f"; + sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 80699188fe2..0fdcb684b2d 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, acl, dbus, fuse, wrapGAppsHook, gnome3 }: +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.1.0"; + version = "1.2.0"; outputs = [ "out" "installedTests" ]; @@ -10,20 +10,19 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx"; + sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71"; }; patches = [ ./respect-path-env-var.patch - # https://github.com/flatpak/xdg-desktop-portal/pull/263 - (fetchpatch { - url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch; - sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq"; + (substituteAll { + src = ./fix-paths.patch; + inherit flatpak; }) ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gnome3.gsettings-desktop-schemas ]; + buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gsettings-desktop-schemas ]; doCheck = true; # XXX: investigate! diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch new file mode 100644 index 00000000000..f4b103eb38b --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/notification.c b/src/notification.c +index 1367114..72ba033 100644 +--- a/src/notification.c ++++ b/src/notification.c +@@ -401,7 +401,7 @@ validate_icon_more (GVariant *v) + int status; + g_autofree char *err = NULL; + g_autoptr(GError) error = NULL; +- const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon"; ++ const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon"; + const char *args[6]; + + if (G_IS_THEMED_ICON (icon)) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7da4a9eeddf..8a9618e1f1e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul These packages are manually refined in lua-overrides.nix */ -{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 4ddab380825..c88b780d164 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, runtimeShell }: stdenv.mkDerivation { name = "avr8-burn-omat-2.1.2"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { mkdir -p $out/{nix-support,bin} mv *.jar license_gpl-3.0.txt lib *.xml *.png $out/nix-support cat >> $out/bin/avr8-burn-omat << EOF - #!${stdenv.shell} - cd $out/nix-support; exec java -jar AVR8_Burn_O_Mat.jar + #!${runtimeShell} + cd $out/nix-support; exec java -jar AVR8_Burn_O_Mat.jar EOF chmod +x $out/bin/avr8-burn-omat ''; diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 69c781c1d98..4b32534e3ef 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -109,6 +109,7 @@ , "three" , "tiddlywiki" , "triton" +, "tsun" , "ttf2eot" , "typescript" , "uglify-js" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 7f2b73da2d9..7418d6d6133 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,6 +13,33 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; + "@angular-devkit/architect-0.13.3" = { + name = "_at_angular-devkit_slash_architect"; + packageName = "@angular-devkit/architect"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.3.tgz"; + sha512 = "89VL75bq3+h3m0jhzWNqXqW+HQcrihnM3i6eiUE6P81LcllP159JMlusAvB1LHLNc6Cc62wTq4BJr7KDILkPOA=="; + }; + }; + "@angular-devkit/core-7.3.3" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.3.tgz"; + sha512 = "fosULDtMoDWrOyUzTmBkJccOy7zodo02kENyKai7vOv9EWfv9jytkVdNc+jl0ys9OE2QadvSYBo49jhnZxFXfQ=="; + }; + }; + "@angular-devkit/schematics-7.3.3" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.3.tgz"; + sha512 = "SdDq9eKwceb6WLwci1fywtZ/kARR5CYyzi5dZIR1lOxrz00682uUBqH/X39mKdqc6eVqR7rtPceqNm6nQpOIMg=="; + }; + }; "@apollographql/apollo-tools-0.3.3" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; @@ -697,13 +724,13 @@ let sha512 = "m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA=="; }; }; - "@babel/polyfill-7.0.0" = { + "@babel/polyfill-7.2.5" = { name = "_at_babel_slash_polyfill"; packageName = "@babel/polyfill"; - version = "7.0.0"; + version = "7.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0.tgz"; - sha512 = "dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q=="; + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz"; + sha512 = "8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug=="; }; }; "@babel/preset-env-7.3.1" = { @@ -724,15 +751,6 @@ let sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA=="; }; }; - "@babel/register-7.0.0" = { - name = "_at_babel_slash_register"; - packageName = "@babel/register"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.0.0.tgz"; - sha512 = "f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g=="; - }; - }; "@babel/runtime-7.3.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -886,13 +904,13 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@iarna/toml-2.2.2" = { + "@iarna/toml-2.2.3" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.2.tgz"; - sha512 = "xm/Wpip5LRK1y1ZlzQLC/pDHlk0e1lNpQgOqWamfZSAU9pbTBHJFLM8wS4EB7LOc3EySARf9lZoGVX7cO26tJQ=="; + url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.3.tgz"; + sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; }; }; "@ionic/cli-framework-1.6.1" = { @@ -1606,6 +1624,24 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; + "@schematics/angular-7.3.3" = { + name = "_at_schematics_slash_angular"; + packageName = "@schematics/angular"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.3.tgz"; + sha512 = "HbH8vajYPka0xGcFAN5IUBx8n8SFMQLFb9di2dJCOBaEakbKVkk8qtOpil54oFQbx7DFCvutq/p0u42JfEbuMQ=="; + }; + }; + "@schematics/update-0.13.3" = { + name = "_at_schematics_slash_update"; + packageName = "@schematics/update"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.3.tgz"; + sha512 = "sCOFQ62dd7VdEGiSUJNZshNI31ODwpJjn2WIvFgZLt6sdHHun67s/JOvOUq4mxx6I74oD6RPJPF4AP5sigVxxg=="; + }; + }; "@sindresorhus/is-0.14.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -1858,22 +1894,31 @@ let sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/node-10.12.26" = { + "@types/node-10.12.27" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.12.27"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.12.27.tgz"; + sha512 = "e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg=="; + }; + }; + "@types/node-11.9.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.12.26"; + version = "11.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.12.26.tgz"; - sha512 = "nMRqS+mL1TOnIJrL6LKJcNZPB8V3eTfRo9FQA2b5gDvrHurC8XbSA86KNe0dShlEL7ReWJv/OU9NL7Z0dnqWTg=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.9.5.tgz"; + sha512 = "vVjM0SVzgaOUpflq4GYBvCpozes8OgIIS5gVXVka+OfK3hvnkC1i93U8WiY2OtNE4XUWyyy/86Kf6e0IHTQw1Q=="; }; }; - "@types/node-11.9.4" = { + "@types/node-6.14.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.9.4"; + version = "6.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.9.4.tgz"; - sha512 = "Zl8dGvAcEmadgs1tmSPcvwzO1YRsz38bVJQvH1RvRqSR9/5n61Q1ktcDL0ht3FXWR+ZpVmXVwN1LuH4Ax23NsA=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.3.tgz"; + sha512 = "V2VrQBCKo4U0rni6tW4AASRDqIO5ZTLDN/Xzrm4mNBr9SGQYZ+7zZJn+hMs89Q8ZCIHzp4aWQPyCpK+rux1YGA=="; }; }; "@types/node-8.10.40" = { @@ -1948,40 +1993,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.4.0" = { + "@vue/cli-shared-utils-3.4.1" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.4.0.tgz"; - sha512 = "w9j2qIroUUC2ym4Lb0lLMdlGmYThhwV0OizOEVigB5eZOEUEBV2Mv43K+nWJ6OyRBACnvhJTDi1gIwJo8zUvOw=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.4.1.tgz"; + sha512 = "IbAQP1J48+q1ChjcHGnE06SdcCEeO77BERcPapjqZl3qJ6aPnq7z8VrNrZxo6oOnBJm7elGOvz4kJ6hirK9aPA=="; }; }; - "@vue/cli-ui-3.4.0" = { + "@vue/cli-ui-3.4.1" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.4.0.tgz"; - sha512 = "o3ZtY53qstqyHTcLpuL4dRBXZKNRUr/9lrypYD8Bj+nOKLk1hr2E8kwI+hV/bZc+QjgaFqjlG8GxPYhwtpOsfw=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.4.1.tgz"; + sha512 = "VzYw+pWlzK9U3SbNFQiAnaVbtNRtb7bIuHjmistZmnipo5GQYt8i5JwxtjP3ZvqojBBOWmU5Mb9S8JYfE6B0Lg=="; }; }; - "@vue/cli-ui-addon-webpack-3.4.0" = { + "@vue/cli-ui-addon-webpack-3.4.1" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.4.0.tgz"; - sha512 = "CobtNRoXLUgTLzLtTekG6y39qQKFV6ebuSkZ8l2aEWv7ISRlj/wluuN47X9TrViJexIFJeh28XW1/vefwt4RgQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.4.1.tgz"; + sha512 = "pNpnu04fHDE+h8I+L6tz16uT3zKEjqZN4rqyWyIHyE6Dcpjk4Ru8/ge0bMfz89AOoYwpuBPh28FSJWtkSxTlAw=="; }; }; - "@vue/cli-ui-addon-widgets-3.4.0" = { + "@vue/cli-ui-addon-widgets-3.4.1" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.4.0.tgz"; - sha512 = "9efXj/83sw9Cq0is52NusQRf0u810KhNo38sAyBd7wlh2DZqU84thse7FvK+npppYkOz244zR0SNtwR2n41kgg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.4.1.tgz"; + sha512 = "E41HRQep+KfOye7LqHl+WiAQmS7noaJUxtVek6IjbWXrzNj4xmZvi7tW7FMj2l3ezZpwUU6mGTSCPz8Ct0EN+A=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -2002,6 +2047,15 @@ let sha512 = "xy3m06+Iu4D32+6soz6zLnwznigXJRuFNTovBX2M4GqVqLb0dnyWLbPnpcXvUSdEN+9DVyDeaq2jyH1eIL2LZQ=="; }; }; + "@webassemblyjs/ast-1.8.4" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.4.tgz"; + sha512 = "MYJJsFkxI6hVK03p8guYwa12EEkQOMIoQTUSSjTYj6zD9leLgDY8HyPJkHnU5UlwxQvlMSoj30Dft8mu4rbqkg=="; + }; + }; "@webassemblyjs/floating-point-hex-parser-1.8.1" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; @@ -2020,6 +2074,15 @@ let sha512 = "vq1TISG4sts4f0lDwMUM0f3kpe0on+G3YyV5P0IySHFeaLKRYZ++n2fCFfG4TcCMYkqFeTUYFxm75L3ddlk2xA=="; }; }; + "@webassemblyjs/floating-point-hex-parser-1.8.4" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.4.tgz"; + sha512 = "Qkxrx/qG0wS/Tp1DnRYGlsmPYxWd/sm7i2fzy5W1f9vrPUhJUhG21Mnp25ED3P7wqinXJ5Ggwck/qOqIb0hdJw=="; + }; + }; "@webassemblyjs/helper-api-error-1.8.1" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; @@ -2038,6 +2101,15 @@ let sha512 = "BmWEynI4FnZbjk8CaYZXwcv9a6gIiu+rllRRouQUo73hglanXD3AGFJE7Q4JZCoVE0p5/jeX6kf5eKa3D4JxwQ=="; }; }; + "@webassemblyjs/helper-api-error-1.8.4" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.4.tgz"; + sha512 = "nxl3QSDOxa3J0ZHrswPvHiCejH0XtfNmfEeqxz4XL6foe/yReVvDn9LseniDlURtxWr5KhNh2CRJ1NnNvogbIA=="; + }; + }; "@webassemblyjs/helper-buffer-1.8.1" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; @@ -2074,22 +2146,31 @@ let sha512 = "K1UxoJML7GKr1QXR+BG7eXqQkvu+eEeTjlSl5wUFQ6W6vaOc5OwSxTcb3oE9x/3+w4NHhrIKD4JXXCZmLdL2cg=="; }; }; - "@webassemblyjs/helper-compiler-1.8.3" = { + "@webassemblyjs/helper-code-frame-1.8.4" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.4.tgz"; + sha512 = "OARFm7ZtGqSRpjyvYMTyskUpZnZ0epQLazvPezqpO88AUeOvl/IoyIPm1W2oqB1EnnKJ3i3dJ8EEfF1hSkPgvA=="; + }; + }; + "@webassemblyjs/helper-compiler-1.8.4" = { name = "_at_webassemblyjs_slash_helper-compiler"; packageName = "@webassemblyjs/helper-compiler"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.8.3.tgz"; - sha512 = "yDhlzgS/g3eJWPu4NKwnyas9+3mFPmPlKvjkXX3C/ZNJDWkRz4AzeLjdph1Y8GpvKYlbBaWSN8/aIIFWADj81g=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.8.4.tgz"; + sha512 = "2tCGf9yBlV6VQXxNmtLa8pV5tUtLUMYKwD22t2Kq5788BaLaBKEqB4PajS0QqX0bSsw5TLKbTToMgsjdzfSn/A=="; }; }; - "@webassemblyjs/helper-flatten-ast-1.8.3" = { + "@webassemblyjs/helper-flatten-ast-1.8.4" = { name = "_at_webassemblyjs_slash_helper-flatten-ast"; packageName = "@webassemblyjs/helper-flatten-ast"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.8.3.tgz"; - sha512 = "/z+Qus3FdaJnmpyTH0JWUSvwku8EJErdKQXdRXaamOnKnLE/DNoT4iAuaGXDa7eHL/qgXIYdpeqJRrb0tj7uWA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.8.4.tgz"; + sha512 = "WyKRjoDHW7izIgGA/mCPcBFc9UNHho2H4BA4dWHF2WlfeKubsi7+TVmfVvQv+A2tP7Ewd5BsucJJ44ckmOvDNg=="; }; }; "@webassemblyjs/helper-fsm-1.8.1" = { @@ -2110,6 +2191,15 @@ let sha512 = "387zipfrGyO77/qm7/SDUiZBjQ5KGk4qkrVIyuoubmRNIiqn3g+6ijY8BhnlGqsCCQX5bYKOnttJobT5xoyviA=="; }; }; + "@webassemblyjs/helper-fsm-1.8.4" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.4.tgz"; + sha512 = "bpDqHABhfwCoCR7tpznOsbOpwBCMYO6nmzWSKOG40U/Mnts2/HCnR5ZTXA19/TtlXWNJM4EkOzZrunch4u4G6g=="; + }; + }; "@webassemblyjs/helper-module-context-1.8.1" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; @@ -2128,6 +2218,15 @@ let sha512 = "lPLFdQfaRssfnGEJit5Sk785kbBPPPK4ZS6rR5W/8hlUO/5v3F+rN8XuUcMj/Ny9iZiyKhhuinWGTUuYL4VKeQ=="; }; }; + "@webassemblyjs/helper-module-context-1.8.4" = { + name = "_at_webassemblyjs_slash_helper-module-context"; + packageName = "@webassemblyjs/helper-module-context"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.4.tgz"; + sha512 = "PzQPKniqlK+rBlqW7tYY8Z4ZmTJlHNLzNWIxCDbyfSyIn6ONDKKBloX7xy90F1kvyMwy2e0EzyYid1USbOiFiw=="; + }; + }; "@webassemblyjs/helper-wasm-bytecode-1.8.1" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; @@ -2146,6 +2245,15 @@ let sha512 = "R1nJW7bjyJLjsJQR5t3K/9LJ0QWuZezl8fGa49DZq4IVaejgvkbNlKEQxLYTC579zgT4IIIVHb5JA59uBPHXyw=="; }; }; + "@webassemblyjs/helper-wasm-bytecode-1.8.4" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.4.tgz"; + sha512 = "95N3PSHUawqwJRGDj12T5sbTUf7DGxZV2faITR5PdH+1oOXYanEWt8dFoIg3Gw/C+ZnASl5fbUjcSWpXTis2tg=="; + }; + }; "@webassemblyjs/helper-wasm-section-1.8.1" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; @@ -2182,6 +2290,15 @@ let sha512 = "UD4HuLU99hjIvWz1pD68b52qsepWQlYCxDYVFJQfHh3BHyeAyAlBJ+QzLR1nnS5J6hAzjki3I3AoJeobNNSZlg=="; }; }; + "@webassemblyjs/ieee754-1.8.4" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.4.tgz"; + sha512 = "jp90pcPqGp3Stda+otuUtRax4k6P3kd90D1mBSLqm+J59KnRCr/NQeaXMRfPIKWVFgfi7tQIMe0Oxm98Ou/RRg=="; + }; + }; "@webassemblyjs/leb128-1.8.1" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; @@ -2200,6 +2317,15 @@ let sha512 = "XXd3s1BmkC1gpGABuCRLqCGOD6D2L+Ma2BpwpjrQEHeQATKWAQtxAyU9Z14/z8Ryx6IG+L4/NDkIGHrccEhRUg=="; }; }; + "@webassemblyjs/leb128-1.8.4" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.4.tgz"; + sha512 = "5rlS2G0+CTs0SReAFJT8J2M5RrweNRMgjOi5dxeT+5Hs9XumCFzh8q5le2DMekcEptmxzlssxPIRBa+pW10GuQ=="; + }; + }; "@webassemblyjs/utf8-1.8.1" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; @@ -2218,13 +2344,22 @@ let sha512 = "Wv/WH9Zo5h5ZMyfCNpUrjFsLZ3X1amdfEuwdb7MLdG3cPAjRS6yc6ElULlpjLiiBTuzvmLhr3ENsuGyJ3wyCgg=="; }; }; - "@webassemblyjs/validation-1.8.3" = { + "@webassemblyjs/utf8-1.8.4" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.4.tgz"; + sha512 = "f50OQaWB555SAx95YBtA8TxwgeIQisticYryYRrPKqzTzjQI+z5R8S5t9OEybtN6vyJ3iL61YTBptRR+WOxPcw=="; + }; + }; + "@webassemblyjs/validation-1.8.4" = { name = "_at_webassemblyjs_slash_validation"; packageName = "@webassemblyjs/validation"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.8.3.tgz"; - sha512 = "UH0JDAy3Wyx9R3+VqCsCUQqkQJqVYIis7Suck++FoIRKPPOdM0cHBzLshVIDpF7mmLcw0k3Crfs6Hczb2gO3qw=="; + url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.8.4.tgz"; + sha512 = "yiVjlqTCrWv+c5FzoHLxnfKyVINzDJ8dXDYtvTLQ/y7yUdLo65sEv3U8yePYEltvfDhkJIRYj5sQ4vQjNCw+YQ=="; }; }; "@webassemblyjs/wasm-edit-1.8.3" = { @@ -2281,6 +2416,15 @@ let sha512 = "NBI3SNNtRoy4T/KBsRZCAWUzE9lI94RH2nneLwa1KKIrt/2zzcTavWg6oY05ArCbb/PZDk3OUi63CD1RYtN65w=="; }; }; + "@webassemblyjs/wasm-parser-1.8.4" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.4.tgz"; + sha512 = "cMOKi0j06W9nwU6+Yr4o63xeY892kcc2HURRiUJx1EJbGY0ETy/GVjaIXpIQaKqSaO86nAQC+6ZV7TYl398Ayw=="; + }; + }; "@webassemblyjs/wast-parser-1.8.1" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; @@ -2299,6 +2443,15 @@ let sha512 = "gZPst4CNcmGtKC1eYQmgCx6gwQvxk4h/nPjfPBbRoD+Raw3Hs+BS3yhrfgyRKtlYP+BJ8LcY9iFODEQofl2qbg=="; }; }; + "@webassemblyjs/wast-parser-1.8.4" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.4.tgz"; + sha512 = "S9IPkQOXcvaLOcGl5w3VfDwL3CaGiK/eC6TCdqK+7oHIp7IsvLHdlueQAlIcNupyxcUd9IBs/nu8H72/tKn4aw=="; + }; + }; "@webassemblyjs/wast-printer-1.8.1" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; @@ -2317,6 +2470,15 @@ let sha512 = "DTA6kpXuHK4PHu16yAD9QVuT1WZQRT7079oIFFmFSjqjLWGXS909I/7kiLTn931mcj7wGsaUNungjwNQ2lGQ3Q=="; }; }; + "@webassemblyjs/wast-printer-1.8.4" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.4.tgz"; + sha512 = "KYTRcJVhgk6BExe/tFU6HxtvdQVrLuuElGAmN9XKSSz2YfpkWIfAauF2rzVHNnMx6NBkoHaEOX6LosRk/IhkJA=="; + }; + }; "@xtuc/ieee754-1.2.0" = { name = "_at_xtuc_slash_ieee754"; packageName = "@xtuc/ieee754"; @@ -2650,13 +2812,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.4.1" = { + "addons-linter-1.6.1" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.4.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.4.1.tgz"; - sha512 = "AX8nCD/gy/6DoX4B7vTMQV6pcP8tG0BjxB3Jv44VZrUTYG+ojHx26abRDyUn+fDqWGf8qzeVn0Vss/NMNjMouA=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.6.1.tgz"; + sha512 = "3+N8cskdXHpId0dhfsldgbYGXamtgfGywvU4oPVb1M7imG3pHFoK+VcAr/kPk1VeYGkSmBl2LxnwGHcw1ERvmA=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -2812,22 +2974,22 @@ let sha512 = "4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg=="; }; }; - "ajv-6.5.5" = { + "ajv-6.9.1" = { name = "ajv"; packageName = "ajv"; - version = "6.5.5"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz"; - sha512 = "7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; + sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; }; }; - "ajv-6.9.1" = { + "ajv-6.9.2" = { name = "ajv"; packageName = "ajv"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; - sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; + sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; }; }; "ajv-errors-1.0.1" = { @@ -3199,13 +3361,13 @@ let sha512 = "JKFHijwkhXpcQ3jOat+ctwiXyjDhQgy0p6GSaj7zG+or+ZSalPqUnPzFRgRwFLVbYxBKJgHCkWX+2VkxWTZzQQ=="; }; }; - "apollo-cache-control-0.5.1" = { + "apollo-cache-control-0.5.2" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.5.1.tgz"; - sha512 = "82hzX7/fFiu5dODLS8oGieEE4jLjMIhIkQ4JTsWj9drv8PZJltl0xqORtU2jA/FottjxfYab8+ebi3BgGPOaqw=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.5.2.tgz"; + sha512 = "uehXDUrd3Qim+nzxqqN7XT1YTbNSyumW3/FY5BxbKZTI8d4oPG4eyVQKqaggooSjswKQnOoIQVes3+qg9tGAkw=="; }; }; "apollo-cache-inmemory-1.4.3" = { @@ -3307,13 +3469,13 @@ let sha512 = "qdEUeonc9pPZvYwXK36h2NZoT7Pddmy0HYOzdV0ON5pcG1YtNmUyyYi83Q60V5wTWjuaCjyJ9hOY6wr0BMvQuA=="; }; }; - "apollo-engine-reporting-1.0.2" = { + "apollo-engine-reporting-1.0.5" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.2.tgz"; - sha512 = "g6JkO5WaMuqXfn3WoZMQyyFzpxfHsw/f7P7XTHSEqTSd/M4uk7/uih/xcqmgBGt4ET30KbaGFz2l4FJzO06A5w=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.5.tgz"; + sha512 = "G4KcA6/eKWtH/WwvOtLoH7o4c1l3EuZsX6ZscBIEPYI78LmhjztG+UI+i3FW1BodURsqimBrbSM+h/JsYIrj+Q=="; }; }; "apollo-engine-reporting-protobuf-0.2.1" = { @@ -3415,13 +3577,13 @@ let sha512 = "mfxzikYXbB/OoEms77AGYwRh7FF3Oim5v5XWAL+VL49FrkbZt5lopVa4bABi7Mz8Nt3Htl9EBJN8765s/yh8IA=="; }; }; - "apollo-server-core-2.4.2" = { + "apollo-server-core-2.4.6" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.4.2"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.2.tgz"; - sha512 = "IOWhqjjI1sH38sj7ycjke0dXXEgaqOkb2hDpLBTSiVWKBIqFfo4gchWK5wcWW9jReDpf/+G2wogH+UvONs2ejg=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.6.tgz"; + sha512 = "sz/a9AKCx5ifnQAehmgXhnmEWv43LCbRnL1V1Z2P5C8xSmWubCskgu6jKPMc2cG1QFLWAXaA8cF4gD9sNGOFTQ=="; }; }; "apollo-server-env-2.2.0" = { @@ -3433,40 +3595,40 @@ let sha512 = "wjJiI5nQWPBpNmpiLP389Ezpstp71szS6DHAeTgYLb/ulCw3CTuuA+0/E1bsThVWiQaDeHZE0sE3yI8q2zrYiA=="; }; }; - "apollo-server-errors-2.2.0" = { + "apollo-server-errors-2.2.1" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.2.0.tgz"; - sha512 = "gV9EZG2tovFtT1cLuCTavnJu2DaKxnXPRNGSTo+SDI6IAk6cdzyW0Gje5N2+3LybI0Wq5KAbW6VLei31S4MWmg=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.2.1.tgz"; + sha512 = "wY/YE3iJVMYC+WYIf8QODBjIP4jhI+oc7kiYo9mrz7LdYPKAgxr/he+NteGcqn/0Ea9K5/ZFTGJDbEstSMeP8g=="; }; }; - "apollo-server-express-2.4.2" = { + "apollo-server-express-2.4.6" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.4.2"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.2.tgz"; - sha512 = "Q5/unCAi6a2dT39LQaIiLC1d8O4fmBDU2CrRhVhPWP8I344xPgNOcrs7MsNN7Ecb56UGbgDKxBoWowFG65ulKw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.6.tgz"; + sha512 = "YlWUjxrveKFSOCyExTa5rTwePeELhjolzP6cAlFIak+kJTnOiJWoTCYzaftkpwmK+c4IyA5XUgC0YhowcrIgEw=="; }; }; - "apollo-server-plugin-base-0.3.2" = { + "apollo-server-plugin-base-0.3.5" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.3.2"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.2.tgz"; - sha512 = "yzXrkVSPBoux2uPgbTGROGh7W0axRWopMZM+KT9aF9H/+yMCwtt0EhGOGyNUDMOFA4rT3z+cLVvYuZr1rSQWcg=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.5.tgz"; + sha512 = "z6xAgQip1RAXf0lQ2T8szCAbD8bCcbcwq4gGJ37ELcMGGTCTp2XOAz/PwIe9Re2Hzuk+OPlKK0AZng7qpXtDkg=="; }; }; - "apollo-tracing-0.5.1" = { + "apollo-tracing-0.5.2" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.5.1.tgz"; - sha512 = "5gb8OWzkGaJFsmQdyMyZnOjcq6weMTkqJSGj0hfR7uX99X4SBFAzZV4nTeK4z0XkXO2I12xSTJoS4gxbFjgeaA=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.5.2.tgz"; + sha512 = "2FdwRvPIq9uuF6OzONroXep6VBGqzHOkP6LlcFQe7SdwxfRP+SD/ycHNSC1acVg2b8d+am9Kzqg2vV54UpOIKA=="; }; }; "apollo-upload-client-10.0.0" = { @@ -4369,13 +4531,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.405.0" = { + "aws-sdk-2.409.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.405.0"; + version = "2.409.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.405.0.tgz"; - sha512 = "krgJBy/5FFGFjlOoODLH4ryXqUSQKz6He6QdIboKXvjIEV2CNxsoB+tFaThKD3SZmFcRxoWjho7R17dIlswTtQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.409.0.tgz"; + sha512 = "QV6j9zBQq/Kz8BqVOrJ03ABjMKtErXdUT1YdYEljoLQZimpzt0ZdQwJAsoZIsxxriOJgrqeZsQUklv9AFQaldQ=="; }; }; "aws-sign2-0.6.0" = { @@ -4855,15 +5017,6 @@ let sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; }; }; - "babel-polyfill-6.26.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz"; - sha1 = "379937abc67d7895970adc621f284cd966cf2153"; - }; - }; "babel-preset-jest-23.2.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; @@ -5305,13 +5458,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.41" = { + "big-integer-1.6.42" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.41"; + version = "1.6.42"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.41.tgz"; - sha512 = "d5AT9lMTYJ/ZE/4gzxb+5ttPcRWljVsvv7lF1w9KzkPhVUhBtHrjDo1J8swfZKepfLsliDhYa31zRYwcD0Yg9w=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.42.tgz"; + sha512 = "3UQFKcRMx+5Z+IK5vYTMYK2jzLRJkt+XqyDdacgWgtMjjuifKpKTFneJLEgeBElOE2/lXZ1LcMcb5s8pwG2U8Q=="; }; }; "big.js-5.2.2" = { @@ -6700,22 +6853,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-db-1.0.30000938" = { + "caniuse-db-1.0.30000939" = { name = "caniuse-db"; packageName = "caniuse-db"; - version = "1.0.30000938"; + version = "1.0.30000939"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000938.tgz"; - sha512 = "1lbcoAGPQFUYOdY7sxpsl8ZDBfn5cyn80XuYnZwk7N4Qp7Behw7uxZCH5jjH2qWTV2WM6hgjvDVpP/uV3M/l9g=="; + url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000939.tgz"; + sha512 = "nB5tLf3hOs+biXl1lhKjHRgNC0J1I7H52h/t1FP7qxARKKwpB0z+P/JewJLYAlxCBP/q7rxJzQzHHrQMl0viKg=="; }; }; - "caniuse-lite-1.0.30000938" = { + "caniuse-lite-1.0.30000939" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000938"; + version = "1.0.30000939"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz"; - sha512 = "ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz"; + sha512 = "oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg=="; }; }; "capture-stack-trace-1.0.1" = { @@ -6871,15 +7024,6 @@ let sha512 = "QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g=="; }; }; - "chalk-2.4.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz"; - sha512 = "Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw=="; - }; - }; "chalk-2.4.1" = { name = "chalk"; packageName = "chalk"; @@ -7069,6 +7213,15 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; + "chokidar-2.0.4" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz"; + sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ=="; + }; + }; "chokidar-2.1.2" = { name = "chokidar"; packageName = "chokidar"; @@ -8860,15 +9013,6 @@ let sha512 = "3Xl1D5eyiQlY5ow6Kn/say0us2TqSw/zgQmyTLxbewTngQZ1CIqxmqD7EFGoCNBrB4HsdPmpiSpFCitybKQN9g=="; }; }; - "core-js-2.3.0" = { - name = "core-js"; - packageName = "core-js"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz"; - sha1 = "fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"; - }; - }; "core-js-2.5.7" = { name = "core-js"; packageName = "core-js"; @@ -9715,13 +9859,13 @@ let sha512 = "PET9PlGt6ejgqU07hbPLx3tP2siDMMFumUe+xwmm4+5W+0cOlpzreCPoMVUBzxWeR4sPdxL+AS53odQTBtzEqA=="; }; }; - "dat-ignore-2.1.1" = { + "dat-ignore-2.1.2" = { name = "dat-ignore"; packageName = "dat-ignore"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; - sha512 = "jRCfWtLh+wtbqJMuge+wZV/2kSL1TKMRWXFgUaT7r0O1OnChKUDG4wqLJo4SjzJjXo7f3V8CVN/u5wYltgSd1Q=="; + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.2.tgz"; + sha512 = "27xyi8MzFCJ6qlB8AMGAjI/ec1q9AKT18Qe+8E8AxrG3Axpf4GHa+rWXBE9vTA5T1Mi4cPnhboiGLhiR4r0JAA=="; }; }; "dat-json-1.0.2" = { @@ -10102,15 +10246,6 @@ let sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69"; }; }; - "decompress-zip-0.3.0" = { - name = "decompress-zip"; - packageName = "decompress-zip"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz"; - sha1 = "ae3bcb7e34c65879adfe77e19c30f86602b4bdb0"; - }; - }; "dedent-0.7.0" = { name = "dedent"; packageName = "dedent"; @@ -10219,6 +10354,15 @@ let sha512 = "R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="; }; }; + "deepmerge-3.1.0" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-3.1.0.tgz"; + sha512 = "/TnecbwXEdycfbsM2++O3eGiatEFHjjNciHEwJclM+T5Kd94qD1AP+2elP/Mq0L5b9VZJao5znR01Mz6eX8Seg=="; + }; + }; "deepmerge-3.2.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -10778,13 +10922,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.27.0" = { + "dispensary-0.30.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.27.0"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.27.0.tgz"; - sha512 = "bG9pSBPH8wTEaugUIBAbBvBHynqOoGxefOT4YXlPoUc9AxQGDUO1uFHafDVWnsGWiSYvTUga0aZ9xThzfGQtlQ=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.30.0.tgz"; + sha512 = "ZZipc2xaDky03RD3s1UJOM6zgygo2ncEzmjuqpPR6pT7jMo0cxH/FTzGarD3Pw2naAsBOXVGG10Fwxth9OrW0g=="; }; }; "diveSync-0.3.0" = { @@ -11273,13 +11417,13 @@ let sha1 = "7c98afab245f6df32290473c0abee2f2d39334c7"; }; }; - "ecdsa-sig-formatter-1.0.10" = { + "ecdsa-sig-formatter-1.0.11" = { name = "ecdsa-sig-formatter"; packageName = "ecdsa-sig-formatter"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz"; - sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; + sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; "ecstatic-3.3.1" = { @@ -11850,13 +11994,13 @@ let sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.47" = { + "es5-ext-0.10.48" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.47"; + version = "0.10.48"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz"; - sha512 = "/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.48.tgz"; + sha512 = "CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw=="; }; }; "es5-ext-0.8.2" = { @@ -11922,15 +12066,6 @@ let sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; }; }; - "es6-promise-3.0.2" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz"; - sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6"; - }; - }; "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; @@ -12057,13 +12192,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escodegen-1.11.0" = { + "escodegen-1.11.1" = { name = "escodegen"; packageName = "escodegen"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz"; - sha512 = "IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw=="; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz"; + sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw=="; }; }; "escodegen-1.9.1" = { @@ -12093,13 +12228,13 @@ let sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; }; - "eslint-5.0.1" = { + "eslint-5.13.0" = { name = "eslint"; packageName = "eslint"; - version = "5.0.1"; + version = "5.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; - sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.13.0.tgz"; + sha512 = "nqD5WQMisciZC5EHZowejLKQjWGuFS5c70fxqSKlnDME+oz9zmE8KTlX+lHSg+/5wsC/kf9Q9eMkC8qS3oM2fg=="; }; }; "eslint-5.14.1" = { @@ -12156,13 +12291,13 @@ let sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; }; }; - "esm-3.2.5" = { + "esm-3.2.6" = { name = "esm"; packageName = "esm"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/esm/-/esm-3.2.5.tgz"; - sha512 = "rukU6Nd3agbHQCJWV4rrlZxqpbO3ix8qhUxK1BhKALGS2E465O0BFwgCOqJjNnYfO/I2MwpUBmPsW8DXoe8tcA=="; + url = "https://registry.npmjs.org/esm/-/esm-3.2.6.tgz"; + sha512 = "3wWjSurKSczMzYyHiBih3VVEQYCoZa6nfsqqcM2Tx6KBAQAeor0SZUfAol+zeVUtESLygayOi2ZcMfYZy7MCsg=="; }; }; "espree-3.5.4" = { @@ -12174,13 +12309,13 @@ let sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="; }; }; - "espree-4.1.0" = { + "espree-5.0.0" = { name = "espree"; packageName = "espree"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz"; - sha512 = "I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w=="; + url = "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz"; + sha512 = "1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA=="; }; }; "espree-5.0.1" = { @@ -13047,15 +13182,6 @@ let sha512 = "0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w=="; }; }; - "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.0.7" = { name = "fast-json-patch"; packageName = "fast-json-patch"; @@ -13425,15 +13551,6 @@ let sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"; }; }; - "find-cache-dir-1.0.0" = { - name = "find-cache-dir"; - packageName = "find-cache-dir"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz"; - sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f"; - }; - }; "find-cache-dir-2.0.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -13704,13 +13821,13 @@ let sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; }; }; - "fluent-syntax-0.7.0" = { + "fluent-syntax-0.10.0" = { name = "fluent-syntax"; packageName = "fluent-syntax"; - version = "0.7.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.7.0.tgz"; - sha512 = "T0iqfhC40jrs3aDjYOKgzIQjjhsH2Fa6LnXB6naPv0ymW3DeYMUFa89y9aLKMpi1P9nl2vEimK7blx4tVnUWBg=="; + url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.10.0.tgz"; + sha512 = "6qRhwQXDTgJjS9DW3IiXZWzUMUPqNPzqh+bZZyUOr6t8xYwkIe+5JONYZuvfvbOUk65paAno0kd8s8kUD2ptNA=="; }; }; "flumecodec-0.0.0" = { @@ -14055,13 +14172,13 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; - "fs-capacitor-2.0.0" = { + "fs-capacitor-2.0.1" = { name = "fs-capacitor"; packageName = "fs-capacitor"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.0.tgz"; - sha512 = "CIJZpxbVWhO+qyODeCR55Q+6vj0p2oL8DAWd/DZi3Ev+25PimUoScw07K0fPgluaH3lFoqNvwW13BDYfHWFQJw=="; + url = "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.1.tgz"; + sha512 = "kyV2oaG1/pu9NPosfGACmBym6okgzyg6hEtA5LSUq0dGpGLe278MVfMwVnSHDA/OBcTCHkPNqWL9eIwbPN6dDg=="; }; }; "fs-chunk-store-1.7.0" = { @@ -14334,13 +14451,13 @@ let sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; }; }; - "fx-runner-1.0.9" = { + "fx-runner-1.0.10" = { name = "fx-runner"; packageName = "fx-runner"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.9.tgz"; - sha1 = "7b23f3773dc76aacc42f11d9aff2769675cb63f0"; + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.10.tgz"; + sha512 = "tXj0lMnSey89Dx7R3Lq+HMUy3ODmOmj5lhRYBgMWNOqbh7Vx8vPUiWMbyJ3HIzGuLnNeXAPH0x/GdFZ7h6h0vQ=="; }; }; "gauge-1.2.7" = { @@ -14433,6 +14550,15 @@ let sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; }; + "get-caller-file-2.0.1" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.1.tgz"; + sha512 = "SpOZHfz845AH0wJYVuZk2jWDqFmu7Xubsx+ldIpwzy5pDUpu7OJHK7QYNSA2NPlDSKQwM1GFaAkciOWjjW92Sg=="; + }; + }; "get-func-name-2.0.0" = { name = "get-func-name"; packageName = "get-func-name"; @@ -15209,13 +15335,22 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.5.2" = { + "graphql-extensions-0.5.4" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.5.2"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.2.tgz"; - sha512 = "D/FAvjYEZ8GM3vfALxRvItozy5iLUfzyoauE2lli+0OuUBCAZDLP0fgqeTFK93NnQX/XSjBVGhcuDWBB7JesEw=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.4.tgz"; + sha512 = "qLThJGVMqcItE7GDf/xX/E40m/aeqFheEKiR5bfra4q5eHxQKGjnIc20P9CVqjOn9I0FkEiU9ypOobfmIf7t6g=="; + }; + }; + "graphql-extensions-0.5.5" = { + name = "graphql-extensions"; + packageName = "graphql-extensions"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.5.tgz"; + sha512 = "jCUt/WVayiQvmXVPMetmq3wpV3RyzXOXFfssoTz9/YFuoSg1Y7BwzgNuilSybQqMPRdfGAsqf/OIa1DZwrnggw=="; }; }; "graphql-import-0.4.5" = { @@ -15740,15 +15875,6 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "hasbin-1.2.3" = { - name = "hasbin"; - packageName = "hasbin"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz"; - sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; - }; - }; "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; @@ -15947,22 +16073,13 @@ let sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; }; }; - "home-or-tmp-3.0.0" = { - name = "home-or-tmp"; - packageName = "home-or-tmp"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-3.0.0.tgz"; - sha1 = "57a8fe24cf33cdd524860a15821ddc25c86671fb"; - }; - }; - "homedir-polyfill-1.0.1" = { + "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "hoox-0.0.1" = { @@ -16802,6 +16919,15 @@ let sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg=="; }; }; + "inquirer-6.2.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz"; + sha512 = "088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg=="; + }; + }; "inquirer-6.2.2" = { name = "inquirer"; packageName = "inquirer"; @@ -16982,6 +17108,15 @@ let sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; + "ip-address-5.8.9" = { + name = "ip-address"; + packageName = "ip-address"; + version = "5.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-address/-/ip-address-5.8.9.tgz"; + sha512 = "7ay355oMN34iXhET1BmCJVsHjOTSItEEIIpOs38qUC23AIhOy+xIPnkrTuEFjeLMrTJ7m8KMXWgWfy/2Vn9sDw=="; + }; + }; "ip-regex-1.0.3" = { name = "ip-regex"; packageName = "ip-regex"; @@ -17702,6 +17837,15 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; + "is-relative-url-2.0.0" = { + name = "is-relative-url"; + packageName = "is-relative-url"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative-url/-/is-relative-url-2.0.0.tgz"; + sha1 = "72902d7fe04b3d4792e7db15f9db84b7204c9cef"; + }; + }; "is-resolvable-1.1.0" = { name = "is-resolvable"; packageName = "is-resolvable"; @@ -18332,6 +18476,15 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; + "jsbn-1.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz"; + sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; + }; + }; "jsdom-7.2.2" = { name = "jsdom"; packageName = "jsdom"; @@ -18674,13 +18827,13 @@ let sha512 = "l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw=="; }; }; - "jsonwebtoken-8.4.0" = { + "jsonwebtoken-8.5.0" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz"; - sha512 = "coyXjRTCy0pw5WYBpMvWOMN+Kjaik2MwTUIq9cna/W7NpO9E+iYbumZONAz3hcr+tXFJECoQVrtmIoC3Oz0gvg=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz"; + sha512 = "IqEycp0znWHNA11TpYi77bVgyBO/pGESDh7Ajhas+u0ttkGkKYIIAjniL4Bw5+oVejVF+SYkaI7XKfwCCyeTuA=="; }; }; "jsprim-0.3.0" = { @@ -18728,13 +18881,13 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.1.5" = { + "jszip-3.2.0" = { name = "jszip"; packageName = "jszip"; - version = "3.1.5"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz"; - sha512 = "5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.2.0.tgz"; + sha512 = "4WjbsaEtBK/DHeDZOPiPw5nzSGLDEDDreFRDEgnoMwmknPjTqa+23XuYFk6NiGbeiAeZCctiQ/X/z0lQBmDVOQ=="; }; }; "jszip-git://github.com/anmonteiro/jszip#patch-1" = { @@ -18774,13 +18927,13 @@ let sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; }; }; - "jwa-1.2.0" = { + "jwa-1.3.0" = { name = "jwa"; packageName = "jwa"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz"; - sha512 = "Grku9ZST5NNQ3hqNUodSkDfEBqAmGA1R8yiyPHOnLzEKI0GaCQC/XhFmsheXYuXzFQJdILbh+lYBiliqG5R/Vg=="; + url = "https://registry.npmjs.org/jwa/-/jwa-1.3.0.tgz"; + sha512 = "SxObIyzv9a6MYuZYaSN6DhSm9j3+qkokwvCB0/OTSV5ylPq1wUQiygZQcHT5Qlux0I5kmISx3J86TxKhuefItg=="; }; }; "jws-3.2.1" = { @@ -18990,13 +19143,13 @@ let sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; - "knockout-3.5.0-rc2" = { + "knockout-3.5.0" = { name = "knockout"; packageName = "knockout"; - version = "3.5.0-rc2"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc2.tgz"; - sha512 = "ncKkcfOX5hV6QyvNLMLe+s9uYbP+jRKljj01Fcg/BPk3PvfcdZF3dV52qkfpR0IC0iRh0AAP7NXFJEt0ofy14g=="; + url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0.tgz"; + sha512 = "vBUF/IsBDzaejHkNpiquKdc5uPrImXuQ4Mb9lEfNNJ5cyHGI8ThDupR+h3eMFZhfmPE/brfwcIAn/fm0yOvJUg=="; }; }; "kuler-1.0.1" = { @@ -19359,13 +19512,13 @@ let sha512 = "axKkW01L0q+urLeE7UMSZKWwk4LrRbi6s5pjKBAvbgDBYnsSaolK1oN/Syilm1dqJFkJQNi6qodwOp8dzSoc9Q=="; }; }; - "lie-3.1.1" = { + "lie-3.3.0" = { name = "lie"; packageName = "lie"; - version = "3.1.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; - sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; + url = "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz"; + sha512 = "UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="; }; }; "liftoff-2.5.0" = { @@ -19386,6 +19539,15 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; + "link-check-4.4.4" = { + name = "link-check"; + packageName = "link-check"; + version = "4.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/link-check/-/link-check-4.4.4.tgz"; + sha512 = "yvowNBZEMOFH9nGLiJ5/YV68PBMVTo4opC2SzcACO8g4gSPTB9Rwa5GIziOX9Z5Er3Yf01DHoOyVV2LeApIw8w=="; + }; + }; "linkify-it-2.1.0" = { name = "linkify-it"; packageName = "linkify-it"; @@ -20007,6 +20169,15 @@ let sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; + "lodash.find-4.6.0" = { + name = "lodash.find"; + packageName = "lodash.find"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz"; + sha1 = "cb0704d47ab71789ffa0de8b97dd926fb88b13b1"; + }; + }; "lodash.flatten-4.4.0" = { name = "lodash.flatten"; packageName = "lodash.flatten"; @@ -20223,6 +20394,15 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; + "lodash.max-4.0.1" = { + name = "lodash.max"; + packageName = "lodash.max"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.max/-/lodash.max-4.0.1.tgz"; + sha1 = "8735566c618b35a9f760520b487ae79658af136a"; + }; + }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -20331,6 +20511,15 @@ let sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; }; }; + "lodash.repeat-4.1.0" = { + name = "lodash.repeat"; + packageName = "lodash.repeat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.1.0.tgz"; + sha1 = "fc7de8131d8c8ac07e4b49f74ffe829d1f2bec44"; + }; + }; "lodash.restparam-3.6.1" = { name = "lodash.restparam"; packageName = "lodash.restparam"; @@ -21060,6 +21249,15 @@ let sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; }; }; + "markdown-link-extractor-1.2.0" = { + name = "markdown-link-extractor"; + packageName = "markdown-link-extractor"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.0.tgz"; + sha512 = "1unDsoZSSiF5oGFu/2y8M3E2I2YhWT/jiKGTQxa1IAmkC1OcyHo9OYNu3qCuVSj5Ty87+mFtgQxJPUfc08WirA=="; + }; + }; "markdown-table-0.4.0" = { name = "markdown-table"; packageName = "markdown-table"; @@ -21078,6 +21276,15 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; + "marked-0.4.0" = { + name = "marked"; + packageName = "marked"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz"; + sha512 = "tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="; + }; + }; "matchdep-2.0.0" = { name = "matchdep"; packageName = "matchdep"; @@ -21132,6 +21339,15 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; + "mdn-browser-compat-data-0.0.66" = { + name = "mdn-browser-compat-data"; + packageName = "mdn-browser-compat-data"; + version = "0.0.66"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-0.0.66.tgz"; + sha512 = "Exx+o05KYCltHmY2thfCoufBaHeqbIzqZHQPDtmcC+nkeFG++ONzwddBtgDBAKeI0IFFKqGIbRT1QBRwmk9QKA=="; + }; + }; "mdn-data-1.1.4" = { name = "mdn-data"; packageName = "mdn-data"; @@ -21834,15 +22050,6 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "mkpath-0.1.0" = { - name = "mkpath"; - packageName = "mkpath"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; - sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; - }; - }; "mkpath-1.0.0" = { name = "mkpath"; packageName = "mkpath"; @@ -21852,15 +22059,6 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mksnapshot-0.3.4" = { - name = "mksnapshot"; - packageName = "mksnapshot"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.4.tgz"; - sha512 = "FgUTiWiY+35LgL95P/MDYrBuQO5o0s3MmaWKX6ZJWoX4vMOY9vPsAv763l1OSSelL9jPsBQ/wf4bzfqTLNPSFg=="; - }; - }; "mocha-2.5.3" = { name = "mocha"; packageName = "mocha"; @@ -22927,6 +23125,15 @@ let sha512 = "obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw=="; }; }; + "node-color-readline-1.0.1" = { + name = "node-color-readline"; + packageName = "node-color-readline"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-color-readline/-/node-color-readline-1.0.1.tgz"; + sha1 = "e57063e6101c8387160ac2aa359d6427e1e26886"; + }; + }; "node-elm-compiler-5.0.1" = { name = "node-elm-compiler"; packageName = "node-elm-compiler"; @@ -23044,15 +23251,6 @@ let sha512 = "5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA=="; }; }; - "node-modules-regexp-1.0.0" = { - name = "node-modules-regexp"; - packageName = "node-modules-regexp"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; - sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; - }; - }; "node-notifier-5.2.1" = { name = "node-notifier"; packageName = "node-notifier"; @@ -23134,13 +23332,13 @@ let sha512 = "mkw8HOosXHMBRdyJkio77vPx4Ls5IY26P5ZyoMWmKMkimXKTnX00DdpmNlkW+dHwMDYq1H66WzFtQhNOdEAbgA=="; }; }; - "node-releases-1.1.7" = { + "node-releases-1.1.8" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.7.tgz"; - sha512 = "bKdrwaqJUPHqlCzDD7so/R+Nk0jGv9a11ZhLrD9f6i947qGLrGAhU3OxRENa19QQmwzGy/g6zCDEuLGDO8HPvA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.8.tgz"; + sha512 = "gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -23485,13 +23683,13 @@ let sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; }; }; - "npm-packlist-1.3.0" = { + "npm-packlist-1.4.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; - sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; "npm-path-2.0.4" = { @@ -24044,6 +24242,15 @@ let sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; }; }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; "on-wakeup-1.0.1" = { name = "on-wakeup"; packageName = "on-wakeup"; @@ -24413,15 +24620,6 @@ let sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; }; }; - "os-locale-3.0.1" = { - name = "os-locale"; - packageName = "os-locale"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz"; - sha512 = "7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw=="; - }; - }; "os-locale-3.1.0" = { name = "os-locale"; packageName = "os-locale"; @@ -24782,6 +24980,15 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; + "pacote-9.4.0" = { + name = "pacote"; + packageName = "pacote"; + version = "9.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz"; + sha512 = "WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w=="; + }; + }; "pacote-9.5.0" = { name = "pacote"; packageName = "pacote"; @@ -24935,13 +25142,13 @@ let sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; }; }; - "parse-headers-2.0.1" = { + "parse-headers-2.0.2" = { name = "parse-headers"; packageName = "parse-headers"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz"; - sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.2.tgz"; + sha512 = "/LypJhzFmyBIDYP9aDVgeyEb5sQfbfY5mnDq4hVhlQ69js87wXfmEI5V3xI6vvXasqebp0oCytYFLxsBVfCzSg=="; }; }; "parse-help-1.0.0" = { @@ -25214,15 +25421,6 @@ let sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; }; }; - "path-0.12.7" = { - name = "path"; - packageName = "path"; - version = "0.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path/-/path-0.12.7.tgz"; - sha1 = "d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"; - }; - }; "path-browserify-0.0.0" = { name = "path-browserify"; packageName = "path-browserify"; @@ -25646,22 +25844,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-5.8.1" = { - name = "pino"; - packageName = "pino"; - version = "5.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.8.1.tgz"; - sha512 = "7bVFzUw3ffIfOM3t7MuQ9KsH+wX5bdGdQhGfccKgleoY7qG4FO3CmVSjywlFmmYGyMOISi1LDGC6JMEH7XkZJg=="; - }; - }; - "pino-5.9.0" = { + "pino-5.11.1" = { name = "pino"; packageName = "pino"; - version = "5.9.0"; + version = "5.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.9.0.tgz"; - sha512 = "6sHy38gWsZbrmYq6vk343VCThy93ZdVfmLsHDVzbl/j621SjSaxCcS/ySmxK/hRmq8jpQb3n44dNRIeqbbQw6A=="; + url = "https://registry.npmjs.org/pino/-/pino-5.11.1.tgz"; + sha512 = "NIua0mGb9Adknq35ONvQmvh93LCUVUjp2+1q1EcvIkJmpJnSd3E5rHVKlKNjzMXFl/z3fI+QA0xXCjPEKNiLvQ=="; }; }; "pino-std-serializers-2.3.0" = { @@ -25673,15 +25862,6 @@ let sha512 = "klfGoOsP6sJH7ON796G4xoUSx2fkpFgKHO4YVVO2zmz31jR+etzc/QzGJILaOIiCD6HTCFgkPx+XN8nk+ruqPw=="; }; }; - "pirates-4.0.1" = { - name = "pirates"; - packageName = "pirates"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz"; - sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA=="; - }; - }; "pkg-dir-2.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -25917,15 +26097,6 @@ let sha512 = "NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg=="; }; }; - "postcss-7.0.6" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.6.tgz"; - sha512 = "Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug=="; - }; - }; "postcss-calc-5.3.1" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -27915,13 +28086,13 @@ let sha512 = "TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw=="; }; }; - "randombytes-2.0.6" = { + "randombytes-2.1.0" = { name = "randombytes"; packageName = "randombytes"; - version = "2.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; - sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A=="; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomfill-1.0.4" = { @@ -28050,13 +28221,13 @@ let sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; - "react-is-16.8.2" = { + "react-is-16.8.3" = { name = "react-is"; packageName = "react-is"; - version = "16.8.2"; + version = "16.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.8.2.tgz"; - sha512 = "D+NxhSR2HUCjYky1q1DwpNUD44cDpUXzSmmFyC3ug1bClcU/iDNy0YNn1iwme28fn+NFhpA13IndOd42CrFb+Q=="; + url = "https://registry.npmjs.org/react-is/-/react-is-16.8.3.tgz"; + sha512 = "Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA=="; }; }; "read-1.0.7" = { @@ -28419,15 +28590,6 @@ let sha512 = "s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw=="; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -28446,6 +28608,15 @@ let sha512 = "odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="; }; }; + "regenerator-runtime-0.13.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.1.tgz"; + sha512 = "5KzMIyPLvfdPmvsdlYsHqITrDfK9k7bmvf97HvHSN4810i254ponbxCQ1NukpRWlu6en2MBWzAlhDExEKISwAA=="; + }; + }; "regenerator-runtime-0.9.6" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -28455,13 +28626,13 @@ let sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; - "regenerator-transform-0.13.3" = { + "regenerator-transform-0.13.4" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.13.3"; + version = "0.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz"; - sha512 = "5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.4.tgz"; + sha512 = "T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A=="; }; }; "regex-cache-0.4.4" = { @@ -28491,24 +28662,6 @@ let sha512 = "nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ=="; }; }; - "regexp.prototype.flags-1.2.0" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha512 = "ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA=="; - }; - }; - "regexpp-1.1.0" = { - name = "regexpp"; - packageName = "regexpp"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; - sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="; - }; - }; "regexpp-2.0.1" = { name = "regexpp"; packageName = "regexpp"; @@ -28878,6 +29031,15 @@ let sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; }; }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; "require-uncached-1.0.3" = { name = "require-uncached"; packageName = "require-uncached"; @@ -29481,6 +29643,15 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; + "rxjs-6.3.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz"; + sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; + }; + }; "rxjs-6.4.0" = { name = "rxjs"; packageName = "rxjs"; @@ -29814,6 +29985,15 @@ let sha1 = "13e8c2658ab9691cb0cd71093240280d36f77a5b"; }; }; + "semver-intersect-1.4.0" = { + name = "semver-intersect"; + packageName = "semver-intersect"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz"; + sha512 = "d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ=="; + }; + }; "semver-regex-1.0.0" = { name = "semver-regex"; packageName = "semver-regex"; @@ -30210,15 +30390,6 @@ let sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "shelljs-0.8.3" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; - sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; - }; - }; "shellsubstitute-1.2.0" = { name = "shellsubstitute"; packageName = "shellsubstitute"; @@ -30642,33 +30813,6 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.110.2" = { - name = "snyk"; - packageName = "snyk"; - version = "1.110.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.110.2.tgz"; - sha512 = "SQE4sudrscd48EoRJqy5h5S6c8YBiOw0r0Se3rfg1l6ElJGgCB9je6XEzfe+UmfES06D7ueFYepiQPxTwH4Qww=="; - }; - }; - "snyk-1.134.2" = { - name = "snyk"; - packageName = "snyk"; - version = "1.134.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.134.2.tgz"; - sha512 = "WGR3TTZxXOdALEEcQtADFEOHaanhbzwLvS6gyg5vF6Akj7qRAwIIXYBUycbNdAax1mylAsXCzR352dkTwKD9lg=="; - }; - }; - "snyk-config-2.2.0" = { - name = "snyk-config"; - packageName = "snyk-config"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.0.tgz"; - sha512 = "mq0wbP/AgjcmRq5i5jg2akVVV3iSYUPTowZwKn7DChRLDL8ySOzWAwan+ImXiyNbrWo87FNI/15O6MpOnTxOIg=="; - }; - }; "snyk-config-2.2.1" = { name = "snyk-config"; packageName = "snyk-config"; @@ -30678,15 +30822,6 @@ let sha512 = "eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA=="; }; }; - "snyk-docker-plugin-1.12.3" = { - name = "snyk-docker-plugin"; - packageName = "snyk-docker-plugin"; - version = "1.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.12.3.tgz"; - sha512 = "ZbvaFCPCd0wxhqxjzU/iyf39tKlq2nvI9nPW32uZV3RGdHrkQH55BzCtBCF9d0dapxX+PKgae/4u2BKNw8hd9Q=="; - }; - }; "snyk-docker-plugin-1.22.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; @@ -30696,15 +30831,6 @@ let sha512 = "bykxNtfeWQNFjF6gv8u8w+TOa4fdr+teLm+DkvYlWkdlvaw5m4yywRI5USve4X6S9p4G+Fw4/wfjXx7LgCcxrQ=="; }; }; - "snyk-go-plugin-1.6.0" = { - name = "snyk-go-plugin"; - packageName = "snyk-go-plugin"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.6.0.tgz"; - sha512 = "E6aYw7XAXSs2wJR3fU+vGQ1lVyjAw8PHIQYQwBwMkTHByhJIWPcu6Hy/jT5LcjJHlhYXlpOuk53HeLVK+kcXrQ=="; - }; - }; "snyk-go-plugin-1.6.1" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; @@ -30714,15 +30840,6 @@ let sha512 = "hFOMyznfcMzF1HaZP18VmjQSqK/jBOowh0lpJY4UqmaQSZyJury3Ax+44O9oVUJi8lb8A4g7RVbxhlWl6bIqlA=="; }; }; - "snyk-gradle-plugin-2.1.1" = { - name = "snyk-gradle-plugin"; - packageName = "snyk-gradle-plugin"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.1.1.tgz"; - sha512 = "aFeVC5y3XkJ5BxknHhtYo76as3xJbzSQlXACGZrQZGQ/w/UhNdM8VI1QB6Eq4uEzexleB/hcJwYxNmhI2CNCeA=="; - }; - }; "snyk-gradle-plugin-2.1.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; @@ -30741,15 +30858,6 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.0.0" = { - name = "snyk-mvn-plugin"; - packageName = "snyk-mvn-plugin"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.0.0.tgz"; - sha512 = "9jAhZhv+7YcqtoQYCYlgMoxK+dWBKlk+wkX27Ebg3vNddNop9q5jZitRXTjsXwfSUZHRt+Ptw1f8vei9kjzZVg=="; - }; - }; "snyk-mvn-plugin-2.0.1" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; @@ -30768,24 +30876,6 @@ let sha512 = "eTdq5VcaHJwGoApejebTChi5hRcIDdNbO6lMwncS0zz9ZxXskoQ0C+VMdep8ELmJa0Gcz6es1sSkABPZs7frrg=="; }; }; - "snyk-nodejs-lockfile-parser-1.7.1" = { - name = "snyk-nodejs-lockfile-parser"; - packageName = "snyk-nodejs-lockfile-parser"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.7.1.tgz"; - sha512 = "0gHELqMhzUxb/t3Tg6d6G9LTDioOXCrEMt9aetOeV8wD/ZRL5VFNjwcdrm8qILLqzDFaFjFIyMc66c0OL4zFAQ=="; - }; - }; - "snyk-nuget-plugin-1.6.5" = { - name = "snyk-nuget-plugin"; - packageName = "snyk-nuget-plugin"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.5.tgz"; - sha512 = "3qIndzkxCxiaGvAwMkqChbChGdwhNePPyfi0WjhC/nJGwecqU3Fb/NeTW7lgyT+xoq/dFnzW0DgBJ4+AyNA2gA=="; - }; - }; "snyk-nuget-plugin-1.7.2" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; @@ -30804,15 +30894,6 @@ let sha512 = "6m736zGVoeT/zS9KEtlmqTSPEPjAfLe8iYoQ3AwbyxDhzuLY49lTaV67MyZtGwjhi1x4KBe+XOgeWwyf6Avf/A=="; }; }; - "snyk-php-plugin-1.5.1" = { - name = "snyk-php-plugin"; - packageName = "snyk-php-plugin"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.1.tgz"; - sha512 = "g5QSHBsRJ2O4cNxKC4zlWwnQYiSgQ77Y6QgGmo3ihPX3VLZrc1amaZIpPsNe1jwXirnGj2rvR5Xw+jDjbzvHFw=="; - }; - }; "snyk-php-plugin-1.5.2" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; @@ -30822,15 +30903,6 @@ let sha512 = "s/s9s7mslHjLnzin2BNLGdy/s6tNBfJ4/T/d9JBjsjIwdJFaUKY/ciWwBLNaWt2Aqtyr3DiUcqg3j/pwTKhEDg=="; }; }; - "snyk-policy-1.13.1" = { - name = "snyk-policy"; - packageName = "snyk-policy"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.13.1.tgz"; - sha512 = "l9evS3Yk70xyvajjg+I6Ij7fr7gxpVRMZl0J1xNpWps/IVu4DSGih3aMmXi47VJozr4A/eFyj7R1lIr2GhqJCA=="; - }; - }; "snyk-policy-1.13.3" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -30840,15 +30912,6 @@ let sha512 = "6J2a+Wt9zgvTtCwi4x8rLtkDQzFNPqubfIgs3aR35ZsEXPwI4XHGo0cxnJPDriqncp2JK72vnRpNfIZ7v0L1Mw=="; }; }; - "snyk-python-plugin-1.9.0" = { - name = "snyk-python-plugin"; - packageName = "snyk-python-plugin"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.9.0.tgz"; - sha512 = "zlyOHoCpmyVym9AwkboeepzEGrY3gHsM7eWP/nJ85TgCnQO5H5orKm3RL57PNbWRY+BnDmoQQ+udQgjym2+3sg=="; - }; - }; "snyk-python-plugin-1.9.1" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; @@ -30876,15 +30939,6 @@ let sha512 = "nlw62wiWhGOTw3BD3jVIwrUkRR4iNxEkkO4Y/PWs8BsUWseGu1H6QgLesFXJb3qx7ANJ5UbUCJMgV+eL0Lf9cA=="; }; }; - "snyk-sbt-plugin-2.0.0" = { - name = "snyk-sbt-plugin"; - packageName = "snyk-sbt-plugin"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.0.0.tgz"; - sha512 = "bOUqsQ1Lysnwfnvf4QQIBfC0M0ZVuhlshTKd7pNwgAJ41YEPJNrPEpzOePl/HfKtwilEEwHh5YHvjYGegEKx0A=="; - }; - }; "snyk-sbt-plugin-2.0.1" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; @@ -31101,6 +31155,33 @@ let sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw=="; }; }; + "socks5-client-1.2.6" = { + name = "socks5-client"; + packageName = "socks5-client"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/socks5-client/-/socks5-client-1.2.6.tgz"; + sha512 = "6ly0ZYGQaX8vBZvnRnRKT5yixfFEuQVxvYL5UGb7EFarP2d1yoWRJRBVfLKkBK5nOzX862EhhzOYwgZxRARwlQ=="; + }; + }; + "socks5-http-client-1.0.4" = { + name = "socks5-http-client"; + packageName = "socks5-http-client"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/socks5-http-client/-/socks5-http-client-1.0.4.tgz"; + sha512 = "K16meYkltPtps6yDOqK9Mwlfz+pdD2kQQQ/TCO/gu2AImUmfO6nF2uXX1YWrPs4NCfClQNih19wqLXmuUcZCrA=="; + }; + }; + "socks5-https-client-1.2.1" = { + name = "socks5-https-client"; + packageName = "socks5-https-client"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks5-https-client/-/socks5-https-client-1.2.1.tgz"; + sha512 = "FbZ/X/2Xq3DAMhuRA4bnN0jy1QxaPTVPLFvyv6CEj0QDKSTdWp9yRxo1JhqXmWKhPQeJyUMajHJB2UjT43pFcw=="; + }; + }; "sodium-browserify-1.2.4" = { name = "sodium-browserify"; packageName = "sodium-browserify"; @@ -31155,13 +31236,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.6.3" = { + "sonic-boom-0.7.3" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.6.3"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.3.tgz"; - sha512 = "TMhj6kDJk9LLzCTTL8+HPCfFn4MwkE4P6k2Up89Rz949+DSRw90V62upRKC99rJEOmu4E9ljH5Otu2JSRmx+bg=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.3.tgz"; + sha512 = "A9EyoIeLD+g9vMLYQKjNCatJtAKdBQMW03+L8ZWWX/A6hq+srRCwdqHrBD1R8oSMLXov3oHN13dljtZf12q2Ow=="; }; }; "sorcery-0.10.0" = { @@ -31290,6 +31371,15 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + }; + }; "source-map-resolve-0.5.2" = { name = "source-map-resolve"; packageName = "source-map-resolve"; @@ -31335,15 +31425,6 @@ let sha512 = "eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w=="; }; }; - "source-map-support-0.5.6" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz"; - sha512 = "N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g=="; - }; - }; "source-map-url-0.4.0" = { name = "source-map-url"; packageName = "source-map-url"; @@ -31533,6 +31614,15 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; + "sprintf-js-1.1.0" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.0.tgz"; + sha1 = "cffcaf702daf65ea39bb4e0fa2b299cec1a1be46"; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -32289,15 +32379,6 @@ let sha512 = "2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="; }; }; - "string.prototype.matchall-2.0.0" = { - name = "string.prototype.matchall"; - packageName = "string.prototype.matchall"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz"; - sha512 = "WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q=="; - }; - }; "string.prototype.padstart-3.0.0" = { name = "string.prototype.padstart"; packageName = "string.prototype.padstart"; @@ -32928,15 +33009,6 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "table-4.0.3" = { - name = "table"; - packageName = "table"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; - sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg=="; - }; - }; "table-5.2.3" = { name = "table"; packageName = "table"; @@ -33514,15 +33586,6 @@ let sha512 = "rUwGDruKq1gX+FFHbTl5qjI7teVO7eOe+C8IcQ7QT+1BK3eEUXJqbZcBOeaRP4FwSC/C1A5jDoIVta0nIQ9yew=="; }; }; - "tmp-0.0.28" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.28"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz"; - sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; - }; - }; "tmp-0.0.29" = { name = "tmp"; packageName = "tmp"; @@ -33559,6 +33622,15 @@ let sha512 = "NQPUaywaVC2hzWkBBsTX3sV2XfxU0mc409rJyrA7iCu5DSTjMLUqI+U4KJVSy/Ltp0zgbWMWua471R7zMql9Pw=="; }; }; + "tmp-promise-1.0.5" = { + name = "tmp-promise"; + packageName = "tmp-promise"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.5.tgz"; + sha512 = "hOabTz9Tp49wCozFwuJe5ISrOqkECm6kzw66XTP23DuzNU7QS/KiZq5LC9Y7QSy8f1rPSLy4bKaViP0OwGI1cA=="; + }; + }; "to-absolute-glob-2.0.2" = { name = "to-absolute-glob"; packageName = "to-absolute-glob"; @@ -33802,15 +33874,6 @@ let sha1 = "42d88dd116618bcf00d6106dd5446f3427902ff1"; }; }; - "touch-0.0.3" = { - name = "touch"; - packageName = "touch"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz"; - sha1 = "51aef3d449571d4f287a5d87c9c8b49181a0db1d"; - }; - }; "touch-3.1.0" = { name = "touch"; packageName = "touch"; @@ -34234,6 +34297,15 @@ let sha512 = "tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA=="; }; }; + "typescript-3.2.4" = { + name = "typescript"; + packageName = "typescript"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz"; + sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; + }; + }; "typewise-1.0.3" = { name = "typewise"; packageName = "typewise"; @@ -34810,13 +34882,13 @@ let sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg=="; }; }; - "unorm-1.4.1" = { + "unorm-1.5.0" = { name = "unorm"; packageName = "unorm"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz"; - sha1 = "364200d5f13646ca8bcd44490271335614792300"; + url = "https://registry.npmjs.org/unorm/-/unorm-1.5.0.tgz"; + sha512 = "sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw=="; }; }; "unpipe-1.0.0" = { @@ -35962,13 +36034,13 @@ let sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; - "webassemblyjs-1.8.3" = { + "webassemblyjs-1.8.4" = { name = "webassemblyjs"; packageName = "webassemblyjs"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.8.3.tgz"; - sha512 = "HBAmsgCj2NmMe3u5zV4/pJDSDyHYSsY75kg5cdox/aE1jS5hPUi41Z+DuIeSJOjjikOGY/t71ygAifmFr07ZFg=="; + url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.8.4.tgz"; + sha512 = "yhaazcPmYk2LGOACImN7gK4geGq3jTiXEPGZPajEXJfDP8Xh9FE10PbpqF4orVjBR+ZX1+0LPsYB8Y7MFL+Yzg=="; }; }; "webidl-conversions-2.0.1" = { @@ -36899,15 +36971,6 @@ let sha512 = "ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig=="; }; }; - "yargs-12.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz"; - sha512 = "e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ=="; - }; - }; "yargs-12.0.4" = { name = "yargs"; packageName = "yargs"; @@ -36926,6 +36989,15 @@ let sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; }; }; + "yargs-13.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz"; + sha512 = "1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -36989,6 +37061,15 @@ let sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; }; }; + "yargs-parser-13.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz"; + sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -37052,15 +37133,6 @@ let sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; }; }; - "yauzl-2.9.2" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"; - }; - }; "yeast-0.1.2" = { name = "yeast"; packageName = "yeast"; @@ -37190,110 +37262,473 @@ let }; in { - asar = nodeEnv.buildNodePackage { - name = "asar"; - packageName = "asar"; - version = "0.14.6"; + "@angular/cli" = nodeEnv.buildNodePackage { + name = "_at_angular_slash_cli"; + packageName = "@angular/cli"; + version = "7.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-0.14.6.tgz"; - sha512 = "ZqybKcdO5At6y3ge2RHxVImc6Eltb2t3sxT7lk4T4zjZBSFUuIGCIZY6f41dCjlvJSizN5QPRr8YTgMhpgBjLg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.3.tgz"; + sha512 = "dw1iBOYbQRN2l/BH21zDItDFC9KXgqeK0A/koDLDukjrUAnW/XVATjxGi+7EPlTpABTFhqu/rHZDy8aBglLDXQ=="; }; dependencies = [ - sources."abbrev-1.1.1" + sources."@angular-devkit/architect-0.13.3" + sources."@angular-devkit/core-7.3.3" + sources."@angular-devkit/schematics-7.3.3" + sources."@schematics/angular-7.3.3" + sources."@schematics/update-0.13.3" + sources."@yarnpkg/lockfile-1.1.0" + sources."JSONStream-1.3.5" + sources."agent-base-4.2.1" + sources."agentkeepalive-3.5.2" sources."ajv-6.9.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-2.0.0" + sources."aproba-1.2.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-each-1.0.1" + sources."atob-2.1.2" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."binary-extensions-1.13.0" + sources."bluebird-3.5.3" sources."brace-expansion-1.1.11" - sources."buffers-0.1.1" - sources."caseless-0.12.0" - sources."chainsaw-0.1.0" - sources."chromium-pickle-js-0.2.0" - sources."combined-stream-1.0.7" - sources."commander-2.19.0" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."buffer-from-1.1.1" + sources."builtins-1.0.3" + sources."cacache-11.3.2" + sources."cache-base-1.0.1" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."chokidar-2.0.4" + sources."chownr-1.1.1" + (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-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."component-emitter-1.2.1" sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."cuint-0.2.2" - sources."dashdash-1.14.1" - sources."decompress-zip-0.3.0" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" + sources."cyclist-0.2.2" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" + sources."duplexify-3.7.1" + sources."encoding-0.1.12" + sources."end-of-stream-1.4.1" + sources."err-code-1.1.2" + sources."es6-promise-4.2.6" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + (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."is-extendable-0.1.1" + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-3.0.2" + sources."external-editor-3.0.3" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-0.26.7" + sources."figgy-pudding-3.5.1" + sources."figures-2.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."flush-write-stream-1.1.1" + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + sources."from2-2.3.0" + sources."fs-minipass-1.2.5" + sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."getpass-0.1.7" - sources."glob-6.0.4" + sources."fsevents-1.2.7" + sources."genfun-5.0.0" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.3" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) sources."graceful-fs-4.1.15" - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."http-signature-1.2.0" + sources."has-flag-3.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."http-cache-semantics-3.8.1" + (sources."http-proxy-agent-2.1.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + (sources."https-proxy-agent-2.2.1" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.1" + ]; + }) + sources."humanize-ms-1.2.1" + sources."iconv-lite-0.4.24" + sources."iferr-0.1.5" + sources."ignore-walk-3.0.1" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."is-typedarray-1.0.0" - sources."isarray-0.0.1" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."ini-1.3.5" + sources."inquirer-6.2.1" + sources."ip-1.1.5" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + 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-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" - sources."klaw-1.3.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" + sources."jsonparse-1.3.1" + sources."kind-of-6.0.2" + sources."lodash-4.17.11" + sources."lodash.debounce-4.0.8" + sources."lru-cache-5.1.1" + (sources."make-fetch-happen-4.0.1" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."micromatch-3.1.10" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" + sources."mississippi-3.0.0" + sources."mixin-deep-1.3.1" sources."mkdirp-0.5.1" - sources."mkpath-0.1.0" - sources."mksnapshot-0.3.4" - sources."nopt-3.0.6" - sources."oauth-sign-0.9.0" + sources."move-concurrently-1.0.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."nan-2.12.1" + sources."nanomatch-1.2.13" + sources."node-fetch-npm-2.0.2" + sources."normalize-package-data-2.5.0" + sources."normalize-path-2.1.1" + sources."npm-bundled-1.0.6" + sources."npm-package-arg-6.1.0" + sources."npm-packlist-1.4.1" + sources."npm-pick-manifest-2.2.3" + (sources."npm-registry-fetch-3.9.0" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) + (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-visit-1.0.1" + sources."object.pick-1.3.0" sources."once-1.4.0" + sources."onetime-2.0.1" + sources."opn-5.4.0" + sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."pacote-9.4.0" + sources."parallel-transform-1.1.0" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" - sources."psl-1.1.31" - sources."punycode-2.1.1" - sources."q-1.5.1" - sources."qs-6.5.2" - sources."readable-stream-1.1.14" - sources."request-2.88.0" - (sources."rimraf-2.6.3" // { + sources."path-parse-1.0.6" + sources."posix-character-classes-0.1.1" + sources."process-nextick-args-2.0.0" + sources."promise-inflight-1.0.1" + sources."promise-retry-1.1.1" + sources."protoduck-5.0.1" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { dependencies = [ - sources."glob-7.1.3" + sources."pump-2.0.1" ]; }) + sources."punycode-2.1.1" + sources."readable-stream-2.3.6" + sources."readdirp-2.2.1" + sources."regex-not-1.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-1.10.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."retry-0.10.1" + sources."rimraf-2.6.3" + sources."run-async-2.3.0" + sources."run-queue-1.0.3" + sources."rxjs-6.3.3" sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sshpk-1.16.1" - sources."string_decoder-0.10.31" - sources."tmp-0.0.28" - (sources."touch-0.0.3" // { + sources."semver-5.6.0" + sources."semver-intersect-1.4.0" + (sources."set-value-2.0.0" // { dependencies = [ - sources."nopt-1.0.10" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - (sources."tough-cookie-2.4.3" // { + sources."signal-exit-3.0.2" + sources."smart-buffer-4.0.2" + (sources."snapdragon-0.8.2" // { dependencies = [ - sources."punycode-1.4.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."is-extendable-0.1.1" + sources."kind-of-5.1.0" + sources."source-map-0.5.7" ]; }) - sources."traverse-0.3.9" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + (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."socks-2.2.3" + sources."socks-proxy-agent-4.0.1" + sources."source-map-0.7.3" + 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."split-string-3.1.0" + sources."ssri-6.0.1" + (sources."static-extend-0.1.2" // { + 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."stream-each-1.2.3" + sources."stream-shift-1.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."string_decoder-1.1.1" + (sources."strip-ansi-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.0.0" + ]; + }) + sources."supports-color-5.5.0" + sources."symbol-observable-1.2.0" + sources."tar-4.4.8" + sources."through-2.3.8" + sources."through2-2.0.5" + 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."tslib-1.9.3" + sources."typedarray-0.0.6" + sources."typescript-3.2.4" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + sources."set-value-0.4.3" + ]; + }) + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.1" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."upath-1.1.0" sources."uri-js-4.2.2" - sources."uuid-3.3.2" - sources."verror-1.10.0" + sources."urix-0.1.0" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.4" + sources."validate-npm-package-name-3.0.0" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."y18n-4.0.0" + sources."yallist-3.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CLI tool for Angular"; + homepage = https://github.com/angular/angular-cli; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + asar = nodeEnv.buildNodePackage { + name = "asar"; + packageName = "asar"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asar/-/asar-1.0.0.tgz"; + sha512 = "MBiDU5cDr9UWuY2F0zq2fZlnyRq1aOPmJGMas22Qa14K1odpRXL3xkMHPN3uw2hAK5mD89Q+/KidOUtpi4V0Cg=="; + }; + dependencies = [ + sources."balanced-match-1.0.0" + sources."bluebird-3.5.3" + sources."brace-expansion-1.1.11" + sources."chromium-pickle-js-0.2.0" + sources."commander-2.19.0" + sources."concat-map-0.0.1" + sources."cuint-0.2.2" + sources."fs.realpath-1.0.0" + sources."glob-7.1.3" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."once-1.4.0" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pify-4.0.1" + sources."tmp-0.0.33" + sources."tmp-promise-1.0.5" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -37317,7 +37752,7 @@ in sources."agent-base-4.2.1" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.0" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."binary-0.3.0" sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" @@ -37645,7 +38080,7 @@ in sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { @@ -37712,7 +38147,7 @@ in dependencies = [ sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -37963,7 +38398,7 @@ in }) sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" (sources."rc-0.4.0" // { dependencies = [ @@ -38266,7 +38701,7 @@ in ]; }) sources."acorn-walk-6.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."aliasify-2.1.0" sources."ansi-0.3.1" sources."ansi-align-2.0.0" @@ -38294,7 +38729,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.3" @@ -38581,7 +39016,7 @@ in sources."object-assign-4.1.1" sources."object-keys-1.1.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-1.1.0" sources."opener-1.5.1" @@ -38623,7 +39058,7 @@ in sources."qs-6.5.2" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.0" sources."raw-body-2.3.3" @@ -38730,7 +39165,7 @@ in sources."undeclared-identifiers-1.1.2" sources."underscore-1.9.1" sources."unique-string-1.0.0" - sources."unorm-1.4.1" + sources."unorm-1.5.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" (sources."update-notifier-2.5.0" // { @@ -39116,7 +39551,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-11.9.4" + sources."@types/node-11.9.5" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -39145,7 +39580,7 @@ in sources."d-1.0.0" sources."debug-3.2.6" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-set-0.1.5" @@ -39408,13 +39843,13 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" sources."ansi-split-1.0.1" sources."ansi-styles-3.2.1" - sources."anymatch-1.3.2" + sources."anymatch-2.0.0" sources."ap-0.1.0" (sources."append-tree-2.4.4" // { dependencies = [ @@ -39422,18 +39857,26 @@ in sources."varint-5.0.0" ]; }) - sources."arr-diff-2.0.0" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-lru-1.1.1" - sources."array-unique-0.2.1" + sources."array-unique-0.3.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" sources."async-0.9.2" sources."asynckit-0.4.0" + sources."atob-2.1.2" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" (sources."bitfield-rle-2.2.1" // { @@ -39451,7 +39894,11 @@ in sources."body-0.1.0" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" @@ -39459,6 +39906,7 @@ in sources."buffer-from-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.1.0" + sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" @@ -39466,20 +39914,40 @@ in sources."chalk-2.4.2" sources."ci-info-1.6.0" sources."circular-append-file-1.0.1" + (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-spinners-1.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."codecs-1.2.1" + sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.3" sources."combined-stream-1.0.7" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-3.1.2" sources."connections-1.4.2" sources."content-types-0.1.0" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."corsify-2.1.0" sources."count-trailing-zeros-1.0.1" @@ -39495,7 +39963,7 @@ in ]; }) sources."dat-encoding-5.0.1" - sources."dat-ignore-2.1.1" + sources."dat-ignore-2.1.2" (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" @@ -39513,9 +39981,12 @@ in sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" sources."debug-4.1.1" + sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-equal-0.2.2" sources."deep-extend-0.6.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."diffy-2.1.0" sources."directory-index-html-2.1.0" @@ -39542,12 +40013,42 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.1" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + 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."ms-2.0.0" + ]; + }) sources."extend-3.0.2" - sources."extglob-0.3.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-bitfield-1.2.2" @@ -39556,28 +40057,39 @@ in sources."fd-lock-1.0.2" sources."fd-read-stream-1.1.0" sources."figures-2.0.0" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."flat-tree-1.6.0" sources."for-each-0.3.3" sources."for-in-1.0.2" - sources."for-own-0.1.5" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-stream-3.0.0" + sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.3" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" sources."global-4.3.2" sources."global-dirs-0.1.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-flag-3.0.0" + 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."http-methods-0.1.0" sources."http-signature-1.2.0" (sources."hypercore-6.25.0" // { @@ -39607,32 +40119,38 @@ in sources."ini-1.3.5" sources."inspect-custom-symbol-1.1.0" sources."ip-1.1.5" + 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-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" + 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-1.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-function-1.0.1" - sources."is-glob-2.0.1" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" - sources."is-number-2.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-obj-1.0.1" sources."is-options-1.0.1" sources."is-path-inside-1.0.1" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" + sources."is-plain-object-2.0.4" 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-string-1.0.4" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" sources."iterators-0.1.0" sources."jsbn-0.1.1" @@ -39652,7 +40170,7 @@ in ]; }) sources."keypress-0.2.1" - sources."kind-of-3.2.2" + sources."kind-of-6.0.2" sources."last-one-wins-1.0.4" sources."latest-version-3.1.0" sources."length-prefixed-message-3.0.3" @@ -39661,11 +40179,12 @@ in sources."lru-3.1.0" sources."lru-cache-4.1.5" sources."make-dir-1.3.0" - sources."math-random-1.0.4" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."memory-pager-1.5.0" sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" - sources."micromatch-2.3.11" + sources."micromatch-3.1.10" sources."mime-2.4.0" sources."mime-db-1.38.0" sources."mime-types-2.1.22" @@ -39674,6 +40193,11 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mirror-folder-3.0.0" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -39688,6 +40212,7 @@ in sources."nan-2.12.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" + sources."nanomatch-1.2.13" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" sources."napi-macros-1.8.2" @@ -39702,21 +40227,36 @@ in sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" - sources."object.omit-2.0.1" + (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-keys-1.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" - sources."parse-glob-3.0.4" - sources."parse-headers-2.0.1" + sources."parse-headers-2.0.2" + sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."performance-now-2.1.0" sources."pify-3.0.0" sources."pkginfo-0.4.1" + sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."preserve-0.2.0" sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" sources."process-0.5.2" @@ -39736,19 +40276,13 @@ in sources."random-access-file-2.1.0" sources."random-access-memory-3.1.1" sources."random-access-storage-1.3.0" - (sources."randomatic-3.1.1" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.2" - ]; - }) - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" - sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."remove-array-items-1.1.1" @@ -39756,13 +40290,21 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."revalidator-0.1.8" sources."rimraf-2.6.3" sources."rusha-0.8.13" 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-diff-2.1.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -39776,15 +40318,66 @@ in sources."simple-sha1-2.1.1" sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + 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."ms-2.0.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."sodium-javascript-0.5.5" sources."sodium-native-2.3.0" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.1.0" + sources."split-string-3.1.0" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" + (sources."static-extend-0.1.2" // { + 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."stream-collector-1.0.1" sources."stream-each-1.2.3" (sources."stream-parser-0.3.1" // { @@ -39795,6 +40388,7 @@ in }) sources."stream-shift-1.0.0" sources."string-width-2.1.1" + sources."string.prototype.trim-1.1.2" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" @@ -39811,6 +40405,13 @@ in sources."thunky-1.0.3" sources."timed-out-4.0.1" sources."to-buffer-1.1.1" + (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."toiletdb-1.4.1" // { dependencies = [ sources."debug-2.6.9" @@ -39822,22 +40423,44 @@ in sources."punycode-1.4.1" ]; }) - sources."township-client-1.3.2" - sources."trim-0.0.1" + (sources."township-client-1.3.2" // { + dependencies = [ + sources."is-number-2.1.0" + sources."kind-of-3.2.2" + ]; + }) sources."ttl-1.3.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uint64be-2.0.2" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) sources."unique-string-1.0.0" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" sources."uri-js-4.2.2" + sources."urix-0.1.0" sources."url-parse-lax-1.0.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.3" @@ -40036,19 +40659,19 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.4.0.tgz"; - sha512 = "9LWHAlPqaGFuh9n6uEIHBBuQ2+G7R3y4MkqGiA7guTUDkCUPRcSfJEOL3P0RHEV6i8v4U1F9LYsTQB4FklHPrw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.6.0.tgz"; + sha512 = "AUHAYzYJNV6QlCxHlZt40iNXc00ibi2pLGwEjcIpXiNW7w28C57SW2bbVa8e+mYwgSr89GRi8RnihooOsZmOcg=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.405.0" + sources."aws-sdk-2.409.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -40077,6 +40700,11 @@ in sources."ieee754-1.1.8" sources."inherits-2.0.3" sources."ini-1.3.5" + (sources."ip-address-5.8.9" // { + dependencies = [ + sources."jsbn-1.1.0" + ]; + }) sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -40088,6 +40716,11 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.11" + sources."lodash.find-4.6.0" + sources."lodash.max-4.0.1" + sources."lodash.merge-4.6.1" + sources."lodash.padstart-4.6.1" + sources."lodash.repeat-4.1.0" sources."lossless-json-1.0.3" sources."mime-db-1.38.0" sources."mime-types-2.1.22" @@ -40107,6 +40740,10 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" + sources."socks5-client-1.2.6" + sources."socks5-http-client-1.0.4" + sources."socks5-https-client-1.2.1" + sources."sprintf-js-1.1.0" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."through-2.3.8" @@ -40221,7 +40858,7 @@ in ]; }) sources."encodeurl-1.0.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-promisify-6.0.1" sources."es6-symbol-3.1.1" @@ -40586,13 +41223,13 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.0-rev4"; + version = "0.19.0-rev5"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev4.tgz"; - sha512 = "PWRg9rOc7R2W1lREG5ZaVDywORXO9TYCJzfkK3KEcyiqBr+NpBONp25VhPQKm5mfQvXEtiCWVvqn54/q0bKx9g=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev5.tgz"; + sha512 = "D/LS6Db9VIuaM3UffbBkrHmR6oLpm68EYVSru9CeHkVqUQwedVuLmZX6d0jvnU0C8I/dLSEdXlGueaPgTGhNnA=="; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."arr-diff-2.0.0" @@ -40688,6 +41325,7 @@ in (sources."find-elm-dependencies-2.0.0" // { dependencies = [ sources."firstline-1.2.0" + sources."lodash-4.17.10" ]; }) sources."find-parent-dir-0.3.0" @@ -40772,7 +41410,7 @@ in sources."jsprim-1.4.1" sources."kind-of-3.2.2" sources."klaw-1.3.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lru-cache-4.1.5" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -40803,7 +41441,11 @@ in sources."kind-of-6.0.2" ]; }) - sources."node-elm-compiler-5.0.1" + (sources."node-elm-compiler-5.0.1" // { + dependencies = [ + sources."lodash-4.17.10" + ]; + }) sources."normalize-path-2.1.1" sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { @@ -40907,11 +41549,7 @@ in sources."repeat-string-1.6.1" sources."request-2.88.0" sources."request-promise-4.2.4" - (sources."request-promise-core-1.1.2" // { - dependencies = [ - sources."lodash-4.17.11" - ]; - }) + sources."request-promise-core-1.1.2" sources."resolve-url-0.2.1" sources."ret-0.1.15" (sources."rimraf-2.6.3" // { @@ -41203,7 +41841,7 @@ in sources."private-0.1.8" sources."prop-types-15.7.2" sources."pseudomap-1.0.2" - sources."react-is-16.8.2" + sources."react-is-16.8.3" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -41288,7 +41926,7 @@ in sources."@babel/highlight-7.0.0" sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" sources."ansi-styles-3.2.1" @@ -41431,7 +42069,7 @@ in sources."@babel/highlight-7.0.0" sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" sources."ansi-styles-3.2.1" @@ -41590,7 +42228,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -42625,7 +43263,7 @@ in }) sources."accepts-1.3.5" sources."agent-base-4.2.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -42740,7 +43378,7 @@ in sources."dotenv-6.2.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.10" + sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."encoding-0.1.12" @@ -42830,7 +43468,7 @@ in sources."har-validator-5.1.3" sources."has-flag-3.0.0" sources."header-case-1.0.1" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."http-errors-1.6.3" (sources."http-proxy-agent-2.1.0" // { @@ -42900,13 +43538,13 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" - (sources."jsonwebtoken-8.4.0" // { + (sources."jsonwebtoken-8.5.0" // { dependencies = [ sources."ms-2.1.1" ]; }) sources."jsprim-1.4.1" - sources."jwa-1.2.0" + sources."jwa-1.3.0" sources."jws-3.2.1" sources."latest-version-3.1.0" sources."lcid-1.0.0" @@ -43306,7 +43944,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."interpret-1.1.0" sources."is-absolute-1.0.0" @@ -43592,7 +44230,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.1" sources."error-ex-1.3.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -43672,7 +44310,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -43997,7 +44635,7 @@ in sources."detect-file-1.0.0" sources."each-props-1.3.2" sources."error-ex-1.3.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" (sources."expand-brackets-2.1.4" // { @@ -44049,7 +44687,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -44275,91 +44913,35 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.10.1"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.1.tgz"; - sha512 = "Zn+mo0NNXIW7+pWfdIZx49IfmuVI4I1UPjZhXFvc0Rq7fHul//gbVASrnxtiTbOOCNvD4JKVvKkpo4BNDzHi6w=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.3.tgz"; + sha512 = "LZZrDZRl1u6aYacpEl10K0wGKSQMboCNBWMgsV2eR4sxYD8jbG+FVBZqp3eo7tTwxZOdc9Cmjh3nQ4Nf4G37gQ=="; }; dependencies = [ - sources."@snyk/dep-graph-1.4.0" - sources."@snyk/gemfile-1.2.0" - sources."@yarnpkg/lockfile-1.1.0" - sources."abbrev-1.1.1" - sources."agent-base-4.2.1" - sources."ajv-6.9.1" - sources."ansi-align-2.0.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."ansicolors-0.3.2" - sources."archy-1.0.0" - sources."argparse-1.0.10" - sources."asap-2.0.6" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."ast-types-0.12.2" sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" - sources."bytes-3.0.0" - sources."camelcase-2.1.1" - sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.4.2" - sources."chardet-0.4.2" - sources."ci-info-1.6.0" sources."cli-1.0.1" - sources."cli-boxes-1.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) sources."clone-2.1.2" - sources."clone-deep-0.3.0" - sources."co-4.6.0" - sources."code-point-at-1.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."colors-1.3.2" sources."combined-stream-1.0.7" sources."commander-2.17.1" sources."concat-map-0.0.1" - sources."configstore-3.1.2" sources."console-browserify-1.1.0" - sources."core-js-2.3.0" sources."core-util-is-1.0.2" - sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" - sources."crypto-random-string-1.0.0" sources."csslint-1.0.5" sources."dashdash-1.14.1" - sources."data-uri-to-buffer-1.2.0" sources."date-now-0.1.4" - sources."debug-3.2.6" - sources."decamelize-1.2.0" - sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" - sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."diff-4.0.1" - sources."dockerfile-ast-0.0.12" (sources."dom-serializer-0.1.1" // { dependencies = [ sources."entities-1.1.2" @@ -44368,108 +44950,32 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.3.0" sources."domutils-1.5.1" - sources."dot-prop-4.2.0" - sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."email-validator-2.0.4" sources."entities-1.0.0" - sources."es6-promise-4.2.6" - sources."es6-promisify-5.0.0" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" - sources."esprima-3.1.3" - sources."estraverse-4.2.0" - sources."esutils-2.0.2" - sources."execa-0.10.0" sources."exit-0.1.2" sources."extend-3.0.2" - sources."external-editor-2.2.0" 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."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."forever-agent-0.6.1" sources."form-data-2.3.3" 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" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) sources."getpass-0.1.7" sources."glob-7.1.3" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."global-dirs-0.1.1" - sources."got-6.7.1" - sources."graceful-fs-4.1.15" - sources."graphlib-2.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-3.0.0" - sources."hosted-git-info-2.7.1" - (sources."htmlparser2-3.8.3" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) - sources."http-errors-1.6.3" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."htmlparser2-3.8.3" sources."http-signature-1.2.0" - sources."https-proxy-agent-2.2.1" - sources."iconv-lite-0.4.24" - 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."invert-kv-1.0.0" - sources."ip-1.1.5" - sources."is-buffer-1.1.6" - sources."is-ci-1.2.1" sources."is-dotfile-1.0.3" - sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" - sources."is-fullwidth-code-point-2.0.0" sources."is-glob-2.0.1" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - 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-retry-allowed-1.1.0" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-wsl-1.1.0" sources."isarray-0.0.1" - sources."isexe-2.0.0" - sources."isobject-3.0.1" sources."isstream-0.1.2" - (sources."js-yaml-3.12.1" // { - dependencies = [ - sources."esprima-4.0.1" - ]; - }) sources."jsbn-0.1.1" (sources."jshint-2.10.1" // { dependencies = [ @@ -44480,221 +44986,40 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - (sources."jszip-3.1.5" // { - dependencies = [ - sources."es6-promise-3.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - ]; - }) - sources."kind-of-3.2.2" - sources."latest-version-3.1.0" - sources."lazy-cache-0.2.7" - sources."lcid-1.0.0" - sources."levn-0.3.0" - sources."lie-3.1.1" sources."lodash-4.17.11" - sources."lodash.assign-4.2.0" - sources."lodash.assignin-4.2.0" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.get-4.4.2" - sources."lodash.set-4.3.2" - sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" - sources."macos-release-2.0.0" - sources."make-dir-1.3.0" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-1.2.0" - (sources."mixin-object-2.0.1" // { - dependencies = [ - sources."for-in-0.1.8" - ]; - }) - sources."ms-2.1.1" - sources."mute-stream-0.0.7" - (sources."nconf-0.10.0" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) - (sources."needle-2.2.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."netmask-1.0.6" - sources."nice-try-1.0.5" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."onetime-2.0.1" - sources."opn-5.4.0" - sources."optionator-0.8.2" - sources."os-locale-1.4.0" - sources."os-name-3.0.0" - sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."pac-proxy-agent-2.0.2" - sources."pac-resolver-3.0.0" - sources."package-json-4.0.1" - sources."pako-1.0.8" sources."parse-glob-3.0.4" sources."parserlib-1.1.1" 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."performance-now-2.1.0" - sources."pify-3.0.0" - sources."prelude-ls-1.1.2" - 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-from-env-1.0.0" - sources."pseudomap-1.0.2" sources."psl-1.1.31" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."raw-body-2.3.3" // { - dependencies = [ - sources."iconv-lite-0.4.23" - ]; - }) - sources."rc-1.2.8" - (sources."readable-stream-2.3.6" // { - dependencies = [ - sources."isarray-1.0.0" - sources."string_decoder-1.1.1" - ]; - }) - sources."recursive-readdir-2.2.2" - sources."registry-auth-token-3.3.2" - sources."registry-url-3.1.0" + sources."readable-stream-1.1.14" sources."request-2.88.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."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."setprototypeof-1.1.0" - (sources."shallow-clone-0.1.2" // { - dependencies = [ - sources."kind-of-2.0.1" - ]; - }) - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" sources."shelljs-0.3.0" - sources."signal-exit-3.0.2" - sources."smart-buffer-1.1.15" - sources."snyk-1.134.2" - sources."snyk-config-2.2.1" - sources."snyk-docker-plugin-1.22.0" - sources."snyk-go-plugin-1.6.1" - sources."snyk-gradle-plugin-2.1.3" - 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-paket-parser-1.4.3" - sources."snyk-php-plugin-1.5.2" - sources."snyk-policy-1.13.3" - sources."snyk-python-plugin-1.9.1" - sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-4.0.2" - 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."source-map-0.6.1" - sources."source-map-support-0.5.10" - sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - sources."statuses-1.5.0" - sources."string-width-2.1.1" sources."string_decoder-0.10.31" - sources."strip-ansi-4.0.0" - sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - sources."temp-dir-1.0.0" - sources."tempfile-2.0.0" - (sources."term-size-1.2.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.7.0" - ]; - }) - sources."then-fs-2.0.0" - sources."through-2.3.8" - sources."thunkify-2.1.2" - sources."timed-out-4.0.1" - sources."tmp-0.0.33" - sources."toml-2.3.6" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" - sources."unique-string-1.0.0" - sources."unpipe-1.0.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" sources."uri-js-4.2.2" - sources."url-parse-lax-1.0.0" - sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" - sources."vscode-languageserver-types-3.14.0" - sources."which-1.3.1" - sources."widest-line-2.0.1" - sources."window-size-0.1.4" - sources."windows-release-3.1.0" - sources."wordwrap-1.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - 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."xml-1.0.1" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" - sources."xregexp-2.0.0" - sources."y18n-3.2.1" - sources."yallist-2.1.2" - (sources."yargs-3.32.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) ]; buildInputs = globalBuildInputs; meta = { @@ -44862,7 +45187,7 @@ in sources."es6-promise-4.2.6" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -45450,7 +45775,7 @@ in sha512 = "MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA=="; }; dependencies = [ - sources."@types/node-10.12.26" + sources."@types/node-10.12.27" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" sources."balanced-match-1.0.0" @@ -45518,10 +45843,10 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.3.tgz"; - sha512 = "3F9MMFWpZmb8A9VEOAo1xll+z0JGPLN/2mclRm9NyfPi8cynkTNwzqTDw1MZpadEnEHcCtDy6mzReM4O0BLIEA=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.4.tgz"; + sha512 = "q5Xmx9QXNOzOzIlMoYtLrLiu4Jl/Ce2bn0CNcv54PhyH89CI4GWlGVDye8ei2Ijt9R3U+vsWPsXpLUNob8bs8Q=="; }; dependencies = [ sources."cli-color-0.1.7" @@ -45604,7 +45929,7 @@ in }; dependencies = [ sources."accepts-1.3.5" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -45758,7 +46083,7 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" (sources."os-locale-3.1.0" // { dependencies = [ @@ -46424,7 +46749,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -46472,7 +46797,7 @@ in sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -46735,7 +47060,7 @@ in sources."abbrev-1.1.1" sources."agent-base-4.2.1" sources."agentkeepalive-3.5.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -47174,7 +47499,7 @@ in sources."npm-bundled-1.0.6" sources."npm-lifecycle-2.1.0" sources."npm-package-arg-6.1.0" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npm-pick-manifest-2.2.3" (sources."npm-registry-fetch-3.9.0" // { dependencies = [ @@ -47512,7 +47837,7 @@ in sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -47794,7 +48119,7 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."opn-5.4.0" sources."parseurl-1.3.2" sources."pascalcase-0.1.1" @@ -47939,7 +48264,7 @@ in dependencies = [ sources."accepts-1.3.5" sources."after-0.8.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -48517,7 +48842,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/estree-0.0.39" - sources."@types/node-11.9.4" + sources."@types/node-11.9.5" sources."@webassemblyjs/ast-1.8.3" sources."@webassemblyjs/floating-point-hex-parser-1.8.3" sources."@webassemblyjs/helper-api-error-1.8.3" @@ -48541,7 +48866,7 @@ in sources."ace.improved-0.2.1" sources."acorn-6.1.0" sources."acorn-dynamic-import-4.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.0" sources."amdefine-1.0.1" @@ -48729,7 +49054,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.0.0" - sources."caniuse-lite-1.0.30000938" + sources."caniuse-lite-1.0.30000939" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -49086,7 +49411,7 @@ in sources."hash-base-3.0.4" sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."http-cache-semantics-3.8.1" sources."https-browserify-1.0.0" @@ -49244,7 +49569,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.7" + sources."node-releases-1.1.8" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" (sources."normalize-url-2.0.1" // { @@ -49362,7 +49687,7 @@ in sources."kind-of-6.0.2" ]; }) - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" (sources."read-pkg-4.0.1" // { dependencies = [ @@ -49422,7 +49747,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-7.0.0" sources."regenerator-runtime-0.12.1" - sources."regenerator-transform-0.13.3" + sources."regenerator-transform-0.13.4" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."regexp-tree-0.1.5" @@ -49811,6 +50136,94 @@ in production = true; bypassCache = true; }; + markdown-link-check = nodeEnv.buildNodePackage { + name = "markdown-link-check"; + packageName = "markdown-link-check"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.7.2.tgz"; + sha512 = "rt6d75iz0Bw9LHmN+DT1a7kiVrkK3gsGhPVB/PwwZDq8LHlILQToC/hwq9tE2CUDg8OdZOV1+7j8vuG9Mu4sIQ=="; + }; + dependencies = [ + sources."ajv-6.9.2" + sources."ansi-styles-3.2.1" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-2.6.2" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.7" + sources."commander-2.19.0" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.2" + sources."escape-string-regexp-1.0.5" + 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."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."getpass-0.1.7" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-flag-3.0.0" + sources."http-signature-1.2.0" + sources."is-absolute-url-2.1.0" + sources."is-relative-url-2.0.0" + sources."is-typedarray-1.0.0" + sources."isemail-3.2.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."link-check-4.4.4" + sources."lodash-4.17.11" + sources."markdown-link-extractor-1.2.0" + sources."marked-0.4.0" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."ms-2.1.1" + sources."oauth-sign-0.9.0" + sources."performance-now-2.1.0" + sources."progress-2.0.3" + sources."psl-1.1.31" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."request-2.88.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sshpk-1.16.1" + sources."supports-color-5.5.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "checks the all of the hyperlinks in a markdown text to determine if they are alive or dead"; + homepage = "https://github.com/tcort/markdown-link-check#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + }; mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; @@ -50040,7 +50453,7 @@ in sources."ecc-jsbn-0.1.2" sources."end-of-stream-0.1.5" sources."errno-0.1.7" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -50220,7 +50633,7 @@ in }) sources."hawk-3.1.3" sources."hoek-2.16.3" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."http-signature-1.1.1" sources."image-size-0.5.5" sources."indx-0.2.3" @@ -50591,10 +51004,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-6.0.0.tgz"; - sha512 = "A7g9k3yr8oJaXn2IItFnfgjyxFc/LTe6Wwv7FczP+e8G74o9xYNSbMYmCf1ouldRojLrFcOb+z75P6Ak0GX6ug=="; + url = "https://registry.npmjs.org/mocha/-/mocha-6.0.1.tgz"; + sha512 = "tQzCxWqxSD6Oyg5r7Ptbev0yAMD8p+Vfh4snPFuiUsWqYj0eVYTDT2DkEY307FTj0WRlIWN9rWMMAUzRmijgVQ=="; }; dependencies = [ sources."ansi-colors-3.2.3" @@ -50731,7 +51144,7 @@ in ]; }) sources."he-1.2.0" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -51064,7 +51477,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -51222,7 +51635,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -51375,7 +51788,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.41" + sources."big-integer-1.6.42" sources."block-stream-0.0.9" sources."body-parser-1.18.3" sources."boom-2.10.1" @@ -51685,7 +52098,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -52194,7 +52607,7 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."entities-1.1.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-4.2.6" @@ -52248,7 +52661,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.3" // { dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" ]; }) sources."hash-sum-1.0.2" @@ -52540,7 +52953,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -52914,7 +53327,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.1" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -53097,7 +53510,7 @@ in }) sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."re-emitter-1.1.3" @@ -53201,7 +53614,7 @@ in sources."accepts-1.2.13" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."archiver-3.0.0" sources."archiver-utils-2.0.0" sources."arraybuffer.slice-0.0.6" @@ -53453,7 +53866,7 @@ in sources."object-assign-4.1.0" sources."object-component-0.0.3" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" sources."options-0.0.6" (sources."parse-torrent-4.1.0" // { @@ -53489,7 +53902,7 @@ in sources."random-access-storage-1.3.0" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" (sources."raw-body-2.1.7" // { dependencies = [ @@ -53748,7 +54161,7 @@ in sources."@babel/template-7.2.2" sources."@babel/traverse-7.2.3" sources."@babel/types-7.3.3" - sources."@iarna/toml-2.2.2" + sources."@iarna/toml-2.2.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -53756,7 +54169,7 @@ in sources."@parcel/utils-1.11.0" sources."@parcel/watcher-1.11.0" sources."@parcel/workers-1.11.0" - sources."@types/node-10.12.26" + sources."@types/node-10.12.27" sources."@types/q-1.5.1" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" @@ -53855,8 +54268,8 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-db-1.0.30000938" - sources."caniuse-lite-1.0.30000938" + sources."caniuse-db-1.0.30000939" + sources."caniuse-lite-1.0.30000939" sources."chalk-2.4.2" sources."chokidar-2.1.2" sources."cipher-base-1.0.4" @@ -54227,7 +54640,7 @@ in sources."node-addon-api-1.6.2" sources."node-forge-0.7.6" sources."node-libs-browser-2.2.0" - sources."node-releases-1.1.7" + sources."node-releases-1.1.8" sources."nopt-4.0.1" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -54411,7 +54824,7 @@ in sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."quote-stream-1.0.2" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.0" (sources."readable-stream-2.3.6" // { @@ -54433,7 +54846,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-7.0.0" sources."regenerator-runtime-0.12.1" - sources."regenerator-transform-0.13.3" + sources."regenerator-transform-0.13.4" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -54940,7 +55353,7 @@ in sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."read-1.0.7" sources."read-only-stream-2.0.0" @@ -55215,18 +55628,18 @@ in production = true; bypassCache = true; }; - reveal = nodeEnv.buildNodePackage { - name = "reveal"; - packageName = "reveal"; - version = "0.0.4"; + "reveal.js" = nodeEnv.buildNodePackage { + name = "reveal.js"; + packageName = "reveal.js"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/reveal/-/reveal-0.0.4.tgz"; - sha1 = "1c1428193359fb03bc029139062ea29f8f691d85"; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-3.7.0.tgz"; + sha512 = "HTOTNhF5mQAw6fcsptk4oql/DEEUwTG0YHk/LzTNNx0/3IgvOQZqKzvlK/zNpqqKMLlhn1gH9Nvp+FFoc/e5/w=="; }; buildInputs = globalBuildInputs; meta = { - description = "The HTML presentation framework"; - homepage = https://github.com/ForbesLindesay/reveal; + description = "The HTML Presentation Framework"; + homepage = http://revealjs.com/; license = "MIT"; }; production = true; @@ -55241,7 +55654,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -56248,7 +56661,7 @@ in sources."ms-2.0.0" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."p-finally-1.0.0" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -56304,7 +56717,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.5" sources."after-0.8.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -56955,7 +57368,6 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."configstore-3.1.2" - sources."core-js-2.3.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -56975,7 +57387,7 @@ in sources."es6-promise-4.2.6" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -57044,20 +57456,13 @@ in sources."esprima-4.0.1" ]; }) - (sources."jszip-3.1.5" // { - dependencies = [ - sources."es6-promise-3.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - ]; - }) + sources."jszip-3.2.0" sources."kind-of-3.2.2" sources."latest-version-3.1.0" sources."lazy-cache-0.2.7" sources."lcid-1.0.0" sources."levn-0.3.0" - sources."lie-3.1.1" + sources."lie-3.3.0" sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" @@ -57137,6 +57542,7 @@ in sources."secure-keys-1.0.0" sources."semver-5.6.0" sources."semver-diff-2.1.0" + sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.1.0" (sources."shallow-clone-0.1.2" // { dependencies = [ @@ -58519,6 +58925,44 @@ in production = true; bypassCache = true; }; + tsun = nodeEnv.buildNodePackage { + name = "tsun"; + packageName = "tsun"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsun/-/tsun-0.4.0.tgz"; + sha512 = "DM9diPumksx/2837NoyRXq97PxSpqt9zhCnHaoeqmX2ItgksNE+QCXO6bczNAEtVVbQYML9LAxl/iawYKyMZng=="; + }; + dependencies = [ + sources."@types/node-6.14.3" + sources."ansi-0.3.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."colors-1.3.3" + sources."diff-2.2.3" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."minimist-0.0.10" + sources."node-color-readline-1.0.1" + sources."optimist-0.6.1" + sources."os-tmpdir-1.0.2" + sources."rimraf-2.2.8" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."temp-0.8.3" + sources."tslib-1.9.3" + sources."wordwrap-0.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "TSUN: a repl for TypeScript Upgraded Node"; + homepage = https://github.com/HerringtonDarkholme/typescript-repl; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; packageName = "ttf2eot"; @@ -58544,10 +58988,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.3.3"; + version = "3.3.3333"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.3.3.tgz"; - sha512 = "Y21Xqe54TBVp+VDSNbuDYdGw0BpoR/Q6wo/+35M8PAU0vipahnyduJWirxxdxjsAkS7hue53x2zp8gz7F05u0A=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz"; + sha512 = "JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw=="; }; buildInputs = globalBuildInputs; meta = { @@ -58591,7 +59035,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."after-0.8.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -58773,7 +59217,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."just-detect-adblock-1.0.0" - sources."knockout-3.5.0-rc2" + sources."knockout-3.5.0" sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."locks-0.2.2" @@ -58815,7 +59259,7 @@ in sources."object-component-0.0.3" sources."octicons-3.5.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" sources."opn-5.4.0" sources."os-homedir-1.0.2" @@ -58988,7 +59432,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -59271,10 +59715,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.4.0.tgz"; - sha512 = "DM31N9pYph1hcsVwrRXvCKx8MuQmhduvZ2SWS97iiGftMEzbR9wl5Adb09TJg1arsHvsr39/lWytHrqIjy0wqg=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.4.1.tgz"; + sha512 = "aV5jWDgeVFrtafJN4Txkx3X36TcEL1uhBiwejKJDG3mXiqWWZAXis7nXaAqt4aI0N7YmL9IvZNDuTjLVuj4B1g=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -59301,23 +59745,23 @@ in sources."@types/express-serve-static-core-4.16.1" sources."@types/long-4.0.0" sources."@types/mime-2.0.1" - sources."@types/node-11.9.4" + sources."@types/node-11.9.5" 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.4.0" - (sources."@vue/cli-ui-3.4.0" // { + sources."@vue/cli-shared-utils-3.4.1" + (sources."@vue/cli-ui-3.4.1" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.4.0" - sources."@vue/cli-ui-addon-widgets-3.4.0" + sources."@vue/cli-ui-addon-webpack-3.4.1" + sources."@vue/cli-ui-addon-widgets-3.4.1" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."aggregate-error-1.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" @@ -59328,11 +59772,15 @@ in ]; }) sources."apollo-cache-1.1.26" - sources."apollo-cache-control-0.5.1" + (sources."apollo-cache-control-0.5.2" // { + dependencies = [ + sources."graphql-extensions-0.5.4" + ]; + }) sources."apollo-cache-inmemory-1.4.3" sources."apollo-client-2.4.13" sources."apollo-datasource-0.3.1" - sources."apollo-engine-reporting-1.0.2" + sources."apollo-engine-reporting-1.0.5" sources."apollo-engine-reporting-protobuf-0.2.1" sources."apollo-env-0.3.3" sources."apollo-graphql-0.1.1" @@ -59344,12 +59792,16 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.14" sources."apollo-server-caching-0.3.1" - sources."apollo-server-core-2.4.2" + sources."apollo-server-core-2.4.6" sources."apollo-server-env-2.2.0" - sources."apollo-server-errors-2.2.0" - sources."apollo-server-express-2.4.2" - sources."apollo-server-plugin-base-0.3.2" - sources."apollo-tracing-0.5.1" + sources."apollo-server-errors-2.2.1" + sources."apollo-server-express-2.4.6" + sources."apollo-server-plugin-base-0.3.5" + (sources."apollo-tracing-0.5.2" // { + dependencies = [ + sources."graphql-extensions-0.5.4" + ]; + }) sources."apollo-upload-client-10.0.0" sources."apollo-utilities-1.1.3" sources."argparse-1.0.10" @@ -59527,7 +59979,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.5" + sources."esm-3.2.6" sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-pubsub-4.3.0" @@ -59606,7 +60058,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" - sources."fs-capacitor-2.0.0" + sources."fs-capacitor-2.0.1" sources."fs-constants-1.0.0" sources."fs-exists-sync-0.1.0" sources."fs-extra-7.0.1" @@ -59641,7 +60093,7 @@ in sources."graceful-readlink-1.0.1" sources."graphql-14.1.1" sources."graphql-anywhere-4.1.28" - sources."graphql-extensions-0.5.2" + sources."graphql-extensions-0.5.5" sources."graphql-subscriptions-1.0.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.4" @@ -59663,7 +60115,7 @@ in }) sources."hash.js-1.1.7" sources."hoek-6.1.2" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" @@ -59877,7 +60329,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.12.26" + sources."@types/node-10.12.27" ]; }) sources."proxy-addr-2.0.4" @@ -60169,32 +60621,32 @@ in "@webassemblyjs/cli" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; packageName = "@webassemblyjs/cli"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.8.3.tgz"; - sha512 = "7/DlFYNCI/UEkngJSseIA7dUiy67dNBFUm6BD0ejZWJvJGFxG7GqICKnIshXgYo5nYzQCIgROZ40jR/D94ZdAQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.8.4.tgz"; + sha512 = "EJMVK05witHYr5xT10/ZXC2865Eeu1P+5x2rV+dpJIqCWlakNestPMSASckIsc2mG9uwv8VbkOdO/T4jjuRKRg=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-compiler-1.8.3" - sources."@webassemblyjs/helper-flatten-ast-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/validation-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.4" + sources."@webassemblyjs/floating-point-hex-parser-1.8.4" + sources."@webassemblyjs/helper-api-error-1.8.4" + sources."@webassemblyjs/helper-code-frame-1.8.4" + sources."@webassemblyjs/helper-compiler-1.8.4" + sources."@webassemblyjs/helper-flatten-ast-1.8.4" + sources."@webassemblyjs/helper-fsm-1.8.4" + sources."@webassemblyjs/helper-module-context-1.8.4" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.4" + sources."@webassemblyjs/ieee754-1.8.4" + sources."@webassemblyjs/leb128-1.8.4" + sources."@webassemblyjs/utf8-1.8.4" + sources."@webassemblyjs/validation-1.8.4" + sources."@webassemblyjs/wasm-parser-1.8.4" + sources."@webassemblyjs/wast-parser-1.8.4" + sources."@webassemblyjs/wast-printer-1.8.4" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."mamacro-0.0.3" - sources."webassemblyjs-1.8.3" + sources."webassemblyjs-1.8.4" ]; buildInputs = globalBuildInputs; meta = { @@ -60207,32 +60659,32 @@ in "@webassemblyjs/repl" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_repl"; packageName = "@webassemblyjs/repl"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.8.3.tgz"; - sha512 = "Yzn3nOKQv5UOk0W7socTGfG/QYOEBrS7yJfZxH9ZUkqDQEwqB//E1/KBgP7zVNnIPewNQ+huwxGpUMdsYIeG0g=="; + url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.8.4.tgz"; + sha512 = "Q0gibyz13bkaL0r2NCyAZaqtANBOralik83qajYqJlxmgQ2FjA+Bp/3bflnXq+OdP3lbUNCKgmMkVZZMsWjlRw=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-compiler-1.8.3" - sources."@webassemblyjs/helper-flatten-ast-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/validation-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.4" + sources."@webassemblyjs/floating-point-hex-parser-1.8.4" + sources."@webassemblyjs/helper-api-error-1.8.4" + sources."@webassemblyjs/helper-code-frame-1.8.4" + sources."@webassemblyjs/helper-compiler-1.8.4" + sources."@webassemblyjs/helper-flatten-ast-1.8.4" + sources."@webassemblyjs/helper-fsm-1.8.4" + sources."@webassemblyjs/helper-module-context-1.8.4" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.4" + sources."@webassemblyjs/ieee754-1.8.4" + sources."@webassemblyjs/leb128-1.8.4" + sources."@webassemblyjs/utf8-1.8.4" + sources."@webassemblyjs/validation-1.8.4" + sources."@webassemblyjs/wasm-parser-1.8.4" + sources."@webassemblyjs/wast-parser-1.8.4" + sources."@webassemblyjs/wast-printer-1.8.4" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."mamacro-0.0.3" - sources."webassemblyjs-1.8.3" + sources."webassemblyjs-1.8.4" ]; buildInputs = globalBuildInputs; meta = { @@ -60281,10 +60733,10 @@ in "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wasm-text-gen"; packageName = "@webassemblyjs/wasm-text-gen"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.8.3.tgz"; - sha512 = "lPLruy11K0+/PHy+MmuICeYtv2wolOablgirZZlBT2KI1Q9R2qgL8xAVshMebU/iLyh0lNmVVfnu/JpBzB6R5g=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.8.4.tgz"; + sha512 = "8yFnYRbvRF4+Yayns+sy1yZY249qVJSuk65kX2ypmI/+Ybzksi61dr5Q/2e9rYcBpJT6eBK0Lkd6/NYA8r1n1w=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" @@ -60293,19 +60745,19 @@ in sources."@babel/parser-7.3.3" sources."@babel/template-7.2.2" sources."@babel/types-7.3.3" - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.4" + sources."@webassemblyjs/floating-point-hex-parser-1.8.4" + sources."@webassemblyjs/helper-api-error-1.8.4" + sources."@webassemblyjs/helper-code-frame-1.8.4" + sources."@webassemblyjs/helper-fsm-1.8.4" + sources."@webassemblyjs/helper-module-context-1.8.4" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.4" + sources."@webassemblyjs/ieee754-1.8.4" + sources."@webassemblyjs/leb128-1.8.4" + sources."@webassemblyjs/utf8-1.8.4" + sources."@webassemblyjs/wasm-parser-1.8.4" + sources."@webassemblyjs/wast-parser-1.8.4" + sources."@webassemblyjs/wast-printer-1.8.4" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."ansi-styles-3.2.1" @@ -60336,21 +60788,21 @@ in "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wast-refmt"; packageName = "@webassemblyjs/wast-refmt"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.8.3.tgz"; - sha512 = "rclaRL+cYHD23lszpAiduB7sPsGBjya9o1bGj5dgPbaCVsUsJ6Wv9BnvIeKxtMFhFkphQNhuJkPCD074U8Tj3Q=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.8.4.tgz"; + sha512 = "OMam70jbAoJMdAJPvH6hzwkcqEGiZYQK05CEo+FsSZHb+HRKhCG32QPOWpGQH7TCHceweygTTIu8EsfqX1ljZA=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.4" + sources."@webassemblyjs/floating-point-hex-parser-1.8.4" + sources."@webassemblyjs/helper-api-error-1.8.4" + sources."@webassemblyjs/helper-code-frame-1.8.4" + sources."@webassemblyjs/helper-fsm-1.8.4" + sources."@webassemblyjs/helper-module-context-1.8.4" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.4" + sources."@webassemblyjs/wast-parser-1.8.4" + sources."@webassemblyjs/wast-printer-1.8.4" sources."@xtuc/long-4.2.2" sources."mamacro-0.0.3" ]; @@ -60393,7 +60845,7 @@ in sources."@xtuc/long-4.2.2" sources."acorn-6.1.0" sources."acorn-dynamic-import-4.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.0" (sources."anymatch-2.0.0" // { @@ -60676,7 +61128,7 @@ in sources."punycode-2.1.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" @@ -60956,7 +61408,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."import-local-2.0.0" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -61372,7 +61824,7 @@ in sources."random-access-file-2.1.0" sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."range-slice-stream-2.0.0" sources."readable-stream-3.1.1" @@ -61472,24 +61924,20 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.9.3"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.9.3.tgz"; - sha512 = "aZnlxuYOMUUBS5C8NBhhAj7T0ouJexlW5Cx5ObtOheoguG3fqXUl+KTY19L1Am/bJoyHC8otGTgew9Z0WHeTtg=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-3.0.0.tgz"; + sha512 = "pUT2YYSnECH/SqKXB0m92HWzAAOt97wJpkSHu7AddyxzclN3R9A2IHq+KUzaXEjiwWzVs/+yUOSpmuwCDouNNg=="; }; dependencies = [ - sources."@babel/polyfill-7.0.0" - (sources."@babel/register-7.0.0" // { - dependencies = [ - sources."source-map-support-0.5.10" - ]; - }) + sources."@babel/code-frame-7.0.0" + sources."@babel/highlight-7.0.0" + sources."@babel/polyfill-7.2.5" + 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.9.4" - sources."@yarnpkg/lockfile-1.1.0" + sources."@types/node-11.9.5" sources."JSONSelect-0.2.1" - sources."abbrev-1.1.1" sources."acorn-5.7.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ @@ -61499,28 +61947,31 @@ in sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.4.1" // { + (sources."addons-linter-1.6.1" // { dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.1.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" - sources."source-map-support-0.5.6" - sources."yargs-12.0.2" - sources."yargs-parser-10.1.0" + sources."ansi-regex-4.0.0" + sources."camelcase-5.0.0" + sources."decamelize-1.2.0" + sources."es6-promisify-6.0.1" + sources."get-caller-file-2.0.1" + sources."is-fullwidth-code-point-2.0.0" + sources."regenerator-runtime-0.13.1" + sources."require-main-filename-2.0.0" + sources."source-map-support-0.5.10" + sources."string-width-3.0.0" + sources."strip-ansi-5.0.0" + sources."yargs-13.1.0" + sources."yargs-parser-13.0.0" ]; }) sources."adm-zip-0.4.13" - sources."agent-base-4.2.1" - sources."ajv-6.5.5" - sources."ajv-keywords-3.4.0" + sources."ajv-6.9.1" + sources."ajv-keywords-1.5.1" sources."ajv-merge-patch-4.1.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" - sources."ansicolors-0.3.2" sources."any-promise-1.3.0" sources."anymatch-2.0.0" (sources."archiver-2.1.1" // { @@ -61536,7 +61987,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."archy-1.0.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -61550,11 +62000,10 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-1.0.1" - sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.12.2" + sources."astral-regex-1.0.0" sources."async-0.2.10" sources."async-each-1.0.1" sources."asynckit-0.4.0" @@ -61565,15 +62014,20 @@ in dependencies = [ sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."js-tokens-3.0.2" sources."supports-color-2.0.0" ]; }) - (sources."babel-polyfill-6.26.0" // { + (sources."babel-polyfill-6.16.0" // { dependencies = [ - sources."regenerator-runtime-0.10.5" + sources."regenerator-runtime-0.9.6" + ]; + }) + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."regenerator-runtime-0.11.1" ]; }) - sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -61596,6 +62050,7 @@ in (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) sources."buffer-5.2.1" @@ -61606,15 +62061,18 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."bunyan-1.8.12" - sources."bytes-3.0.0" sources."cache-base-1.0.1" - sources."caller-path-0.1.0" - sources."callsites-0.2.0" + (sources."caller-path-0.1.0" // { + dependencies = [ + sources."callsites-0.2.0" + ]; + }) + sources."callsites-3.0.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.4.0" - sources."chardet-0.4.2" + sources."chalk-2.4.2" + sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.2" (sources."chokidar-2.1.2" // { dependencies = [ @@ -61650,7 +62108,6 @@ in ]; }) sources."clone-1.0.4" - sources."clone-deep-0.3.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" @@ -61661,7 +62118,6 @@ in sources."combined-stream-1.0.7" sources."commander-2.19.0" sources."common-tags-1.8.0" - sources."commondir-1.0.1" sources."component-emitter-1.2.1" (sources."compress-commons-1.2.2" // { dependencies = [ @@ -61695,45 +62151,26 @@ in sources."css-what-2.1.3" sources."d-1.0.0" sources."dashdash-1.14.1" - (sources."data-uri-to-buffer-2.0.0" // { - dependencies = [ - sources."@types/node-8.10.40" - ]; - }) sources."debounce-1.1.0" sources."debug-2.6.9" - (sources."decamelize-2.0.0" // { - dependencies = [ - sources."xregexp-4.0.0" - ]; - }) + sources."decamelize-2.0.0" sources."decode-uri-component-0.2.0" sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" - sources."deepmerge-2.2.1" + sources."deepmerge-3.1.0" sources."defaults-1.0.3" - sources."define-properties-1.1.3" sources."define-property-2.0.2" - sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - (sources."dispensary-0.27.0" // { + (sources."dispensary-0.30.0" // { dependencies = [ sources."async-2.6.2" sources."decamelize-1.2.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.1.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" - sources."pino-5.8.1" sources."source-map-support-0.5.10" sources."yargs-12.0.5" ]; }) - sources."dockerfile-ast-0.0.12" sources."doctrine-2.1.0" sources."dom-serializer-0.1.1" sources."domelementtype-1.3.1" @@ -61743,15 +62180,13 @@ in sources."dtrace-provider-0.8.7" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.10" - sources."email-validator-2.0.4" + sources."ecdsa-sig-formatter-1.0.11" + sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.13.0" - sources."es-to-primitive-1.2.0" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -61765,12 +62200,11 @@ in sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" sources."escope-3.6.0" - (sources."eslint-5.0.1" // { + (sources."eslint-5.13.0" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."debug-3.2.6" + sources."debug-4.1.1" sources."ms-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -61778,7 +62212,6 @@ in (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { dependencies = [ sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-3.0.0" sources."ansi-styles-2.2.1" @@ -61788,14 +62221,13 @@ in sources."espree-3.5.4" sources."figures-1.7.0" sources."globals-9.18.0" + sources."ignore-3.3.10" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-2.0.0" sources."onetime-1.1.0" - sources."pluralize-1.2.1" sources."progress-1.1.8" sources."restore-cursor-1.0.1" sources."run-async-0.1.0" - sources."shelljs-0.7.8" sources."slice-ansi-0.0.4" sources."string-width-1.0.2" sources."strip-ansi-4.0.0" @@ -61808,8 +62240,9 @@ in ]; }) sources."eslint-scope-4.0.0" + sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" - (sources."espree-4.1.0" // { + (sources."espree-5.0.0" // { dependencies = [ sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" @@ -61822,7 +62255,7 @@ in sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - sources."execa-0.10.0" + sources."execa-1.0.0" sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -61839,25 +62272,22 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" ]; }) 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."extend-shallow-3.0.2" + sources."external-editor-3.0.3" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-parse-1.0.3" sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -61866,14 +62296,13 @@ in sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" - sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - sources."find-cache-dir-1.0.0" - sources."find-up-2.1.0" + sources."find-up-3.0.0" (sources."firefox-profile-1.2.0" // { dependencies = [ sources."async-2.5.0" @@ -61887,9 +62316,8 @@ in }) sources."flat-cache-1.3.4" sources."flatstr-1.0.9" - sources."fluent-syntax-0.7.0" + sources."fluent-syntax-0.10.0" sources."for-in-1.0.2" - sources."for-own-1.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fragment-cache-0.2.1" @@ -61897,33 +62325,18 @@ in sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.0.1" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - (sources."fx-runner-1.0.9" // { + (sources."fx-runner-1.0.10" // { dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" - sources."lodash-4.17.10" sources."which-1.2.4" ]; }) sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" - sources."get-stream-3.0.0" - (sources."get-uri-2.0.3" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.1" - ]; - }) + sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."gettext-parser-1.1.0" @@ -61941,85 +62354,53 @@ in }) sources."global-dirs-0.1.1" sources."globals-11.11.0" - sources."got-6.7.1" + (sources."got-6.7.1" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" - sources."graphlib-2.1.7" sources."growly-1.3.0" 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-color-0.1.7" sources."has-flag-3.0.0" - 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."hasbin-1.2.3" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) - sources."home-or-tmp-3.0.0" sources."hosted-git-info-2.7.1" sources."htmlparser2-3.10.1" - sources."http-errors-1.6.3" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) sources."http-signature-1.2.0" - (sources."https-proxy-agent-2.2.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) sources."iconv-lite-0.4.24" sources."ieee754-1.1.12" - sources."ignore-3.3.10" - sources."immediate-3.0.6" + sources."ignore-4.0.6" + sources."import-fresh-3.0.0" 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-5.2.0" // { + (sources."inquirer-6.2.2" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."ansi-regex-4.0.0" + sources."strip-ansi-5.0.0" ]; }) sources."interpret-1.2.0" sources."invert-kv-2.0.0" - sources."ip-1.1.5" sources."is-absolute-0.1.7" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-date-object-1.0.1" - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-extendable-0.1.1" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + 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" @@ -62028,19 +62409,21 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.19.0" sources."is-npm-1.0.0" - sources."is-number-3.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-property-1.0.2" sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" sources."is-relative-0.1.3" sources."is-resolvable-1.1.0" 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-utf8-0.2.1" sources."is-windows-1.0.2" @@ -62052,7 +62435,7 @@ in sources."jed-1.1.1" sources."jetpack-id-1.0.0" sources."js-select-0.6.0" - sources."js-tokens-3.0.2" + sources."js-tokens-4.0.0" (sources."js-yaml-3.12.1" // { dependencies = [ sources."esprima-4.0.1" @@ -62075,20 +62458,11 @@ in ]; }) sources."jsprim-1.4.1" - (sources."jszip-3.1.5" // { - dependencies = [ - sources."core-js-2.3.0" - sources."es6-promise-3.0.2" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) - sources."jwa-1.2.0" + sources."jszip-2.6.1" + sources."jwa-1.3.0" sources."jws-3.2.1" - sources."kind-of-3.2.2" + sources."kind-of-6.0.2" sources."latest-version-3.1.0" - sources."lazy-cache-0.2.7" (sources."lazystream-1.0.0" // { dependencies = [ sources."readable-stream-2.3.6" @@ -62097,7 +62471,6 @@ in }) sources."lcid-2.0.0" sources."levn-0.3.0" - sources."lie-3.1.1" (sources."load-json-file-1.1.0" // { dependencies = [ sources."parse-json-2.2.0" @@ -62105,14 +62478,8 @@ in sources."strip-bom-2.0.0" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.11" - sources."lodash.assign-4.2.0" - sources."lodash.assignin-4.2.0" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" sources."lodash.isinteger-4.0.4" @@ -62120,36 +62487,22 @@ in sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" sources."lodash.once-4.1.1" - sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.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."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" + sources."mdn-browser-compat-data-0.0.66" sources."mem-4.1.0" - (sources."micromatch-3.1.10" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."micromatch-3.1.10" sources."mime-db-1.38.0" sources."mime-types-2.1.22" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."mixin-object-2.0.1" // { - dependencies = [ - sources."for-in-0.1.8" - ]; - }) + sources."mixin-deep-1.3.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -62167,35 +62520,14 @@ in }) sources."mz-2.7.0" sources."nan-2.12.1" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" - (sources."nconf-0.10.0" // { - dependencies = [ - sources."async-1.5.2" - sources."camelcase-2.1.1" - sources."cliui-3.2.0" - sources."decamelize-1.2.0" - sources."invert-kv-1.0.0" - sources."lcid-1.0.0" - sources."os-locale-1.4.0" - sources."string-width-1.0.2" - sources."y18n-3.2.1" - sources."yargs-3.32.0" - ]; - }) sources."ncp-2.0.0" - sources."needle-2.2.4" sources."neo-async-2.6.0" - sources."netmask-1.0.6" sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-forge-0.7.6" - sources."node-modules-regexp-1.0.0" sources."node-notifier-5.2.1" (sources."nomnom-1.8.1" // { dependencies = [ @@ -62221,9 +62553,9 @@ in sources."kind-of-5.1.0" ]; }) + sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.1.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -62231,29 +62563,21 @@ in sources."opn-5.3.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" - sources."os-locale-3.0.1" - sources."os-name-2.0.1" + sources."os-locale-3.1.0" sources."os-shim-0.1.3" 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-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - (sources."pac-proxy-agent-2.0.2" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."pac-resolver-3.0.0" + sources."p-limit-2.1.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" sources."package-json-4.0.1" sources."pako-1.0.8" + sources."parent-module-1.0.0" sources."parse-json-4.0.0" sources."parse5-3.0.3" sources."pascalcase-0.1.1" - sources."path-0.12.7" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -62270,43 +62594,31 @@ in sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pino-5.9.0" + sources."pino-5.11.1" sources."pino-std-serializers-2.3.0" - sources."pirates-4.0.1" - sources."pkg-dir-2.0.0" - sources."pluralize-7.0.0" + sources."pluralize-1.2.1" sources."po2json-0.4.5" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.6" // { + (sources."postcss-7.0.14" // { dependencies = [ - sources."chalk-2.4.2" + sources."supports-color-6.1.0" ]; }) sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" - sources."probe-image-size-4.0.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.0" - sources."progress-2.0.3" - sources."promise-7.3.1" - (sources."proxy-agent-2.3.1" // { + (sources."probe-image-size-4.0.0" // { dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" + sources."deepmerge-2.2.1" ]; }) - sources."proxy-from-env-1.0.0" + sources."process-nextick-args-2.0.0" + sources."progress-2.0.3" sources."pseudomap-1.0.2" sources."psl-1.1.31" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."quick-format-unescaped-3.0.2" - (sources."raw-body-2.3.3" // { - dependencies = [ - sources."iconv-lite-0.4.23" - ]; - }) sources."rc-1.2.8" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { @@ -62328,11 +62640,9 @@ in ]; }) sources."rechoir-0.6.2" - sources."recursive-readdir-2.2.2" - sources."regenerator-runtime-0.11.1" + sources."regenerator-runtime-0.12.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.2.0" - sources."regexpp-1.1.0" + sources."regexpp-2.0.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { @@ -62348,47 +62658,43 @@ in sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."require-uncached-1.0.3" + (sources."require-uncached-1.0.3" // { + dependencies = [ + sources."resolve-from-1.0.1" + ]; + }) sources."resolve-1.10.0" - sources."resolve-from-1.0.1" + sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.3.0" sources."rx-lite-3.1.2" - sources."rx-lite-aggregates-4.0.8" - sources."rxjs-5.5.12" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" 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."set-blocking-2.0.0" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - sources."setprototypeof-1.1.0" sources."sha.js-2.4.11" - (sources."shallow-clone-0.1.2" // { - dependencies = [ - sources."kind-of-2.0.1" - ]; - }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" - sources."shelljs-0.8.3" + sources."shelljs-0.7.8" sources."shellwords-0.1.1" (sources."sign-addon-0.3.1" // { dependencies = [ sources."ajv-5.5.2" - sources."babel-polyfill-6.16.0" sources."es6-error-4.0.0" sources."fast-deep-equal-1.1.0" sources."har-validator-5.0.3" @@ -62396,7 +62702,6 @@ in sources."mz-2.5.0" sources."oauth-sign-0.8.2" sources."punycode-1.4.1" - sources."regenerator-runtime-0.9.6" sources."request-2.87.0" sources."source-map-0.5.7" sources."source-map-support-0.4.6" @@ -62404,12 +62709,11 @@ in ]; }) sources."signal-exit-3.0.2" - (sources."slice-ansi-1.0.0" // { + (sources."slice-ansi-2.1.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."smart-buffer-1.1.15" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -62425,6 +62729,7 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" sources."source-map-0.5.7" ]; @@ -62434,88 +62739,12 @@ in sources."define-property-1.0.0" ]; }) - sources."snapdragon-util-3.0.1" - (sources."snyk-1.110.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."chalk-2.4.2" - sources."debug-3.2.6" - sources."inquirer-3.3.0" - sources."ms-2.1.1" - sources."rx-lite-4.0.8" - sources."source-map-support-0.5.10" - sources."strip-ansi-4.0.0" - ]; - }) - (sources."snyk-config-2.2.0" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-docker-plugin-1.12.3" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-go-plugin-1.6.0" - sources."snyk-gradle-plugin-2.1.1" - (sources."snyk-module-1.9.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-mvn-plugin-2.0.0" - (sources."snyk-nodejs-lockfile-parser-1.7.1" // { - dependencies = [ - sources."lodash-4.17.10" - sources."source-map-support-0.5.10" - ]; - }) - (sources."snyk-nuget-plugin-1.6.5" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-php-plugin-1.5.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-policy-1.13.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-python-plugin-1.9.0" - (sources."snyk-resolve-1.0.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-resolve-deps-4.0.2" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-sbt-plugin-2.0.0" - sources."snyk-tree-1.0.0" - (sources."snyk-try-require-1.3.1" // { + (sources."snapdragon-util-3.0.1" // { dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" + sources."kind-of-3.2.2" ]; }) - sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" - sources."sonic-boom-0.6.3" + sources."sonic-boom-0.7.3" sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-support-0.5.3" @@ -62546,7 +62775,6 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" (sources."stream-to-promise-2.2.0" // { @@ -62562,7 +62790,6 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.matchall-2.0.0" sources."string_decoder-1.2.0" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" @@ -62571,35 +62798,41 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."symbol-observable-1.0.1" - sources."table-4.0.3" + (sources."table-5.2.3" // { + dependencies = [ + sources."ansi-regex-4.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.0.0" + sources."strip-ansi-5.0.0" + ]; + }) (sources."tar-stream-1.6.2" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; }) - sources."temp-dir-1.0.0" - sources."tempfile-2.0.0" (sources."term-size-1.2.0" // { dependencies = [ sources."cross-spawn-5.1.0" sources."execa-0.7.0" + sources."get-stream-3.0.0" ]; }) sources."text-table-0.2.0" - sources."then-fs-2.0.0" sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."through-2.3.8" - sources."thunkify-2.1.2" sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" - sources."to-object-path-0.3.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."toml-2.3.6" sources."tosource-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -62613,17 +62846,16 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."undefsafe-2.0.2" sources."underscore-1.6.0" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" sources."set-value-0.4.3" ]; }) sources."unique-string-1.0.0" sources."universalify-0.1.2" - sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -62642,12 +62874,10 @@ in sources."url-parse-lax-1.0.0" sources."use-3.1.1" sources."user-home-2.0.0" - sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" - sources."vscode-languageserver-types-3.14.0" sources."watchpack-1.5.0" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" @@ -62656,8 +62886,6 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."widest-line-2.0.1" - sources."win-release-1.1.1" - sources."window-size-0.1.4" sources."winreg-0.0.12" sources."wordwrap-1.0.0" (sources."wrap-ansi-2.1.0" // { @@ -62672,7 +62900,7 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" - sources."xregexp-2.0.0" + sources."xregexp-4.0.0" sources."xtend-4.0.1" sources."y18n-4.0.0" sources."yallist-2.1.2" @@ -62696,11 +62924,10 @@ in sources."decamelize-1.2.0" ]; }) - sources."yauzl-2.9.2" + sources."yauzl-2.10.0" (sources."zip-dir-1.0.2" // { dependencies = [ sources."async-1.5.2" - sources."jszip-2.6.1" ]; }) (sources."zip-stream-1.2.0" // { @@ -62766,7 +62993,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."aggregate-error-1.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index bed3e10b5a1..0f72522ce48 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -13,13 +13,13 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "ajv-6.9.1" = { + "ajv-6.9.2" = { name = "ajv"; packageName = "ajv"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; - sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; + sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; }; }; "ansi-regex-2.1.1" = { @@ -760,13 +760,13 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "homedir-polyfill-1.0.1" = { + "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "http-signature-1.2.0" = { @@ -1309,13 +1309,13 @@ let sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; }; }; - "npm-packlist-1.3.0" = { + "npm-packlist-1.4.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; - sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; "npmlog-4.1.2" = { @@ -2216,7 +2216,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."interpret-1.1.0" sources."is-absolute-1.0.0" @@ -2391,7 +2391,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -2561,7 +2561,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 16384d7440b..add1dbd00f7 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,13 +49,13 @@ let sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw=="; }; }; - "ajv-6.9.1" = { + "ajv-6.9.2" = { name = "ajv"; packageName = "ajv"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; - sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; + sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; }; }; "amdefine-1.0.1" = { @@ -1363,13 +1363,13 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "ecdsa-sig-formatter-1.0.10" = { + "ecdsa-sig-formatter-1.0.11" = { name = "ecdsa-sig-formatter"; packageName = "ecdsa-sig-formatter"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz"; - sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; + sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; "ejs-2.5.7" = { @@ -1957,13 +1957,13 @@ let sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; }; }; - "homedir-polyfill-1.0.1" = { + "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "http-basic-2.5.1" = { @@ -2515,13 +2515,13 @@ let sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; - "jwa-1.2.0" = { + "jwa-1.3.0" = { name = "jwa"; packageName = "jwa"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz"; - sha512 = "Grku9ZST5NNQ3hqNUodSkDfEBqAmGA1R8yiyPHOnLzEKI0GaCQC/XhFmsheXYuXzFQJdILbh+lYBiliqG5R/Vg=="; + url = "https://registry.npmjs.org/jwa/-/jwa-1.3.0.tgz"; + sha512 = "SxObIyzv9a6MYuZYaSN6DhSm9j3+qkokwvCB0/OTSV5ylPq1wUQiygZQcHT5Qlux0I5kmISx3J86TxKhuefItg=="; }; }; "jws-3.2.1" = { @@ -2974,13 +2974,13 @@ let sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; }; }; - "npm-packlist-1.3.0" = { + "npm-packlist-1.4.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; - sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; "npmlog-4.1.2" = { @@ -4554,7 +4554,7 @@ in sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."home-or-tmp-2.0.0" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."invariant-2.2.4" sources."is-3.3.0" @@ -4635,7 +4635,7 @@ in sources."@types/node-8.10.40" sources."JSV-4.0.2" sources."adal-node-0.1.28" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -4787,7 +4787,7 @@ in sources."duplexer-0.1.1" sources."easy-table-1.1.0" sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.10" + sources."ecdsa-sig-formatter-1.0.11" sources."envconf-0.0.4" sources."escape-string-regexp-1.0.5" sources."event-stream-3.1.5" @@ -4857,7 +4857,7 @@ in ]; }) sources."jsrsasign-4.8.2" - sources."jwa-1.2.0" + sources."jwa-1.3.0" sources."jws-3.2.1" sources."jwt-decode-2.2.0" sources."keypress-0.1.0" @@ -5165,7 +5165,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."interpret-1.1.0" sources."is-absolute-1.0.0" @@ -5340,7 +5340,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -5510,7 +5510,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -5579,7 +5579,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 76e52692383..47773c20954 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -13,6 +13,7 @@ , libuuid , autoreconfHook , gcc48 +, runtimeShell , ... }: { name, src, version, source-date, source-url, ... }: @@ -114,7 +115,7 @@ stdenv.mkDerivation rec { # Create the script cat > "$out/bin/${cmd}" <<EOF - #!${stdenv.shell} + #!${runtimeShell} set -f LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:$libs" exec $out/pharo "\$@" EOF diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 19065f972a4..0e65a9b990e 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -17,6 +17,7 @@ , gcc48 , fetchFromGitHub , makeWrapper +, runtimeShell } @args: let @@ -62,4 +63,3 @@ rec { }; } - diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix index c6ee1eaf8bc..8f75170c58c 100644 --- a/pkgs/development/python-modules/cmd2/old.nix +++ b/pkgs/development/python-modules/cmd2/old.nix @@ -2,6 +2,7 @@ , pyperclip, six, pyparsing, vim , contextlib2 ? null, subprocess32 ? null , pytest, mock, which, fetchFromGitHub, glibcLocales +, runtimeShell }: buildPythonPackage rec { pname = "cmd2"; @@ -19,8 +20,8 @@ buildPythonPackage rec { postPatch = stdenv.lib.optional stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin - echo '#${stdenv.shell}' > bin/pbpaste - echo '#${stdenv.shell}' > bin/pbcopy + echo '#${runtimeShell}' > bin/pbpaste + echo '#${runtimeShell}' > bin/pbcopy chmod +x bin/{pbcopy,pbpaste} export PATH=$(realpath bin):$PATH ''; diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 070923c8385..fee2156e67d 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "1.3.0"; + version = "2.0.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-typing/issues/8 @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0703z7vlsfa3dvgcq22f9rzmj0svyp2a8wc7h73d0aac28ydhpv9"; + sha256 = "017rshrz9kzax851hdbd3924jmr06h2sx3xdq7m4dwhgz3pgqfcy"; }; # setuptools-markdown uses pypandoc which is broken at the moment diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index cae3f34f0c9..5fb83126d1c 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "1.2.1"; + version = "1.4.1"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-utils/issues/130 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0g8f5vdjh7qd8kgsqqd9qkm6m79rx3w9yp0rf9vpdsv3xfzrkh1w"; + sha256 = "1bwn7b5f0nzvwiw9zs63wy3qhaxvz2fhjp4wj9djp2337d7195h4"; }; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 5cd6ad8bf87..90450d3fb0a 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -10,10 +10,10 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.6.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "24adaca52e8d821a2f5d5e6fe2e37cf321b1fafb505926ea79a7c2f019ce5b07"; + sha256 = "03i437hg0911mg94kx3zl0czm004q0qakrssm6skx8zlpiqzxnry"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 012bab56ab6..10d57d7264b 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.9.5"; + version = "3.9.6"; src = fetchPypi { inherit pname version; - sha256 = "f500a0561b83a2982d3424d640243d05bda9716f4fe9a655e331f3a07ca02710"; + sha256 = "d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2562975e592..1944e23f4b4 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -20,6 +20,7 @@ , openpyxl , tables , xlwt +, runtimeShell , libcxx ? null }: @@ -97,8 +98,8 @@ in buildPythonPackage rec { # Until then we disable the tests. + optionalString isDarwin '' # Fake the impure dependencies pbpaste and pbcopy - echo "#!${stdenv.shell}" > pbcopy - echo "#!${stdenv.shell}" > pbpaste + echo "#!${runtimeShell}" > pbcopy + echo "#!${runtimeShell}" > pbpaste chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index a4538b260fd..e08fe05d822 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0c1lm3i4yngi1qclb0hny19vwjd2si5k2qni30wcrnxqqasqak1y"; + sha256 = "19c0f950x544ndsdkfhga58x69iiin2vqiz59pqn9mymk2vrlpkg"; }; meta = { diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 4c6ca0bad33..676f6b22990 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.4.0"; + version = "0.5.0"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "4042492db49efbdfc53e0afa89509695826b3fb74fb52444ed04f64c229a65f5"; + sha256 = "09mv7hcczayzjbd4dsrph16ab21slaiamgph9lwr1kjdw7ri5cpg"; }; buildInputs = [ exiv2 boost ]; diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index df8df2cb93c..65ff765a584 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Pyro4"; - version = "4.74"; + version = "4.75"; src = fetchPypi { inherit pname version; - sha256 = "89ed7b12c162e5124f322f992f9506c44f5e1a379926cf01ee73ef810d3bf75f"; + sha256 = "1dfpp36imddx19yv0kd28gk1l71ckhpqy6jd590wpm2680jw15rq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 3f54fefadf2..661bc6363f4 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spectral-cube"; - version = "0.4.3"; + version = "0.4.4"; doCheck = false; # the tests requires several pytest plugins that are not in nixpkgs src = fetchPypi { inherit pname version; - sha256 = "057g3mzlg5cy4wg2hh3p6gssn93rs6i7pswzhldvcq4k8m8hsl3b"; + sha256 = "9051ede204b1e25b6358b5e0e573b624ec0e208c24eb03a7ed4925b745c93b5e"; }; propagatedBuildInputs = [ astropy radio_beam pytest ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 4652bd0cf45..72bc88964b8 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.10.1"; + version = "2.18.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "12dslgxr06ymv1w9lzvlxp1zg0p6zg58l67pdb3v5v24c51rxrg7"; + sha256 = "0riqzxvhlbxw62ax89r18qj9nnz7kpbfspyblc8jrbj2jx9xaabr"; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index a17ecc0e592..91e83250d8b 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "18.3.0"; + version = "19.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1c7qfpr1zz34whz66lk4xpwdn7d5jqk6ccgas5n54li479mra0an"; + sha256 = "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p"; }; # Skip a failing test until fixed upstream: diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index e28f5d85a6b..7b7dab1481e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips +, file, libvirt, glib, vips, taglib , libselinux ? null, libsepol ? null }@args: @@ -423,6 +423,10 @@ in ''; }; + taglib-ruby = attrs: { + buildInputs = [ taglib ]; + }; + timfel-krb5-auth = attrs: { buildInputs = [ kerberos ]; }; diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index d2c27b9f485..939ae10c089 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ant, jdk }: +{ stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { name = "jdepend-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install dist/${name}.jar $out/share cat > "$out/bin/jdepend" <<EOF - #!${stdenv.shell} + #!${runtimeShell} exec ${jdk.jre}/bin/java -classpath "$out/share/*" "\$@" EOF chmod a+x $out/bin/jdepend diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 32d35f1421c..eb9f0d106d1 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -6,6 +6,7 @@ # Allow to independently override the jdks used to build and run respectively , buildJdk, runJdk , buildJdkName +, runtimeShell # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -281,7 +282,7 @@ stdenv.mkDerivation rec { mkdir -p tools cat > tools/bazel <<"EOF" - #!${stdenv.shell} -e + #!${runtimeShell} -e exit 1 EOF chmod +x tools/bazel @@ -290,7 +291,7 @@ stdenv.mkDerivation rec { ! hello_test cat > tools/bazel <<"EOF" - #!${stdenv.shell} -e + #!${runtimeShell} -e exec "$BAZEL_REAL" "$@" EOF diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 7fd80148831..baa658b522a 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, nix-update-source, lib, python, which, pychecker ? null }: +{ stdenv, fetchFromGitHub, nix-update-source, lib, python +, which, runtimeShell, pychecker ? null }: stdenv.mkDerivation rec { version = "0.7.0"; src = fetchFromGitHub { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { cp -r python/bin $out/bin ''; passthru.updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} set -e echo cd ${toString ./.} diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ae9fa6b3690..f44e76c0b8e 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.7.0"; + version = "11.8.0"; # 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 = "1q8m2hi85kh01lz6agp76ppny3ik5m61v5l3ipha4jf6k90140k8"; + sha256 = "1g9r0ny25r4iv7m5jf8fbfak4rhlcz7mm3x7mwwpmiyhnjbwz08s"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1325jh984hv7yhc977d271866i5gq78lmw4h16sj5i8zny4wzgz5"; + sha256 = "07xg46dl2d0scb7hqn5gcg3g4icr28z03n3q2rgqckn4782ha2s1"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "119azvkbx6gmmh7y166jxaja0a6n8lghmslsyar95dxw8akxrfzz"; + sha256 = "0jvhlcxlxpam2hr9gh0zcjgl04is3rm0lkm94v4m6wk9yxknx3wp"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index a2a049615b7..3b52c262c0c 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, jshon, electron, hyper-haskell-server, extra-packages ? [] }: +{ stdenv, fetchFromGitHub, jshon, electron +, runtimeShell, hyper-haskell-server, extra-packages ? [] }: let binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); @@ -34,7 +35,7 @@ in stdenv.mkDerivation rec { # install electron wrapper script cat > $out/bin/hyper-haskell <<EOF - #!${stdenv.shell} + #!${runtimeShell} export PATH="${binPath}:\$PATH" exec ${electron}/bin/electron $out/app "\$@" EOF diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index 11e02eba566..c8ab6b0fd96 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper -, cmake, llvmPackages, rapidjson }: +, cmake, llvmPackages, rapidjson, runtimeShell }: stdenv.mkDerivation rec { name = "ccls-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSYSTEM_CLANG=ON" ]; - shell = stdenv.shell; + shell = runtimeShell; postFixup = '' # We need to tell ccls where to find the standard library headers. diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index f032a85173a..54ad7ca7071 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, makeWrapper -, cmake, llvmPackages, ncurses }: +, cmake, llvmPackages, ncurses +, runtimeShell }: let src = fetchFromGitHub { @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" ]; - shell = stdenv.shell; + shell = runtimeShell; postFixup = '' # We need to tell cquery where to find the standard library headers. diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index ed265b4489b..869e7a61121 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -14,7 +14,7 @@ with pkgs.stdenv.lib; # the derivation. use language extensions specified by args ctagsWrapped = makeOverridable ( {args, name} : pkgs.writeScriptBin name '' - #!${stdenv.shell} + #!${pkgs.runtimeShell} exec ${pkgs.ctags}/bin/ctags ${concatStringsSep " " (map escapeShellArg args)} "$@" '') { args = let x = pkgs.ctagsWrapped; in concatLists [ diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index e80a37d37dd..9891726c663 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand , gcc, autoconf, automake, which, procps, libiberty_static +, runtimeShell , sysconfDir ? "" # set this parameter to override the default value $out/etc , static ? false }: @@ -53,7 +54,7 @@ let mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then cat > $out/bin/gcc << EOF - #!${stdenv.shell} + #!${runtimeShell} ${extraConfig} exec ${distcc}/bin/distcc gcc "\$@" EOF @@ -61,7 +62,7 @@ let fi if [ -x "${gcc.cc}/bin/g++" ]; then cat > $out/bin/g++ << EOF - #!${stdenv.shell} + #!${runtimeShell} ${extraConfig} exec ${distcc}/bin/distcc g++ "\$@" EOF diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index f7b77cdc418..874aa04157d 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git }: +{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: stdenv.mkDerivation rec { name = "opengrok-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out cp -a * $out/ substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname" - substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${stdenv.shell}" + substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${runtimeShell}" wrapProgram $out/bin/OpenGrok \ --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \ --set JAVA_HOME "${jre}" \ diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index c89492287db..18ffc238f0d 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -9,7 +9,7 @@ { stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor , freetype, libXinerama, libxcb, zlib, pciutils -, makeDesktopItem, xkeyboardconfig +, makeDesktopItem, xkeyboardconfig, runtimeShell }: let @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # Make wrapper script that uses the LD_PRELOAD library mkdir -p "$out/bin" cat > "$out/bin/saleae-logic" << EOF - #!${stdenv.shell} + #!${runtimeShell} export LD_PRELOAD="$out/lib/preload.so" export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" export PATH="${pciutils}/bin:\$PATH" diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 5a1c2364a77..a1f5e5769ae 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }: +{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, + runtimeShell }: rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; @@ -32,7 +33,7 @@ rustPlatform.buildRustPackage rec { doCheck = true; checkInputs = let fakeRustup = writeScriptBin "rustup" '' - #!${stdenv.shell} + #!${runtimeShell} shift shift exec "$@" diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index e93791d4696..8f68471f1e3 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, libguestfs, qemu, writeText, withLibvirt ? true}: +{ stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive +, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux }: let # NOTE: bumping the version and updating the hash is insufficient; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index e2250297c8e..211f7169397 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeScript, writeText, php }: +{ stdenv, lib, fetchurl, writeScript, writeText, php, runtimeShell }: let version = "2.0.1"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin $dir cat <<_EOF > $out/bin/wp -#!${stdenv.shell} +#!${runtimeShell} set -euo pipefail diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index b2455095a01..959c79405e8 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildPackages, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics +, runtimeShell , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" , xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" , sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }: @@ -35,7 +36,7 @@ let ''; xcode-select = writeText "xcode-select" '' -#!${stdenv.shell} +#!${runtimeShell} while [ $# -gt 0 ]; do case "$1" in -h | --help) ;; # noop @@ -50,7 +51,7 @@ done ''; xcrun = writeText "xcrun" '' -#!${stdenv.shell} +#!${runtimeShell} while [ $# -gt 0 ]; do case "$1" in --sdk | -sdk) shift ;; diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix index bf6951dc688..7b5a4710aa0 100644 --- a/pkgs/development/web/nodejs/update.nix +++ b/pkgs/development/web/nodejs/update.nix @@ -9,10 +9,11 @@ , common-updater-scripts , majorVersion , nix +, runtimeShell }: writeScript "update-nodejs" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq gnupg nix ]} HOME=`mktemp -d` diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 123d4296c97..d4ff86c424b 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, requireFile, commercialVersion ? false }: +{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }: let plainName = "andyetitmoves"; version = "1.2.2"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName cat > $out/bin/$binName << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/opt/andyetitmoves exec ./lib/$binName EOF diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 91959a1c942..b2c86222f2b 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis }: +{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp AstroMenace $out cp gamedata.vfs $out cat > $out/bin/AstroMenace << EOF - #!${stdenv.shell} + #!${runtimeShell} $out/AstroMenace --dir=$out EOF chmod 755 $out/bin/AstroMenace diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 2c55911defc..b39eb987e00 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, lua, ncurses , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa -, debug +, debug, runtimeShell }: let @@ -86,7 +86,7 @@ let mkdir $app/Contents/MacOS launcher=$app/Contents/MacOS/Cataclysm.sh cat << EOF > $launcher - #!${stdenv.shell} + #!${runtimeShell} $out/bin/cataclysm-tiles EOF chmod 555 $launcher diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 859e503e101..c51f014b179 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, libGLU_combined, nasm -, pkgconfig, SDL2, SDL2_mixer }: +, pkgconfig, SDL2, SDL2_mixer, runtimeShell }: let year = "2015"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { installPhase = '' # Make wrapper script cat > eduke32-wrapper <<EOF - #!${stdenv.shell} + #!${runtimeShell} if [ "$EDUKE32_DATA_DIR" = "" ]; then EDUKE32_DATA_DIR=/var/lib/games/eduke32 diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 5c8d2541a01..d334439cafb 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xorgproto }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xorgproto +, runtimeShell }: stdenv.mkDerivation { name = "fsg-4.4"; @@ -24,7 +25,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin $out/libexec cp sand $out/libexec - echo -e '#!${stdenv.shell}\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg + echo -e '#!${runtimeShell}\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg chmod a+x $out/bin/fsg ''; diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 2d636064205..1d56d86f530 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,11 +1,11 @@ { stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr -, libXrender, fontconfig, freetype, openal }: +, libXrender, fontconfig, freetype, openal, runtimeShell }: let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation { name = "oilrush"; - src = + src = let url = config.oilrush.url or null; sha256 = config.oilrush.sha256 or null; @@ -54,7 +54,7 @@ stdenv.mkDerivation { cp -r * "$out/opt/oilrush" mkdir -p "$out/bin" cat << EOF > "$out/bin/oilrush" - #!${stdenv.shell} + #!${runtimeShell} LD_LIBRARY_PATH=.:${makeLibraryPath [ openal ]}:\$LD_LIBRARY_PATH cd "$out/opt/oilrush" exec ./launcher_$arch.sh "\$@" @@ -66,7 +66,7 @@ stdenv.mkDerivation { longDescription = '' Oil Rush is a real-time naval strategy game based on group control. It combines the strategic challenge of a classical RTS with the sheer fun - of Tower Defense. + of Tower Defense. ''; homepage = http://oilrush-game.com/; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index e5243aef2d3..237021e9801 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchzip, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps -, writeScriptBin, makeWrapper +, writeScriptBin, makeWrapper, runtimeShell }: let @@ -21,7 +21,7 @@ let }; playmidi = writeScriptBin "playmidi" '' - #!${stdenv.shell} + #!${runtimeShell} trap "${procps}/bin/pkill fluidsynth" EXIT ${fluidsynth}/bin/fluidsynth -a ${audioDriver} -i ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 $* ''; diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index f48736a56d6..3a9635f6712 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, libGLU_combined, SDL, SDL_image, SDL_mixer -, libpng, zlib, libjpeg, imagemagick, libX11 +, libpng, zlib, libjpeg, imagemagick, libX11, runtimeShell }: stdenv.mkDerivation rec { @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { cp -rv packages $out/share/sauerbraten/ cp -rv data $out/share/sauerbraten/ cat > $out/bin/sauerbraten_server <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/sauerbraten ./sauer_server "\$@" EOF cat > $out/bin/sauerbraten_client <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/sauerbraten ./sauer_client "\$@" EOF diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix index 1ccb351af4a..a96250e7acb 100644 --- a/pkgs/games/scummvm/games.nix +++ b/pkgs/games/scummvm/games.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, writeText -, scummvm }: +, scummvm, runtimeShell }: let desktopItem = name: short: long: description: makeDesktopItem { @@ -13,7 +13,7 @@ let }; run = name: short: code: writeText "${short}.sh" '' - #!${stdenv.shell} -eu + #!${runtimeShell} -eu exec ${scummvm}/bin/scummvm \ --path=@out@/share/${name} \ diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index ccece066cdc..a97338f6f20 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, unzip, zlib, libpng, bzip2, SDL, SDL_mixer -, buildEnv, config +, buildEnv, config, runtimeShell }: let @@ -95,7 +95,7 @@ let postBuild = '' rm "$out/bin" && mkdir "$out/bin" cat > "$out/bin/simutrans" <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd "$out"/share/simutrans exec "${binaries}/bin/simutrans" -use_workdir "\''${extraFlagsArray[@]}" "\$@" EOF @@ -167,4 +167,3 @@ let }; in result - diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index ad0c7441d7f..2556aa49b4c 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, -libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis}: +libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell }: stdenv.mkDerivation rec { version = "2.2.1-r6404"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir "$out/bin" for i in "$out"/games/*; do - echo '#!${stdenv.shell}' >> "$out/bin/$(basename "$i")" + echo '#!${runtimeShell}' >> "$out/bin/$(basename "$i")" echo "$i"' "$@"' >> "$out/bin/$(basename "$i")" chmod a+x "$out/bin/$(basename "$i")" done diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 17f25e25e3f..4661cf7d803 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -4,6 +4,7 @@ , extraProfile ? "" # string to append to profile , nativeOnly ? false , runtimeOnly ? false +, runtimeShell # DEPRECATED , withJava ? config.steam.java or false @@ -35,7 +36,7 @@ let ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); runSh = writeScript "run.sh" '' - #!${stdenv.shell} + #!${runtimeShell} runtime_paths="${lib.concatStringsSep ":" ldPath}" if [ "$1" == "--print-steam-runtime-library-paths" ]; then echo "$runtime_paths" @@ -195,7 +196,7 @@ in buildFHSUserEnv rec { '' + extraProfile; runScript = writeScript "steam-wrapper.sh" '' - #!${stdenv.shell} + #!${runtimeShell} if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS ${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1 # If there was an error running glxinfo, we know something is wrong with the configuration @@ -204,7 +205,7 @@ in buildFHSUserEnv rec { ** WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix and then run \`sudo nixos-rebuild switch\`: - { + { hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; } @@ -226,7 +227,7 @@ in buildFHSUserEnv rec { inherit multiPkgs extraBuildCommands; runScript = writeScript "steam-run" '' - #!${stdenv.shell} + #!${runtimeShell} run="$1" if [ "$run" = "" ]; then echo "Usage: steam-run command-to-run args..." >&2 diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index dd6e9a070b1..95493498f5e 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, traceDeps ? false}: +{stdenv, fetchurl, runtimeShell, traceDeps ? false}: let traceLog = "/tmp/steam-trace-dependencies.log"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { rm $out/bin/steamdeps ${stdenv.lib.optionalString traceDeps '' cat > $out/bin/steamdeps <<EOF - #!${stdenv.shell} + #!${runtimeShell} echo \$1 >> ${traceLog} cat \$1 >> ${traceLog} echo >> ${traceLog} diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 48fa0a3b518..57e7217fcdb 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tcllib }: +{ stdenv, fetchurl, tcl, tcllib, runtimeShell }: stdenv.mkDerivation { name = "tcl2048-0.4.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { mkdir -pv $out/bin cp $src $out/2048.tcl cat > $out/bin/2048 << EOF - #!${stdenv.shell} + #!${runtimeShell} # wrapper for tcl2048 export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index cfef1ed0db2..02c55d7d06c 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, libX11, libGLU_combined }: +{ stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU_combined }: with stdenv.lib; stdenv.mkDerivation { @@ -38,7 +38,7 @@ stdenv.mkDerivation { # The wrapper script itself. We use $LD_LIBRARY_PATH for libGL. cat << EOF > "$out/bin/Tibia" - #!${stdenv.shell} + #!${runtimeShell} cd $out/res ${glibc.out}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@" EOF diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index fd1a3e178d5..470856af90e 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal }: +{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal, runtimeShell }: stdenv.mkDerivation rec { name = "tremulous-${version}"; version = "1.1.0"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { for b in tremulous tremded do cat << EOF > $out/bin/$b - #!${stdenv.shell} + #!${runtimeShell} cd $out/opt/tremulous exec ./$b.$arch "\$@" EOF diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 85157d8df18..ae16510fdc5 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: +{ fetchurl, stdenv, runtimeShell +, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: stdenv.mkDerivation rec { name = "trigger-rally-0.6.5"; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin cat <<EOF > $out/bin/trigger-rally - #!${stdenv.shell} + #!${runtimeShell} exec $out/games/trigger-rally "$@" EOF chmod +x $out/bin/trigger-rally diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 83fce64ca32..483912bab45 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,14 +1,14 @@ -{ stdenv, requireFile, SDL, libpulseaudio, alsaLib }: +{ stdenv, requireFile, SDL, libpulseaudio, alsaLib, runtimeShell }: stdenv.mkDerivation rec { name = "vessel-12082012"; - goBuyItNow = '' + goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. You can do this by using "nix-prefetch-url file://\$PWD/${name}-bin" in the directory where you saved it. - ''; + ''; src = if (stdenv.isi686) then requireFile { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { phases = "installPhase"; ld_preload = ./isatty.c; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; installPhase = '' @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { # allow scripting of the mojoinstaller gcc -fPIC -shared -o isatty.so $ld_preload - echo @@@ + echo @@@ echo @@@ this next step appears to hang for a while - echo @@@ + echo @@@ - # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. + # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. LD_PRELOAD=./isatty.so $(cat $NIX_CC/nix-support/dynamic-linker) $src << IM_A_BOT n $out/libexec/strangeloop/vessel/ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { rm $out/libexec/strangeloop/vessel/x86/libstdc++* # props to Ethan Lee (the Vessel porter) for understanding - # how $ORIGIN works in rpath. There is hope for humanity. + # how $ORIGIN works in rpath. There is hope for humanity. patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { done cat > $out/bin/Vessel << EOW - #!${stdenv.shell} + #!${runtimeShell} cd $out/libexec/strangeloop/vessel/ exec ./x86/vessel.x86 EOW diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 97bfd9e730c..7d8380e9f7c 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,25 +1,26 @@ { stdenv, requireFile , libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined +, runtimeShell , demo ? false }: # TODO: add i686 support stdenv.mkDerivation rec { - name = if demo + name = if demo then "WorldOfGooDemo-1.41" else "WorldofGoo-1.41"; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "supported" else throw "Sorry. World of Goo only is only supported on x86_64 now."; - goBuyItNow = '' + goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. You can do this by using "nix-prefetch-url file://\$PWD/WorldOfGooSetup.1.41.tar.gz" in the directory where you saved it. - Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. - ''; + Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. + ''; getTheDemo = '' We cannot download the demo version automatically. Please go to @@ -28,8 +29,8 @@ stdenv.mkDerivation rec { directory where you saved it. ''; - src = if demo - then + src = if demo + then requireFile { message = getTheDemo; name = "WorldOfGooDemo.1.41.tar.gz"; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis libGLU_combined ] + ":" + stdenv.cc.cc + "/lib64"; @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { #makeWrapper doesn't do cd. :( cat > $out/bin/WorldofGoo << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/libexec/2dboy/WorldOfGoo exec ./WorldOfGoo.bin64 EOF diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/pkgs/misc/cups/drivers/hl3140cw/default.nix new file mode 100644 index 00000000000..001a3c1eac0 --- /dev/null +++ b/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -0,0 +1,78 @@ +{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: + +let + version = "1.1.4-0"; + cupsdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf007070/hl3140cwcupswrapper-${version}.i386.deb"; + sha256 = "a76281828ca6ee86c63034673577fadcf5f24e8ed003213bdbb6bf47a7aced6f"; + }; + srcdir = "hl3140cw_cupswrapper_GPL_source_${version}"; + cupssrc = fetchurl { + url = "https://download.brother.com/welcome/dlf006740/${srcdir}.tar.gz"; + sha256 = "1wp85rbvbar6rqqkaffymxjpls6jx9m9230dlrpqwy5akiaxf0rl"; + }; + lprdeb = fetchurl { + url = "https://support.brother.com/g/b/files/dlf/dlf007068/hl3140cwlpr-1.1.2-1.i386.deb"; + sha256 = "601f392b52ed7080f71b780181823bb8f6abfd0591146b452ba1f23e21f9f865"; + }; +in +stdenv.mkDerivation { + name = "cups-brother-hl3140cw"; + nativeBuildInputs = [ makeWrapper dpkg ]; + buildInputs = [ cups ghostscript a2ps ]; + + unpackPhase = '' + tar -xvf ${cupssrc} + ''; + + buildPhase = '' + gcc -Wall ${srcdir}/brcupsconfig/brcupsconfig.c -o brcupsconfpt1 + ''; + + installPhase = '' + # install lpr + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw \ + --replace /opt "$out/opt" + substituteInPlace $out/opt/brother/Printers/hl3140cw/inf/setupPrintcapij \ + --replace /opt "$out/opt" + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 + + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/hl3140cw/lpd/brhl3140cwfilter + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_hl3140cw + + wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + + dpkg-deb -x ${cupsdeb} $out + + substituteInPlace $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw \ + --replace /opt "$out/opt" + + mkdir -p $out/lib/cups/filter + ln -s $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw $out/lib/cups/filter/cupswrapperhl3140cw + + ln -s $out/opt/brother/Printers/hl3140cw/cupswrapper/brother_hl3140cw_printer_en.ppd $out/lib/cups/filter/brother_hl3140cw_printer_en.ppd + + cp brcupsconfpt1 $out/opt/brother/Printers/hl3140cw/cupswrapper/ + ln -s $out/opt/brother/Printers/hl3140cw/cupswrapper/brcupsconfpt1 $out/lib/cups/filter/brcupsconfpt1 + ln -s $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw $out/lib/cups/filter/brother_lpdwrapper_hl3140cw + + wrapProgram $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + ''; + + meta = { + homepage = http://www.brother.com/; + description = "Brother hl3140cw printer driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl3140cw_us_eu&os=128"; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 607e3c2c57f..e22a159c428 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd +{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd, runtimeShell , ghostscript, a2ps }: # Why: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { unpackPhase = "true"; brprintconf_mfcj6510dw_script = '' - #!${stdenv.shell} + #!${runtimeShell} cd $(mktemp -d) ln -s @out@/usr/bin/brprintconf_mfcj6510dw_patched brprintconf_mfcj6510dw_patched ln -s @out@/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwfunc brmfcj6510dwfunc diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 45b2f79146c..1349fa0f0b6 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -4,7 +4,8 @@ , udev , libGLU_combined, SDL , libao, openal, libpulseaudio -, gtk2, gtksourceview }: +, gtk2, gtksourceview +, runtimeShell }: with stdenv.lib; stdenv.mkDerivation rec { @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { # stuff needed by higan at runtime cat <<EOF > $out/bin/higan-init.sh - #!${stdenv.shell} + #!${runtimeShell} cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ @@ -69,8 +70,8 @@ stdenv.mkDerivation rec { longDescription = '' higan (formerly bsnes) is a multi-system game console emulator. It currently supports the following systems: - - Nintendo's Famicom, Super Famicom (with subsystems: - Super Game Boy, BS-X Satellaview, Sufami Turbo); + - Nintendo's Famicom, Super Famicom (with subsystems: + Super Game Boy, BS-X Satellaview, Sufami Turbo); Game Boy, Game Boy Color, Game Boy Advance; - Sega's Master System, Game Gear, Mega Drive; - NEC's PC Engine, SuperGrafx; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index bdc372c7ca2..4f40c10b037 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123 }: +{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123, runtimeShell }: let libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk_pixbuf pango libXinerama ]; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; runner = writeText "kega-fusion" '' - #!${stdenv.shell} -ex + #!${runtimeShell} -ex kega_libdir="@out@/lib/kega-fusion" kega_localdir="$HOME/.Kega Fusion" diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 6b708cccc8f..1072a66e0ea 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, cores }: +{ stdenv, pkgs, cores, runtimeShell }: assert cores != []; @@ -7,7 +7,7 @@ with pkgs.lib; let script = exec: '' - #!${stdenv.shell} + #!${runtimeShell} nohup sh -c "pkill -SIGTSTP kodi" & # https://forum.kodi.tv/showthread.php?tid=185074&pid=1622750#pid1622750 nohup sh -c "sleep 10 && ${exec} '$@' -f;pkill -SIGCONT kodi" diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index fa2121f5bc1..2537669bbc4 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig -, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib +, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mv $out/share/retrofe/example/retrofe $out/bin/ cat > $out/bin/retrofe-init << EOF - #!${stdenv.shell} + #!${runtimeShell} echo "This will install retrofe's example files into this directory" echo "Example files location: $out/share/retrofe/example/" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 360a98fd567..14332c70078 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,6 +1,6 @@ { stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin , nix-prefetch-hg, nix-prefetch-git -, fetchFromGitHub +, fetchFromGitHub, runtimeShell }: /* @@ -359,19 +359,57 @@ rec { inherit vimrcFile; # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim - vimWithRC = {vimExecutable, name ? null, vimrcFile ? null, gvimrcFile ? null}: - let rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; - in writeScriptBin (if name == null then "vim" else name) '' - #!${stdenv.shell} - exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" + vimWithRC = { + vimExecutable, + gvimExecutable, + vimManPages, + wrapManual, + wrapGui, + name ? "vim", + vimrcFile ? null, + gvimrcFile ? null, + vimExecutableName, + gvimExecutableName, + }: + let + rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; + vimWrapperScript = writeScriptBin vimExecutableName '' + #!${runtimeShell} + exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" ''; + gvimWrapperScript = writeScriptBin gvimExecutableName '' + #!${stdenv.shell} + exec ${gvimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" + ''; + in + buildEnv { + inherit name; + paths = [ + vimWrapperScript + ] ++ lib.optional wrapGui gvimWrapperScript + ++ lib.optional wrapManual vimManPages + ; + }; # add a customize option to a vim derivation makeCustomizable = vim: vim // { - customize = { name, vimrcConfig }: vimWithRC { + customize = { + name, + vimrcConfig, + wrapManual ? true, + wrapGui ? false, + vimExecutableName ? name, + gvimExecutableName ? (lib.concatStrings [ "g" name ]), + }: vimWithRC { vimExecutable = "${vim}/bin/vim"; - inherit name; + gvimExecutable = "${vim}/bin/gvim"; + inherit name wrapManual wrapGui vimExecutableName gvimExecutableName; vimrcFile = vimrcFile vimrcConfig; + vimManPages = buildEnv { + name = "vim-doc"; + paths = [ vim ]; + pathsToLink = [ "/share/man" ]; + }; }; override = f: makeCustomizable (vim.override f); diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index e5b83511e72..2a9eeae3d57 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript +{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript, runtimeShell , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: @@ -53,7 +53,7 @@ let }; openDebugAD7Script = writeScript "OpenDebugAD7" '' - #!${stdenv.shell} + #!${runtimeShell} BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" ${if gdbUseFixed then '' diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 084a1e01375..77284e4dfa8 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -7,8 +7,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "1.2.5"; - sha256 = "011yx3pwqbcz5fmzani57k0axgh458r4ipqwbjlklnrwbrkjhzra"; + version = "1.2.7"; + sha256 = "1z1l9jbx7y7y643qxp76bxkpik4kbcqkw1492s11mrflqlfasyfn"; }; postPatch = '' diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/pkgs/os-specific/darwin/stubs/default.nix index ec8f948a00b..6fedf0a451e 100644 --- a/pkgs/os-specific/darwin/stubs/default.nix +++ b/pkgs/os-specific/darwin/stubs/default.nix @@ -1,7 +1,7 @@ -{ stdenv, writeScriptBin }: +{ stdenv, writeScriptBin, runtimeShell }: let fake = name: stdenv.lib.overrideDerivation (writeScriptBin name '' - #!${stdenv.shell} + #!${runtimeShell} echo >&2 "Faking call to ${name} with arguments:" echo >&2 "$@" '') (drv: { diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index f5bc7458240..4b914860068 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, kernel }: +{ stdenv, fetchurl, fetchpatch, kernel, runtimeShell }: let baseName = "bbswitch"; @@ -36,12 +36,12 @@ stdenv.mkDerivation { mkdir -p $out/bin tee $out/bin/discrete_vga_poweroff << EOF - #!${stdenv.shell} + #!${runtimeShell} echo -n OFF > /proc/acpi/bbswitch EOF tee $out/bin/discrete_vga_poweron << EOF - #!${stdenv.shell} + #!${runtimeShell} echo -n ON > /proc/acpi/bbswitch EOF diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 3a6e0a08103..b1b5401b88d 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -3,62 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "0z8ilypad82q3l6q6kbv6hczvhjn8k63j8051x5yqfyjq686nlh1"; + sha256 = "0hd181sghdk944hxd7d41s7zhqd4dmsbkxipjj27bgisrjixvc11"; }; - patches = [ - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=0d42179e1246f996d334c8bd18deca469fdb1add"; - sha256 = "0w5n3ypwavq5zlyfxpcyvbaf96g59xkwbw9xwpjyzb7h5j264615"; - }) - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=df426738fb212d62b132d9bb447f0128194e00ab"; - sha256 = "0ps2prjijlcgv1i97xb5ypw840dhkc7ja1aw8zhlbrap7pbgi1mm"; - }) - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=b70d508c50e8e2d2b8fb96ae44ae10f84cf0c1ae"; - sha256 = "0pslmsbay2cy1k07w1mdcr0b8w059jkrqrr9zi1aljvkm3vbwhj1"; - }) - - #KRACKAttack.com - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; - sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; - sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; - sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; - sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; - sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; - sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; - }) - #(fetchurl { # wpa-supplicant only - # url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; - # sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; - #}) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; - sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl openssl sqlite ]; diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index baf24b27562..9b915725514 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript }: +{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript, runtimeShell }: let @@ -11,7 +11,7 @@ let bin = "${drv}${path}"; in assert name != ""; writeScript "setUID-${name}" '' - #!${stdenv.shell} + #!${runtimeShell} inode=$(stat -Lc %i ${bin}) for file in $(type -ap ${name}); do case $(stat -Lc %a $file) in diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 9be17ade149..de5559c5434 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -3,8 +3,8 @@ , gobject-introspection }: python3.pkgs.buildPythonApplication rec { - pname = "piper-${version}"; - version = "0.2.902"; + pname = "piper"; + version = "0.2.903"; format = "other"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "1ny0vf8ym9v040cb5h084k5wwn929fnhq9infbdq8f8vvy61magb"; + sha256 = "0zh4lm074x5gwvx663bapdyv8lf84yjwfg8cpf77rszyja1hx13a"; }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index de23071f026..6ba4f8d4b06 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -10,7 +10,7 @@ # Add a hook script in the managed etc directory, e.g.: # etc = [ # { source = pkgs.writeScript "rtfkill.hook" '' -# #!${stdenv.shell} +# #!${pkgs.runtimeShell} # # if [ "$RFKILL_STATE" -eq "1" ]; then # exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on @@ -39,7 +39,7 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p "$out/etc/udev/rules.d/"; cat > "$out/etc/udev/rules.d/90-rfkill.rules" << EOF - SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" + SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" EOF mkdir -p "$out/bin/"; diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix index 1b6dfd90b1e..b89912434ec 100644 --- a/pkgs/os-specific/linux/tp_smapi/update.nix +++ b/pkgs/os-specific/linux/tp_smapi/update.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }: +{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts, runtimeShell }: writeScript "update-tp_smapi" '' -#!${stdenv.shell} +#!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]} tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags` diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 2affc8ceff2..04d0a0cf8d0 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -19,6 +19,11 @@ unwrapped = stdenv.mkDerivation rec { sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b"; }; + # Short-lived cross fix, as upstream is migrating to meson anyway. + postPatch = '' + substituteInPlace platform.mk --replace "objdump" "$OBJDUMP" + ''; + outputs = [ "out" "dev" ]; configurePhase = "patchShebangs scripts/"; diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix index 2e0b4abc939..d4420be94b5 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/servers/home-assistant/esphome.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.11.1"; + version = "1.11.2"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1764q4wyl8qlk2514gikv8178c8fwhhvbw64zkd76nb107hxzrk5"; + sha256 = "0kg8fqv3mv8i852jr42p4mipa9wjlzjwj60j1r2zpgzgr8p8wfs8"; }; ESPHOME_USE_SUBPROCESS = ""; diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/pkgs/servers/mail/system-sendmail/default.nix index fe0aeb5b3af..7bd7df84924 100644 --- a/pkgs/servers/mail/system-sendmail/default.nix +++ b/pkgs/servers/mail/system-sendmail/default.nix @@ -1,7 +1,7 @@ -{ stdenv, writeText }: +{ stdenv, writeText, runtimeShell }: let script = writeText "script" '' - #!${stdenv.shell} + #!${runtimeShell} if command -v sendmail > /dev/null 2>&1 && [ "$(command -v sendmail)" != "{{MYPATH}}" ]; then exec sendmail "$@" diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 132f812bf46..b677b6080d1 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, patchelf }: +{ stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let bootstrap = fetchurl { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # otherwise it fails spectacularly. mkdir -p $out/bin cat << EOF > $out/bin/meteor - #!${stdenv.shell} + #!${runtimeShell} if [[ ! -f \$HOME/.meteor/package-metadata/v2.0.1/packages.data.db ]]; then mkdir -p \$HOME/.meteor/package-metadata/v2.0.1 diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 1d8f9ca3c79..721f4a04302 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,20 +1,22 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.4.3"; + version = "6.0.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; + excludedPackages = [ "release_publisher" ]; + src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "11fwb80a9qqlzmg11vw4llfa0mz80jkljg0gmp0sbv6c9jspqncv"; + sha256 = "1dacji3b8iqfx92cb6psrhvg2hym8xl1lzfn7yvyss4vjj7pmbbc"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "141msgrxdn4nmwp6jhh3zg5zcbj82pxdr7ysc5v28rh9paj79yyd"; + sha256 = "02c7klma5zl1mcis7gnbfi56i59ps7i757yyy8v9gnp5ynnb55v4"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index a0f7341571c..3e6eaa4766e 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook -, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl }: +, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl +, runtimeShell }: with stdenv.lib; @@ -50,7 +51,7 @@ in stdenv.mkDerivation rec { preBuild = '' mkdir -p $out cat <<_EOF > $out/share -#!${stdenv.shell} +#!${runtimeShell} exit 0 _EOF chmod 755 $out/share diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index a25eff5b05c..c4dbbbddffb 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nginx-sso-${version}"; - version = "0.15.1"; + version = "0.16.0"; rev = "v${version}"; goPackagePath = "github.com/Luzifer/nginx-sso"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "Luzifer"; repo = "nginx-sso"; - sha256 = "0mm6yhm22wf32yl9wvl8fy9m5jjd491khyy4cl73fn381h3n5qi2"; + sha256 = "062ni683x22ss6kj7jmdx0nrhrcgmzsfw24z5l0jj7b4wvpcn02b"; }; postInstall = '' diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 1d3240fae71..7880c6db7fd 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, mono, v8 }: +{ stdenv, fetchFromGitHub, git, mono, v8, runtimeShell }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/eventstore/clusternode} cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ cat > $out/bin/clusternode << EOF - #!${stdenv.shell} + #!${runtimeShell} exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" EOF chmod +x $out/bin/clusternode diff --git a/pkgs/servers/openafs/1.8/linux-4.20.patch b/pkgs/servers/openafs/1.8/linux-4.20.patch new file mode 100644 index 00000000000..bb896d82b69 --- /dev/null +++ b/pkgs/servers/openafs/1.8/linux-4.20.patch @@ -0,0 +1,62 @@ +--- a/src/afs/LINUX/osi_machdep.h ++++ b/src/afs/LINUX/osi_machdep.h +@@ -75,7 +75,14 @@ + #if defined(HAVE_LINUX_CRED_H) + #include "h/cred.h" + #endif +-#if defined(HAVE_LINUX_CURRENT_KERNEL_TIME) ++ ++#if defined(HAVE_LINUX_KTIME_GET_COARSE_REAL_TS64) ++static inline time_t osi_Time(void) { ++ struct timespec64 xtime; ++ ktime_get_coarse_real_ts64(&xtime); ++ return xtime.tv_sec; ++} ++#elif defined(HAVE_LINUX_CURRENT_KERNEL_TIME) + static inline time_t osi_Time(void) { + struct timespec xtime; + xtime = current_kernel_time(); +--- a/src/cf/linux-kernel-func.m4 ++++ b/src/cf/linux-kernel-func.m4 +@@ -72,6 +72,10 @@ AC_CHECK_LINUX_FUNC([iter_file_splice_write], + AC_CHECK_LINUX_FUNC([kernel_setsockopt], + [#include <linux/net.h>], + [kernel_setsockopt(NULL, 0, 0, NULL, 0);]) ++AC_CHECK_LINUX_FUNC([ktime_get_coarse_real_ts64], ++ [#include <linux/time.h>], ++ [struct timespec64 *s; ++ ktime_get_coarse_real_ts64(s);]) + AC_CHECK_LINUX_FUNC([locks_lock_file_wait], + [#include <linux/fs.h>], + [locks_lock_file_wait(NULL, NULL);]) +--- a/src/afs/LINUX/osi_misc.c ++++ b/src/afs/LINUX/osi_misc.c +@@ -28,18 +28,6 @@ + int afs_osicred_initialized = 0; + afs_ucred_t afs_osi_cred; + +-void +-afs_osi_SetTime(osi_timeval_t * tvp) +-{ +- struct timespec tv; +- tv.tv_sec = tvp->tv_sec; +- tv.tv_nsec = tvp->tv_usec * NSEC_PER_USEC; +- +- AFS_STATCNT(osi_SetTime); +- +- do_settimeofday(&tv); +-} +- + void + osi_linux_mask(void) + { +--- a/src/afs/LINUX/osi_prototypes.h ++++ b/src/afs/LINUX/osi_prototypes.h +@@ -45,7 +45,6 @@ extern void osi_ioctl_init(void); + extern void osi_ioctl_clean(void); + + /* osi_misc.c */ +-extern void afs_osi_SetTime(osi_timeval_t * tvp); + extern int osi_lookupname_internal(char *aname, int followlink, + struct vfsmount **mnt, struct dentry **dpp); + extern int osi_lookupname(char *aname, uio_seg_t seg, int followlink, diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 958fcd578c2..36a73bf5878 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -11,6 +11,8 @@ in stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; + patches = [ ./linux-4.20.patch ]; + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index e440f11b2e4..c77330bd2ac 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "percona-server-${version}"; - version = "5.6.35-80.0"; + version = "5.6.43-84.3"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz"; - sha256 = "0szjywx902da09pg8yqj8l2acplmh69hn5smrk45i291qsi5m6r5"; + sha256 = "1cc0lfmpq4pw90bcsszsygw06vd4j4bh3ph5x0yn3z7wddvmjlpw"; }; buildInputs = [ cmake bison ncurses openssl zlib libaio perl ]; @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a - rm $out/share/man/man1/mysql-test-run.pl.1 ''; passthru.mysqlVersion = "5.6"; @@ -57,6 +56,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ grahamc ]; - broken = true; # 2018-04-11 }; } diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix index c48a9f938bd..d5e84cce984 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/codimd/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper -, fetchpatch, nodejs-6_x, phantomjs2 }: +, fetchpatch, nodejs-6_x, phantomjs2, runtimeShell }: let nodePackages = import ./node.nix { inherit pkgs; @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cat > $out/bin/codimd <<EOF - #!${stdenv.shell} + #!${runtimeShell} ${nodejs-6_x}/bin/node $out/app.js EOF cp -R {app.js,bin,lib,locales,package.json,public} $out/ diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 535fb061de9..8df8499d11e 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages } : +{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : stdenv.mkDerivation rec { name = "pyIRCt-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/${name} cat > $out/bin/pyIRCt <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/${name} ./irc.py \"$@\" EOF diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index b1c4d93f687..76861ab842b 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, xmpppy, pythonPackages, fetchcvs } : +{ stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } : stdenv.mkDerivation rec { name = "pyMAILt-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/$name cat > $out/bin/pyMAILt <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/${name} ./mail.py \"$@\" EOF diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 780a77c5caa..5bacaf2982e 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils }: +{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, runtimeShell }: stdenv.mkDerivation rec { name = "zookeeper-${version}"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { done cat << EOF > $out/bin/zooInspector.sh - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/zooinspector exec ${jre}/bin/java -cp $classpath org.apache.zookeeper.inspector.ZooInspector EOF diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index aafc0855dbe..7b4f8adc82f 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -54,6 +54,8 @@ in lib.init bootStages ++ [ then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc + else if crossSystem.useLLVM or false + then buildPackages.llvmPackages_7.lldClang else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cafd1031ab8..39b84179ae0 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -86,7 +86,7 @@ rec { doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform; doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform; - separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux; + separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false); outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; fixedOutputDrv = attrs ? outputHash; diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 622799106cd..5d9c120c501 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -26,14 +26,20 @@ let # We need to remove whitespace, unfortunately # Windows programs use \r but Unix programs use \n + echo Running native-built program natively + # find expected value natively ${getExecutable hostPkgs pkgFun exec} ${args'} \ | dos2unix > $out/expected + echo Running cross-built program in emulator + # run emulator to get actual value ${emulator} ${getExecutable crossPkgs pkgFun exec} ${args'} \ | dos2unix > $out/actual + echo Comparing results... + if [ "$(cat $out/actual)" != "$(cat $out/expected)" ]; then echo "${pkgName} did not output expected value:" cat $out/expected @@ -47,10 +53,10 @@ let fi ''; - mapMultiPlatformTest = test: lib.mapAttrs (name: system: test rec { + mapMultiPlatformTest = crossSystemFun: test: lib.mapAttrs (name: system: test rec { crossPkgs = import pkgs.path { localSystem = { inherit (pkgs.hostPlatform) config; }; - crossSystem = system; + crossSystem = crossSystemFun system; }; emulator = crossPkgs.hostPlatform.emulator pkgs; @@ -65,26 +71,30 @@ let } else pkg; }) testedSystems; -in - -lib.mapAttrs (_: mapMultiPlatformTest) { + tests = { + + file = {platformFun, crossPkgs, emulator}: compareTest { + inherit emulator crossPkgs; + hostPkgs = pkgs; + exec = "/bin/file"; + args = [ + "${pkgs.file}/share/man/man1/file.1.gz" + "${pkgs.dejavu_fonts}/share/fonts/truetype/DejaVuMathTeXGyre.ttf" + ]; + pkgFun = pkgs: platformFun pkgs.file; + }; - file = {platformFun, crossPkgs, emulator}: compareTest { - inherit emulator crossPkgs; - hostPkgs = pkgs; - exec = "/bin/file"; - args = [ - "${pkgs.file}/share/man/man1/file.1.gz" - "${pkgs.dejavu_fonts}/share/fonts/truetype/DejaVuMathTeXGyre.ttf" - ]; - pkgFun = pkgs: platformFun pkgs.file; - }; + hello = {platformFun, crossPkgs, emulator}: compareTest { + inherit emulator crossPkgs; + hostPkgs = pkgs; + exec = "/bin/hello"; + pkgFun = pkgs: pkgs.hello; + }; - hello = {platformFun, crossPkgs, emulator}: compareTest { - inherit emulator crossPkgs; - hostPkgs = pkgs; - exec = "/bin/hello"; - pkgFun = pkgs: pkgs.hello; }; -} +in (lib.mapAttrs (_: mapMultiPlatformTest builtins.id) tests) +// (lib.mapAttrs' (name: test: { + name = "${name}-llvm"; + value = mapMultiPlatformTest (system: system // {useLLVM = true;}) test; + }) tests) diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 669cb4b4844..bf3ff7c6528 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -8,6 +8,7 @@ , lib , primusLib , writeScriptBin +, runtimeShell , primusLib_i686 ? null , useNvidia ? true }: @@ -25,7 +26,7 @@ let )); in writeScriptBin "primusrun" '' - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH exec "$@" '' diff --git a/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch b/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch new file mode 100644 index 00000000000..d5299528134 --- /dev/null +++ b/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch @@ -0,0 +1,45 @@ +From 428c6e0eb604b63a67fda6af445c10c8ae3c1826 Mon Sep 17 00:00:00 2001 +From: Philipp Gesang <phg@phi-gamma.net> +Date: Sun, 27 Jan 2019 21:37:13 +0100 +Subject: [PATCH] makefile: fix installation + +- comment hard-coded $(CC) +- avoid full paths during install +- set proper permissions +--- + Makefile | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 9268c6f..0797579 100644 +--- a/Makefile ++++ b/Makefile +@@ -76,7 +76,7 @@ MW=-Wformat -Werror=format-security -Wall + + CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW) + +-CC=gcc ++#CC=gcc + + # also using contents of usin CPPFLAGS, CFLAGS, LDFLAGS out of environment + # variables, if they exist +@@ -94,9 +94,14 @@ clean: + rm -f regtest/statsize regtest/statsize64 + cd regtest; /bin/sh regtest.clean + ++ifndef DESTDIR ++install: ++ $(error Please specify install prefix as $$DESTDIR) ++else + install: afio +- cp afio /usr/local/bin +- cp afio.1 /usr/share/man/man1 ++ install -Dm755 afio $(DESTDIR)/bin/afio ++ install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 ++endif + + # generate default list of -E extensions from manpage + # note: on sun, I had to change awk command below to nawk or gawk +-- +2.18.1 + diff --git a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch b/pkgs/tools/archivers/afio/afio-2.5.1-install.patch deleted file mode 100644 index 9fa7aacfa88..00000000000 --- a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- p1/Makefile.orig 2017-02-14 21:40:20.404249126 +0100 -+++ p1/Makefile 2017-02-19 23:38:43.880414077 +0100 -@@ -66,37 +66,42 @@ - # systems the large file compile environment itself might be buggy or beta. - #LARGEFILEFLAGS= - LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - - # even more warnings flags.. - MW= - #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations - - CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} - --CC=gcc -+#CC=gcc - - CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I - LDFLAGS = - - afio : afio.o compfile.o exten.o match.o $M - ${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio - - clean: - rm -f *.o afio - rm -f regtest/cmpstat regtest/makesparse - rm -f regtest/statsize regtest/statsize64 - cd regtest; /bin/sh regtest.clean - -+ifndef DESTDIR -+install: -+ $(error Please specify install prefix as $$DESTDIR) -+else - install: afio -- cp afio /usr/local/bin -- cp afio.1 /usr/share/man/man1 -+ install -Dm755 afio $(DESTDIR)/bin/afio -+ install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 -+endif - - # generate default list of -E extensions from manpage - # note: on sun, I had to change awk command below to nawk or gawk - # to get it to work. - exten_default.h : afio.1 - awk -f exten_make.awk afio.1 >exten_default.h - - - afio.o : afio.h patchlevel.h - compfile.o : afio.h diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 551e38a7869..0014febf40e 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "2.5.1"; + version = "2.5.2"; name = "afio-${version}"; src = fetchurl { url = "http://members.chello.nl/~k.holtman/${name}.tgz"; - sha256 = "363457a5d6ee422d9b704ef56d26369ca5ee671d7209cfe799cab6e30bf2b99a"; + sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; }; /* * A patch to simplify the installation and for removing the * hard coded dependency on GCC. */ - patches = [ ./afio-2.5.1-install.patch ]; + patches = [ ./0001-makefile-fix-installation.patch ]; installFlags = "DESTDIR=$(out)"; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 8d2bf5e634c..c9a369ce4f7 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins , pythonPackages, imagemagick, gobject-introspection, gst_all_1 +, runtimeShell , fetchpatch # Attributes needed for tests of the external plugins @@ -227,7 +228,7 @@ in pythonPackages.buildPythonApplication rec { tmphome="$(mktemp -d)" EDITOR="${writeScript "beetconfig.sh" '' - #!${stdenv.shell} + #!${runtimeShell} cat > "$1" <<CFG plugins: ${concatStringsSep " " allEnabledPlugins} CFG diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 93e7afdce41..4b72ed3bfd3 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mpDris2"; name = "${pname}-${version}"; - version = "0.7"; + version = "0.8"; src = fetchurl { url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz"; - sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21"; + sha256 = "14a3va3929qaq1sp9hs9w4bs6lykdvshkbc58kbsc5nzvlgmrcdn"; }; preConfigure = '' diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix index e6284aa42d7..224b8b12906 100644 --- a/pkgs/tools/backup/flockit/default.nix +++ b/pkgs/tools/backup/flockit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation rec { name = "flockit-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp ./libflockit.so $out/lib (cat <<EOI - #!${stdenv.shell} + #!${runtimeShell} env LD_PRELOAD="$out/lib/libflockit.so" FLOCKIT_FILE_PREFIX=\$1 \''${@:2} EOI ) > $out/bin/flockit diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix new file mode 100644 index 00000000000..888711a8501 --- /dev/null +++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }: + +stdenv.mkDerivation rec { + name = "cdimgtools-${version}"; + version = "0.3"; + + src = fetchFromRepoOrCz { + repo = "cdimgtools"; + rev = "version/0.3"; + sha256 = "1hxg3glxj26fh9xnv184sfdc2wi4cnzvn7chz47wcqdsd0d5fn8w"; + }; + + nativeBuildInputs = [ autoreconfHook makeWrapper asciidoc perlPackages.PodPerldoc xmlto sourceHighlight docbook_xsl docbook_xml_dtd_45 ]; + + buildInputs = [ perl perlPackages.StringEscape perlPackages.DataHexdumper libdvdcss libdvdread ]; + + patches = [ ./nrgtool_fix_my.patch ./removed_dvdcss_interface_2.patch]; + + postFixup = '' + for cmd in raw96cdconv nrgtool; do + wrapProgram "$out/bin/$cmd" --prefix PERL5LIB : "$PERL5LIB" + done + ''; + + outputs = [ "out" "doc" ]; + + installTargets = [ "install" "install-doc" ]; + + meta = with stdenv.lib; { + homepage = https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html; + description = "Tools to inspect and manipulate CD/DVD optical disc images"; + license = licenses.gpl2; + maintainers = with maintainers; [ hhm ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch b/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch new file mode 100644 index 00000000000..5ed389c46ca --- /dev/null +++ b/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch @@ -0,0 +1,12 @@ +Fixes an error in nrgtool. +--- a/nrgtool ++++ b/nrgtool +@@ -162,7 +162,7 @@ sub process_file { + } + seek $nrg, 0, SEEK_SET if ($iff_only); + seek $nrg, $offset, SEEK_SET unless ($iff_only); +- while (my $_ = read_chunk($nrg, $iff)) { ++ while ($_ = read_chunk($nrg, $iff)) { + if ($_ < -1) { + warn "ERROR while reading an IFF chunk; aborting\n"; + return; diff --git a/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch b/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch new file mode 100644 index 00000000000..cb265eae05b --- /dev/null +++ b/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch @@ -0,0 +1,53 @@ +Removes the deprecated and removed `dvdcss_interface_2` libdvdcss function. + +This does not change any functionality; it only modifies the printing of software version information. +--- a/cssdec.c ++++ b/cssdec.c +@@ -102,8 +102,8 @@ int main( int argc, char *argv[] ) + b_keyonly = 1; + break; + case 'V': +- printf( "%s version %s (libdvdcss version %s)\n", +- progname, progversion, dvdcss_interface_2 ); ++ printf( "%s version %s\n", ++ progname, progversion ); + exit( EX_SUCCESS ); + break; + case '?': +@@ -126,8 +126,8 @@ int main( int argc, char *argv[] ) + if( argc >= 3 ) end = (int)strtol( argv[2], (char **)NULL, 0 ); + + /* Initialize libdvdcss */ +- printe( 2, "%s version %s (libdvdcss version %s)", +- progname, progversion, dvdcss_interface_2 ); ++ printe( 2, "%s version %s", ++ progname, progversion ); + dvdcss = dvdcss_open( (char *)dvdfile ); + if( dvdcss == NULL ) + { +diff --git a/dvdimgdecss.c b/dvdimgdecss.c +index 0b7006d..b7d251a 100644 +--- a/dvdimgdecss.c ++++ b/dvdimgdecss.c +@@ -157,8 +157,8 @@ int main( int argc, char *argv[] ) + dvdread_decrypt = 1; + break; + case 'V': +- printf( "%s version %s (libdvdcss version %s)\n", +- progname, progversion, dvdcss_interface_2 ); ++ printf( "%s version %s\n", ++ progname, progversion ); + exit( EX_SUCCESS ); + break; + case '?': +@@ -180,8 +180,8 @@ int main( int argc, char *argv[] ) + if( !imgfile ) verbosity++; + + /* Open the DVD */ +- printe( 2, "%s: version %s (libdvdcss version %s)\n", +- progname, progversion, dvdcss_interface_2 ); ++ printe( 2, "%s: version %s\n", ++ progname, progversion ); + dvdcss = dvdcss_open( dvdfile ); + if( dvdcss == NULL ) { + printe( 1, "opening of the DVD (%s) with libdvdcss failed\n", dvdfile ); diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix index d600f280400..e4e34aa919b 100644 --- a/pkgs/tools/cd-dvd/cuetools/default.nix +++ b/pkgs/tools/cd-dvd/cuetools/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, autoreconfHook +{ stdenv, fetchFromGitHub, autoreconfHook , bison, flac, flex, id3v2, vorbis-tools }: stdenv.mkDerivation rec { - name = "cuetools-${version}"; + pname = "cuetools"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/svend/cuetools/archive/${version}.tar.gz"; - sha256 = "01xi3rvdmil9nawsha04iagjylqr1l9v9vlzk99scs8c207l58i4"; + src = fetchFromGitHub { + owner = "svend"; + repo = pname; + rev = version; + sha256 = "02ksv1ahf1v4cr2xbclsfv5x17m9ivzbssb5r8xjm97yh8a7spa3"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bison flac flex id3v2 vorbis-tools ]; + postInstall = '' + # add link for compatibility with Debian-based distros, which package `cuetag.sh` as `cuetag` + ln -s $out/bin/cuetag.sh $out/bin/cuetag + ''; + meta = with stdenv.lib; { description = "A set of utilities for working with cue files and toc files"; homepage = https://github.com/svend/cuetools; diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index ce2aa9520d6..19c160c62f5 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3 }: +{ stdenv, fetchurl, python3, runtimeShell }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/${python3.sitePackages}/" cp "${src}" "$out/${python3.sitePackages}/mozlz4a.py" - echo "#!${stdenv.shell}" >> "$out/bin/mozlz4a" + echo "#!${runtimeShell}" >> "$out/bin/mozlz4a" echo "export PYTHONPATH='$PYTHONPATH'" >> "$out/bin/mozlz4a" echo "'${python3}/bin/python' '$out/${python3.sitePackages}/mozlz4a.py' \"\$@\"" >> "$out/bin/mozlz4a" chmod a+x "$out/bin/mozlz4a" diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index fb9b7cae488..a6b3ba01bfa 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -1,6 +1,6 @@ # The releases of this project are apparently precompiled to .jar files. -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin"; mkdir -p "$out/share"; install -D -m444 -t "$out/share" *.jar - echo "#!${stdenv.shell}" > "$out/bin/briss" + echo "#!${runtimeShell}" > "$out/bin/briss" echo "${jre}/bin/java -Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" >> "$out/bin/briss" chmod +x "$out/bin/briss" ''; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index e9301731e85..666cdae131e 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp }: +{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp, runtimeShell }: let version = "0.20"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { doCheck = true; preCheck = '' - sed -i -e "s|#!/bin/bash|#!${stdenv.shell}|" test/renderercheck.sh + sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" test/renderercheck.sh ''; meta = { diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 16580aac955..b561fb626e0 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -2,7 +2,7 @@ , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null -, buildPackages }: +, buildPackages, runtimeShell }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { substituteInPlace setup/ibus-setup.in --subst-var-by PYTHON ${python3Runtime.interpreter} substituteInPlace data/dconf/Makefile.am --replace "dconf update" true substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus - echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh + echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 08efe3e6e18..de211d1d1c4 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText }: +{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText, runtimeShell }: buildGoPackage rec { name = "fzf-${version}"; @@ -47,7 +47,7 @@ buildGoPackage rec { cp -R $src/shell $bin/share/fzf cat <<SCRIPT > $bin/bin/fzf-share - #!${stdenv.shell} + #!${runtimeShell} # Run this script to find the fzf shared folder where all the shell # integration scripts are living. echo $bin/share/fzf diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix new file mode 100644 index 00000000000..638beb2c75d --- /dev/null +++ b/pkgs/tools/misc/mcfly/default.nix @@ -0,0 +1,30 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "mcfly-${version}"; + version = "v0.3.1"; + rev = "${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "cantino"; + repo = "mcfly"; + sha256 = "0pmyw21zns4zn7pffji4yvbj63fx3g15cx81pk4bs6lzyz5zbdc2"; + }; + + preInstall = '' + mkdir -p $out/share/mcfly + cp mcfly.bash $out/share/mcfly/ + chmod +x $out/share/mcfly/mcfly.bash + ''; + + cargoSha256 = "0asldrf6s23f9aylk9f8zimmaskgqv3vkdhfnrd26zl9axm0a0ap"; + + meta = with stdenv.lib; { + homepage = https://github.com/cantino/mcfly; + description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.melkor333 ]; + }; +} diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix index 3cce28df4f3..3896ca77a16 100644 --- a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix +++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3 }: +{ stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3, runtimeShell }: stdenv.mkDerivation { name = "odroid-xu3-bootloader-2015-12-04"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { install -Dm755 $src/sd_fuse/hardkernel_1mb_uboot/sd_fusing.1M.sh $out/bin/sd_fuse-xu3 sed -i \ - -e '1i#!${stdenv.shell}' \ + -e '1i#!${runtimeShell}' \ -e '1iPATH=${lib.makeBinPath [ coreutils ]}:$PATH' \ -e '/set -x/d' \ -e 's,.\/sd_fusing\.sh,sd_fuse-xu3,g' \ diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index 8b7f1d38744..35233d97d56 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchFromGitHub, cairo, meson, ninja, wayland, pkgconfig, wayland-protocols }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, cairo, wayland, wayland-protocols +, buildDocs ? true, scdoc +}: stdenv.mkDerivation rec { - name = "slurp-${version}"; - version = "1.0.1"; + pname = "slurp"; + version = "1.1.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${version}"; - sha256 = "072lkwhpvr753wfqzmd994bnhbrgfavxcgqcyml7abab28sdhs1y"; + sha256 = "15fqspg3cjl830l95ibibprxf9p13mc2rpyf9bdwsdx2f4qrkq62"; }; nativeBuildInputs = [ meson ninja pkgconfig - ]; + ] ++ stdenv.lib.optional buildDocs scdoc; buildInputs = [ cairo @@ -23,6 +26,8 @@ stdenv.mkDerivation rec { wayland-protocols ]; + mesonFlags = stdenv.lib.optional buildDocs "-Dman-pages=enabled"; + meta = with stdenv.lib; { description = "Select a region in a Wayland compositor"; homepage = https://github.com/emersion/slurp; diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index e0d1ff20835..0e84f738e80 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { name = "smc-6.6.3"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp misc/smc.ico "$out/share/icons/" cat > "$out/bin/smc" << EOF - #!${stdenv.shell} + #!${runtimeShell} ${jre}/bin/java -jar "$out/share/java/Smc.jar" "\$@" EOF chmod a+x "$out/bin/smc" diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index c04c16ae1cc..9ac60ca8b13 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, unzip }: +{ stdenv, fetchurl, jre, unzip, runtimeShell }: stdenv.mkDerivation rec { major = "14"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp -R * "$out/lib" cat > "$out/bin/umlet" << EOF - #!${stdenv.shell} + #!${runtimeShell} programDir="$out/lib" cd "\$programDir" diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 710c6c61c64..4f1ca8f89ce 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { name = "wakatime-${version}"; - version = "10.6.0"; + version = "10.8.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "0g4zvy1ll30jg55ddpfqmlncqd0igg6kqy87j4izs1dpapk7a1ln"; + sha256 = "057gq6j41x9z29az4s21crswm97pa9z4v58m34q8mi3chihc3pj6"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix index 8a411d89da5..bdcdc47ea13 100644 --- a/pkgs/tools/misc/xdummy/default.nix +++ b/pkgs/tools/misc/xdummy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, writeScriptBin, xorg, xkeyboard_config }: +{ stdenv, writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell }: let xorgConfig = writeText "dummy-xorg.conf" '' @@ -73,7 +73,7 @@ let ''; in writeScriptBin "xdummy" '' - #!${stdenv.shell} + #!${runtimeShell} exec ${xorg.xorgserver.out}/bin/Xorg \ -noreset \ -logfile /dev/null \ diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 7305013eb8b..3be931a362b 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,7 +1,7 @@ { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs , fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool , libuuid, libxfs, lvm2, openssl, perl, procps, quota -, time, utillinux, which, writeScript, xfsprogs }: +, time, utillinux, which, writeScript, xfsprogs, runtimeShell }: stdenv.mkDerivation { name = "xfstests-2018-04-11"; @@ -78,7 +78,7 @@ stdenv.mkDerivation { # wants to write temporary files there. So create a temporary # to run from and symlink the runtime files to it. wrapperScript = writeScript "xfstests-check" '' - #!${stdenv.shell} + #!${runtimeShell} set -e export RESULT_BASE="$(pwd)/results" diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 589e6717c7d..61945266e13 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation rec { name = "zsh-autoenv-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -R $src $out/share/zsh-autoenv cat <<SCRIPT > $out/bin/zsh-autoenv-share - #!${stdenv.shell} + #!${runtimeShell} # Run this script to find the fzf shared folder where all the shell # integration scripts are living. echo $out/share/zsh-autoenv diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index 94a606f9c78..c53cce49a38 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , pkgs, makeWrapper, buildEnv -, nodejs +, nodejs, runtimeShell }: let @@ -49,7 +49,7 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cat >$out/bin/airfield <<EOF - #!${stdenv.shell} + #!${runtimeShell} ${nodejs}/bin/node ${src}/airfield.js EOF ''; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 194758905ff..6c440fc48fd 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: let version = "1.7.23"; @@ -8,7 +8,7 @@ let sha256 = "1y83qisn9pkn88vphpli7h8nacv8jv3sq0h04zbri25nfkgvl4an"; }; launcher = '' - #!${stdenv.shell} + #!${runtimeShell} exec ${jre}/bin/java -jar ${jar} "$@" ''; in stdenv.mkDerivation { diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 8205bddc7fe..d7ff19612eb 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ stdenv, fetchFromGitHub, openssl, runtimeShell }: let version = "3.0.0"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { # Helper utility cat > $out/bin/easyrsa-init <<EOF - #!${stdenv.shell} -e + #!${runtimeShell} -e cp -r $out/share/easyrsa/* . EOF chmod +x $out/bin/easyrsa-init diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index a37626c14da..e85cfb52553 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ip2unix-${version}"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "0xxwx1ip5jhkq93b91gcqd1i4njlvl9c4vjzijbdhjrrzz971iwk"; + sha256 = "1x2nfv15a1hg8vrw5vh8fqady12v9hfrb4p3cfg0ybx52y0xs48a"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix new file mode 100644 index 00000000000..058a36f3ed1 --- /dev/null +++ b/pkgs/tools/networking/nettee/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchurl, writeScript, file, cleanPackaging }: + +let + version = "0.3.4"; + sha256 = "00xbkp99x9v07r34w7m2p8gak5hdsdbka36n7a733rdrrkgf5z7r"; + +in stdenv.mkDerivation { + name = "nettee-${version}"; + + src = fetchurl { + url = "http://saf.bio.caltech.edu/pub/software/linux_or_unix_tools/beta-nettee-${version}.tar.gz"; + inherit sha256; + }; + + meta = { + homepage = "http://saf.bio.caltech.edu/nettee.html"; + description = ''Network "tee" program''; + license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ Profpatsch ]; + platforms = lib.platforms.linux; + }; + + outputs = [ "bin" "man" "doc" "out" ]; + + patchPhase = '' + # h_addr field was removed + sed -e '1 i #define h_addr h_addr_list[0]' \ + -i nettee.c + ''; + + buildPhase = '' + cat README.TXT + mkdir -p $bin/bin + $CC -o $bin/bin/nettee \ + -Wall -pedantic -std=c99\ + -D_LARGEFILE64_SOURCE -D_POSIX_SOURCE -D_XOPEN_SOURCE\ + nettee.c rb.c nio.c + ''; + + installPhase = '' + ${cleanPackaging.commonFileActions { + docFiles = [ + "*.html" + "*.TXT" + "LICENSE" + "*.sh" + "topology.txt" + "beowulf.master" + "topology_info" + ]; + noiseFiles = [ + "*.c" + "*.h" + "nettee" + ]; + }} $doc/share/doc/nettee + + mkdir -p $man/share/man/{man1,man3} + mv nettee.1 $man/share/man/man1 + mv nettee_cmd.3 $man/share/man/man3 + ''; + + postFixup = '' + ${cleanPackaging.checkForRemainingFiles} + ''; + +} diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index b8fa92e3202..98466a800a3 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radvd-${version}"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "1md6n63sg1n9x8yv0p7fwm1xxaiadj1q3mpadiqsvn14y1ddc2av"; + sha256 = "1p2wlv3djvla0r84hdncc3wfa530xigs7z9ssc2v5r1pcpzgxgz1"; }; nativeBuildInputs = [ pkgconfig bison flex check ]; diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 18f192d3535..44b262861e1 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -5,7 +5,7 @@ # for token storage, except that it would make the Nix package inconsistent with # upstream and other distributions. -{ stdenv, lib, writeShellScriptBin, fetchFromGitHub, curl, jq }: +{ stdenv, lib, writeShellScriptBin, fetchFromGitHub, curl, jq, runtimeShell }: stdenv.mkDerivation rec { name = "slack-cli-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp src/slack "$out/bin/.slack-wrapped" cat <<-WRAPPER > "$out/bin/slack" - #!${stdenv.shell} + #!${runtimeShell} [ "\$1" = "init" -a -z "\$SLACK_CLI_TOKEN" ] && cat <<-'MESSAGE' >&2 WARNING: slack-cli must be configured using the SLACK_CLI_TOKEN environment variable. Using \`slack init\` will not work because it tries diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 56b54fed61b..7cac5a45570 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, ant }: +{ stdenv, fetchFromGitHub, jdk, ant, runtimeShell }: stdenv.mkDerivation rec { name = "zap-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share" tar xvf "ZAP_${version}_Linux.tar.gz" -C "$out/share/" mkdir -p "$out/bin" - echo "#!${stdenv.shell}" > "$out/bin/zap" + echo "#!${runtimeShell}" > "$out/bin/zap" echo \"$out/share/ZAP_${version}/zap.sh\" >> "$out/bin/zap" chmod +x "$out/bin/zap" ''; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.owasp.org/index.php/ZAP; description = "Java application for web penetration testing"; - maintainers = with maintainers; [ mog ]; + maintainers = with maintainers; [ mog ]; platforms = platforms.linux; license = licenses.asl20; }; diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index 75ce3344e20..49fe307667a 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive +{ stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive, runtimeShell , extraPkgs ? pkgs: [], appimageTools }: let @@ -9,7 +9,7 @@ in buildFHSUserEnv (fhsArgs // { targetPkgs = pkgs: fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; runScript = writeScript "appimage-exec" '' - #!${stdenv.shell} + #!${runtimeShell} APPIMAGE="$(realpath "$1")" if [ ! -x "$APPIMAGE" ]; then diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index 063c173a401..efedb8b67da 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,4 +1,5 @@ -{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }: +{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper +, runtimeShell }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; version = "0.4.0"; @@ -26,7 +27,7 @@ let self = stdenv.mkDerivation rec { let impl = import "${self}/share/nix/api.nix" { inherit pkgs pinConfig; }; in { inherit (impl) augmentedPkgs pins callPackage; }; updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} set -e echo cd ${toString ./.} diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index 7584496f258..cabd1e491a7 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }: +{ stdenv, lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts +, runtimeShell }: python3Packages.buildPythonApplication rec { version = "0.6.3"; name = "nix-update-source-${version}"; @@ -28,7 +29,7 @@ python3Packages.buildPythonApplication rec { overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; }); }; updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} set -e echo cd ${toString ./.} diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index 4a9cd4867da..a025c69b738 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -3,7 +3,7 @@ let generic = { patches ? [] }: buildGoPackage rec { - version = "1.6.1"; + version = "1.6.4"; name = "certmgr-${version}"; goPackagePath = "github.com/cloudflare/certmgr/"; @@ -12,7 +12,7 @@ let owner = "cloudflare"; repo = "certmgr"; rev = "v${version}"; - sha256 = "1ky2pw1wxrb2fxfygg50h0mid5l023x6xz9zj5754a023d01qqr2"; + sha256 = "0glvyp61ya21pdm2bsvq3vfhmmxc2998vxc6hiyc79ijsv9n6jqi"; }; inherit patches; diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index accb92b13ea..a4a3b919e64 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,12 +1,12 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_5.6.5_amd64.deb", - "sha256": "c7529b745aa462b56eac17af6fe88d4c1610fd2f446d222aaad9510f19212a7d", - "version": "5.6.5" + "path": "pool/main/e/enpass/enpass_6.0.1.239_amd64.deb", + "sha256": "408a2bb318564307607f13b52fec7667f425c01ac40cbe345ebfa191ab1479ba", + "version": "6.0.1.239" }, "i386": { - "path": "pool/main/e/enpass/enpass_5.6.5_i386.deb", - "sha256": "de46e27d5552dcd9d72abac8e5c3b6161ad551ce191a2ee689c67367b63ff8f9", - "version": "5.6.5" + "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb", + "sha256": "3f699ac3e2ecfd4afee1505d8d364d4f6b6b94c55ba989d0a80bd678ff66cb2c", + "version": "5.6.9" } } \ No newline at end of file diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 0f0c4233ca9..97a692d7f33 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, dpkg, openssl, xorg +{ stdenv, fetchurl, dpkg, xorg , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype -, gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig +, gtk3, pango , makeWrapper , python, pythonPackages, lib -, libredirect, lsof +, lsof, curl, libuuid, cups, mesa_drivers }: let all_data = builtins.fromJSON (builtins.readFile ./data.json); system_map = { - i686-linux = "i386"; + # i686-linux = "i386"; Uncomment if enpass 6 becomes available on i386 x86_64-linux = "amd64"; }; @@ -18,7 +18,7 @@ let # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ - openssl + mesa_drivers libGLU_combined fontconfig freetype @@ -29,17 +29,15 @@ let libXi libSM libICE - libXext libXrender libXScrnSaver + libxcb glib - gtk2 + gtk3 pango - cairo - atk - gdk_pixbuf - jasper - stdenv.cc.cc + curl + libuuid + cups ]); package = stdenv.mkDerivation rec { @@ -63,39 +61,22 @@ let unpackPhase = "dpkg -X $src ."; installPhase='' - mkdir $out - cp -r opt/Enpass/* $out + mkdir -p $out/bin + cp -r opt/enpass/* $out/bin cp -r usr/* $out - rm $out/bin/runenpass.sh - cp $out/bin/EnpassHelper/EnpassHelper{,.untampered} - cp $out/bin/EnpassHelper/EnpassNMHost{,.untampered} sed \ - -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \ + -i s@/opt/enpass/Enpass@$out/bin/Enpass@ \ $out/share/applications/enpass.desktop - for i in $out/bin/{Enpass,EnpassHelper/{EnpassHelper,EnpassNMHost}}; do + for i in $out/bin/{Enpass,importer_enpass}; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i done - # The helper's sha256 sum must match, hence the use of libredirect. - # Also, lsof must be in the path for proper operation. + # lsof must be in PATH for proper operation wrapProgram $out/bin/Enpass \ - --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ - --set QT_PLUGIN_PATH "$out/plugins" \ - --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ - --set HIDE_TOOLBAR_LINE 0 \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered:$out/bin/EnpassHelper/EnpassNMHost=$out/bin/EnpassHelper/EnpassNMHost.untampered" \ + --set LD_LIBRARY_PATH "${libPath}" \ --prefix PATH : ${lsof}/bin - - makeWrapper $out/bin/EnpassHelper/{EnpassNMHost,runNativeMessaging.sh} \ - --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ - --set QT_PLUGIN_PATH "$out/plugins" \ - --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ - --set HIDE_TOOLBAR_LINE 0 ''; }; updater = { diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 62b92b7d0bd..2eda1908837 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText }: +{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText, runtimeShell }: let version = "1.4.0"; @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png cat > $out/bin/jd-gui <<EOF - #!${stdenv.shell} + #!${runtimeShell} export JAVA_HOME=${jre} ${jre}/bin/java -jar ${jar} $@ EOF diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 40385940a94..4207bac4473 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme , dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3 -, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook }: +, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook +, runtimeShell }: let versionSuffix = "20190205202117.6394d03e6c"; @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { mv opt/keybase $out/share/ cat > $out/bin/keybase-gui <<EOF - #!${stdenv.shell} + #!${runtimeShell} checkFailed() { if [ "\$NIX_SKIP_KEYBASE_CHECKS" = "1" ]; then diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 3a7e1b5a343..705338634f1 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,13 +1,8 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null +, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null , enableEmacs ? false }: -let - mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; - mkEnable = mkFlag "enable" "disable"; - mkWith = mkFlag "with" "without"; -in stdenv.mkDerivation rec { name = "pinentry-1.1.0"; @@ -30,14 +25,14 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - (mkWith (libcap != null) "libcap") - (mkEnable (libsecret != null) "libsecret") - (mkEnable (ncurses != null) "pinentry-curses") - (mkEnable true "pinentry-tty") - (mkEnable enableEmacs "pinentry-emacs") - (mkEnable (gtk2 != null) "pinentry-gtk2") - (mkEnable (gcr != null) "pinentry-gnome3") - (mkEnable (qt != null) "pinentry-qt") + (stdenv.lib.withFeature (libcap != null) "libcap") + (stdenv.lib.enableFeature (libsecret != null) "libsecret") + (stdenv.lib.enableFeature (ncurses != null) "pinentry-curses") + (stdenv.lib.enableFeature true "pinentry-tty") + (stdenv.lib.enableFeature enableEmacs "pinentry-emacs") + (stdenv.lib.enableFeature (gtk2 != null) "pinentry-gtk2") + (stdenv.lib.enableFeature (gcr != null) "pinentry-gnome3") + (stdenv.lib.enableFeature (qt != null) "pinentry-qt") ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix index 2ca515358a6..b4418e04f03 100644 --- a/pkgs/tools/text/esh/default.nix +++ b/pkgs/tools/text/esh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, asciidoctor, gawk, gnused }: +{ stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }: stdenv.mkDerivation rec { name = "esh-${version}"; @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . substituteInPlace esh \ - --replace '"/bin/sh"' '"${stdenv.shell}"' \ + --replace '"/bin/sh"' '"${runtimeShell}"' \ --replace '"awk"' '"${gawk}/bin/awk"' \ --replace 'sed' '${gnused}/bin/sed' substituteInPlace tests/test-dump.exp \ - --replace '#!/bin/sh' '#!${stdenv.shell}' + --replace '#!/bin/sh' '#!${runtimeShell}' ''; doCheck = true; diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 5f926f771c5..9240926ab5b 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ant, jdk }: +{ fetchurl, stdenv, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { name = "fop-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # There is a fop script in the source archive, but it has many impurities. # Instead of patching out 90 % of the script, we write our own. cat > "$out/bin/fop" <<EOF - #!${stdenv.shell} + #!${runtimeShell} java_exec_args="-Djava.awt.headless=true" exec ${jdk.jre}/bin/java \$java_exec_args -classpath "$out/lib/*" org.apache.fop.cli.Main "\$@" EOF diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index d18164be3be..491116127d2 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "1f3qrnbjr9ikbdvpsyx726nyiz4f7ka38rimy9fvbl7kmi62w1v7"; + sha256 = "0w81mz99ap037ih8ws6zsjkcfr90hgjmnplsg4c6bqdj50ad32n6"; }; postPatch = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7634a678e74..252a87266e7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -99,7 +99,7 @@ mapAliases ({ firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 flameGraph = flamegraph; # added 2018-04-25 - font-awesome-ttf = font-awesome_4; # 2018-02-25 + font-awesome-ttf = font-awesome; # 2018-02-25 foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 313871ff65c..e26fe4f6ebf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1181,6 +1181,8 @@ in clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; + clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; + colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; colpack = callPackage ../applications/science/math/colpack { }; @@ -1869,6 +1871,8 @@ in cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; + cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; @@ -3793,6 +3797,8 @@ in mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; + mcfly = callPackage ../tools/misc/mcfly { }; + mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -4419,6 +4425,10 @@ in netselect = callPackage ../tools/networking/netselect { }; + nettee = callPackage ../tools/networking/nettee { + inherit (skawarePackages) cleanPackaging; + }; + # stripped down, needed by steam networkmanager098 = callPackage ../tools/networking/network-manager/0.9.8 { }; @@ -6678,6 +6688,8 @@ in useMacosReexportHack = true; }; }; + llvm-polly = llvmPackages_7.llvm-polly; + clang-polly = clang_7.override { cc = llvmPackages_7.clang-polly-unwrapped; }; clang_7 = llvmPackages_7.clang; clang_6 = llvmPackages_6.clang; @@ -6832,7 +6844,10 @@ in { substitutions = { gcc = gcc-unwrapped; }; } ../development/compilers/gcc/libstdc++-hook.sh; - crossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic; + crossLibcStdenv = overrideCC stdenv + (if stdenv.targetPlatform.useLLVM or false + then buildPackages.llvmPackages_7.lldClangNoLibc + else buildPackages.gccCrossStageStatic); # The GCC used to build libc for the target platform. Normal gccs will be # built with, and use, that cross-compiled libc. @@ -7374,13 +7389,11 @@ in stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); - llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({ + llvmPackages_7 = callPackage ../development/compilers/llvm/7 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; llvmPackages_latest = llvmPackages_7; @@ -12541,8 +12554,11 @@ in skalibs = skawarePackages.skalibs; - skawarePackages = recurseIntoAttrs { - buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { }; + skawarePackages = recurseIntoAttrs rec { + cleanPackaging = callPackage ../build-support/skaware/clean-packaging.nix { }; + buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { + inherit cleanPackaging; + }; skalibs = callPackage ../development/libraries/skalibs { }; execline = callPackage ../tools/misc/execline { }; @@ -15489,6 +15505,8 @@ in cm_unicode = callPackage ../data/fonts/cm-unicode {}; + creep = callPackage ../data/fonts/creep { }; + crimson = callPackage ../data/fonts/crimson {}; dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {}); @@ -15584,8 +15602,8 @@ in fira-mono = callPackage ../data/fonts/fira-mono { }; - font-awesome_4 = callPackage ../data/fonts/font-awesome-4 { }; font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { }; + font-awesome = font-awesome_5; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; @@ -19020,7 +19038,7 @@ in qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; - qtractor = callPackage ../applications/audio/qtractor { }; + qtractor = libsForQt5.callPackage ../applications/audio/qtractor { }; qtscrobbler = callPackage ../applications/audio/qtscrobbler { }; @@ -20293,6 +20311,8 @@ in xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; + xmobar = haskellPackages.xmobar; + xmonad-log = callPackage ../tools/misc/xmonad-log { }; xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { @@ -22276,6 +22296,8 @@ in cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; + cups-brother-hl3140cw = pkgsi686Linux.callPackage ../misc/cups/drivers/hl3140cw { }; + cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { }; # this driver ships with pre-compiled 32-bit binary libraries diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 32498592392..681650b7000 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3256,6 +3256,18 @@ let }; }; + DataHexdumper = buildPerlPackage rec { + name = "Data-Hexdumper-3.0001"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz"; + sha256 = "f9243cbe8affed5045fe4df505726a7a7289471e30c51ac065b3ed6ce0d1a604"; + }; + meta = { + description = "Make binary data human-readable"; + license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; + }; + }; + DataHierarchy = buildPerlPackage { name = "Data-Hierarchy-0.34"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 52018b43991..8c7f4830363 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -165,6 +165,18 @@ let sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; }; + sqlsrv = buildPecl rec { + name = "sqlsrv-5.6.0"; + sha256 = "089iy2lz7p3x9c88zaxrg37m74gh3phxqsldr33nj16rpb5d67bc"; + buildInputs = [ pkgs.unixODBC ]; + }; + + pdo_sqlsrv = buildPecl rec { + name = "pdo_sqlsrv-5.6.0"; + sha256 = "11g07l6mn804hbcmwqwfd6a4yx5bz54bmk5j2dpm8nil1rq9qb7r"; + buildInputs = [ pkgs.unixODBC ]; + }; + xdebug = if isPhp73 then xdebug73 else xdebug7; xdebug7 = assert !isPhp73; buildPecl { diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 6ca370e0b9b..2aa07517fdf 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -67,6 +67,7 @@ let trivialBuilders = self: super: import ../build-support/trivial-builders.nix { inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; + inherit (self) runtimeShell; }; stdenvBootstappingAndPlatforms = self: super: { |